lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-03 07:45:29 -05:00
Code Issues Releases Wiki Activity

cleanup unused scenarios

Browse Source
This commit is contained in:
Darien Raymond
2018-10-22 22:40:53 +02:00
parent 17e51b277b
commit c2566e1331
4 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/router/router.go
View File

@@ -11,9 +11,27 @@ import (
"v2ray.com/core/common/session"
"v2ray.com/core/features/dns"
"v2ray.com/core/features/routing"
"v2ray.com/core/proxy"
)
type key uint32
const (
resolvedIPsKey key = iota
)
type IPResolver interface {
Resolve() []net.Address
}
func ContextWithResolveIPs(ctx context.Context, f IPResolver) context.Context {
return context.WithValue(ctx, resolvedIPsKey, f)
}
func ResolvedIPsFromContext(ctx context.Context) (IPResolver, bool) {
ips, ok := ctx.Value(resolvedIPsKey).(IPResolver)
return ips, ok
}
func init() {
common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
r := new(Router)
@@ -89,7 +107,7 @@ func (r *Router) PickRoute(ctx context.Context) (string, error) {
if r.domainStrategy == Config_IpOnDemand {
if outbound != nil && outbound.Target.IsValid() && outbound.Target.Address.Family().IsDomain() {
resolver.domain = outbound.Target.Address.Domain()
ctx = proxy.ContextWithResolveIPs(ctx, resolver)
ctx = ContextWithResolveIPs(ctx, resolver)
}
}
@@ -108,7 +126,7 @@ func (r *Router) PickRoute(ctx context.Context) (string, error) {
resolver.domain = dest.Address.Domain()
ips := resolver.Resolve()
if len(ips) > 0 {
ctx = proxy.ContextWithResolveIPs(ctx, resolver)
ctx = ContextWithResolveIPs(ctx, resolver)
for _, rule := range r.rules {
if rule.Apply(ctx) {
return rule.Tag, nil