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

fix #374

Browse Source
This commit is contained in:
Darien Raymond 2017-01-28 09:04:29 +01:00
parent c5ecdc8078
commit 0bf5f3e531
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/router/condition.go
View File

@ -124,9 +124,12 @@ func NewCIDRMatcher(ip []byte, mask uint32, onSource bool) (*CIDRMatcher, error)
} }
func (v *CIDRMatcher) Apply(ctx context.Context) bool { func (v *CIDRMatcher) Apply(ctx context.Context) bool {
ips := make([]net.IP, 4) ips := make([]net.IP, 0, 4)
if resolveIPs, ok := proxy.ResolvedIPsFromContext(ctx); ok { if resolveIPs, ok := proxy.ResolvedIPsFromContext(ctx); ok {
for _, rip := range resolveIPs { for _, rip := range resolveIPs {
if !rip.Family().IsIPv6() {
continue
}
ips = append(ips, rip.IP()) ips = append(ips, rip.IP())
} }
} }
@ -138,7 +141,7 @@ func (v *CIDRMatcher) Apply(ctx context.Context) bool {
dest = proxy.DestinationFromContext(ctx) dest = proxy.DestinationFromContext(ctx)
} }
if dest.IsValid() && dest.Address.Family().Either(v2net.AddressFamilyIPv4, v2net.AddressFamilyIPv6) { if dest.IsValid() && dest.Address.Family().IsIPv6() {
ips = append(ips, dest.Address.IP()) ips = append(ips, dest.Address.IP())
} }
@ -163,9 +166,12 @@ func NewIPv4Matcher(ipnet *v2net.IPNet, onSource bool) *IPv4Matcher {
} }
func (v *IPv4Matcher) Apply(ctx context.Context) bool { func (v *IPv4Matcher) Apply(ctx context.Context) bool {
ips := make([]net.IP, 4) ips := make([]net.IP, 0, 4)
if resolveIPs, ok := proxy.ResolvedIPsFromContext(ctx); ok { if resolveIPs, ok := proxy.ResolvedIPsFromContext(ctx); ok {
for _, rip := range resolveIPs { for _, rip := range resolveIPs {
if !rip.Family().IsIPv4() {
continue
}
ips = append(ips, rip.IP()) ips = append(ips, rip.IP())
} }
} }
@ -177,7 +183,7 @@ func (v *IPv4Matcher) Apply(ctx context.Context) bool {
dest = proxy.DestinationFromContext(ctx) dest = proxy.DestinationFromContext(ctx)
} }
if dest.IsValid() && dest.Address.Family().Either(v2net.AddressFamilyIPv4) { if dest.IsValid() && dest.Address.Family().IsIPv4() {
ips = append(ips, dest.Address.IP()) ips = append(ips, dest.Address.IP())
} }