lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 18:17:52 -05:00
Code Issues Releases Wiki Activity

Fix transportcommon.ListenWithSecuritySettings

Browse Source
This commit is contained in:
dyhkwong 2024-06-24 01:20:13 +08:00 committed by Xiaokang Wang (Shelikhoo)
parent 863479bb81
commit 66a81ecbf5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
transport/internet/transportcommon/listener.go
View File

@ -2,12 +2,14 @@ package transportcommon
import ( import (
"context" "context"
"crypto/tls"
"github.com/v2fly/v2ray-core/v5/common/environment" "github.com/v2fly/v2ray-core/v5/common/environment"
"github.com/v2fly/v2ray-core/v5/common/environment/envctx" "github.com/v2fly/v2ray-core/v5/common/environment/envctx"
"github.com/v2fly/v2ray-core/v5/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v5/common/session" "github.com/v2fly/v2ray-core/v5/common/session"
"github.com/v2fly/v2ray-core/v5/transport/internet" "github.com/v2fly/v2ray-core/v5/transport/internet"
v2tls "github.com/v2fly/v2ray-core/v5/transport/internet/tls"
) )
func ListenWithSecuritySettings(ctx context.Context, address net.Address, port net.Port, streamSettings *internet.MemoryStreamConfig) ( func ListenWithSecuritySettings(ctx context.Context, address net.Address, port net.Port, streamSettings *internet.MemoryStreamConfig) (
@ -43,5 +45,11 @@ func ListenWithSecuritySettings(ctx context.Context, address net.Address, port n
if streamSettings.SocketSettings != nil && streamSettings.SocketSettings.AcceptProxyProtocol { if streamSettings.SocketSettings != nil && streamSettings.SocketSettings.AcceptProxyProtocol {
newError("accepting PROXY protocol").AtWarning().WriteToLog(session.ExportIDToError(ctx)) newError("accepting PROXY protocol").AtWarning().WriteToLog(session.ExportIDToError(ctx))
} }
if config := v2tls.ConfigFromStreamSettings(streamSettings); config != nil {
if tlsConfig := config.GetTLSConfig(); tlsConfig != nil {
l = tls.NewListener(l, tlsConfig)
}
}
return l, nil return l, nil
} }