grpc.dialer: do not resolve server address

cmd/gost/main.go

@@ -55,74 +55,39 @@ func init() {
 
 func main() {
 	cfg := &config.Config{}
-	var err error
+	if cfgFile != "" {
-	if apiAddr != "" {
+		if err := cfg.ReadFile(cfgFile); err != nil {
-		cfg, err = buildConfigFromCmd(services, nodes)
-		if err != nil {
 			log.Fatal(err)
 		}
-		if debug && cfg != nil {
+	}
-			if cfg.Log == nil {
+
-				cfg.Log = &config.LogConfig{}
+	cmdCfg, err := buildConfigFromCmd(services, nodes)
-			}
+	if err != nil {
-			cfg.Log.Level = string(logger.DebugLevel)
+		log.Fatal(err)
+	}
+	cfg.Chains = append(cfg.Chains, cmdCfg.Chains...)
+	cfg.Services = append(cfg.Services, cmdCfg.Services...)
+
+	if len(cfg.Services) == 0 && apiAddr == "" {
+		if err := cfg.Load(); err != nil {
+			log.Fatal(err)
 		}
-		if apiAddr != "" {
+	}
-			cfg.API = &config.APIConfig{
+
-				Addr: apiAddr,
+	if debug {
-			}
+		if cfg.Log == nil {
+			cfg.Log = &config.LogConfig{}
 		}
-		if metricsAddr != "" {
+		cfg.Log.Level = string(logger.DebugLevel)
-			cfg.Metrics = &config.MetricsConfig{
+	}
-				Addr: metricsAddr,
+	if apiAddr != "" {
-			}
+		cfg.API = &config.APIConfig{
+			Addr: apiAddr,
 		}
-	} else {
+	}
-		if cfgFile != "" {
+	if metricsAddr != "" {
-			err = cfg.ReadFile(cfgFile)
+		cfg.Metrics = &config.MetricsConfig{
-			if err != nil {
+			Addr: metricsAddr,
-				log.Fatal(err)
-			}
-		} else {
-			err = cfg.Load()
-			if err != nil {
-				if len(services) > 0 {
-					log.Info("Cannot load config from default path. ", err)
-				} else {
-					log.Fatal(err)
-				}
-			}
-		}
-		if len(services) > 0 || len(nodes) > 0 {
-			var cmdCfg = &config.Config{}
-			cmdCfg, err = buildConfigFromCmd(services, nodes)
-			if err != nil {
-				log.Fatal(err)
-			}
-			if cmdCfg.Chains != nil && len(cmdCfg.Chains) > 0 {
-				if cfg.Chains == nil || len(cfg.Chains) == 0 {
-					cfg.Chains = cmdCfg.Chains
-				} else {
-					for i := 0; i < len(cfg.Chains); i++ {
-						var hops = append([]*config.HopConfig{}, cmdCfg.Chains[0].Hops...)
-						cfg.Chains[i].Hops = append(hops, cfg.Chains[i].Hops...)
-					}
-				}
-			}
-			if cmdCfg.Services != nil && len(cmdCfg.Services) > 0 {
-				if (cfg.Chains != nil && len(cfg.Chains) > 0) {
-					for i := 0; i < len(cmdCfg.Services); i++ {
-						var handler = cmdCfg.Services[i].Handler
-						if (handler != nil && (handler.Chain == "" && handler.ChainGroup == nil)) {
-							handler.Chain = cfg.Chains[0].Name
-						}
-					}
-				}
-				if cfg.Services == nil {
-					cfg.Services = []*config.ServiceConfig{}
-				}
-				cfg.Services = append(append([]*config.ServiceConfig{}, cmdCfg.Services...), cfg.Services...)
-			}
 		}
 	}
 

go.mod

@@ -5,7 +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-20221111142129-c2a1dd2a89cb
+	github.com/go-gost/core v0.0.0-20221201112214-c9c31fa74c47
+	github.com/go-gost/x v0.0.0-20221201111748-25c393edaf6e
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )
 
@@ -25,7 +26,6 @@ require (
 	github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 // indirect
 	github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 // indirect
 	github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 // indirect
-	github.com/go-gost/x v0.0.0-20221125101447-bcfff2266907 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-playground/validator/v10 v10.10.1 // indirect
@@ -100,8 +100,8 @@ require (
 	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20220703234212-c31a7b1ab478 // indirect
 	google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 // indirect
-	google.golang.org/grpc v1.49.0 // indirect
+	google.golang.org/grpc v1.51.0 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -97,10 +97,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-20220914115321-50d443049f3b h1:fWUPYFp0W/6GEhL0wrURGPQN2AQHhf4IZKiALJJOJh8=
+github.com/go-gost/core v0.0.0-20221201112214-c9c31fa74c47 h1:zDcxDCjFjRWhNPPo0AHMWqTeMSOcXdcxe7G+4bJw/hU=
-github.com/go-gost/core v0.0.0-20220914115321-50d443049f3b/go.mod h1:bHVbCS9da6XtKNYMkMUVcck5UqDDUkyC37erVfs4GXQ=
+github.com/go-gost/core v0.0.0-20221201112214-c9c31fa74c47/go.mod h1:bHVbCS9da6XtKNYMkMUVcck5UqDDUkyC37erVfs4GXQ=
-github.com/go-gost/core v0.0.0-20221111142129-c2a1dd2a89cb h1:BkuYeTJYfN3nGHtnljjRBuBBXg2hTRBN9EmszZalyzg=
-github.com/go-gost/core v0.0.0-20221111142129-c2a1dd2a89cb/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=
@@ -109,10 +107,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-20221118091920-54ab717f6b0f h1:Opw06cksqhOyhdhjRX03ukyniH8vz1iGajuyzhB53As=
+github.com/go-gost/x v0.0.0-20221201111748-25c393edaf6e h1:J+CoN0x4jiu8/c/zdyxsFNH+VL91dVqJ2+L4AZwUgOg=
-github.com/go-gost/x v0.0.0-20221118091920-54ab717f6b0f/go.mod h1:WmsDaUXWDGxbyp1Frp7KaW09AkUjUE7/JEWkewFw4yc=
+github.com/go-gost/x v0.0.0-20221201111748-25c393edaf6e/go.mod h1:YEnqHqjU8Bq2MfNAu6wgU1pNOqu8Qb+qRW0SsTg25wo=
-github.com/go-gost/x v0.0.0-20221125101447-bcfff2266907 h1:m4Udup6i9muHlYWDG7pm1+jOZKLzfvRQ6crP4H1hRss=
-github.com/go-gost/x v0.0.0-20221125101447-bcfff2266907/go.mod h1:WmsDaUXWDGxbyp1Frp7KaW09AkUjUE7/JEWkewFw4yc=
 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=
@@ -750,8 +746,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
+google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
-google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -765,8 +761,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=