Remove usage of ShadowConn for ssHandler and ssConnector (#68)
The new ss library has integrated the function of ShadowConn.
This commit is contained in:
@@ -14,7 +14,6 @@ import (
|
||||
"github.com/go-gost/go-shadowsocks2/utils"
|
||||
"github.com/go-gost/gosocks5"
|
||||
ctxvalue "github.com/go-gost/x/ctx"
|
||||
"github.com/go-gost/x/internal/util/ss"
|
||||
"github.com/go-gost/x/registry"
|
||||
)
|
||||
|
||||
@@ -102,11 +101,7 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
|
||||
}
|
||||
|
||||
target := socks.Addr(rawaddr[:n])
|
||||
_, padding, err := utils.GeneratePadding()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
conn, err = c.client.WrapConn(conn, target, padding, nil)
|
||||
conn, err = c.client.WrapConn(conn, target)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -118,7 +113,7 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
sc = ss.ShadowConn(conn, nil)
|
||||
sc = conn
|
||||
|
||||
return sc, nil
|
||||
}
|
||||
|
||||
@@ -93,13 +93,8 @@ func (c *ssuConnector) Connect(ctx context.Context, conn net.Conn, network, addr
|
||||
return ss.UDPClientConn(pc, conn.RemoteAddr(), taddr, c.md.udpBufferSize, &c.client, &c.sessionMap), nil
|
||||
}
|
||||
|
||||
_, padding, err := utils.GeneratePadding()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
target := socks.ParseAddr(taddr.String())
|
||||
conn, err = c.tcpClient.WrapConn(conn, target, padding, nil)
|
||||
conn, err := c.tcpClient.WrapConn(conn, target)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user