chore: code cleanup

xishang0128 · Jan 16, 2023 · 4e4d741 · 4e4d741
1 parent bec66e9
commit 4e4d741
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -17,17 +17,13 @@ import (
 	"strings"
 	"sync"
 	"time"
-	_ "unsafe"
 
 	"github.com/Dreamacro/clash/common/buf"
 	N "github.com/Dreamacro/clash/common/net"
 
 	"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