forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p/nat: remove forceful port mapping in upnp

Browse source
This commit is contained in:
qqqeck 2024-08-05 13:43:27 +09:00 committed by Csaba Kiraly
parent ee30681a8d
commit ca78b84407
No known key found for this signature in database
GPG key ID: 0FE274EE8C95166E
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
p2p/nat/natupnp.go
View file

@ -86,7 +86,6 @@ func (n *upnp) AddMapping(protocol string, extport, intport int, desc string, li
} }
protocol = strings.ToUpper(protocol) protocol = strings.ToUpper(protocol)
lifetimeS := uint32(lifetime / time.Second) lifetimeS := uint32(lifetime / time.Second)
n.DeleteMapping(protocol, extport, intport)
err = n.withRateLimit(func() error { err = n.withRateLimit(func() error {
return n.client.AddPortMapping("", uint16(extport), protocol, uint16(intport), ip.String(), true, desc, lifetimeS) return n.client.AddPortMapping("", uint16(extport), protocol, uint16(intport), ip.String(), true, desc, lifetimeS)
@ -111,13 +110,16 @@ func (n *upnp) addAnyPortMapping(protocol string, extport, intport int, ip net.I
} }
// It will retry with a random port number if the client does // It will retry with a random port number if the client does
// not support AddAnyPortMapping. // not support AddAnyPortMapping.
var err error
for i := 0; i < 3; i++ {
extport = n.randomPort() extport = n.randomPort()
err := n.client.AddPortMapping("", uint16(extport), protocol, uint16(intport), ip.String(), true, desc, lifetimeS) err := n.client.AddPortMapping("", uint16(extport), protocol, uint16(intport), ip.String(), true, desc, lifetimeS)
if err != nil { if err == nil {
return 0, err
}
return uint16(extport), nil return uint16(extport), nil
} }
}
return 0, err
}
func (n *upnp) randomPort() int { func (n *upnp) randomPort() int {
if n.rand == nil { if n.rand == nil {