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

Chore: rename to SerializeSocksAddr

Browse Source
This commit is contained in:
xjasonlyu
2021-11-08 21:06:24 +08:00
parent 8fcd8fee85
commit af55e8517c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constant/metadata.go
View File

@@ -61,7 +61,7 @@ func (m *Metadata) UDPAddr() *net.UDPAddr {
} }
} }
func (m *Metadata) SerializesSocksAddr() socks5.Addr { func (m *Metadata) SerializeSocksAddr() socks5.Addr {
var ( var (
buf [][]byte buf [][]byte
port [2]byte port [2]byte

4
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) c = ss.cipher.StreamConn(c)
_, err = c.Write(metadata.SerializesSocksAddr()) _, err = c.Write(metadata.SerializeSocksAddr())
return return
} }
@@ -89,7 +89,7 @@ type ssPacketConn struct {
func (pc *ssPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { func (pc *ssPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
var packet []byte var packet []byte
if m, ok := addr.(*M.Metadata); ok { if m, ok := addr.(*M.Metadata); ok {
packet, err = socks5.EncodeUDPPacket(m.SerializesSocksAddr(), b) packet, err = socks5.EncodeUDPPacket(m.SerializeSocksAddr(), b)
} else { } else {
packet, err = socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b) packet, err = socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b)
} }

4
proxy/socks5.go
View File

@@ -59,7 +59,7 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
} }
} }
_, err = socks5.ClientHandshake(c, metadata.SerializesSocksAddr(), socks5.CmdConnect, user) _, err = socks5.ClientHandshake(c, metadata.SerializeSocksAddr(), socks5.CmdConnect, user)
return return
} }
@@ -142,7 +142,7 @@ type socksPacketConn struct {
func (pc *socksPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { func (pc *socksPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
var packet []byte var packet []byte
if m, ok := addr.(*M.Metadata); ok { if m, ok := addr.(*M.Metadata); ok {
packet, err = socks5.EncodeUDPPacket(m.SerializesSocksAddr(), b) packet, err = socks5.EncodeUDPPacket(m.SerializeSocksAddr(), b)
} else { } else {
packet, err = socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b) packet, err = socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b)
} }