From 7f924fdeb66cfd740c16fc94f2f5cdd77fe1363c Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Wed, 28 Sep 2022 11:53:25 +0800 Subject: [PATCH] fix proxy protocol --- cmd/gost/main.go | 3 +-- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd/gost/main.go b/cmd/gost/main.go index 618b5ff..a89d86a 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -9,7 +9,6 @@ import ( "runtime" "github.com/go-gost/core/logger" - "github.com/go-gost/core/metrics" "github.com/go-gost/x/config" "github.com/go-gost/x/config/parsing" xlogger "github.com/go-gost/x/logger" @@ -122,7 +121,7 @@ func main() { } if cfg.Metrics != nil { - metrics.Init(xmetrics.NewMetrics()) + xmetrics.Init(xmetrics.NewMetrics()) if cfg.Metrics.Addr != "" { s, err := buildMetricsService(cfg.Metrics) if err != nil { diff --git a/go.mod b/go.mod index 504db46..eaaac1c 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.18 replace github.com/templexxx/cpu v0.0.7 => github.com/templexxx/cpu v0.0.10-0.20211111114238-98168dcec14a require ( - github.com/go-gost/core v0.0.0-20220920034830-41ff9835a66d - github.com/go-gost/x v0.0.0-20220922104515-cf20abf6568b + github.com/go-gost/core v0.0.0-20220928034632-6e7a8f461903 + github.com/go-gost/x v0.0.0-20220928035231-bd7da26c4248 ) require ( diff --git a/go.sum b/go.sum index f514483..0815f47 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,8 @@ github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gost/core v0.0.0-20220920034830-41ff9835a66d h1:UFn21xIJgWE/te12rzQA7Ymwbo+MaxOcp38K41L+Yck= -github.com/go-gost/core v0.0.0-20220920034830-41ff9835a66d/go.mod h1:bHVbCS9da6XtKNYMkMUVcck5UqDDUkyC37erVfs4GXQ= +github.com/go-gost/core v0.0.0-20220928034632-6e7a8f461903 h1:Ye6Ns0+Ms63vC+nbe9sBgBDTr+l+ukPX18SvEJuWXUw= +github.com/go-gost/core v0.0.0-20220928034632-6e7a8f461903/go.mod h1:bHVbCS9da6XtKNYMkMUVcck5UqDDUkyC37erVfs4GXQ= 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.3.1-0.20211109033403-d894d75b7f09 h1:A95M6UWcfZgOuJkQ7QLfG0Hs5peWIUSysCDNz4pfe04= @@ -108,8 +108,8 @@ github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/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-20220922104515-cf20abf6568b h1:eJ7H2Nkee589pX7/9umjJyFHe4cZmUbCr031TcMkxOY= -github.com/go-gost/x v0.0.0-20220922104515-cf20abf6568b/go.mod h1:jILEGMQKVQDNGVbPqV985vv+/x9xYUbXSOkYP8ynjsU= +github.com/go-gost/x v0.0.0-20220928035231-bd7da26c4248 h1:/E7XlnvgF5M9gIBjN1DeIm71NJTnpUiP3+pbPU+3mHY= +github.com/go-gost/x v0.0.0-20220928035231-bd7da26c4248/go.mod h1:jG7eBUyLoNxf8G4RmypAJKyLYrzSrM67F0rSSdjHWbQ= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=