Merge pull request #942 from TrekkieCoder/main

#921 Do not handle custom rt-tables
loxilb-io · Jan 22, 2025 · 2adf4da · 2adf4da
2 parents 9580db7 + 07f5c3d
commit 2adf4da
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/api/loxinlp/nlp.go b/api/loxinlp/nlp.go
@@ -1208,6 +1208,11 @@ func DelNeigh(neigh nlp.Neigh, link nlp.Link) int {
 
 func AddRoute(route nlp.Route) int {
 	var ipNet net.IPNet
+
+	if route.Table < 254 {
+		return -1
+	}
+
 	if route.Dst == nil {
 		if route.Family == 2 {
 			r := net.IPv4(0, 0, 0, 0)
@@ -1293,6 +1298,9 @@ func GetRouteNoHook(destination string) ([]string, string, error) {
 	}
 
 	for _, rt := range rts {
+		if rt.Table < 254 {
+			continue
+		}
 		if src == "" {
 			src = rt.Src.String()
 		}
@@ -1320,6 +1328,11 @@ func DelRouteNoHook(DestinationIPNet string) int {
 func DelRoute(route nlp.Route) int {
 	var ret int
 	var ipNet net.IPNet
+
+	if route.Table < 254 {
+		return -1
+	}
+
 	if route.Dst == nil {
 		r := net.IPv4(0, 0, 0, 0)
 		m := net.CIDRMask(0, 32)

diff --git a/loxilb-ebpf b/loxilb-ebpf
+2 −2		common/llb_dpapi.h
+2 −2		kernel/llb_kern_devif.c
+1 −1		kernel/llb_kern_entry.c
+1 −1		kernel/llb_kern_l3fwd.c
+1 −1		kernel/llb_kern_natlbfwd.c
+0 −2		kernel/loxilb_libdp.c