before removing a pending hostinfo in handshake_manager, make sure it's the one we wanted to delete (#1811)

JackDoan · web-flow · commit a99699e3707b · 2026-07-21T10:31:00.000-05:00
diff --git a/handshake_manager.go b/handshake_manager.go
@@ -529,7 +529,9 @@ func (hm *HandshakeManager) DeleteHostInfo(hostinfo *HostInfo) {
 
 func (hm *HandshakeManager) unlockedDeleteHostInfo(hostinfo *HostInfo) {
 	for _, addr := range hostinfo.vpnAddrs {
-		delete(hm.vpnIps, addr)
+		if cur, ok := hm.vpnIps[addr]; ok && cur.hostinfo == hostinfo {
+			delete(hm.vpnIps, addr)
+		}
 	}
 
 	if len(hm.vpnIps) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,9 @@ func (hm HandshakeManager) DeleteHostInfo(hostinfo HostInfo) {`
`529`	`529`
`530`	`530`	`func (hm HandshakeManager) unlockedDeleteHostInfo(hostinfo HostInfo) {`
`531`	`531`	`for _, addr := range hostinfo.vpnAddrs {`
`532`		`- delete(hm.vpnIps, addr)`
	`532`	`+ if cur, ok := hm.vpnIps[addr]; ok && cur.hostinfo == hostinfo {`
	`533`	`+ delete(hm.vpnIps, addr)`
	`534`	`+ }`
`533`	`535`	`}`
`534`	`536`
`535`	`537`	`if len(hm.vpnIps) == 0 {`