github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

L -> l, A -> a

pull/2714/head
RPRX 2020-08-26 05:01:35 +00:00 committed by GitHub
parent 9046bea466
commit f5642b4075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transport/internet/tcp/hub.go
View File

@ -35,7 +35,7 @@ func ListenTCP(ctx context.Context, address net.Address, port net.Port, streamSe
if err != nil { if err != nil {
return nil, newError("failed to listen TCP on", address, ":", port).Base(err) return nil, newError("failed to listen TCP on", address, ":", port).Base(err)
} }
newError("Listening TCP on ", address, ":", port).WriteToLog(session.ExportIDToError(ctx)) newError("listening TCP on ", address, ":", port).WriteToLog(session.ExportIDToError(ctx))
tcpSettings := streamSettings.ProtocolSettings.(*Config) tcpSettings := streamSettings.ProtocolSettings.(*Config)
var l *Listener var l *Listener
@ -47,7 +47,7 @@ func ListenTCP(ctx context.Context, address net.Address, port net.Port, streamSe
config: tcpSettings, config: tcpSettings,
addConn: handler, addConn: handler,
} }
newError("Accepting PROXY protocol").AtWarning().WriteToLog(session.ExportIDToError(ctx)) newError("accepting PROXY protocol").AtWarning().WriteToLog(session.ExportIDToError(ctx))
} else { } else {
l = &Listener{ l = &Listener{
listener: listener, listener: listener,

4
transport/internet/websocket/hub.go
View File

@ -70,14 +70,14 @@ func ListenWS(ctx context.Context, address net.Address, port net.Port, streamSet
if err != nil { if err != nil {
return nil, newError("failed to listen TCP(for WS) on", address, ":", port).Base(err) return nil, newError("failed to listen TCP(for WS) on", address, ":", port).Base(err)
} }
newError("Listening TCP(for WS) on ", address, ":", port).WriteToLog(session.ExportIDToError(ctx)) newError("listening TCP(for WS) on ", address, ":", port).WriteToLog(session.ExportIDToError(ctx))
wsSettings := streamSettings.ProtocolSettings.(*Config) wsSettings := streamSettings.ProtocolSettings.(*Config)
if wsSettings.AcceptProxyProtocol { if wsSettings.AcceptProxyProtocol {
policyFunc := func(upstream net.Addr) (proxyproto.Policy, error) { return proxyproto.REQUIRE, nil } policyFunc := func(upstream net.Addr) (proxyproto.Policy, error) { return proxyproto.REQUIRE, nil }
listener = &proxyproto.Listener{Listener: listener, Policy: policyFunc} listener = &proxyproto.Listener{Listener: listener, Policy: policyFunc}
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 config := v2tls.ConfigFromStreamSettings(streamSettings); config != nil {