Merge pull request #511 from shutter-network/feat/libp2p-advertiseaddr

libp2p: Add advertise addresses config option

Author: ulope

rolling-shutter/p2p/config.go

@@ -43,6 +43,7 @@ func (c *Config) Init() {
 type Config struct {
 	P2PKey                   *keys.Libp2pPrivate `shconfig:",required"`
 	ListenAddresses          []*address.P2PAddress
+	AdvertiseAddresses       []*address.P2PAddress `comment:"Optional, addresses to be advertised to other peers instead of auto-detected ones."`
 	CustomBootstrapAddresses []*address.P2PAddress `comment:"Overwrite p2p boostrap nodes"`
 	Environment              env.Environment
 	DiscoveryNamespace       string `shconfig:",required" comment:"Must be unique for each instance id."`

rolling-shutter/p2p/messaging.go

@@ -88,8 +88,13 @@ func New(config *Config) (*P2PMessaging, error) {
 	for _, addr := range config.ListenAddresses {
 		listenAddresses = append(listenAddresses, addr.Multiaddr)
 	}
+	advertiseAddresses := []multiaddr.Multiaddr{}
+	for _, addr := range config.AdvertiseAddresses {
+		advertiseAddresses = append(advertiseAddresses, addr.Multiaddr)
+	}
 	cfg := &p2pNodeConfig{
 		ListenAddrs:        listenAddresses,
+		AdvertiseAddrs:     advertiseAddresses,
 		PrivKey:            *config.P2PKey,
 		Environment:        config.Environment,
 		DiscoveryNamespace: config.DiscoveryNamespace,

rolling-shutter/p2p/p2p.go

@@ -64,6 +64,7 @@ type P2PNode struct {
 
 type p2pNodeConfig struct {
 	ListenAddrs        []multiaddr.Multiaddr
+	AdvertiseAddrs     []multiaddr.Multiaddr
 	BootstrapPeers     []peer.AddrInfo
 	PrivKey            keys.Libp2pPrivate
 	Environment        env.Environment
@@ -216,6 +217,14 @@ func createHost(
 			// Attempt to open ports using uPNP for NATed hosts.
 			libp2p.NATPortMap(),
 		)
+		if len(config.AdvertiseAddrs) > 0 {
+			// If advertise addresses are set, only advertise those
+			options = append(options,
+				libp2p.AddrsFactory(func(addrs []multiaddr.Multiaddr) []multiaddr.Multiaddr {
+					return config.AdvertiseAddrs
+				}),
+			)
+		}
 		if len(config.BootstrapPeers) > 0 {
 			options = append(options,
 				libp2p.EnableAutoRelayWithStaticRelays(config.BootstrapPeers),