mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-04 14:08:39 +00:00
p2p/nat: server list contains IPv6 servers (#35084)
stun-list.txt includes 10 bracketd IPv6 server, but the dial network is fixed to "udp4"
This commit is contained in:
parent
19f5fe079b
commit
38667bc64e
2 changed files with 3 additions and 2 deletions
|
|
@ -73,6 +73,7 @@ func TestParseStun(t *testing.T) {
|
||||||
}{
|
}{
|
||||||
{"stun", &stun{serverList: strings.Split(stunDefaultServers, "\n")}},
|
{"stun", &stun{serverList: strings.Split(stunDefaultServers, "\n")}},
|
||||||
{"stun:1.2.3.4:1234", &stun{serverList: []string{"1.2.3.4:1234"}}},
|
{"stun:1.2.3.4:1234", &stun{serverList: []string{"1.2.3.4:1234"}}},
|
||||||
|
{"stun:[2001:db8::1]:3478", &stun{serverList: []string{"[2001:db8::1]:3478"}}},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range testcases {
|
for _, tc := range testcases {
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ func newSTUN(serverAddr string) (Interface, error) {
|
||||||
if serverAddr == "" {
|
if serverAddr == "" {
|
||||||
s.serverList = strings.Split(stunDefaultServers, "\n")
|
s.serverList = strings.Split(stunDefaultServers, "\n")
|
||||||
} else {
|
} else {
|
||||||
_, err := net.ResolveUDPAddr("udp4", serverAddr)
|
_, err := net.ResolveUDPAddr("udp", serverAddr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
@ -111,7 +111,7 @@ func (s *stun) externalIP(server string) (net.IP, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Trace("Attempting STUN binding request", "server", server)
|
log.Trace("Attempting STUN binding request", "server", server)
|
||||||
conn, err := stunV3.Dial("udp4", server)
|
conn, err := stunV3.Dial("udp", server)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue