change port logic on sudph and stcpr init

pkg/transport/manager.go

@@ -84,7 +84,7 @@ func NewManager(log *logging.Logger, arClient addrresolver.APIClient, ebc *appev
 // InitDmsgClient initilizes the dmsg client and also adds dmsgC to the factory
 func (tm *Manager) InitDmsgClient(ctx context.Context, dmsgC *dmsg.Client) {
 	tm.factory.DmsgC = dmsgC
-	tm.InitClient(ctx, network.DMSG)
+	tm.InitClient(ctx, network.DMSG, 0)
 }
 
 // Serve starts all network clients and starts accepting connections
@@ -146,9 +146,8 @@ func (tm *Manager) SetPTpsCache(pTps []PersistentTransports) {
 }
 
 // InitClient initilizes a network client
-func (tm *Manager) InitClient(ctx context.Context, netType network.Type) {
-
-	client, err := tm.factory.MakeClient(netType)
+func (tm *Manager) InitClient(ctx context.Context, netType network.Type, port int) {
+	client, err := tm.factory.MakeClient(netType, port)
 	if err != nil {
 		tm.Logger.Warnf("Cannot initialize %s transport client", netType)
 	}

pkg/transport/network/client.go

@@ -62,7 +62,7 @@ type ClientFactory struct {
 }
 
 // MakeClient creates a new client of specified type
-func (f *ClientFactory) MakeClient(netType Type) (Client, error) {
+func (f *ClientFactory) MakeClient(netType Type, port int) (Client, error) {
 	log := logging.MustGetLogger(string(netType))
 	if f.MLogger != nil {
 		log = f.MLogger.PackageLogger(string(netType))
@@ -88,9 +88,9 @@ func (f *ClientFactory) MakeClient(netType Type) (Client, error) {
 	case STCP:
 		return newStcp(generic, f.PKTable), nil
 	case STCPR:
-		return newStcpr(resolved), nil
+		return newStcpr(resolved, port), nil
 	case SUDPH:
-		return newSudph(resolved), nil
+		return newSudph(resolved, port), nil
 	case DMSG:
 		return newDmsgClient(f.DmsgC), nil
 	}

pkg/transport/network/stcpr.go

@@ -3,6 +3,7 @@ package network
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"net"
 
@@ -12,10 +13,11 @@ import (
 
 type stcprClient struct {
 	*resolvedClient
+	port int
 }
 
-func newStcpr(resolved *resolvedClient) Client {
-	client := &stcprClient{resolvedClient: resolved}
+func newStcpr(resolved *resolvedClient, port int) Client {
+	client := &stcprClient{resolvedClient: resolved, port: port}
 	client.netType = STCPR
 	return client
 }
@@ -50,10 +52,22 @@ func (c *stcprClient) Start() error {
 }
 
 func (c *stcprClient) serve() {
-	lis, err := net.Listen("tcp", "")
-	if err != nil {
-		c.log.Errorf("Failed to listen on random port: %v", err)
-		return
+	var lis net.Listener
+	var err error
+	var confPort string
+	if c.port != 0 {
+		confPort = fmt.Sprintf(":%d", c.port)
+	}
+	for {
+		lis, err = net.Listen("tcp", confPort)
+		if err != nil {
+			c.log.WithError(err).Warnf("Failed to listen on port: %d", c.port)
+			c.port++
+			confPort = fmt.Sprintf(":%d", c.port)
+			c.log.Warnf("Trying port %d", c.port)
+			continue
+		}
+		break
 	}
 
 	localAddr := lis.Addr().String()

pkg/transport/network/sudph.go

@@ -30,10 +30,11 @@ const (
 type sudphClient struct {
 	*resolvedClient
 	filter *pfilter.PacketFilter
+	port   int
 }
 
-func newSudph(resolved *resolvedClient) Client {
-	client := &sudphClient{resolvedClient: resolved}
+func newSudph(resolved *resolvedClient, port int) Client {
+	client := &sudphClient{resolvedClient: resolved, port: port}
 	client.netType = SUDPH
 	return client
 }
@@ -50,17 +51,30 @@ func (c *sudphClient) Start() error {
 func (c *sudphClient) serve() {
 	lis, err := c.listen()
 	if err != nil {
-		c.log.Errorf("Failed to listen on random port: %v", err)
+		c.log.Errorf("Failed to listen on port: %v", err)
 		return
 	}
 	c.acceptTransports(lis)
 }
 
 // listen
 func (c *sudphClient) listen() (net.Listener, error) {
-	packetListener, err := net.ListenPacket("udp", "")
-	if err != nil {
-		return nil, err
+	var packetListener net.PacketConn
+	var err error
+	var confPort string
+	if c.port != 0 {
+		confPort = fmt.Sprintf(":%d", c.port)
+	}
+	for {
+		packetListener, err = net.ListenPacket("udp", confPort)
+		if err != nil {
+			c.log.WithError(err).Warnf("Failed to listen on port: %d", c.port)
+			c.port++
+			confPort = fmt.Sprintf(":%d", c.port)
+			c.log.Warnf("Trying port %d", c.port)
+			continue
+		}
+		break
 	}
 	c.filter = pfilter.NewPacketFilter(packetListener)
 	sudphVisorsConn := c.filter.NewConn(visorsConnPriority, nil)

pkg/visor/init.go

@@ -466,20 +466,20 @@ func initSudphClient(ctx context.Context, v *Visor, log *logging.Logger) error {
 		case stun.NATSymmetric, stun.NATSymmetricUDPFirewall:
 			log.Warnf("SUDPH transport wont be available as visor is under %v", v.stunClient.NATType.String())
 		default:
-			v.tpM.InitClient(ctx, network.SUDPH)
+			v.tpM.InitClient(ctx, network.SUDPH, v.conf.Transport.SudphPort)
 		}
 	}
 	return nil
 }
 
 func initStcprClient(ctx context.Context, v *Visor, log *logging.Logger) error {
-	v.tpM.InitClient(ctx, network.STCPR)
+	v.tpM.InitClient(ctx, network.STCPR, v.conf.Transport.StcprPort)
 	return nil
 }
 
 func initStcpClient(ctx context.Context, v *Visor, log *logging.Logger) error {
 	if v.conf.STCP != nil {
-		v.tpM.InitClient(ctx, network.STCP)
+		v.tpM.InitClient(ctx, network.STCP, 0)
 	}
 	return nil
 }

pkg/visor/visorconfig/config.go

@@ -73,6 +73,8 @@ func MakeBaseConfig(common *Common, testEnv bool, dmsgHTTP bool, services *Servi
 			Location:         LocalPath + "/" + TpLogStore,
 			RotationInterval: DefaultLogRotationInterval,
 		},
+		SudphPort: 0,
+		StcprPort: 0,
 	}
 	conf.Routing = &Routing{
 		RouteFinder:        services.RouteFinder, //utilenv.RouteFinderAddr,

pkg/visor/visorconfig/v1.go

@@ -56,6 +56,8 @@ type Transport struct {
 	PublicAutoconnect bool            `json:"public_autoconnect"`
 	TransportSetup    []cipher.PubKey `json:"transport_setup_nodes"`
 	LogStore          *LogStore       `json:"log_store"`
+	StcprPort         int             `json:"stcpr_port"`
+	SudphPort         int             `json:"sudph_port"`
 }
 
 // LogStore configures a LogStore.