mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-05 04:06:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/netstack: only remove address from netstack when all TCP connections done

Browse Source 
Signed-off-by: Naman Sood <mail@nsood.in>
This commit is contained in:
Naman Sood 2021-03-26 10:45:20 -04:00
parent 8e8c1a1d38
commit 6a00f2a3c9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wgengine/netstack/netstack.go
View File

@ -179,9 +179,12 @@ func (ns *Impl) addSubnetAddress(pn tcpip.NetworkProtocolNumber, addr tcpip.Addr
func (ns *Impl) removeSubnetAddress(addr tcpip.Address) {
ns.mu.Lock()
defer ns.mu.Unlock()
ns.connsToSubnetIP[addr]--
ns.mu.Unlock()
ns.ipstack.RemoveAddress(nicID, addr)
if ns.connsToSubnetIP[addr] == 0 {
ns.ipstack.RemoveAddress(nicID, addr)
delete(ns.connsToSubnetIP, addr)
}
}
func ipPrefixToAddressWithPrefix(ipp netaddr.IPPrefix) tcpip.AddressWithPrefix {
@ -217,12 +220,9 @@ func (ns *Impl) updateIPs(nm *netmap.NetworkMap) {
}
ns.mu.Lock()
for ip := range ns.connsToSubnetIP {
if ns.connsToSubnetIP[ip] > 0 {
ipsToBeAdded[ip.WithPrefix()] = true
} else {
ipsToBeRemoved[ip.WithPrefix()] = true
delete(ns.connsToSubnetIP, ip)
}
ipp := ip.WithPrefix()
ipsToBeAdded[ipp] = true
delete(ipsToBeRemoved, ipp)
}
ns.mu.Unlock()