Merge pull request #160 from dj-nlx/main

gh-28 nat64 fixes
loxilb-io · Dec 15, 2022 · 9ef2d0d · 9ef2d0d
2 parents b61e46a + 2c53896
commit 9ef2d0d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/loxinet/rules.go b/loxinet/rules.go
@@ -775,6 +775,9 @@ func (R *RuleH) AddNatLbRule(serv cmn.LbServiceArg, servEndPoints []cmn.LbEndPoi
 		if pNetAddr == nil {
 			return RuleUnknownEpErr, errors.New("malformed-lbep error")
 		}
+		if tk.IsNetIPv4(serv.ServIP) && tk.IsNetIPv6(k.EpIP) {
+			return RuleUnknownServiceErr, errors.New("malformed-service nat46 error")
+		}
 		if serv.Proto == "icmp" && k.EpPort != 0 {
 			return RuleUnknownServiceErr, errors.New("malformed-service error")
 		}
@@ -1639,6 +1642,7 @@ func (r *ruleEnt) Nat2DP(work DpWorkT) int {
 					r.Sync = DpCreateErr
 					return -1
 				}
+
 				ep.RIP = sip
 			} else {
 				ep.RIP = r.tuples.l3Dst.addr.IP.Mask(r.tuples.l3Dst.addr.Mask)
@@ -1647,7 +1651,16 @@ func (r *ruleEnt) Nat2DP(work DpWorkT) int {
 	} else {
 		for idx := range nWork.endPoints {
 			ep := &nWork.endPoints[idx]
-			ep.RIP = net.IPv4(0, 0, 0, 0)
+			if tk.IsNetIPv6(nWork.ServiceIP.String()) && tk.IsNetIPv4(ep.XIP.String()) {
+				e, sip := r.zone.L3.IfaSelectAny(ep.XIP)
+				if e != 0 {
+					r.Sync = DpCreateErr
+					return -1
+				}
+				ep.RIP = sip
+			} else {
+				ep.RIP = net.IPv4(0, 0, 0, 0)
+			}
 		}
 	}
+5 −3		common/llb_dp_mdi.h
+2 −2		kernel/llb_ebpf_main.c
+208 −0		kernel/llb_kern_cdefs.h
+40 −16		kernel/llb_kern_compose.c
+1 −1		kernel/llb_kern_ct.c
+1 −5		kernel/llb_kern_devif.c
+6 −3		kernel/llb_kern_fcfwd.c
+1 −5		kernel/llb_kern_l2fwd.c
+32 −20		kernel/llb_kern_l3fwd.c