From 093a4d6a8231ad248c46baf47e44e4f6866239a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sun, 16 Jan 2022 20:39:29 +0000 Subject: [PATCH] fix error formatting in sockopt --- transport/internet/sockopt_darwin.go | 12 ++++++------ transport/internet/sockopt_freebsd.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/transport/internet/sockopt_darwin.go b/transport/internet/sockopt_darwin.go index ba253e982..4480dd1c3 100644 --- a/transport/internet/sockopt_darwin.go +++ b/transport/internet/sockopt_darwin.go @@ -26,18 +26,18 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf if config.TcpKeepAliveIdle > 0 { if err := unix.SetsockoptInt(int(fd), unix.IPPROTO_TCP, unix.TCP_KEEPALIVE, int(config.TcpKeepAliveInterval)); err != nil { - return newError("failed to set TCP_KEEPINTVL", err) + return newError("failed to set TCP_KEEPINTVL").Base(err) } } if config.TcpKeepAliveInterval > 0 { if err := unix.SetsockoptInt(int(fd), unix.IPPROTO_TCP, unix.TCP_KEEPINTVL, int(config.TcpKeepAliveIdle)); err != nil { - return newError("failed to set TCP_KEEPIDLE", err) + return newError("failed to set TCP_KEEPIDLE").Base(err) } } if config.TcpKeepAliveIdle > 0 || config.TcpKeepAliveInterval > 0 { if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1); err != nil { - return newError("failed to set SO_KEEPALIVE", err) + return newError("failed to set SO_KEEPALIVE").Base(err) } } } @@ -59,17 +59,17 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig) } if config.TcpKeepAliveIdle > 0 { if err := unix.SetsockoptInt(int(fd), unix.IPPROTO_TCP, unix.TCP_KEEPALIVE, int(config.TcpKeepAliveInterval)); err != nil { - return newError("failed to set TCP_KEEPINTVL", err) + return newError("failed to set TCP_KEEPINTVL").Base(err) } } if config.TcpKeepAliveInterval > 0 { if err := unix.SetsockoptInt(int(fd), unix.IPPROTO_TCP, unix.SO_KEEPALIVE, int(config.TcpKeepAliveIdle)); err != nil { - return newError("failed to set TCP_KEEPIDLE", err) + return newError("failed to set TCP_KEEPIDLE").Base(err) } } if config.TcpKeepAliveIdle > 0 || config.TcpKeepAliveInterval > 0 { if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1); err != nil { - return newError("failed to set SO_KEEPALIVE", err) + return newError("failed to set SO_KEEPALIVE").Base(err) } } } diff --git a/transport/internet/sockopt_freebsd.go b/transport/internet/sockopt_freebsd.go index b90a0fc72..37b2d369e 100644 --- a/transport/internet/sockopt_freebsd.go +++ b/transport/internet/sockopt_freebsd.go @@ -144,16 +144,16 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf if config.TcpKeepAliveIdle > 0 || config.TcpKeepAliveInterval > 0 { if config.TcpKeepAliveIdle > 0 { if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPIDLE, int(config.TcpKeepAliveIdle)); err != nil { - return newError("failed to set TCP_KEEPIDLE", err) + return newError("failed to set TCP_KEEPIDLE").Base(err) } } if config.TcpKeepAliveInterval > 0 { if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPINTVL, int(config.TcpKeepAliveInterval)); err != nil { - return newError("failed to set TCP_KEEPINTVL", err) + return newError("failed to set TCP_KEEPINTVL").Base(err) } } if err := syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, 1); err != nil { - return newError("failed to set SO_KEEPALIVE", err) + return newError("failed to set SO_KEEPALIVE").Base(err) } } } @@ -193,16 +193,16 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig) if config.TcpKeepAliveIdle > 0 || config.TcpKeepAliveInterval > 0 { if config.TcpKeepAliveIdle > 0 { if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPIDLE, int(config.TcpKeepAliveIdle)); err != nil { - return newError("failed to set TCP_KEEPIDLE", err) + return newError("failed to set TCP_KEEPIDLE").Base(err) } } if config.TcpKeepAliveInterval > 0 { if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPINTVL, int(config.TcpKeepAliveInterval)); err != nil { - return newError("failed to set TCP_KEEPINTVL", err) + return newError("failed to set TCP_KEEPINTVL").Base(err) } } if err := syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, 1); err != nil { - return newError("failed to set SO_KEEPALIVE", err) + return newError("failed to set SO_KEEPALIVE").Base(err) } } }