other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 04:39:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: gRPC & HTTP/2 dialer (#445)

This commit is contained in:
Jim Han 2021-03-31 00:43:31 +08:00 committed by GitHub
parent b63049f404
commit 3ed14c2fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
transport/internet/grpc/dial.go
View File

@ -36,6 +36,7 @@ func init() {
type dialerConf struct { type dialerConf struct {
net.Destination net.Destination
*internet.SocketConfig *internet.SocketConfig
*tls.Config
} }
var ( var (
@ -46,14 +47,9 @@ var (
func dialgRPC(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (net.Conn, error) { func dialgRPC(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (net.Conn, error) {
grpcSettings := streamSettings.ProtocolSettings.(*Config) grpcSettings := streamSettings.ProtocolSettings.(*Config)
config := tls.ConfigFromStreamSettings(streamSettings) tlsConfig := tls.ConfigFromStreamSettings(streamSettings)
var dialOption = grpc.WithInsecure()
if config != nil { conn, err := getGrpcClient(ctx, dest, tlsConfig, streamSettings.SocketSettings)
dialOption = grpc.WithTransportCredentials(credentials.NewTLS(config.GetTLSConfig()))
}
conn, err := getGrpcClient(ctx, dest, dialOption, streamSettings.SocketSettings)
if err != nil { if err != nil {
return nil, newError("Cannot dial gRPC").Base(err) return nil, newError("Cannot dial gRPC").Base(err)
@ -76,7 +72,7 @@ func dialgRPC(ctx context.Context, dest net.Destination, streamSettings *interne
return encoding.NewHunkConn(grpcService, nil), nil return encoding.NewHunkConn(grpcService, nil), nil
} }
func getGrpcClient(ctx context.Context, dest net.Destination, dialOption grpc.DialOption, sockopt *internet.SocketConfig) (*grpc.ClientConn, error) { func getGrpcClient(ctx context.Context, dest net.Destination, tlsConfig *tls.Config, sockopt *internet.SocketConfig) (*grpc.ClientConn, error) {
globalDialerAccess.Lock() globalDialerAccess.Lock()
defer globalDialerAccess.Unlock() defer globalDialerAccess.Unlock()
@ -84,10 +80,16 @@ func getGrpcClient(ctx context.Context, dest net.Destination, dialOption grpc.Di
globalDialerMap = make(map[dialerConf]*grpc.ClientConn) globalDialerMap = make(map[dialerConf]*grpc.ClientConn)
} }
if client, found := globalDialerMap[dialerConf{dest, sockopt}]; found && client.GetState() != connectivity.Shutdown { if client, found := globalDialerMap[dialerConf{dest, sockopt, tlsConfig}]; found && client.GetState() != connectivity.Shutdown {
return client, nil return client, nil
} }
dialOption := grpc.WithInsecure()
if tlsConfig != nil {
dialOption = grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig.GetTLSConfig()))
}
conn, err := grpc.Dial( conn, err := grpc.Dial(
gonet.JoinHostPort(dest.Address.String(), dest.Port.String()), gonet.JoinHostPort(dest.Address.String(), dest.Port.String()),
dialOption, dialOption,
@ -125,6 +127,6 @@ func getGrpcClient(ctx context.Context, dest net.Destination, dialOption grpc.Di
return internet.DialSystem(gctx, net.TCPDestination(address, port), sockopt) return internet.DialSystem(gctx, net.TCPDestination(address, port), sockopt)
}), }),
) )
globalDialerMap[dialerConf{dest, sockopt}] = conn globalDialerMap[dialerConf{dest, sockopt, tlsConfig}] = conn
return conn, err return conn, err
} }

5
transport/internet/http/dialer.go
View File

@ -21,6 +21,7 @@ import (
type dialerConf struct { type dialerConf struct {
net.Destination net.Destination
*internet.SocketConfig *internet.SocketConfig
*tls.Config
} }
var ( var (
@ -36,7 +37,7 @@ func getHTTPClient(ctx context.Context, dest net.Destination, tlsSettings *tls.C
globalDialerMap = make(map[dialerConf]*http.Client) globalDialerMap = make(map[dialerConf]*http.Client)
} }
if client, found := globalDialerMap[dialerConf{dest, sockopt}]; found { if client, found := globalDialerMap[dialerConf{dest, sockopt, tlsSettings}]; found {
return client, nil return client, nil
} }
@ -92,7 +93,7 @@ func getHTTPClient(ctx context.Context, dest net.Destination, tlsSettings *tls.C
Transport: transport, Transport: transport,
} }
globalDialerMap[dialerConf{dest, sockopt}] = client globalDialerMap[dialerConf{dest, sockopt, tlsSettings}] = client
return client, nil return client, nil
} }