return all the public addresses in NatInfo

2023-05-10 11:54:48 +03:00
parent b414124e5e
commit ca9c873858
6 changed files with 31 additions and 5 deletions
@@ -16,6 +16,7 @@ import (
 	"github.com/libp2p/go-libp2p/p2p/net/swarm"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"
 	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr/net"
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"

@@ -134,7 +135,7 @@ func (a *NetAPI) NetFindPeer(ctx context.Context, p peer.ID) (peer.AddrInfo, err
 	return a.Router.FindPeer(ctx, p)
 }

-func (a *NetAPI) NetAutoNatStatus(ctx context.Context) (i api.NatInfo, err error) {
+func (a *NetAPI) NetAutoNatStatus(context.Context) (i api.NatInfo, err error) {
 	autonat := a.RawHost.(*basichost.BasicHost).GetAutoNat()

 	if autonat == nil {
@@ -143,7 +144,19 @@ func (a *NetAPI) NetAutoNatStatus(ctx context.Context) (i api.NatInfo, err error
 		}, nil
 	}

-	return api.NatInfo{Reachability: autonat.Status()}, nil
+	var addrs []string
+	if autonat.Status() == network.ReachabilityPublic {
+		for _, addr := range a.Host.Addrs() {
+			if manet.IsPublicAddr(addr) {
+				addrs = append(addrs, addr.String())
+			}
+		}
+	}
+
+	return api.NatInfo{
+		Reachability: autonat.Status(),
+		PublicAddrs:  addrs,
+	}, nil
 }

 func (a *NetAPI) NetAgentVersion(ctx context.Context, p peer.ID) (string, error) {