|
|
|
|
@ -7,41 +7,30 @@ package router |
|
|
|
|
import ( |
|
|
|
|
"fmt" |
|
|
|
|
"math/rand" |
|
|
|
|
"net" |
|
|
|
|
"net/netip" |
|
|
|
|
"reflect" |
|
|
|
|
"strings" |
|
|
|
|
"testing" |
|
|
|
|
|
|
|
|
|
"go4.org/netipx" |
|
|
|
|
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
func randIP() net.IP { |
|
|
|
|
func randIP() netip.Addr { |
|
|
|
|
b := byte(rand.Intn(3)) |
|
|
|
|
return net.IP{b, b, b, b} |
|
|
|
|
return netip.AddrFrom4([4]byte{b, b, b, b}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func randRouteData() *winipcfg.RouteData { |
|
|
|
|
return &winipcfg.RouteData{ |
|
|
|
|
Destination: net.IPNet{ |
|
|
|
|
IP: randIP(), |
|
|
|
|
Mask: net.CIDRMask(rand.Intn(3)+1, 32), |
|
|
|
|
}, |
|
|
|
|
NextHop: randIP(), |
|
|
|
|
Metric: uint32(rand.Intn(3)), |
|
|
|
|
Destination: netip.PrefixFrom(randIP(), rand.Intn(30)+1), |
|
|
|
|
NextHop: randIP(), |
|
|
|
|
Metric: uint32(rand.Intn(3)), |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func TestRouteLess(t *testing.T) { |
|
|
|
|
type D = winipcfg.RouteData |
|
|
|
|
ipnet := func(s string) net.IPNet { |
|
|
|
|
ipp, err := netip.ParsePrefix(s) |
|
|
|
|
if err != nil { |
|
|
|
|
t.Fatalf("error parsing test data %q: %v", s, err) |
|
|
|
|
} |
|
|
|
|
return *netipx.PrefixIPNet(ipp) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ipnet := netip.MustParsePrefix |
|
|
|
|
tests := []struct { |
|
|
|
|
ri, rj *winipcfg.RouteData |
|
|
|
|
want bool |
|
|
|
|
@ -72,76 +61,51 @@ func TestRouteLess(t *testing.T) { |
|
|
|
|
want: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
ri: &D{Destination: ipnet("1.1.0.0/16"), Metric: 1, NextHop: net.ParseIP("3.3.3.3")}, |
|
|
|
|
rj: &D{Destination: ipnet("1.1.0.0/16"), Metric: 1, NextHop: net.ParseIP("4.4.4.4")}, |
|
|
|
|
ri: &D{Destination: ipnet("1.1.0.0/16"), Metric: 1, NextHop: netip.MustParseAddr("3.3.3.3")}, |
|
|
|
|
rj: &D{Destination: ipnet("1.1.0.0/16"), Metric: 1, NextHop: netip.MustParseAddr("4.4.4.4")}, |
|
|
|
|
want: true, |
|
|
|
|
}, |
|
|
|
|
} |
|
|
|
|
for i, tt := range tests { |
|
|
|
|
got := routeLess(tt.ri, tt.rj) |
|
|
|
|
got := routeDataLess(tt.ri, tt.rj) |
|
|
|
|
if got != tt.want { |
|
|
|
|
t.Errorf("%v. less = %v; want %v", i, got, tt.want) |
|
|
|
|
} |
|
|
|
|
back := routeLess(tt.rj, tt.ri) |
|
|
|
|
back := routeDataLess(tt.rj, tt.ri) |
|
|
|
|
if back && got { |
|
|
|
|
t.Errorf("%v. less both ways", i) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func TestRouteLessConsistent(t *testing.T) { |
|
|
|
|
func TestRouteDataLessConsistent(t *testing.T) { |
|
|
|
|
for i := 0; i < 10000; i++ { |
|
|
|
|
ri := randRouteData() |
|
|
|
|
rj := randRouteData() |
|
|
|
|
if routeLess(ri, rj) && routeLess(rj, ri) { |
|
|
|
|
if routeDataLess(ri, rj) && routeDataLess(rj, ri) { |
|
|
|
|
t.Fatalf("both compare less to each other:\n\t%#v\nand\n\t%#v", ri, rj) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func equalNetIPs(a, b []*net.IPNet) bool { |
|
|
|
|
if len(a) != len(b) { |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
for i := range a { |
|
|
|
|
if netCompare(*a[i], *b[i]) != 0 { |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return true |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func ipnet4(ip string, bits int) *net.IPNet { |
|
|
|
|
return &net.IPNet{ |
|
|
|
|
IP: net.ParseIP(ip), |
|
|
|
|
Mask: net.CIDRMask(bits, 32), |
|
|
|
|
func nets(cidrs ...string) (ret []netip.Prefix) { |
|
|
|
|
for _, s := range cidrs { |
|
|
|
|
ret = append(ret, netip.MustParsePrefix(s)) |
|
|
|
|
} |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// each cidr can end in "[4]" to mean To4 form.
|
|
|
|
|
func nets(cidrs ...string) (ret []*net.IPNet) { |
|
|
|
|
for _, s := range cidrs { |
|
|
|
|
to4 := strings.HasSuffix(s, "[4]") |
|
|
|
|
if to4 { |
|
|
|
|
s = strings.TrimSuffix(s, "[4]") |
|
|
|
|
} |
|
|
|
|
ip, ipNet, err := net.ParseCIDR(s) |
|
|
|
|
if err != nil { |
|
|
|
|
panic(fmt.Sprintf("Bogus CIDR %q in test", s)) |
|
|
|
|
} |
|
|
|
|
if to4 { |
|
|
|
|
ip = ip.To4() |
|
|
|
|
} |
|
|
|
|
ipNet.IP = ip |
|
|
|
|
ret = append(ret, ipNet) |
|
|
|
|
func nilIfEmpty[E any](s []E) []E { |
|
|
|
|
if len(s) == 0 { |
|
|
|
|
return nil |
|
|
|
|
} |
|
|
|
|
return |
|
|
|
|
return s |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func TestDeltaNets(t *testing.T) { |
|
|
|
|
tests := []struct { |
|
|
|
|
a, b []*net.IPNet |
|
|
|
|
wantAdd, wantDel []*net.IPNet |
|
|
|
|
a, b []netip.Prefix |
|
|
|
|
wantAdd, wantDel []netip.Prefix |
|
|
|
|
}{ |
|
|
|
|
{ |
|
|
|
|
a: nets("1.2.3.4/24", "1.2.3.4/31", "1.2.3.3/32", "10.0.1.1/32", "100.0.1.1/32"), |
|
|
|
|
@ -161,30 +125,16 @@ func TestDeltaNets(t *testing.T) { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
a: nets("100.84.36.11/32", "fe80::99d0:ec2d:b2e7:536b/64"), |
|
|
|
|
b: nets("100.84.36.11/32[4]"), |
|
|
|
|
b: nets("100.84.36.11/32"), |
|
|
|
|
wantDel: nets("fe80::99d0:ec2d:b2e7:536b/64"), |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
a: []*net.IPNet{ |
|
|
|
|
{ |
|
|
|
|
IP: net.ParseIP("1.2.3.4"), |
|
|
|
|
Mask: net.IPMask{0xff, 0xff, 0xff, 0xff}, |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
b: []*net.IPNet{ |
|
|
|
|
{ |
|
|
|
|
IP: net.ParseIP("1.2.3.4"), |
|
|
|
|
Mask: net.IPMask{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
} |
|
|
|
|
for i, tt := range tests { |
|
|
|
|
add, del := deltaNets(tt.a, tt.b) |
|
|
|
|
if !equalNetIPs(add, tt.wantAdd) { |
|
|
|
|
if !reflect.DeepEqual(nilIfEmpty(add), nilIfEmpty(tt.wantAdd)) { |
|
|
|
|
t.Errorf("[%d] add:\n got: %v\n want: %v\n", i, add, tt.wantAdd) |
|
|
|
|
} |
|
|
|
|
if !equalNetIPs(del, tt.wantDel) { |
|
|
|
|
if !reflect.DeepEqual(nilIfEmpty(del), nilIfEmpty(tt.wantDel)) { |
|
|
|
|
t.Errorf("[%d] del:\n got: %v\n want: %v\n", i, del, tt.wantDel) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -210,35 +160,40 @@ func equalRouteDatas(a, b []*winipcfg.RouteData) bool { |
|
|
|
|
return true |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func ipnet4(ip string, bits int) netip.Prefix { |
|
|
|
|
return netip.PrefixFrom(netip.MustParseAddr(ip), bits) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func TestFilterRoutes(t *testing.T) { |
|
|
|
|
var h0 net.IP |
|
|
|
|
var h0 netip.Addr |
|
|
|
|
|
|
|
|
|
in := []*winipcfg.RouteData{ |
|
|
|
|
// LinkLocal and Loopback routes.
|
|
|
|
|
{*ipnet4("169.254.0.0", 16), h0, 1}, |
|
|
|
|
{*ipnet4("169.254.255.255", 32), h0, 1}, |
|
|
|
|
{*ipnet4("127.0.0.0", 8), h0, 1}, |
|
|
|
|
{*ipnet4("127.255.255.255", 32), h0, 1}, |
|
|
|
|
{ipnet4("169.254.0.0", 16), h0, 1}, |
|
|
|
|
{ipnet4("169.254.255.255", 32), h0, 1}, |
|
|
|
|
{ipnet4("127.0.0.0", 8), h0, 1}, |
|
|
|
|
{ipnet4("127.255.255.255", 32), h0, 1}, |
|
|
|
|
// Local LAN routes.
|
|
|
|
|
{*ipnet4("192.168.0.0", 24), h0, 1}, |
|
|
|
|
{*ipnet4("192.168.0.255", 32), h0, 1}, |
|
|
|
|
{*ipnet4("192.168.1.0", 25), h0, 1}, |
|
|
|
|
{*ipnet4("192.168.1.127", 32), h0, 1}, |
|
|
|
|
{ipnet4("192.168.0.0", 24), h0, 1}, |
|
|
|
|
{ipnet4("192.168.0.255", 32), h0, 1}, |
|
|
|
|
{ipnet4("192.168.1.0", 25), h0, 1}, |
|
|
|
|
{ipnet4("192.168.1.127", 32), h0, 1}, |
|
|
|
|
// Some random other route.
|
|
|
|
|
{*ipnet4("192.168.2.23", 32), h0, 1}, |
|
|
|
|
{ipnet4("192.168.2.23", 32), h0, 1}, |
|
|
|
|
// Our own tailscale address.
|
|
|
|
|
{*ipnet4("100.100.100.100", 32), h0, 1}, |
|
|
|
|
{ipnet4("100.100.100.100", 32), h0, 1}, |
|
|
|
|
// Other tailscale addresses.
|
|
|
|
|
{*ipnet4("100.100.100.101", 32), h0, 1}, |
|
|
|
|
{*ipnet4("100.100.100.102", 32), h0, 1}, |
|
|
|
|
{ipnet4("100.100.100.101", 32), h0, 1}, |
|
|
|
|
{ipnet4("100.100.100.102", 32), h0, 1}, |
|
|
|
|
} |
|
|
|
|
want := []*winipcfg.RouteData{ |
|
|
|
|
{*ipnet4("169.254.0.0", 16), h0, 1}, |
|
|
|
|
{*ipnet4("127.0.0.0", 8), h0, 1}, |
|
|
|
|
{*ipnet4("192.168.0.0", 24), h0, 1}, |
|
|
|
|
{*ipnet4("192.168.1.0", 25), h0, 1}, |
|
|
|
|
{*ipnet4("192.168.2.23", 32), h0, 1}, |
|
|
|
|
{*ipnet4("100.100.100.101", 32), h0, 1}, |
|
|
|
|
{*ipnet4("100.100.100.102", 32), h0, 1}, |
|
|
|
|
{ipnet4("169.254.0.0", 16), h0, 1}, |
|
|
|
|
{ipnet4("127.0.0.0", 8), h0, 1}, |
|
|
|
|
{ipnet4("192.168.0.0", 24), h0, 1}, |
|
|
|
|
{ipnet4("192.168.1.0", 25), h0, 1}, |
|
|
|
|
{ipnet4("192.168.2.23", 32), h0, 1}, |
|
|
|
|
{ipnet4("100.100.100.101", 32), h0, 1}, |
|
|
|
|
{ipnet4("100.100.100.102", 32), h0, 1}, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
got := filterRoutes(in, mustCIDRs("100.100.100.100/32")) |
|
|
|
|
@ -248,29 +203,29 @@ func TestFilterRoutes(t *testing.T) { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
func TestDeltaRouteData(t *testing.T) { |
|
|
|
|
var h0 net.IP |
|
|
|
|
h1 := net.ParseIP("99.99.99.99") |
|
|
|
|
h2 := net.ParseIP("99.99.9.99") |
|
|
|
|
var h0 netip.Addr |
|
|
|
|
h1 := netip.MustParseAddr("99.99.99.99") |
|
|
|
|
h2 := netip.MustParseAddr("99.99.9.99") |
|
|
|
|
|
|
|
|
|
a := []*winipcfg.RouteData{ |
|
|
|
|
{*ipnet4("1.2.3.4", 32), h0, 1}, |
|
|
|
|
{*ipnet4("1.2.3.4", 24), h1, 2}, |
|
|
|
|
{*ipnet4("1.2.3.4", 24), h2, 1}, |
|
|
|
|
{*ipnet4("1.2.3.5", 32), h0, 1}, |
|
|
|
|
{ipnet4("1.2.3.4", 32), h0, 1}, |
|
|
|
|
{ipnet4("1.2.3.4", 24), h1, 2}, |
|
|
|
|
{ipnet4("1.2.3.4", 24), h2, 1}, |
|
|
|
|
{ipnet4("1.2.3.5", 32), h0, 1}, |
|
|
|
|
} |
|
|
|
|
b := []*winipcfg.RouteData{ |
|
|
|
|
{*ipnet4("1.2.3.5", 32), h0, 1}, |
|
|
|
|
{*ipnet4("1.2.3.4", 24), h1, 2}, |
|
|
|
|
{*ipnet4("1.2.3.4", 24), h2, 2}, |
|
|
|
|
{ipnet4("1.2.3.5", 32), h0, 1}, |
|
|
|
|
{ipnet4("1.2.3.4", 24), h1, 2}, |
|
|
|
|
{ipnet4("1.2.3.4", 24), h2, 2}, |
|
|
|
|
} |
|
|
|
|
add, del := deltaRouteData(a, b) |
|
|
|
|
|
|
|
|
|
wantAdd := []*winipcfg.RouteData{ |
|
|
|
|
{*ipnet4("1.2.3.4", 24), h2, 2}, |
|
|
|
|
{ipnet4("1.2.3.4", 24), h2, 2}, |
|
|
|
|
} |
|
|
|
|
wantDel := []*winipcfg.RouteData{ |
|
|
|
|
{*ipnet4("1.2.3.4", 32), h0, 1}, |
|
|
|
|
{*ipnet4("1.2.3.4", 24), h2, 1}, |
|
|
|
|
{ipnet4("1.2.3.4", 32), h0, 1}, |
|
|
|
|
{ipnet4("1.2.3.4", 24), h2, 1}, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if !equalRouteDatas(add, wantAdd) { |
|
|
|
|
|
Brad Fitzpatrick
4 years ago
committed by
Brad Fitzpatrick