xsteadfastx/wireguard-go
1
0
Fork 0
mirror of https://git.zx2c4.com/wireguard-go synced 2024-11-15 01:05:15 +01:00
Code Issues Releases Wiki Activity

wgcfg: add fast CIDR.Contains implementation

Browse Source 
Signed-off-by: Tyler Kropp <kropptyler@gmail.com>
This commit is contained in:
Tyler Kropp 2020-03-02 19:41:28 -05:00 committed by David Crawshaw
parent a38504e399
commit c7bb15a70d
2 changed files with 142 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wgcfg/ip.go
View File

@ -2,6 +2,7 @@ package wgcfg
import (
"fmt"
"math"
"net"
)
@ -106,12 +107,33 @@ func (r *CIDR) IPNet() *net.IPNet {
}
return &net.IPNet{IP: r.IP.IP(), Mask: net.CIDRMask(int(r.Mask), bits)}
}
func (r *CIDR) Contains(ip *IP) bool {
if r == nil || ip == nil {
return false
}
// TODO: this isn't hard, write a more efficient implementation.
return r.IPNet().Contains(ip.IP())
c := int8(r.Mask)
i := 0
if r.IP.Is4() {
i = 12
if ip.Is6() {
return false
}
}
for ; i < 16 && c > 0; i++ {
var x uint8
if c < 8 {
x = 8 - uint8(c)
}
m := uint8(math.MaxUint8) >> x << x
a := r.IP.Addr[i] & m
b := ip.Addr[i] & m
if a != b {
return false
}
c -= 8
}
return true
}
func (r CIDR) MarshalText() ([]byte, error) {

118
wgcfg/ip_test.go Normal file
View File

@ -0,0 +1,118 @@
/* SPDX-License-Identifier: MIT
*
* Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
*/
package wgcfg_test
import (
"testing"
"golang.zx2c4.com/wireguard/wgcfg"
)
func TestCIDRContains(t *testing.T) {
t.Run("home router test", func(t *testing.T) {
r, err := wgcfg.ParseCIDR("192.168.0.0/24")
if err != nil {
t.Fatal(err)
}
ip := wgcfg.ParseIP("192.168.0.1")
if ip == nil {
t.Fatalf("address failed to parse")
}
if !r.Contains(ip) {
t.Fatalf("'%s' should contain '%s'", r, ip)
}
})
t.Run("IPv4 outside network", func(t *testing.T) {
r, err := wgcfg.ParseCIDR("192.168.0.0/30")
if err != nil {
t.Fatal(err)
}
ip := wgcfg.ParseIP("192.168.0.4")
if ip == nil {
t.Fatalf("address failed to parse")
}
if r.Contains(ip) {
t.Fatalf("'%s' should not contain '%s'", r, ip)
}
})
t.Run("IPv4 does not contain IPv6", func(t *testing.T) {
r, err := wgcfg.ParseCIDR("192.168.0.0/24")
if err != nil {
t.Fatal(err)
}
ip := wgcfg.ParseIP("2001:db8:85a3:0:0:8a2e:370:7334")
if ip == nil {
t.Fatalf("address failed to parse")
}
if r.Contains(ip) {
t.Fatalf("'%s' should not contain '%s'", r, ip)
}
})
t.Run("IPv6 inside network", func(t *testing.T) {
r, err := wgcfg.ParseCIDR("2001:db8:1234::/48")
if err != nil {
t.Fatal(err)
}
ip := wgcfg.ParseIP("2001:db8:1234:0000:0000:0000:0000:0001")
if ip == nil {
t.Fatalf("ParseIP returned nil pointer")
}
if !r.Contains(ip) {
t.Fatalf("'%s' should not contain '%s'", r, ip)
}
})
t.Run("IPv6 outside network", func(t *testing.T) {
r, err := wgcfg.ParseCIDR("2001:db8:1234:0:190b:0:1982::/126")
if err != nil {
t.Fatal(err)
}
ip := wgcfg.ParseIP("2001:db8:1234:0:190b:0:1982:4")
if ip == nil {
t.Fatalf("ParseIP returned nil pointer")
}
if r.Contains(ip) {
t.Fatalf("'%s' should not contain '%s'", r, ip)
}
})
}
func BenchmarkCIDRContainsIPv4(b *testing.B) {
b.Run("IPv4", func(b *testing.B) {
r, err := wgcfg.ParseCIDR("192.168.1.0/24")
if err != nil {
b.Fatal(err)
}
ip := wgcfg.ParseIP("1.2.3.4")
if ip == nil {
b.Fatalf("ParseIP returned nil pointer")
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
r.Contains(ip)
}
})
b.Run("IPv6", func(b *testing.B) {
r, err := wgcfg.ParseCIDR("2001:db8:1234::/48")
if err != nil {
b.Fatal(err)
}
ip := wgcfg.ParseIP("2001:db8:1234:0000:0000:0000:0000:0001")
if ip == nil {
b.Fatalf("ParseIP returned nil pointer")
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
r.Contains(ip)
}
})
}