Merge pull request #498 from TrekkieCoder/main

PR : gh-494 Fixes for ipvs-compat mode

api/loxinlp/nlp.go

@@ -19,6 +19,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	cmn "github.com/loxilb-io/loxilb/common"
+	tk "github.com/loxilb-io/loxilib"
+	nlp "github.com/vishvananda/netlink"
+	"golang.org/x/sys/unix"
 	"net"
 	"os"
 	"os/exec"
@@ -27,12 +31,6 @@ import (
 	"strings"
 	"syscall"
 	"time"
-
-	tk "github.com/loxilb-io/loxilib"
-	nlp "github.com/vishvananda/netlink"
-	"golang.org/x/sys/unix"
-
-	cmn "github.com/loxilb-io/loxilb/common"
 )
 
 const (
@@ -368,12 +366,21 @@ func AddNeighNoHook(address, ifName, macAddress string) int {
 
 func DelNeighNoHook(address, ifName string) int {
 	var ret int
+	Address := net.ParseIP(address)
 	IfName, err := nlp.LinkByName(ifName)
 	if err != nil {
-		tk.LogIt(tk.LogWarning, "[NLP] Port %s find Fail\n", ifName)
-		return -1
+		nList, err1 := nlp.NeighList(0, 0)
+		if err1 != nil {
+			tk.LogIt(tk.LogWarning, "[NLP] Neighbor List get Failed\n")
+			return -1
+		}
+		for _, n := range nList {
+			if n.IP.String() == address {
+				nlp.NeighDel(&n)
+			}
+		}
+		return 0
 	}
-	Address := net.ParseIP(address)
 
 	// Make Neigh
 	neigh := nlp.Neigh{

loxinet/rules.go

@@ -2540,6 +2540,7 @@ func (R *RuleH) AdvRuleVIPIfL2(IP net.IP) error {
 				} else {
 					tk.LogIt(tk.LogInfo, "nat lb-rule vip %s:%s added\n", IP.String(), "lo")
 				}
+				loxinlp.DelNeighNoHook(IP.String(), "")
 			}
 			ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 			defer cancel()