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

check if address is set

pull/215/head v1.16
v2ray 2016-06-12 22:54:33 +02:00
parent 679d646571
commit 8a5f37dad7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/dokodemo/config_json.go
View File

@ -22,7 +22,9 @@ func (this *Config) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, rawConfig); err != nil { if err := json.Unmarshal(data, rawConfig); err != nil {
return errors.New("Dokodemo: Failed to parse config: " + err.Error()) return errors.New("Dokodemo: Failed to parse config: " + err.Error())
} }
this.Address = rawConfig.Host.Address if rawConfig.Host != nil {
this.Address = rawConfig.Host.Address
}
this.Port = rawConfig.PortValue this.Port = rawConfig.PortValue
this.Network = rawConfig.NetworkList this.Network = rawConfig.NetworkList
this.Timeout = rawConfig.TimeoutValue this.Timeout = rawConfig.TimeoutValue

10
proxy/dokodemo/dokodemo.go
View File

@ -129,7 +129,7 @@ func (this *DokodemoDoor) ListenTCP() error {
func (this *DokodemoDoor) HandleTCPConnection(conn *hub.Connection) { func (this *DokodemoDoor) HandleTCPConnection(conn *hub.Connection) {
defer conn.Close() defer conn.Close()
dest := v2net.TCPDestination(this.address, this.port) var dest v2net.Destination
if this.config.FollowRedirect { if this.config.FollowRedirect {
originalDest := GetOriginalDestination(conn) originalDest := GetOriginalDestination(conn)
if originalDest != nil { if originalDest != nil {
@ -137,6 +137,14 @@ func (this *DokodemoDoor) HandleTCPConnection(conn *hub.Connection) {
dest = originalDest dest = originalDest
} }
} }
if dest == nil && this.address != nil && this.port > v2net.Port(0) {
dest = v2net.TCPDestination(this.address, this.port)
}
if dest == nil {
log.Info("Dokodemo: Unknown destination, stop forwarding...")
return
}
ray := this.packetDispatcher.DispatchToOutbound(dest) ray := this.packetDispatcher.DispatchToOutbound(dest)
defer ray.InboundOutput().Release() defer ray.InboundOutput().Release()