SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-06 05:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove deprecated features

Browse source
This commit is contained in:
世界 2023-10-25 12:00:00 +08:00
parent a8112ff824
commit aa05a4d050
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
29 changed files with 11 additions and 2341 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inbound/default_tcp.go
View file

@ -5,7 +5,6 @@ import (
"net"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/common/proxyproto"
"github.com/sagernet/sing-box/log"
E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata"
@ -34,9 +33,8 @@ func (a *myInboundAdapter) ListenTCP() (net.Listener, error) {
if err == nil {
a.logger.Info("tcp server started at ", tcpListener.Addr())
}
if a.listenOptions.ProxyProtocol {
a.logger.Warn("Proxy Protocol is deprecated, see https://sing-box.sagernet.org/deprecated")
tcpListener = &proxyproto.Listener{Listener: tcpListener, AcceptNoHeader: a.listenOptions.ProxyProtocolAcceptNoHeader}
if a.listenOptions.ProxyProtocol || a.listenOptions.ProxyProtocolAcceptNoHeader {
return nil, E.New("Proxy Protocol is deprecated and removed in sing-box 1.6.0")
}
a.tcpListener = tcpListener
return tcpListener, err