github/v2ray-core
4
0 Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-13 22:45:13 +00:00
Code Issues Releases Wiki Activity

rewrite alloc.buffer

Browse Source
This commit is contained in:
Darien Raymond committed 2016-12-06 11:03:42 +01:00
1 parent 4bf8288cc2
commit 8c8f0a53fd
51 files changed
+391 -299
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

proxy/socks/protocol/udp.go
+12 -6
View File
@@ -5,6 +5,7 @@ import (
"v2ray.com/core/common/alloc"
"v2ray.com/core/common/errors"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/common/serial"
)
var (
@@ -26,14 +27,17 @@ func (request *Socks5UDPRequest) Write(buffer *alloc.Buffer) {
buffer.AppendBytes(0, 0, request.Fragment)
switch request.Address.Family() {
case v2net.AddressFamilyIPv4:
buffer.AppendBytes(AddrTypeIPv4).Append(request.Address.IP())
buffer.AppendBytes(AddrTypeIPv4)
buffer.Append(request.Address.IP())
case v2net.AddressFamilyIPv6:
buffer.AppendBytes(AddrTypeIPv6).Append(request.Address.IP())
buffer.AppendBytes(AddrTypeIPv6)
buffer.Append(request.Address.IP())
case v2net.AddressFamilyDomain:
buffer.AppendBytes(AddrTypeDomain, byte(len(request.Address.Domain()))).Append([]byte(request.Address.Domain()))
buffer.AppendBytes(AddrTypeDomain, byte(len(request.Address.Domain())))
buffer.Append([]byte(request.Address.Domain()))
}
buffer.AppendUint16(request.Port.Value())
buffer.Append(request.Data.Value)
buffer.AppendFunc(serial.WriteUint16(request.Port.Value()))
buffer.Append(request.Data.Bytes())
}
func ReadUDPRequest(packet []byte) (*Socks5UDPRequest, error) {
@@ -79,7 +83,9 @@ func ReadUDPRequest(packet []byte) (*Socks5UDPRequest, error) {
}
if len(packet) > dataBegin {
request.Data = alloc.NewBuffer().Clear().Append(packet[dataBegin:])
b := alloc.NewSmallBuffer()
b.Append(packet[dataBegin:])
request.Data = b
}
return request, nil