package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-26 18:21:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve(socks5): unify addr parsing

Browse Source
This commit is contained in:
xjasonlyu
2022-02-06 19:48:12 +08:00
parent cc56100f15
commit 1b38ce2d25
4 changed files with 49 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/shadowsocks.go
View File

@@ -61,7 +61,7 @@ func (ss *Shadowsocks) DialContext(ctx context.Context, metadata *M.Metadata) (c
}
c = ss.cipher.StreamConn(c)
_, err = c.Write(metadata.SerializeSocksAddr())
_, err = c.Write(serializeSocksAddr(metadata))
return
}
@@ -89,9 +89,9 @@ type ssPacketConn struct {
func (pc *ssPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
var packet []byte
if ma, ok := addr.(*M.Addr); ok {
packet, err = socks5.EncodeUDPPacket(ma.Metadata().SerializeSocksAddr(), b)
packet, err = socks5.EncodeUDPPacket(serializeSocksAddr(ma.Metadata()), b)
} else {
packet, err = socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b)
packet, err = socks5.EncodeUDPPacket(socks5.ParseAddr(addr), b)
}
if err != nil {