GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-21 03:59:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: code improvements

Browse Source
This commit is contained in:
Toby 2022-02-27 13:53:37 -08:00
parent 97ef033b65
commit a94009ed4b
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pkg/transport/socks5.go
View File

@ -87,20 +87,11 @@ func (c *SOCKS5Client) DialTCP(raddr *net.TCPAddr) (*net.TCPConn, error) {
_ = conn.Close() _ = conn.Close()
return nil, err return nil, err
} }
var atyp byte atyp, addr, port, err := addrToSOCKS5Addr(raddr)
var addr, port []byte if err != nil {
if ip4 := raddr.IP.To4(); ip4 != nil {
atyp = socks5.ATYPIPv4
addr = ip4
} else if ip6 := raddr.IP.To16(); ip6 != nil {
atyp = socks5.ATYPIPv6
addr = ip6
} else {
_ = conn.Close() _ = conn.Close()
return nil, errors.New("unsupported address type") return nil, err
} }
port = make([]byte, 2)
binary.BigEndian.PutUint16(port, uint16(raddr.Port))
r := socks5.NewRequest(socks5.CmdConnect, atyp, addr, port) r := socks5.NewRequest(socks5.CmdConnect, atyp, addr, port)
reply, err := c.request(conn, r) reply, err := c.request(conn, r)
if err != nil { if err != nil {
@ -201,21 +192,12 @@ func (c *socks5UDPConn) ReadFromUDP(b []byte) (int, *net.UDPAddr, error) {
} }
func (c *socks5UDPConn) WriteToUDP(b []byte, addr *net.UDPAddr) (int, error) { func (c *socks5UDPConn) WriteToUDP(b []byte, addr *net.UDPAddr) (int, error) {
var atyp byte atyp, dstAddr, dstPort, err := addrToSOCKS5Addr(addr)
var dstAddr, dstPort []byte if err != nil {
if ip4 := addr.IP.To4(); ip4 != nil { return 0, err
atyp = socks5.ATYPIPv4
dstAddr = ip4
} else if ip6 := addr.IP.To16(); ip6 != nil {
atyp = socks5.ATYPIPv6
dstAddr = ip6
} else {
return 0, errors.New("unsupported address type")
} }
dstPort = make([]byte, 2)
binary.BigEndian.PutUint16(dstPort, uint16(addr.Port))
d := socks5.NewDatagram(atyp, dstAddr, dstPort, b) d := socks5.NewDatagram(atyp, dstAddr, dstPort, b)
_, err := c.udpConn.Write(d.Bytes()) _, err = c.udpConn.Write(d.Bytes())
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -229,6 +211,7 @@ func (c *socks5UDPConn) Close() error {
} }
func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, error) { func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, error) {
iPort := int(binary.BigEndian.Uint16(port))
switch atyp { switch atyp {
case socks5.ATYPIPv4: case socks5.ATYPIPv4:
if len(addr) != 4 { if len(addr) != 4 {
@ -236,7 +219,7 @@ func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, err
} }
return &net.UDPAddr{ return &net.UDPAddr{
IP: addr, IP: addr,
Port: int(binary.BigEndian.Uint16(port)), Port: iPort,
}, nil }, nil
case socks5.ATYPIPv6: case socks5.ATYPIPv6:
if len(addr) != 16 { if len(addr) != 16 {
@ -244,7 +227,7 @@ func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, err
} }
return &net.UDPAddr{ return &net.UDPAddr{
IP: addr, IP: addr,
Port: int(binary.BigEndian.Uint16(port)), Port: iPort,
}, nil }, nil
case socks5.ATYPDomain: case socks5.ATYPDomain:
if len(addr) == 0 { if len(addr) == 0 {
@ -256,10 +239,38 @@ func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, err
} }
return &net.UDPAddr{ return &net.UDPAddr{
IP: ipAddr.IP, IP: ipAddr.IP,
Port: int(binary.BigEndian.Uint16(port)), Port: iPort,
Zone: ipAddr.Zone, Zone: ipAddr.Zone,
}, nil }, nil
default: default:
return nil, errors.New("unsupported address type") return nil, errors.New("unsupported address type")
} }
} }
func addrToSOCKS5Addr(addr net.Addr) (byte, []byte, []byte, error) {
var addrIP net.IP
var addrPort int
if tcpAddr, ok := addr.(*net.TCPAddr); ok {
addrIP = tcpAddr.IP
addrPort = tcpAddr.Port
} else if udpAddr, ok := addr.(*net.UDPAddr); ok {
addrIP = udpAddr.IP
addrPort = udpAddr.Port
} else {
return 0, nil, nil, errors.New("unsupported address type")
}
var atyp byte
var saddr, sport []byte
if ip4 := addrIP.To4(); ip4 != nil {
atyp = socks5.ATYPIPv4
saddr = addrIP
} else if ip6 := addrIP.To16(); ip6 != nil {
atyp = socks5.ATYPIPv6
saddr = ip6
} else {
return 0, nil, nil, errors.New("unsupported address type")
}
sport = make([]byte, 2)
binary.BigEndian.PutUint16(sport, uint16(addrPort))
return atyp, saddr, sport, nil
}