From db6b6e9ba07629c90654a7720c452fb44a864dfb Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 11 Oct 2021 13:42:20 +0200 Subject: [PATCH] agent: rename setsockoptReuseAddrAndPort to setReuseAddrAndPortSockopts --- agent/agent.go | 2 +- agent/sockopt_reuseport.go | 4 ++-- agent/sockopt_unsupported.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/agent.go b/agent/agent.go index 5fde1fd1..2af03e5a 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -107,7 +107,7 @@ func Listen(opts Options) error { } var lc net.ListenConfig if opts.ReuseSocketAddrAndPort { - lc.Control = setsockoptReuseAddrAndPort + lc.Control = setReuseAddrAndPortSockopts } listener, err = lc.Listen(context.Background(), "tcp", addr) if err != nil { diff --git a/agent/sockopt_reuseport.go b/agent/sockopt_reuseport.go index a91f0e70..8311fe39 100644 --- a/agent/sockopt_reuseport.go +++ b/agent/sockopt_reuseport.go @@ -13,10 +13,10 @@ import ( "golang.org/x/sys/unix" ) -// setsockoptReuseAddrAndPort sets the SO_REUSEADDR and SO_REUSEPORT socket +// setReuseAddrAndPortSockopts sets the SO_REUSEADDR and SO_REUSEPORT socket // options on c's underlying socket in order to increase the chance to re-bind() // to the same address and port upon agent restart. -func setsockoptReuseAddrAndPort(network, address string, c syscall.RawConn) error { +func setReuseAddrAndPortSockopts(network, address string, c syscall.RawConn) error { var soerr error if err := c.Control(func(su uintptr) { sock := int(su) diff --git a/agent/sockopt_unsupported.go b/agent/sockopt_unsupported.go index 526bdf2a..2493e8ca 100644 --- a/agent/sockopt_unsupported.go +++ b/agent/sockopt_unsupported.go @@ -9,6 +9,6 @@ package agent import "syscall" -func setsockoptReuseAddrAndPort(network, address string, c syscall.RawConn) error { +func setReuseAddrAndPortSockopts(network, address string, c syscall.RawConn) error { return nil }