Browse Source

apply sockopt rename

Shelikhoo 3 years ago
parent
commit
4357719480

+ 8 - 8
transport/internet/sockopt_darwin.go

@@ -42,14 +42,14 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.TxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.SocketRxBufSize)); err != nil {
+	if config.RxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.RxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF").Base(err)
 		}
 	}
@@ -86,14 +86,14 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig)
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.TxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF/SO_SNDBUFFORCE").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.SocketRxBufSize)); err != nil {
+	if config.RxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.RxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF/SO_RCVBUFFORCE").Base(err)
 		}
 	}

+ 8 - 8
transport/internet/sockopt_freebsd.go

@@ -172,14 +172,14 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.TxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.SocketRxBufSize)); err != nil {
+	if config.RxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.RxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF").Base(err)
 		}
 	}
@@ -229,14 +229,14 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig)
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.TxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_SNDBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.SocketRxBufSize)); err != nil {
+	if config.RxBufSize != 0 {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_RCVBUF, int(config.RxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF").Base(err)
 		}
 	}

+ 12 - 12
transport/internet/sockopt_linux.go

@@ -88,22 +88,22 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
+	if config.TxBufSize != 0 {
 		syscallTarget := unix.SO_SNDBUF
-		if config.SocketForceBufSize {
+		if config.ForceBufSize {
 			syscallTarget = unix.SO_SNDBUFFORCE
 		}
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.SocketTxBufSize)); err != nil {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF/SO_SNDBUFFORCE").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
+	if config.RxBufSize != 0 {
 		syscallTarget := unix.SO_RCVBUF
-		if config.SocketForceBufSize {
+		if config.ForceBufSize {
 			syscallTarget = unix.SO_RCVBUFFORCE
 		}
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.SocketRxBufSize)); err != nil {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.RxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF/SO_RCVBUFFORCE").Base(err)
 		}
 	}
@@ -166,22 +166,22 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig)
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
+	if config.TxBufSize != 0 {
 		syscallTarget := unix.SO_SNDBUF
-		if config.SocketForceBufSize {
+		if config.ForceBufSize {
 			syscallTarget = unix.SO_SNDBUFFORCE
 		}
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.SocketTxBufSize)); err != nil {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF/SO_SNDBUFFORCE").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
+	if config.RxBufSize != 0 {
 		syscallTarget := unix.SO_RCVBUF
-		if config.SocketForceBufSize {
+		if config.ForceBufSize {
 			syscallTarget = unix.SO_RCVBUFFORCE
 		}
-		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.SocketRxBufSize)); err != nil {
+		if err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, syscallTarget, int(config.RxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF/SO_RCVBUFFORCE").Base(err)
 		}
 	}

+ 8 - 8
transport/internet/sockopt_windows.go

@@ -35,14 +35,14 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
-		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_SNDBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.TxBufSize != 0 {
+		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_SNDBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
-		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_RCVBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.RxBufSize != 0 {
+		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_RCVBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF").Base(err)
 		}
 	}
@@ -62,14 +62,14 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig)
 		}
 	}
 
-	if config.SocketTxBufSize != 0 {
-		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_SNDBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.TxBufSize != 0 {
+		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_SNDBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_SNDBUF").Base(err)
 		}
 	}
 
-	if config.SocketRxBufSize != 0 {
-		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_RCVBUF, int(config.SocketTxBufSize)); err != nil {
+	if config.RxBufSize != 0 {
+		if err := windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_RCVBUF, int(config.TxBufSize)); err != nil {
 			return newError("failed to set SO_RCVBUF").Base(err)
 		}
 	}