connecting dots

io/aes.go

@@ -0,0 +1,27 @@
+package io
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"io"
+)
+
+func NewAesDecryptReader(key []byte, iv []byte, reader io.Reader) (io.Reader, error) {
+	aesBlock, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+
+	aesMode := cipher.NewCBCDecrypter(aesBlock, iv)
+	return NewCryptionReader(aesMode, reader), nil
+}
+
+func NewAesEncryptWriter(key []byte, iv []byte, writer io.Writer) (io.Writer, error) {
+	aesBlock, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, err
+	}
+
+	aesMode := cipher.NewCBCEncrypter(aesBlock, iv)
+	return NewCryptionWriter(aesMode, writer), nil
+}

io/socks/socks.go

@@ -5,6 +5,8 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+
+	v2net "github.com/v2ray/v2ray-core/net"
 )
 
 const (
@@ -128,7 +130,7 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
 	// buffer[2] is a reserved field
 	request.AddrType = buffer[3]
 	switch request.AddrType {
-	case 0x01:
+	case AddrTypeIPv4:
 		nBytes, err = reader.Read(request.IPv4[:])
 		if err != nil {
 			return
@@ -137,7 +139,7 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
 			err = fmt.Errorf("Unable to read IPv4 address.")
 			return
 		}
-	case 0x03:
+	case AddrTypeDomain:
 		buffer = make([]byte, 257)
 		nBytes, err = reader.Read(buffer)
 		if err != nil {
@@ -149,7 +151,7 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
 			return
 		}
 		request.Domain = string(buffer[1 : domainLength+1])
-	case 0x04:
+	case AddrTypeIPv6:
 		nBytes, err = reader.Read(request.IPv6[:])
 		if err != nil {
 			return
@@ -177,6 +179,19 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
 	return
 }
 
+func (request *Socks5Request) Destination() v2net.VAddress {
+	switch request.AddrType {
+	case AddrTypeIPv4:
+		return v2net.IPAddress(request.IPv4[:], request.Port)
+	case AddrTypeIPv6:
+		return v2net.IPAddress(request.IPv6[:], request.Port)
+	case AddrTypeDomain:
+		return v2net.DomainAddress(request.Domain, request.Port)
+	default:
+		panic("Unknown address type")
+	}
+}
+
 const (
 	ErrorSuccess                 = byte(0x00)
 	ErrorGeneralFailure          = byte(0x01)

io/vmess/vmess.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/v2ray/v2ray-core"
 	v2io "github.com/v2ray/v2ray-core/io"
+	v2net "github.com/v2ray/v2ray-core/net"
 )
 
 const (
@@ -22,7 +23,7 @@ const (
 	addrTypeIPv6   = byte(0x03)
 	addrTypeDomain = byte(0x02)
 
-	vMessVersion = byte(0x01)
+	Version = byte(0x01)
 )
 
 var (
@@ -95,12 +96,25 @@ func (r *VMessRequest) targetAddressType() byte {
 	return r[56]
 }
 
+func (r *VMessRequest) Destination() v2net.VAddress {
+	switch r.targetAddressType() {
+	case addrTypeIPv4:
+		fallthrough
+	case addrTypeIPv6:
+		return v2net.IPAddress(r.targetAddressBytes(), r.Port())
+	case addrTypeDomain:
+		return v2net.DomainAddress(r.TargetAddress(), r.Port())
+	default:
+		panic("Unpexected address type")
+	}
+}
+
 func (r *VMessRequest) TargetAddress() string {
 	switch r.targetAddressType() {
 	case addrTypeIPv4:
-		return string(net.IPv4(r[57], r[58], r[59], r[60]))
+		return net.IP(r[57:61]).String()
 	case addrTypeIPv6:
-		return string(net.IP(r[57:73]))
+		return net.IP(r[57:73]).String()
 	case addrTypeDomain:
 		domainLength := int(r[57])
 		return string(r[58 : 58+domainLength])
@@ -326,4 +340,10 @@ func (w *VMessRequestWriter) Write(writer io.Writer, request *VMessRequest) erro
 	return nil
 }
 
-type VMessOutput [4]byte
+type VMessResponse [4]byte
+
+func NewVMessResponse(request *VMessRequest) *VMessResponse {
+	response := new(VMessResponse)
+	copy(response[:], request.ResponseHeader())
+	return response
+}