mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-04 14:13:03 +00:00
I don't know what's going wrong :(
This commit is contained in:
parent
1e3d739a5b
commit
ba4aa2896d
@ -52,7 +52,7 @@ func dialgRPC(ctx context.Context, dest net.Destination, streamSettings *interne
|
|||||||
conn, err := getGrpcClient(ctx, dest, tlsConfig, streamSettings.SocketSettings)
|
conn, err := getGrpcClient(ctx, dest, tlsConfig, streamSettings.SocketSettings)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, newError("Cannot dial gRPC").Base(err)
|
return nil, newError("failed to dial gRPC").Base(err)
|
||||||
}
|
}
|
||||||
client := encoding.NewGRPCServiceClient(conn)
|
client := encoding.NewGRPCServiceClient(conn)
|
||||||
if grpcSettings.MultiMode {
|
if grpcSettings.MultiMode {
|
||||||
@ -113,12 +113,6 @@ func getGrpcClient(ctx context.Context, dest net.Destination, tlsConfig *tls.Con
|
|||||||
gctx = session.ContextWithOutbound(gctx, session.OutboundFromContext(ctx))
|
gctx = session.ContextWithOutbound(gctx, session.OutboundFromContext(ctx))
|
||||||
|
|
||||||
rawHost, rawPort, err := net.SplitHostPort(s)
|
rawHost, rawPort, err := net.SplitHostPort(s)
|
||||||
select {
|
|
||||||
case <-gctx.Done():
|
|
||||||
return nil, gctx.Err()
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -130,8 +124,14 @@ func getGrpcClient(ctx context.Context, dest net.Destination, tlsConfig *tls.Con
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
address := net.ParseAddress(rawHost)
|
address := net.ParseAddress(rawHost)
|
||||||
return internet.DialSystem(gctx, net.TCPDestination(address, port), sockopt)
|
conn, err := internet.DialSystem(gctx, net.TCPDestination(address, port), sockopt)
|
||||||
|
if err != nil {
|
||||||
|
newError("failed to dial connection for gRPC").Base(err).WriteToLog()
|
||||||
|
}
|
||||||
|
return conn, err
|
||||||
}),
|
}),
|
||||||
|
grpc.WithBlock(),
|
||||||
|
grpc.WithReturnConnectionError(),
|
||||||
)
|
)
|
||||||
globalDialerMap[dialerConf{dest, sockopt, tlsConfig}] = conn
|
globalDialerMap[dialerConf{dest, sockopt, tlsConfig}] = conn
|
||||||
return conn, err
|
return conn, err
|
||||||
|
Loading…
Reference in New Issue
Block a user