octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 11:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1784 from calmh/fix-1782

Browse Source 
Implement upnpSvc.Stop() (fixes #1782)
This commit is contained in:
Zillode 2015-05-10 14:47:02 +02:00
commit 1a11ce6211
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/syncthing/upnpsvc.go
View File

@ -19,6 +19,7 @@ import (
type upnpSvc struct { type upnpSvc struct {
cfg *config.Wrapper cfg *config.Wrapper
localPort int localPort int
stop chan struct{}
} }
func newUPnPSvc(cfg *config.Wrapper, localPort int) *upnpSvc { func newUPnPSvc(cfg *config.Wrapper, localPort int) *upnpSvc {
@ -31,6 +32,7 @@ func newUPnPSvc(cfg *config.Wrapper, localPort int) *upnpSvc {
func (s *upnpSvc) Serve() { func (s *upnpSvc) Serve() {
extPort := 0 extPort := 0
foundIGD := true foundIGD := true
s.stop = make(chan struct{})
for { for {
igds := upnp.Discover(time.Duration(s.cfg.Options().UPnPTimeoutS) * time.Second) igds := upnp.Discover(time.Duration(s.cfg.Options().UPnPTimeoutS) * time.Second)
@ -49,12 +51,17 @@ func (s *upnpSvc) Serve() {
// We always want to do renewal so lets just pick a nice sane number. // We always want to do renewal so lets just pick a nice sane number.
d = 30 * time.Minute d = 30 * time.Minute
} }
time.Sleep(d)
select {
case <-s.stop:
return
case <-time.After(d):
}
} }
} }
func (s *upnpSvc) Stop() { func (s *upnpSvc) Stop() {
panic("upnpSvc cannot stop") close(s.stop)
} }
func (s *upnpSvc) tryIGDs(igds []upnp.IGD, prevExtPort int) int { func (s *upnpSvc) tryIGDs(igds []upnp.IGD, prevExtPort int) int {