lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-28 18:25:23 +00:00
Code Issues Releases Wiki Activity

Fix Socks UDP implementation

Browse Source
This commit is contained in:
V2Ray 2015-10-05 16:57:50 +02:00
parent 3ac8b9caa5
commit eb94f7a51c
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxy/socks/protocol/udp.go
View File

@ -22,6 +22,28 @@ func (request *Socks5UDPRequest) Destination() v2net.Destination {
return v2net.NewUDPDestination(request.Address)
}
func (request *Socks5UDPRequest) Bytes(buffer []byte) []byte {
if buffer == nil {
buffer = make([]byte, 0, 2*1024)
}
buffer = append(buffer, 0, 0, request.Fragment)
switch {
case request.Address.IsIPv4():
buffer = append(buffer, AddrTypeIPv4)
buffer = append(buffer, request.Address.IP()...)
case request.Address.IsIPv6():
buffer = append(buffer, AddrTypeIPv6)
buffer = append(buffer, request.Address.IP()...)
case request.Address.IsDomain():
buffer = append(buffer, AddrTypeDomain)
buffer = append(buffer, byte(len(request.Address.Domain())))
buffer = append(buffer, []byte(request.Address.Domain())...)
}
buffer = append(buffer, request.Address.PortBytes()...)
buffer = append(buffer, request.Data...)
return buffer
}
func ReadUDPRequest(packet []byte) (request Socks5UDPRequest, err error) {
// packet[0] and packet[1] are reserved
request.Fragment = packet[2]

8
proxy/socks/udp.go
View File

@ -54,15 +54,17 @@ func (server *SocksServer) AcceptPackets(conn *net.UDPConn) error {
}
udpPacket := v2net.NewPacket(request.Destination(), request.Data, false)
go server.handlePacket(conn, udpPacket, addr)
go server.handlePacket(conn, udpPacket, addr, request)
}
}
func (server *SocksServer) handlePacket(conn *net.UDPConn, packet v2net.Packet, clientAddr *net.UDPAddr) {
func (server *SocksServer) handlePacket(conn *net.UDPConn, packet v2net.Packet, clientAddr *net.UDPAddr, request protocol.Socks5UDPRequest) {
ray := server.vPoint.DispatchToOutbound(packet)
close(ray.InboundInput())
if data, ok := <-ray.InboundOutput(); ok {
conn.WriteToUDP(data, clientAddr)
request.Data = data
udpMessage := request.Bytes(nil)
nBytes, err := conn.WriteToUDP(udpMessage, clientAddr)
}
}