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

Possibility to change UPnP ID (#354)

Browse Source
This commit is contained in:
davtoro 2019-12-16 03:22:24 +01:00 committed by Matt Joiner
parent f448f55e88
commit 82e1c81a9a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.go
View File

@ -32,6 +32,7 @@ type ClientConfig struct {
ListenHost func(network string) string
ListenPort int
NoDefaultPortForwarding bool
UpnpID string
// Don't announce to trackers. This only leaves DHT to discover peers.
DisableTrackers bool `long:"disable-trackers"`
DisablePEX bool `long:"disable-pex"`
@ -151,6 +152,7 @@ func NewDefaultClientConfig() *ClientConfig {
HTTPUserAgent: DefaultHTTPUserAgent,
ExtendedHandshakeClientVersion: "go.torrent dev 20181121",
Bep20: "-GT0002-",
UpnpID: "anacrolix/torrent",
NominalDialTimeout: 20 * time.Second,
MinDialTimeout: 3 * time.Second,
EstablishedConnsPerTorrent: 50,

9
portfwd.go
View File

@ -7,8 +7,8 @@ import (
"github.com/anacrolix/upnp"
)
func (cl *Client) addPortMapping(d upnp.Device, proto upnp.Protocol, internalPort int) {
externalPort, err := d.AddPortMapping(proto, internalPort, internalPort, "anacrolix/torrent", 0)
func (cl *Client) addPortMapping(d upnp.Device, proto upnp.Protocol, internalPort int, upnpID string) {
externalPort, err := d.AddPortMapping(proto, internalPort, internalPort, upnpID, 0)
if err != nil {
cl.logger.WithValues(log.Warning).Printf("error adding %s port mapping: %s", proto, err)
} else if externalPort != internalPort {
@ -29,10 +29,11 @@ func (cl *Client) forwardPort() {
cl.lock()
cl.logger.Printf("discovered %d upnp devices", len(ds))
port := cl.incomingPeerPort()
id := cl.config.UpnpID
cl.unlock()
for _, d := range ds {
go cl.addPortMapping(d, upnp.TCP, port)
go cl.addPortMapping(d, upnp.UDP, port)
go cl.addPortMapping(d, upnp.TCP, port, id)
go cl.addPortMapping(d, upnp.UDP, port, id)
}
cl.lock()
}