lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

hysteria2, grpc: fix the use of GetTLSConfig (#3176)

Browse Source
This commit is contained in:
dyhkwong 2024-10-13 02:23:18 +08:00 committed by GitHub
parent 6c091e6645
commit 408e76f445
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ func dialgRPC(ctx context.Context, dest net.Destination, streamSettings *interne
transportCredentials := insecure.NewCredentials()
if config != nil {
transportCredentials = credentials.NewTLS(config.GetTLSConfig())
transportCredentials = credentials.NewTLS(config.GetTLSConfig(tls.WithDestination(dest)))
}
dialOption := grpc.WithTransportCredentials(transportCredentials)

6
transport/internet/hysteria2/dialer.go
View File

@ -24,12 +24,12 @@ var RunningClient map[dialerConf](hyClient.Client)
var ClientMutex sync.Mutex
var MBps uint64 = 1000000 / 8 // MByte
func GetClientTLSConfig(streamSettings *internet.MemoryStreamConfig) (*hyClient.TLSConfig, error) {
func GetClientTLSConfig(dest net.Destination, streamSettings *internet.MemoryStreamConfig) (*hyClient.TLSConfig, error) {
config := tls.ConfigFromStreamSettings(streamSettings)
if config == nil {
return nil, newError(Hy2MustNeedTLS)
}
tlsConfig := config.GetTLSConfig()
tlsConfig := config.GetTLSConfig(tls.WithDestination(dest))
return &hyClient.TLSConfig{
RootCAs: tlsConfig.RootCAs,
@ -67,7 +67,7 @@ func (f *connFactory) New(addr net.Addr) (net.PacketConn, error) {
}
func NewHyClient(dest net.Destination, streamSettings *internet.MemoryStreamConfig) (hyClient.Client, error) {
tlsConfig, err := GetClientTLSConfig(streamSettings)
tlsConfig, err := GetClientTLSConfig(dest, streamSettings)
if err != nil {
return nil, err
}