github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow IP address is passed as domain in socks5 protocol

pull/62/head
v2ray 2015-12-12 20:57:39 +01:00
parent cf56b89898
commit 88851f2bc9
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proxy/socks/protocol/socks.go
View File

@ -2,6 +2,7 @@ package protocol
import ( import (
"io" "io"
"net"
"github.com/v2ray/v2ray-core/common/alloc" "github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/log" "github.com/v2ray/v2ray-core/common/log"
@ -267,7 +268,12 @@ func (request *Socks5Request) Destination() v2net.Destination {
case AddrTypeIPv6: case AddrTypeIPv6:
address = v2net.IPAddress(request.IPv6[:], request.Port) address = v2net.IPAddress(request.IPv6[:], request.Port)
case AddrTypeDomain: case AddrTypeDomain:
address = v2net.DomainAddress(request.Domain, request.Port) maybeIP := net.ParseIP(request.Domain)
if maybeIP != nil {
address = v2net.IPAddress(maybeIP, request.Port)
} else {
address = v2net.DomainAddress(request.Domain, request.Port)
}
default: default:
panic("Unknown address type") panic("Unknown address type")
} }

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

@ -2,6 +2,7 @@ package protocol
import ( import (
"errors" "errors"
"net"
"github.com/v2ray/v2ray-core/common/alloc" "github.com/v2ray/v2ray-core/common/alloc"
"github.com/v2ray/v2ray-core/common/log" "github.com/v2ray/v2ray-core/common/log"
@ -73,7 +74,12 @@ func ReadUDPRequest(packet []byte) (*Socks5UDPRequest, error) {
} }
domain := string(packet[5 : 5+domainLength]) domain := string(packet[5 : 5+domainLength])
port := v2net.PortFromBytes(packet[5+domainLength : 5+domainLength+2]) port := v2net.PortFromBytes(packet[5+domainLength : 5+domainLength+2])
request.Address = v2net.DomainAddress(domain, port) maybeIP := net.ParseIP(domain)
if maybeIP != nil {
request.Address = v2net.IPAddress(maybeIP, port)
} else {
request.Address = v2net.DomainAddress(domain, port)
}
dataBegin = 5 + domainLength + 2 dataBegin = 5 + domainLength + 2
default: default:
log.Warning("Unknown address type %d", addrType) log.Warning("Unknown address type %d", addrType)