perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rediscover gateway on UPnP renewal

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-08-13 21:15:20 +01:00
parent dc9df0a79a
commit 870e3ca893
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/syncthing/main.go
View File

@ -577,9 +577,6 @@ func setupUPnP(rnd rand.Source) {
if err == nil { if err == nil {
externalPort = r externalPort = r
l.Infoln("Created UPnP port mapping - external port", externalPort) l.Infoln("Created UPnP port mapping - external port", externalPort)
if cfg.Options.UPnPRenewal > 0 {
go renewUPnP(igd, rnd, port)
}
break break
} }
} }
@ -592,17 +589,25 @@ func setupUPnP(rnd rand.Source) {
l.Debugf("UPnP: %v", err) l.Debugf("UPnP: %v", err)
} }
} }
if cfg.Options.UPnPRenewal > 0 {
go renewUPnP(rnd, port)
}
} }
} else { } else {
l.Warnln("Multiple listening addresses; not attempting UPnP port mapping") l.Warnln("Multiple listening addresses; not attempting UPnP port mapping")
} }
} }
func renewUPnP(igd *upnp.IGD, rnd rand.Source, port int) { func renewUPnP(rnd rand.Source, port int) {
for { for {
time.Sleep(time.Duration(cfg.Options.UPnPRenewal) * time.Minute) time.Sleep(time.Duration(cfg.Options.UPnPRenewal) * time.Minute)
err := igd.AddPortMapping(upnp.TCP, externalPort, port, "syncthing", cfg.Options.UPnPLease*60) igd, err := upnp.Discover()
if err != nil {
continue
}
err = igd.AddPortMapping(upnp.TCP, externalPort, port, "syncthing", cfg.Options.UPnPLease*60)
if err == nil { if err == nil {
l.Infoln("Renewed UPnP port mapping - external port", externalPort) l.Infoln("Renewed UPnP port mapping - external port", externalPort)
continue continue