p2p: Make p2p listen address configurable via config.NetAddress

network/p2p/p2p.go

@@ -20,6 +20,7 @@
 	"context"
 	"fmt"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/algorand/go-algorand/config"
@@ -83,13 +84,22 @@
 	version := config.GetCurrentVersion()
 	ua := fmt.Sprintf("algod/%d.%d (%s; commit=%s; %d) %s(%s)", version.Major, version.Minor, version.Channel, version.CommitHash, version.BuildNumber, runtime.GOOS, runtime.GOARCH)
 
+	var listenAddr string
+	if cfg.NetAddress != "" {
+		if parsedListenAddr, perr := netAddressToListenAddress(cfg.NetAddress); perr == nil {
+			listenAddr = parsedListenAddr
+		}
+	} else {
+		listenAddr = "/ip4/0.0.0.0/tcp/0"
+	}
+
 	h, err := libp2p.New(
 		libp2p.Identity(privKey),
 		libp2p.UserAgent(ua),
 		libp2p.Transport(tcp.NewTCPTransport),
 		libp2p.Muxer("/yamux/1.0.0", &ymx),
 		libp2p.Peerstore(pstore),
-		libp2p.ListenAddrStrings("/ip4/0.0.0.0/tcp/0"),
+		libp2p.ListenAddrStrings(listenAddr),
 	)
 	if err != nil {
 		return nil, err
@@ -173,3 +183,23 @@
 func (s *serviceImpl) ClosePeer(peer peer.ID) error {
 	return s.host.Network().ClosePeer(peer)
 }
+
+// netAddressToListenAddress converts a netAddress in "ip:port" format to a listen address
+// that can be passed in to libp2p.ListenAddrStrings
+func netAddressToListenAddress(netAddress string) (string, error) {
+	// split the string on ":"
+	// if there are more than 2 parts, return an error
+	parts := strings.Split(netAddress, ":")
+	if len(parts) != 2 {
+		return "", fmt.Errorf("invalid netAddress %s; required format is \"ip:port\"", netAddress)
+	}
+	ip := "0.0.0.0"
+	if parts[0] != "" {
+		ip = parts[0]
+	}
+	if parts[1] == "" {
+		return "", fmt.Errorf("invalid netAddress %s, port is required", netAddress)
+	}
+
+	return fmt.Sprintf("/ip4/%s/tcp/%s", ip, parts[1]), nil
+}

network/p2p/p2p_test.go

@@ -0,0 +1,76 @@
+// Copyright (C) 2019-2023 Algorand, Inc.
+// This file is part of go-algorand
+//
+// go-algorand is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// go-algorand is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with go-algorand.  If not, see <https://www.gnu.org/licenses/>.
+
+package p2p
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/algorand/go-algorand/test/partitiontest"
+	"github.com/stretchr/testify/require"
+)
+
+// Tests the helper function netAddressToListenAddress which converts
+// a config value netAddress to a multiaddress usable by libp2p.
+func TestNetAddressToListenAddress(t *testing.T) {
+	partitiontest.PartitionTest(t)
+	t.Parallel()
+
+	tests := []struct {
+		input  string
+		output string
+		err    bool
+	}{
+		{
+			input:  "192.168.1.1:8080",
+			output: "/ip4/192.168.1.1/tcp/8080",
+			err:    false,
+		},
+		{
+			input:  ":8080",
+			output: "/ip4/0.0.0.0/tcp/8080",
+			err:    false,
+		},
+		{
+			input:  "192.168.1.1:",
+			output: "",
+			err:    true,
+		},
+		{
+			input:  "192.168.1.1",
+			output: "",
+			err:    true,
+		},
+		{
+			input:  "192.168.1.1:8080:9090",
+			output: "",
+			err:    true,
+		},
+	}
+
+	for _, test := range tests { //nolint:paralleltest
+		t.Run(fmt.Sprintf("input: %s", test.input), func(t *testing.T) {
+			res, err := netAddressToListenAddress(test.input)
+			if test.err {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				require.Equal(t, test.output, res)
+			}
+		})
+	}
+}