status-im/torrent
2
0
Fork 0
mirror of synced 2025-02-23 14:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up UPnP logging

Browse Source
This commit is contained in:
Matt Joiner 2019-09-13 11:55:02 +10:00
parent 1a4eb45d4d
commit 16a03ed4d4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
portfwd.go
View File

@ -7,14 +7,14 @@ import (
"github.com/anacrolix/upnp"
)
func addPortMapping(d upnp.Device, proto upnp.Protocol, internalPort int, debug bool) {
func (cl *Client) addPortMapping(d upnp.Device, proto upnp.Protocol, internalPort int) {
externalPort, err := d.AddPortMapping(proto, internalPort, internalPort, "anacrolix/torrent", 0)
if err != nil {
log.Printf("error adding %s port mapping: %s", proto, err)
cl.logger.WithValues(log.Warning).Printf("error adding %s port mapping: %s", proto, err)
} else if externalPort != internalPort {
log.Printf("external port %d does not match internal port %d in port mapping", externalPort, internalPort)
} else if debug {
log.Printf("forwarded external %s port %d", proto, externalPort)
cl.logger.WithValues(log.Warning).Printf("external port %d does not match internal port %d in port mapping", externalPort, internalPort)
} else {
cl.logger.WithValues(log.Info).Printf("forwarded external %s port %d", proto, externalPort)
}
}
@ -25,14 +25,14 @@ func (cl *Client) forwardPort() {
return
}
cl.unlock()
ds := upnp.Discover(0, 2*time.Second, cl.logger)
ds := upnp.Discover(0, 2*time.Second, cl.logger.WithValues("upnp-discover"))
cl.lock()
cl.logger.Printf("discovered %d upnp devices", len(ds))
port := cl.incomingPeerPort()
cl.unlock()
for _, d := range ds {
go addPortMapping(d, upnp.TCP, port, cl.config.Debug)
go addPortMapping(d, upnp.UDP, port, cl.config.Debug)
go cl.addPortMapping(d, upnp.TCP, port)
go cl.addPortMapping(d, upnp.UDP, port)
}
cl.lock()
}