diff options
| -rw-r--r-- | util/network.go | 12 | ||||
| -rw-r--r-- | util/network_win.go | 43 |
2 files changed, 1 insertions, 54 deletions
diff --git a/util/network.go b/util/network.go index f8f8fb36..b9066de7 100644 --- a/util/network.go +++ b/util/network.go @@ -1,5 +1,3 @@ -// +build !windows - package util import ( @@ -29,15 +27,7 @@ func CreateListener(address string) (net.Listener, error) { } } - ls := net.ListenConfig{ - Control: func(network, address string, c syscall.RawConn) error { - return c.Control(func(descriptor uintptr) { - syscall.SetsockoptInt(int(descriptor), syscall.SOL_SOCKET, syscall.SO_REUSEPORT, 1) - }) - }, - } - - return ls.Listen(dsn[0], dsn[1]) + return net.Listen(dsn[0], dsn[1]) } // fileExists checks if a file exists and is not a directory before we diff --git a/util/network_win.go b/util/network_win.go deleted file mode 100644 index 843d5779..00000000 --- a/util/network_win.go +++ /dev/null @@ -1,43 +0,0 @@ -// +build windows - -package util - -import ( - "errors" - "fmt" - "net" - "os" - "strings" - "syscall" -) - -// CreateListener crates socket listener based on DSN definition. -func CreateListener(address string) (net.Listener, error) { - dsn := strings.Split(address, "://") - if len(dsn) != 2 { - return nil, errors.New("invalid DSN (tcp://:6001, unix://file.sock)") - } - - if dsn[0] != "unix" && dsn[0] != "tcp" { - return nil, errors.New("invalid Protocol (tcp://:6001, unix://file.sock)") - } - - if dsn[0] == "unix" && fileExists(dsn[1]) { - err := syscall.Unlink(dsn[1]) - if err != nil { - return nil, fmt.Errorf("error during the unlink syscall: error %v", err) - } - } - - return net.Listen(dsn[0], dsn[1]) -} - -// fileExists checks if a file exists and is not a directory before we -// try using it to prevent further errors. -func fileExists(filename string) bool { - info, err := os.Stat(filename) - if os.IsNotExist(err) { - return false - } - return !info.IsDir() -} |