table: replace radix with crit-bit algo for longer-prefixes search

faster and less memory usage.

Now go-radix has gone.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>

1 files changed, 1 insertions, 17 deletions

diff --git a/internal/pkg/table/roa.go b/internal/pkg/table/roa.go
index 4d8aeb04..f4ff0aa2 100644
--- a/internal/pkg/table/roa.go
+++ b/internal/pkg/table/roa.go
@@ -172,22 +172,6 @@ func (rt *ROATable) DeleteAll(network string) {
 	}
 }
 
-func pathToIPNet(path *Path) *net.IPNet {
-	switch T := path.GetNlri().(type) {
-	case *bgp.IPAddrPrefix:
-		return &net.IPNet{
-			IP:   net.IP(T.Prefix.To4()),
-			Mask: net.CIDRMask(int(T.Length), 32),
-		}
-	case *bgp.IPv6AddrPrefix:
-		return &net.IPNet{
-			IP:   net.IP(T.Prefix.To16()),
-			Mask: net.CIDRMask(int(T.Length), 128),
-		}
-	}
-	return nil
-}
-
 func (rt *ROATable) Validate(path *Path) *Validation {
 	if path.IsWithdraw || path.IsEOR() {
 		// RPKI isn't enabled or invalid path
@@ -229,7 +213,7 @@ func (rt *ROATable) Validate(path *Path) *Validation {
 		}
 	}
 
-	r := pathToIPNet(path)
+	r := nlriToIPNet(path.GetNlri())
 	prefixLen, _ := r.Mask.Size()
 	var bucket *roaBucket
 	tree.WalkMatch(r, func(r *net.IPNet, v interface{}) bool {