merge wiring: route agent address lookups through ResolveAgentAddresses (V1.0.1)

internal/sub/service.go

@@ -1353,10 +1353,11 @@ func (s *SubService) agentNodeAddress(nodeID int) string {
 	if !ok || ag == nil {
 		return ""
 	}
-	if ip := strings.TrimSpace(ag.IPv4); ip != "" {
-		return ip
+	v4, v6 := service.ResolveAgentAddresses(ag)
+	if v4 != "" {
+		return v4
 	}
-	return strings.TrimSpace(ag.IPv6)
+	return v6
 }
 
 // resolveInboundAddress picks the host an external client should connect to,

internal/web/service/inbound.go

@@ -499,9 +499,10 @@ func agentAdvertisedAddresses(db *gorm.DB, nodeIDs map[int]bool) map[int]string
 		if _, done := out[*ag.NodeID]; done {
 			continue
 		}
-		addr := strings.TrimSpace(ag.IPv4)
+		v4, v6 := ResolveAgentAddresses(ag)
+		addr := v4
 		if addr == "" {
-			addr = strings.TrimSpace(ag.IPv6)
+			addr = v6
 		}
 		out[*ag.NodeID] = addr
 	}