1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-28 18:25:23 +00:00

format code

This commit is contained in:
V2Ray 2015-10-05 16:58:14 +02:00
parent 8461cde710
commit 9b12ee2eb3
2 changed files with 21 additions and 21 deletions

View File

@ -23,25 +23,25 @@ func (request *Socks5UDPRequest) Destination() v2net.Destination {
}
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
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) {

View File

@ -63,8 +63,8 @@ func (server *SocksServer) handlePacket(conn *net.UDPConn, packet v2net.Packet,
close(ray.InboundInput())
if data, ok := <-ray.InboundOutput(); ok {
request.Data = data
udpMessage := request.Bytes(nil)
request.Data = data
udpMessage := request.Bytes(nil)
nBytes, err := conn.WriteToUDP(udpMessage, clientAddr)
}
}