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

use ip if already resolved

pull/714/merge
Darien Raymond 2017-11-15 12:55:54 +01:00
parent 26f005e822
commit 23f209075f
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
proxy/freedom/freedom.go
View File

@ -49,25 +49,20 @@ func New(ctx context.Context, config *Config) (*Handler, error) {
return f, nil return f, nil
} }
func (v *Handler) ResolveIP(destination net.Destination) net.Destination { func (v *Handler) ResolveIP(ctx context.Context, domain string) net.Address {
if !destination.Address.Family().IsDomain() { if resolver, ok := proxy.ResolvedIPsFromContext(ctx); ok {
return destination ips := resolver.Resolve()
if len(ips) == 0 {
return nil
}
return ips[dice.Roll(len(ips))]
} }
ips := v.dns.Get(destination.Address.Domain()) ips := v.dns.Get(domain)
if len(ips) == 0 { if len(ips) == 0 {
log.Trace(newError("DNS returns nil answer. Keep domain as is.")) return nil
return destination
} }
return net.IPAddress(ips[dice.Roll(len(ips))])
ip := ips[dice.Roll(len(ips))]
newDest := net.Destination{
Network: destination.Network,
Address: net.IPAddress(ip),
Port: destination.Port,
}
log.Trace(newError("changing destination from ", destination, " to ", newDest))
return newDest
} }
func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dialer proxy.Dialer) error { func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dialer proxy.Dialer) error {
@ -87,7 +82,15 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
var conn internet.Connection var conn internet.Connection
if v.domainStrategy == Config_USE_IP && destination.Address.Family().IsDomain() { if v.domainStrategy == Config_USE_IP && destination.Address.Family().IsDomain() {
destination = v.ResolveIP(destination) ip := v.ResolveIP(ctx, destination.Address.Domain())
if ip != nil {
destination = net.Destination{
Network: destination.Network,
Address: ip,
Port: destination.Port,
}
log.Trace(newError("changing destination to ", destination))
}
} }
err := retry.ExponentialBackoff(5, 100).On(func() error { err := retry.ExponentialBackoff(5, 100).On(func() error {