From 0db15d46c3067baad712ae3b7d9b4c7a7a3c4206 Mon Sep 17 00:00:00 2001 From: Dreamacro <8615343+Dreamacro@users.noreply.github.com> Date: Sat, 20 Nov 2021 12:34:14 +0800 Subject: [PATCH 1/2] Change: use nop packet conn for reject --- adapter/outbound/reject.go | 53 +++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/adapter/outbound/reject.go b/adapter/outbound/reject.go index f1940d39a..3b096716e 100644 --- a/adapter/outbound/reject.go +++ b/adapter/outbound/reject.go @@ -2,7 +2,6 @@ package outbound import ( "context" - "errors" "io" "net" "time" @@ -17,12 +16,12 @@ type Reject struct { // DialContext implements C.ProxyAdapter func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) { - return NewConn(&NopConn{}, r), nil + return NewConn(&nopConn{}, r), nil } // ListenPacketContext implements C.ProxyAdapter func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) { - return nil, errors.New("match reject rule") + return newPacketConn(newNopPacketConn(), r), nil } func NewReject() *Reject { @@ -35,30 +34,48 @@ func NewReject() *Reject { } } -type NopConn struct{} +type nopConn struct{} -func (rw *NopConn) Read(b []byte) (int, error) { +func (rw *nopConn) Read(b []byte) (int, error) { return 0, io.EOF } -func (rw *NopConn) Write(b []byte) (int, error) { +func (rw *nopConn) Write(b []byte) (int, error) { return 0, io.EOF } -// Close is fake function for net.Conn -func (rw *NopConn) Close() error { return nil } +func (rw *nopConn) Close() error { return nil } +func (rw *nopConn) LocalAddr() net.Addr { return nil } +func (rw *nopConn) RemoteAddr() net.Addr { return nil } +func (rw *nopConn) SetDeadline(time.Time) error { return nil } +func (rw *nopConn) SetReadDeadline(time.Time) error { return nil } +func (rw *nopConn) SetWriteDeadline(time.Time) error { return nil } -// LocalAddr is fake function for net.Conn -func (rw *NopConn) LocalAddr() net.Addr { return nil } +type nopPacketConn struct { + ch chan struct{} +} -// RemoteAddr is fake function for net.Conn -func (rw *NopConn) RemoteAddr() net.Addr { return nil } +func (npc *nopPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { + return len(b), nil +} -// SetDeadline is fake function for net.Conn -func (rw *NopConn) SetDeadline(time.Time) error { return nil } +func (npc *nopPacketConn) ReadFrom(b []byte) (int, net.Addr, error) { + <-npc.ch + return 0, nil, io.EOF +} -// SetReadDeadline is fake function for net.Conn -func (rw *NopConn) SetReadDeadline(time.Time) error { return nil } +func (npc *nopPacketConn) Close() error { + close(npc.ch) + return nil +} -// SetWriteDeadline is fake function for net.Conn -func (rw *NopConn) SetWriteDeadline(time.Time) error { return nil } +func (npc *nopPacketConn) LocalAddr() net.Addr { return &net.UDPAddr{IP: net.IPv4zero, Port: 0} } +func (npc *nopPacketConn) SetDeadline(time.Time) error { return nil } +func (npc *nopPacketConn) SetReadDeadline(time.Time) error { return nil } +func (npc *nopPacketConn) SetWriteDeadline(time.Time) error { return nil } + +func newNopPacketConn() *nopPacketConn { + return &nopPacketConn{ + ch: make(chan struct{}), + } +} From 4524cf44181944e400d22f4881e1b5dbd0d87b91 Mon Sep 17 00:00:00 2001 From: Dreamacro <8615343+Dreamacro@users.noreply.github.com> Date: Sat, 20 Nov 2021 12:44:31 +0800 Subject: [PATCH 2/2] Fix: should return io.EOF immediately --- adapter/outbound/reject.go | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/adapter/outbound/reject.go b/adapter/outbound/reject.go index 3b096716e..f47521049 100644 --- a/adapter/outbound/reject.go +++ b/adapter/outbound/reject.go @@ -21,7 +21,7 @@ func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ... // ListenPacketContext implements C.ProxyAdapter func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) { - return newPacketConn(newNopPacketConn(), r), nil + return newPacketConn(&nopPacketConn{}, r), nil } func NewReject() *Reject { @@ -51,31 +51,12 @@ func (rw *nopConn) SetDeadline(time.Time) error { return nil } func (rw *nopConn) SetReadDeadline(time.Time) error { return nil } func (rw *nopConn) SetWriteDeadline(time.Time) error { return nil } -type nopPacketConn struct { - ch chan struct{} -} +type nopPacketConn struct{} -func (npc *nopPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { - return len(b), nil -} - -func (npc *nopPacketConn) ReadFrom(b []byte) (int, net.Addr, error) { - <-npc.ch - return 0, nil, io.EOF -} - -func (npc *nopPacketConn) Close() error { - close(npc.ch) - return nil -} - -func (npc *nopPacketConn) LocalAddr() net.Addr { return &net.UDPAddr{IP: net.IPv4zero, Port: 0} } -func (npc *nopPacketConn) SetDeadline(time.Time) error { return nil } -func (npc *nopPacketConn) SetReadDeadline(time.Time) error { return nil } -func (npc *nopPacketConn) SetWriteDeadline(time.Time) error { return nil } - -func newNopPacketConn() *nopPacketConn { - return &nopPacketConn{ - ch: make(chan struct{}), - } -} +func (npc *nopPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { return len(b), nil } +func (npc *nopPacketConn) ReadFrom(b []byte) (int, net.Addr, error) { return 0, nil, io.EOF } +func (npc *nopPacketConn) Close() error { return nil } +func (npc *nopPacketConn) LocalAddr() net.Addr { return &net.UDPAddr{IP: net.IPv4zero, Port: 0} } +func (npc *nopPacketConn) SetDeadline(time.Time) error { return nil } +func (npc *nopPacketConn) SetReadDeadline(time.Time) error { return nil } +func (npc *nopPacketConn) SetWriteDeadline(time.Time) error { return nil }