lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-30 05:56:54 -05:00
Code Issues Releases Wiki Activity

converting from host to address directly

Browse Source
This commit is contained in:
v2ray 2015-12-17 00:58:45 +01:00
parent 34a0cb0b70
commit 6543facd51
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/net/json/host.go
View File

@ -3,6 +3,8 @@ package json
import (
"encoding/json"
"net"
v2net "github.com/v2ray/v2ray-core/common/net"
)
type Host struct {
@ -51,3 +53,11 @@ func (this *Host) IP() net.IP {
func (this *Host) Domain() string {
return this.domain
}
func (this *Host) Address() v2net.Address {
if this.IsIP() {
return v2net.IPAddress(this.IP())
} else {
return v2net.DomainAddress(this.Domain())
}
}

6
proxy/dokodemo/json/json.go
View File

@ -14,11 +14,7 @@ type DokodemoConfig struct {
}
func (this *DokodemoConfig) Address() v2net.Address {
if this.Host.IsIP() {
return v2net.IPAddress(this.Host.IP())
} else {
return v2net.DomainAddress(this.Host.Domain())
}
return this.Host.Address()
}
func (this *DokodemoConfig) Port() v2net.Port {

6
proxy/vmess/outbound/json/outbound.go
View File

@ -37,11 +37,7 @@ func (t *ConfigTarget) UnmarshalJSON(data []byte) error {
log.Error("Address is not set in VMess outbound config.")
return proxyconfig.BadConfiguration
}
if rawConfig.Address.IsIP() {
t.Destination = v2net.TCPDestination(v2net.IPAddress(rawConfig.Address.IP()), rawConfig.Port)
} else {
t.Destination = v2net.TCPDestination(v2net.DomainAddress(rawConfig.Address.Domain()), rawConfig.Port)
}
t.Destination = v2net.TCPDestination(rawConfig.Address.Address(), rawConfig.Port)
return nil
}