Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
node: relayTransportAddr as a slice of the circuit's components
Antonio Ojea8be6847d54f9
diff --git a/internal/node/mcp.go b/internal/node/mcp.goindex ae22dc9c..4245c684 100644--- a/internal/node/mcp.go+++ b/internal/node/mcp.go@@ -591,17 +591,17 @@ func circuitRelay(ma multiaddr.Multiaddr) peer.ID {}// relayTransportAddr is the relay's own address carried in a circuit-// address, or nil for a bare /p2p/<relay>/p2p-circuit.+// address, the components before /p2p/<relay>/p2p-circuit, or nil for a+// bare circuit or any other address.func relayTransportAddr(ma multiaddr.Multiaddr) multiaddr.Multiaddr {+ if circuitRelay(ma) == "" {+ return nil+ }parts := multiaddr.Split(ma)if len(parts) < 3 {return nil}- var via multiaddr.Multiaddr- for _, c := range parts[:len(parts)-2] {- via = via.AppendComponent(&c)- }- return via+ return multiaddr.Multiaddr(slices.Clone(parts[:len(parts)-2]))}// transitCatalogRefreshInterval bounds how often a relay the catalog doesdiff --git a/internal/node/mcp_test.go b/internal/node/mcp_test.goindex d4f34eea..70de3daf 100644--- a/internal/node/mcp_test.go+++ b/internal/node/mcp_test.go@@ -309,3 +309,27 @@ func TestSplitToolName(t *testing.T) {})}}++// The relay's own address is what a circuit address carries before its+// /p2p/<relay>/p2p-circuit tail; a bare circuit and a direct address carry+// none.+func TestRelayTransportAddr(t *testing.T) {+ relayHost, err := mocknet.New().GenPeer()+ if err != nil {+ t.Fatal(err)+ }+ relay := relayHost.ID().String()+ for _, tc := range []struct {+ addr, want string+ }{+ {"/ip4/136.113.153.46/udp/4501/quic-v1/p2p/" + relay + "/p2p-circuit", "/ip4/136.113.153.46/udp/4501/quic-v1"},+ {"/dns4/bootstrap.example/tcp/4501/p2p/" + relay + "/p2p-circuit", "/dns4/bootstrap.example/tcp/4501"},+ {"/p2p/" + relay + "/p2p-circuit", ""},+ {"/ip4/10.0.0.1/tcp/5002", ""},+ } {+ got := relayTransportAddr(multiaddr.StringCast(tc.addr))+ if (got == nil) != (tc.want == "") || (got != nil && got.String() != tc.want) {+ t.Errorf("relayTransportAddr(%s) = %v, want %q", tc.addr, got, tc.want)+ }+ }+}