Merge a47995f into backport/derekm/NET-6459/wanfed-oom/needlessly-pre…

…mium-sculpin

.changelog/19503.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+wan-federation: Fix a bug where servers wan-federated through mesh-gateways could crash due to overlapping LAN IP addresses.
+```

agent/pool/pool.go

@@ -46,6 +46,7 @@ type Conn struct {
 	refCount    int32
 	shouldClose int32
 
+	dc       string
 	nodeName string
 	addr     net.Addr
 	session  muxSession
@@ -231,7 +232,7 @@ func (p *ConnPool) acquire(dc string, nodeName string, addr net.Addr) (*Conn, er
 
 	addrStr := addr.String()
 
-	poolKey := nodeName + ":" + addrStr
+	poolKey := makePoolKey(dc, nodeName, addrStr)
 
 	// Check to see if there's a pooled connection available. This is up
 	// here since it should the vastly more common case than the rest
@@ -490,6 +491,7 @@ func (p *ConnPool) getNewConn(dc string, nodeName string, addr net.Addr) (*Conn,
 	// Wrap the connection
 	c := &Conn{
 		refCount: 1,
+		dc:       dc,
 		nodeName: nodeName,
 		addr:     addr,
 		session:  session,
@@ -511,7 +513,7 @@ func (p *ConnPool) clearConn(conn *Conn) {
 
 	// Clear from the cache
 	addrStr := conn.addr.String()
-	poolKey := conn.nodeName + ":" + addrStr
+	poolKey := makePoolKey(conn.dc, conn.nodeName, addrStr)
 	p.Lock()
 	if c, ok := p.pool[poolKey]; ok && c == conn {
 		delete(p.pool, poolKey)
@@ -713,3 +715,8 @@ func (p *ConnPool) reap() {
 		p.Unlock()
 	}
 }
+
+// makePoolKey generates a unique key for grouping connections together into a pool.
+func makePoolKey(dc, nodeName, addrStr string) string {
+	return dc + ":" + nodeName + ":" + addrStr
+}