From 56a68ae06f47d0e1b21b770bac916dad3d31905e Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Mon, 24 Jun 2024 21:42:37 +0800 Subject: [PATCH] fix netns for socks5 and relay handler --- cmd/gost/main.go | 4 +++- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/gost/main.go b/cmd/gost/main.go index d3a5a42..b5dd464 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -63,7 +63,9 @@ func worker(id int, args []string, ctx *context.Context, ret *int) { cmd.Stderr = os.Stderr cmd.Env = append(os.Environ(), fmt.Sprintf("_GOST_ID=%d", id)) - cmd.Run() + if err := cmd.Run(); err != nil { + log.Fatal(err) + } if cmd.ProcessState.Exited() { *ret = cmd.ProcessState.ExitCode() } diff --git a/go.mod b/go.mod index e191f3b..5b72132 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.22 toolchain go1.22.2 require ( - github.com/go-gost/core v0.0.0-20240621153412-5aede9a2b32f - github.com/go-gost/x v0.0.0-20240621153818-2ae04628222a + github.com/go-gost/core v0.0.0-20240624131323-ca340b1bf1a2 + github.com/go-gost/x v0.0.0-20240624131804-f9bfca76ed1f github.com/judwhite/go-svc v1.2.1 ) diff --git a/go.sum b/go.sum index 95db688..51e41e4 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= -github.com/go-gost/core v0.0.0-20240621153412-5aede9a2b32f h1:deEX5HhpUDB03wAggTWn3/8l20cEGVq25bMsd9wqizo= -github.com/go-gost/core v0.0.0-20240621153412-5aede9a2b32f/go.mod h1:aTPFucvJyqc/o5h5/ZtyHJ0xgFIq5Ip+cMlhazm+TaI= +github.com/go-gost/core v0.0.0-20240624131323-ca340b1bf1a2 h1:+VxqwMcnO/Jqpa88n9D2YoApTFrSRbjlFd9Oy/xvE0s= +github.com/go-gost/core v0.0.0-20240624131323-ca340b1bf1a2/go.mod h1:aTPFucvJyqc/o5h5/ZtyHJ0xgFIq5Ip+cMlhazm+TaI= github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s= github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc= github.com/go-gost/gosocks5 v0.4.0 h1:EIrOEkpJez4gwHrMa33frA+hHXJyevjp47thpMQsJzI= @@ -65,8 +65,8 @@ github.com/go-gost/relay v0.5.0 h1:JG1tgy/KWiVXS0ukuVXvbM0kbYuJTWxYpJ5JwzsCf/c= github.com/go-gost/relay v0.5.0/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 h1:xj8gUZGYO3nb5+6Bjw9+tsFkA9sYynrOvDvvC4uDV2I= github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs= -github.com/go-gost/x v0.0.0-20240621153818-2ae04628222a h1:vv3XqA3rSaShSSiv8BNB6UMOBL31ni0w6OLkZRUI0Vg= -github.com/go-gost/x v0.0.0-20240621153818-2ae04628222a/go.mod h1:Glu6+AqAYDmAB+U7jkwEctKG4ZWERiT6pzO75kgyTiY= +github.com/go-gost/x v0.0.0-20240624131804-f9bfca76ed1f h1:WZmHBag1F1odBYWM4my1qDdaFSU3qJ5dCwnIva/a2aA= +github.com/go-gost/x v0.0.0-20240624131804-f9bfca76ed1f/go.mod h1:XRTGoqkj3BCGyvcFIqDyC6sFP4AEXcVbKM1FVvleTIo= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=