From 3317beb1912e73bcb0e2692657fb58fec422cded Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Sun, 1 Aug 2021 00:35:37 +0800 Subject: [PATCH] Fix: listener patch diff --- constant/listener.go | 7 +++++++ listener/http/server.go | 27 ++++++++++++++++++--------- listener/listener.go | 36 ++++++++++++++++++------------------ listener/mixed/mixed.go | 29 +++++++++++++++++++---------- listener/redir/tcp.go | 27 ++++++++++++++++++--------- listener/socks/tcp.go | 27 ++++++++++++++++++--------- listener/socks/udp.go | 27 ++++++++++++++++++--------- listener/tproxy/tproxy.go | 39 ++++++++++++++++++++++++--------------- listener/tproxy/udp.go | 27 ++++++++++++++++++--------- 9 files changed, 158 insertions(+), 88 deletions(-) create mode 100644 constant/listener.go diff --git a/constant/listener.go b/constant/listener.go new file mode 100644 index 00000000..07782a9e --- /dev/null +++ b/constant/listener.go @@ -0,0 +1,7 @@ +package constant + +type Listener interface { + RawAddress() string + Address() string + Close() error +} diff --git a/listener/http/server.go b/listener/http/server.go index 6c5a7f6a..bfdd9f1b 100644 --- a/listener/http/server.go +++ b/listener/http/server.go @@ -10,9 +10,26 @@ import ( type Listener struct { listener net.Listener + addr string closed bool } +// RawAddress implements C.Listener +func (l *Listener) RawAddress() string { + return l.addr +} + +// Address implements C.Listener +func (l *Listener) Address() string { + return l.listener.Addr().String() +} + +// Close implements C.Listener +func (l *Listener) Close() error { + l.closed = true + return l.listener.Close() +} + func New(addr string, in chan<- C.ConnContext) (*Listener, error) { return NewWithAuthenticate(addr, in, true) } @@ -30,6 +47,7 @@ func NewWithAuthenticate(addr string, in chan<- C.ConnContext, authenticate bool hl := &Listener{ listener: l, + addr: addr, } go func() { for { @@ -46,12 +64,3 @@ func NewWithAuthenticate(addr string, in chan<- C.ConnContext, authenticate bool return hl, nil } - -func (l *Listener) Close() { - l.closed = true - l.listener.Close() -} - -func (l *Listener) Address() string { - return l.listener.Addr().String() -} diff --git a/listener/listener.go b/listener/listener.go index 5d0e8d7b..f9fffdf4 100644 --- a/listener/listener.go +++ b/listener/listener.go @@ -20,15 +20,15 @@ var ( allowLan = false bindAddress = "*" - socksListener *socks.Listener - socksUDPListener *socks.UDPListener - httpListener *http.Listener - redirListener *redir.Listener - redirUDPListener *tproxy.UDPListener - tproxyListener *tproxy.Listener - tproxyUDPListener *tproxy.UDPListener - mixedListener *mixed.Listener - mixedUDPLister *socks.UDPListener + socksListener C.Listener + socksUDPListener C.Listener + httpListener C.Listener + redirListener C.Listener + redirUDPListener C.Listener + tproxyListener C.Listener + tproxyUDPListener C.Listener + mixedListener C.Listener + mixedUDPLister C.Listener // lock for recreate function socksMux sync.Mutex @@ -69,7 +69,7 @@ func ReCreateHTTP(port int, tcpIn chan<- C.ConnContext) error { addr := genAddr(bindAddress, port, allowLan) if httpListener != nil { - if httpListener.Address() == addr { + if httpListener.RawAddress() == addr { return nil } httpListener.Close() @@ -100,7 +100,7 @@ func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P shouldUDPIgnore := false if socksListener != nil { - if socksListener.Address() != addr { + if socksListener.RawAddress() != addr { socksListener.Close() socksListener = nil } else { @@ -109,7 +109,7 @@ func ReCreateSocks(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P } if socksUDPListener != nil { - if socksUDPListener.Address() != addr { + if socksUDPListener.RawAddress() != addr { socksUDPListener.Close() socksUDPListener = nil } else { @@ -150,7 +150,7 @@ func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P addr := genAddr(bindAddress, port, allowLan) if redirListener != nil { - if redirListener.Address() == addr { + if redirListener.RawAddress() == addr { return nil } redirListener.Close() @@ -158,7 +158,7 @@ func ReCreateRedir(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P } if redirUDPListener != nil { - if redirUDPListener.Address() == addr { + if redirUDPListener.RawAddress() == addr { return nil } redirUDPListener.Close() @@ -191,7 +191,7 @@ func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound. addr := genAddr(bindAddress, port, allowLan) if tproxyListener != nil { - if tproxyListener.Address() == addr { + if tproxyListener.RawAddress() == addr { return nil } tproxyListener.Close() @@ -199,7 +199,7 @@ func ReCreateTProxy(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound. } if tproxyUDPListener != nil { - if tproxyUDPListener.Address() == addr { + if tproxyUDPListener.RawAddress() == addr { return nil } tproxyUDPListener.Close() @@ -235,7 +235,7 @@ func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P shouldUDPIgnore := false if mixedListener != nil { - if mixedListener.Address() != addr { + if mixedListener.RawAddress() != addr { mixedListener.Close() mixedListener = nil } else { @@ -243,7 +243,7 @@ func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P } } if mixedUDPLister != nil { - if mixedUDPLister.Address() != addr { + if mixedUDPLister.RawAddress() != addr { mixedUDPLister.Close() mixedUDPLister = nil } else { diff --git a/listener/mixed/mixed.go b/listener/mixed/mixed.go index 97be69f0..8fd4f990 100644 --- a/listener/mixed/mixed.go +++ b/listener/mixed/mixed.go @@ -15,8 +15,25 @@ import ( type Listener struct { listener net.Listener - closed bool + addr string cache *cache.Cache + closed bool +} + +// RawAddress implements C.Listener +func (l *Listener) RawAddress() string { + return l.addr +} + +// Address implements C.Listener +func (l *Listener) Address() string { + return l.listener.Addr().String() +} + +// Close implements C.Listener +func (l *Listener) Close() error { + l.closed = true + return l.listener.Close() } func New(addr string, in chan<- C.ConnContext) (*Listener, error) { @@ -27,6 +44,7 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { ml := &Listener{ listener: l, + addr: addr, cache: cache.New(30 * time.Second), } go func() { @@ -45,15 +63,6 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { return ml, nil } -func (l *Listener) Close() { - l.closed = true - l.listener.Close() -} - -func (l *Listener) Address() string { - return l.listener.Addr().String() -} - func handleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) { bufConn := N.NewBufferedConn(conn) head, err := bufConn.Peek(1) diff --git a/listener/redir/tcp.go b/listener/redir/tcp.go index f7160eb0..15c98a8f 100644 --- a/listener/redir/tcp.go +++ b/listener/redir/tcp.go @@ -9,9 +9,26 @@ import ( type Listener struct { listener net.Listener + addr string closed bool } +// RawAddress implements C.Listener +func (l *Listener) RawAddress() string { + return l.addr +} + +// Address implements C.Listener +func (l *Listener) Address() string { + return l.listener.Addr().String() +} + +// Close implements C.Listener +func (l *Listener) Close() error { + l.closed = true + return l.listener.Close() +} + func New(addr string, in chan<- C.ConnContext) (*Listener, error) { l, err := net.Listen("tcp", addr) if err != nil { @@ -19,6 +36,7 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { } rl := &Listener{ listener: l, + addr: addr, } go func() { @@ -37,15 +55,6 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { return rl, nil } -func (l *Listener) Close() { - l.closed = true - l.listener.Close() -} - -func (l *Listener) Address() string { - return l.listener.Addr().String() -} - func handleRedir(conn net.Conn, in chan<- C.ConnContext) { target, err := parserPacket(conn) if err != nil { diff --git a/listener/socks/tcp.go b/listener/socks/tcp.go index 20e48f85..49d0a1e3 100644 --- a/listener/socks/tcp.go +++ b/listener/socks/tcp.go @@ -15,9 +15,26 @@ import ( type Listener struct { listener net.Listener + addr string closed bool } +// RawAddress implements C.Listener +func (l *Listener) RawAddress() string { + return l.addr +} + +// Address implements C.Listener +func (l *Listener) Address() string { + return l.listener.Addr().String() +} + +// Close implements C.Listener +func (l *Listener) Close() error { + l.closed = true + return l.listener.Close() +} + func New(addr string, in chan<- C.ConnContext) (*Listener, error) { l, err := net.Listen("tcp", addr) if err != nil { @@ -26,6 +43,7 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { sl := &Listener{ listener: l, + addr: addr, } go func() { for { @@ -43,15 +61,6 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { return sl, nil } -func (l *Listener) Close() { - l.closed = true - l.listener.Close() -} - -func (l *Listener) Address() string { - return l.listener.Addr().String() -} - func handleSocks(conn net.Conn, in chan<- C.ConnContext) { bufConn := N.NewBufferedConn(conn) head, err := bufConn.Peek(1) diff --git a/listener/socks/udp.go b/listener/socks/udp.go index f822d76a..a2d21508 100644 --- a/listener/socks/udp.go +++ b/listener/socks/udp.go @@ -13,9 +13,26 @@ import ( type UDPListener struct { packetConn net.PacketConn + addr string closed bool } +// RawAddress implements C.Listener +func (l *UDPListener) RawAddress() string { + return l.addr +} + +// Address implements C.Listener +func (l *UDPListener) Address() string { + return l.packetConn.LocalAddr().String() +} + +// Close implements C.Listener +func (l *UDPListener) Close() error { + l.closed = true + return l.packetConn.Close() +} + func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) { l, err := net.ListenPacket("udp", addr) if err != nil { @@ -28,6 +45,7 @@ func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) sl := &UDPListener{ packetConn: l, + addr: addr, } go func() { for { @@ -47,15 +65,6 @@ func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) return sl, nil } -func (l *UDPListener) Close() error { - l.closed = true - return l.packetConn.Close() -} - -func (l *UDPListener) Address() string { - return l.packetConn.LocalAddr().String() -} - func handleSocksUDP(pc net.PacketConn, in chan<- *inbound.PacketAdapter, buf []byte, addr net.Addr) { target, payload, err := socks5.DecodeUDPPacket(buf) if err != nil { diff --git a/listener/tproxy/tproxy.go b/listener/tproxy/tproxy.go index 87f2d7d6..1a09f366 100644 --- a/listener/tproxy/tproxy.go +++ b/listener/tproxy/tproxy.go @@ -10,9 +10,32 @@ import ( type Listener struct { listener net.Listener + addr string closed bool } +// RawAddress implements C.Listener +func (l *Listener) RawAddress() string { + return l.addr +} + +// Address implements C.Listener +func (l *Listener) Address() string { + return l.listener.Addr().String() +} + +// Close implements C.Listener +func (l *Listener) Close() error { + l.closed = true + return l.listener.Close() +} + +func (l *Listener) handleTProxy(conn net.Conn, in chan<- C.ConnContext) { + target := socks5.ParseAddrToSocksAddr(conn.LocalAddr()) + conn.(*net.TCPConn).SetKeepAlive(true) + in <- inbound.NewSocket(target, conn, C.TPROXY) +} + func New(addr string, in chan<- C.ConnContext) (*Listener, error) { l, err := net.Listen("tcp", addr) if err != nil { @@ -32,6 +55,7 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { rl := &Listener{ listener: l, + addr: addr, } go func() { @@ -49,18 +73,3 @@ func New(addr string, in chan<- C.ConnContext) (*Listener, error) { return rl, nil } - -func (l *Listener) Close() { - l.closed = true - l.listener.Close() -} - -func (l *Listener) Address() string { - return l.listener.Addr().String() -} - -func (l *Listener) handleTProxy(conn net.Conn, in chan<- C.ConnContext) { - target := socks5.ParseAddrToSocksAddr(conn.LocalAddr()) - conn.(*net.TCPConn).SetKeepAlive(true) - in <- inbound.NewSocket(target, conn, C.TPROXY) -} diff --git a/listener/tproxy/udp.go b/listener/tproxy/udp.go index 6f9de6f5..f3d8dbb3 100644 --- a/listener/tproxy/udp.go +++ b/listener/tproxy/udp.go @@ -11,9 +11,26 @@ import ( type UDPListener struct { packetConn net.PacketConn + addr string closed bool } +// RawAddress implements C.Listener +func (l *UDPListener) RawAddress() string { + return l.addr +} + +// Address implements C.Listener +func (l *UDPListener) Address() string { + return l.packetConn.LocalAddr().String() +} + +// Close implements C.Listener +func (l *UDPListener) Close() error { + l.closed = true + return l.packetConn.Close() +} + func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) { l, err := net.ListenPacket("udp", addr) if err != nil { @@ -22,6 +39,7 @@ func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) rl := &UDPListener{ packetConn: l, + addr: addr, } c := l.(*net.UDPConn) @@ -60,15 +78,6 @@ func NewUDP(addr string, in chan<- *inbound.PacketAdapter) (*UDPListener, error) return rl, nil } -func (l *UDPListener) Close() error { - l.closed = true - return l.packetConn.Close() -} - -func (l *UDPListener) Address() string { - return l.packetConn.LocalAddr().String() -} - func handlePacketConn(pc net.PacketConn, in chan<- *inbound.PacketAdapter, buf []byte, lAddr *net.UDPAddr, rAddr *net.UDPAddr) { target := socks5.ParseAddrToSocksAddr(rAddr) pkt := &packet{