Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/connections: Stun resolves server adress beforehand (fixes #4453) 

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4454
This commit is contained in:
Audrius Butkevicius 2017-10-22 18:48:06 +00:00
parent b2966957e0
commit a9c221189b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/connections/kcp_listen.go
View File

@ -200,6 +200,7 @@ func (t *kcpListener) stunRenewal(listener net.PacketConn) {
var natType stun.NATType
var extAddr *stun.Host
var udpAddr *net.UDPAddr
var err error
oldType := stun.NATUnknown
@ -218,7 +219,17 @@ func (t *kcpListener) stunRenewal(listener net.PacketConn) {
}
for _, addr := range t.cfg.StunServers() {
client.SetServerAddr(addr)
// Resolve the address, so that in case the server advertises two
// IPs, we always hit the same one, as otherwise, the mapping might
// expire as we hit the other address, and cause us to flip flop
// between servers/external addresses, as a result flooding discovery
// servers.
udpAddr, err = net.ResolveUDPAddr("udp", addr)
if err != nil {
l.Debugf("%s stun addr resolution on %s: %s", t.uri, addr, err)
continue
}
client.SetServerAddr(udpAddr.String())
natType, extAddr, err = client.Discover()
if err != nil || extAddr == nil {