From 35c6dc27060d218062bc74985c9c327f352241ff Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Sat, 7 Sep 2024 15:30:49 +0800 Subject: [PATCH] feat: remove port reuse --- pkg/common/startrpc/socket_posix.go | 26 -------------------------- pkg/common/startrpc/socket_windows.go | 26 -------------------------- pkg/common/startrpc/start.go | 9 +-------- 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkg/common/startrpc/socket_posix.go delete mode 100644 pkg/common/startrpc/socket_windows.go diff --git a/pkg/common/startrpc/socket_posix.go b/pkg/common/startrpc/socket_posix.go deleted file mode 100644 index 402abe888..000000000 --- a/pkg/common/startrpc/socket_posix.go +++ /dev/null @@ -1,26 +0,0 @@ -//go:build linux || darwin - -package startrpc - -import ( - "context" - "github.com/openimsdk/tools/log" - "net" - "syscall" -) - -func createListener() net.ListenConfig { - lc := net.ListenConfig{ - Control: func(network, address string, conn syscall.RawConn) error { - return conn.Control(func(fd uintptr) { - err := syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1) - if err != nil { - log.ZError(context.Background(), "Failed to set socket flag to SO_REUSEADDR", err) - return - } - }) - }, - } - - return lc -} diff --git a/pkg/common/startrpc/socket_windows.go b/pkg/common/startrpc/socket_windows.go deleted file mode 100644 index bf4da24de..000000000 --- a/pkg/common/startrpc/socket_windows.go +++ /dev/null @@ -1,26 +0,0 @@ -//go:build windows - -package startrpc - -import ( - "context" - "github.com/openimsdk/tools/log" - "net" - "syscall" -) - -func createListener() net.ListenConfig { - lc := net.ListenConfig{ - Control: func(network, address string, conn syscall.RawConn) error { - return conn.Control(func(fd uintptr) { - err := syscall.SetsockoptInt(syscall.Handle(fd), syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1) - if err != nil { - log.ZError(context.Background(), "Failed to set socket flag to SO_REUSEADDR", err) - return - } - }) - }, - } - - return lc -} diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 08bc1ddac..85a6c3d51 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -55,17 +55,10 @@ func Start[T any](ctx context.Context, discovery *config.Discovery, prometheusCo "prometheusPorts", prometheusConfig.Ports) rpcTcpAddr := net.JoinHostPort(network.GetListenIP(listenIP), strconv.Itoa(rpcPort)) - lc := createListener() - listener, err := lc.Listen( - ctx, + listener, err := net.Listen( "tcp", rpcTcpAddr, ) - if err != nil { - return errs.WrapMsg(err, "listen err", "rpcTcpAddr", rpcTcpAddr) - } - - defer listener.Close() client, err := kdisc.NewDiscoveryRegister(discovery, share) if err != nil { return err