Use the opened TcpListener/UdpConn in the remote object

go/chisel/share/settings/remote.go

@@ -1,17 +1,15 @@
 package settings
 
 import (
-	"context"
 	"errors"
+	"fmt"
 	"net"
 	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
-
-	"github.com/inverse-inc/packetfence/go/reuseport"
 )
 
 // short-hand conversions (see remote_test)
@@ -163,27 +161,34 @@ func DecodeRemote(s string) (*Remote, error) {
 
 func (r *Remote) setupLocalPort() error {
 	if r.LocalProto == "tcp" {
-		l, err := reuseport.ReusePortListenConfig.Listen(context.Background(), "tcp", r.LocalHost+":0")
+		addr, err := net.ResolveTCPAddr("tcp", r.LocalHost+":"+r.LocalPort)
+		if err != nil {
+			return fmt.Errorf("resolve: %w", err)
+		}
+
+		tl, err := net.ListenTCP("tcp", addr)
 		if err != nil {
 			return err
 		}
 
-		tl := l.(*net.TCPListener)
 		r.LocalPort = strconv.Itoa(tl.Addr().(*net.TCPAddr).Port)
 		r.ReusedTcpListener = tl
 		r.Dynamic = true
 		return nil
 	}
 
 	if r.LocalProto == "udp" {
-		l, err := reuseport.ReusePortListenConfig.ListenPacket(context.Background(), "udp", r.LocalHost+":0")
+		addr, err := net.ResolveUDPAddr("udp", r.Local())
 		if err != nil {
 			return err
 		}
 
-		uc := l.(*net.UDPConn)
-		r.LocalPort = strconv.Itoa(uc.LocalAddr().(*net.UDPAddr).Port)
-		r.ReusedUdpConn = uc
+		conn, err := net.ListenUDP("udp", addr)
+		if err != nil {
+			return err
+		}
+		r.LocalPort = strconv.Itoa(conn.LocalAddr().(*net.UDPAddr).Port)
+		r.ReusedUdpConn = conn
 		r.Dynamic = true
 		return nil
 	}

go/chisel/share/settings/remote_test.go

@@ -43,6 +43,10 @@ func TestLocalTcp(t *testing.T) {
 	if remote.LocalPort == "0" {
 		t.Fatalf("The local port was not resolved")
 	}
+
+	if remote.ReusedTcpListener == nil {
+		t.Fatalf("TCPListener not saved")
+	}
 }
 
 func TestLocalUdp(t *testing.T) {
@@ -54,4 +58,8 @@ func TestLocalUdp(t *testing.T) {
 	if remote.LocalPort == "0" {
 		t.Fatalf("The local port was not resolved")
 	}
+
+	if remote.ReusedUdpConn == nil {
+		t.Fatalf("UdpConn not saved")
+	}
 }