Merge pull request #926 from vanonox/selectSameProtocol

IfaSelect return at least ip of same protocol of dest addr
loxilb-io · Jan 10, 2025 · e50e998 · e50e998
2 parents 3678f70 + 0f9ca57
commit e50e998
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/pkg/loxinet/layer3.go b/pkg/loxinet/layer3.go
@@ -281,6 +281,12 @@ func (l3 *L3H) IfaSelect(Obj string, addr net.IP, findAny bool) (int, net.IP, st
 					continue
 				}
 				if len(ifa.Ifas) > 0 {
+					for _, ifaEnt := range ifa.Ifas {
+						if (tk.IsNetIPv4(addr.String()) && tk.IsNetIPv4(ifaEnt.IfaNet.IP.String())) ||
+							(tk.IsNetIPv6(addr.String()) && tk.IsNetIPv6(ifaEnt.IfaNet.IP.String())) {
+							return 0, ifaEnt.IfaAddr, Obj
+						}
+					}
 					return 0, ifa.Ifas[0].IfaAddr, Obj
 				}
 			}
@@ -309,6 +315,12 @@ func (l3 *L3H) IfaSelect(Obj string, addr net.IP, findAny bool) (int, net.IP, st
 
 	// Select first IP
 	if len(ifa.Ifas) > 0 {
+		for _, ifaEnt := range ifa.Ifas {
+			if (tk.IsNetIPv4(addr.String()) && tk.IsNetIPv4(ifaEnt.IfaNet.IP.String())) ||
+				(tk.IsNetIPv6(addr.String()) && tk.IsNetIPv6(ifaEnt.IfaNet.IP.String())) {
+				return 0, ifaEnt.IfaAddr, Obj
+			}
+		}
 		return 0, ifa.Ifas[0].IfaAddr, Obj
 	}