go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix grpc dialer

Browse Source
This commit is contained in:
ginuerzh 2023-03-20 18:28:35 +08:00
parent f32b72ce56
commit 661953e09f
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/parsing/chain.go
View File

@ -96,9 +96,6 @@ func ParseHop(cfg *config.HopConfig) (chain.Hop, error) {
}) })
serverName, _, _ := net.SplitHostPort(v.Addr) serverName, _, _ := net.SplitHostPort(v.Addr)
if serverName == "" {
serverName = "localhost"
}
tlsCfg := v.Connector.TLS tlsCfg := v.Connector.TLS
if tlsCfg == nil { if tlsCfg == nil {

9
dialer/grpc/dialer.go
View File

@ -59,17 +59,14 @@ func (d *grpcDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialO
opt(&options) opt(&options)
} }
adr := addr
if h, p, err := net.SplitHostPort(addr); err == nil && h == "" {
adr = net.JoinHostPort("localhost", p)
}
host := d.md.host host := d.md.host
if host == "" { if host == "" {
host = adr host = options.Host
} }
if h, _, _ := net.SplitHostPort(host); h != "" { if h, _, _ := net.SplitHostPort(host); h != "" {
host = h host = h
} }
// d.options.Logger.Infof("grpc dialer, addr %s, host %s/%s", addr, d.md.host, options.Host)
grpcOpts := []grpc.DialOption{ grpcOpts := []grpc.DialOption{
// grpc.WithBlock(), // grpc.WithBlock(),
@ -97,7 +94,7 @@ func (d *grpcDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialO
})) }))
} }
cc, err := grpc.DialContext(ctx, adr, grpcOpts...) cc, err := grpc.DialContext(ctx, addr, grpcOpts...)
if err != nil { if err != nil {
d.options.Logger.Error(err) d.options.Logger.Error(err)
return nil, err return nil, err