From 4e4d741075e336c500dbe199159b4171291cdd81 Mon Sep 17 00:00:00 2001 From: wwqgtxx Date: Mon, 16 Jan 2023 12:11:34 +0800 Subject: [PATCH] chore: code cleanup --- adapter/outbound/base.go | 3 --- common/net/bufconn.go | 3 --- common/net/sing.go | 2 -- transport/vless/conn.go | 3 --- transport/vmess/websocket.go | 4 ---- 5 files changed, 15 deletions(-) diff --git a/adapter/outbound/base.go b/adapter/outbound/base.go index e0efe5958d..dc339969e9 100644 --- a/adapter/outbound/base.go +++ b/adapter/outbound/base.go @@ -188,9 +188,6 @@ func (c *conn) AppendToChains(a C.ProxyAdapter) { } func (c *conn) Upstream() any { - if wrapper, ok := c.ExtendedConn.(*N.ExtendedConnWrapper); ok { - return wrapper.Conn - } return c.ExtendedConn } diff --git a/common/net/bufconn.go b/common/net/bufconn.go index b3e3d1f355..9f1dda2b21 100644 --- a/common/net/bufconn.go +++ b/common/net/bufconn.go @@ -56,8 +56,5 @@ func (c *BufferedConn) ReadBuffer(buffer *buf.Buffer) (err error) { } func (c *BufferedConn) Upstream() any { - if wrapper, ok := c.ExtendedConn.(*ExtendedConnWrapper); ok { - return wrapper.Conn - } return c.ExtendedConn } diff --git a/common/net/sing.go b/common/net/sing.go index 37ba3f0c1d..342f2e9581 100644 --- a/common/net/sing.go +++ b/common/net/sing.go @@ -8,8 +8,6 @@ import ( "github.com/sagernet/sing/common/network" ) -type ExtendedConnWrapper = bufio.ExtendedConnWrapper - var NewExtendedConn = bufio.NewExtendedConn var NewExtendedWriter = bufio.NewExtendedWriter var NewExtendedReader = bufio.NewExtendedReader diff --git a/transport/vless/conn.go b/transport/vless/conn.go index d57f3ae1f5..75eef495d5 100644 --- a/transport/vless/conn.go +++ b/transport/vless/conn.go @@ -123,9 +123,6 @@ func (vc *Conn) recvResponse() error { } func (vc *Conn) Upstream() any { - if wrapper, ok := vc.ExtendedConn.(*N.ExtendedConnWrapper); ok { - return wrapper.Conn - } return vc.ExtendedConn } diff --git a/transport/vmess/websocket.go b/transport/vmess/websocket.go index 90cd7772f4..b38c0006f5 100644 --- a/transport/vmess/websocket.go +++ b/transport/vmess/websocket.go @@ -17,7 +17,6 @@ import ( "strings" "sync" "time" - _ "unsafe" "github.com/Dreamacro/clash/common/buf" N "github.com/Dreamacro/clash/common/net" @@ -25,9 +24,6 @@ import ( "github.com/gorilla/websocket" ) -//go:linkname maskBytes github.com/gorilla/websocket.maskBytes -func maskBytes(key [4]byte, pos int, b []byte) int - type websocketConn struct { conn *websocket.Conn reader io.Reader