Merge pull request #655 from TrekkieCoder/main

in-cluster: fix to support when pod and loxilb are in same node
loxilb-io · Apr 26, 2024 · 417e009 · 417e009
2 parents 9e2c8bd + 5340215
commit 417e009
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/api/api.go b/api/api.go
@@ -124,7 +124,7 @@ func RunAPIServer() {
 	if options.Opts.TLS {
 		server.TLSHost = options.Opts.TLSHost
 		server.TLSPort = options.Opts.TLSPort
-		
+
 		server.TLSCertificateKey = options.Opts.TLSCertificateKey
 		server.TLSCertificate = options.Opts.TLSCertificate
 	}
@@ -134,7 +134,7 @@ func RunAPIServer() {
 		os.Exit(0)
 	}
 	ApiReady = true
-	
+
 	if err := server.Serve(); err != nil {
 		log.Fatalln(err)
 	}

diff --git a/api/restapi/server.go b/api/restapi/server.go
diff --git a/pkg/loxinet/layer3.go b/pkg/loxinet/layer3.go
@@ -395,7 +395,7 @@ func (l3 *L3H) IfaSelectAny(addr net.IP, findAny bool) (int, net.IP, string) {
 	if err == 0 {
 		switch rtn := tDat.(type) {
 		case *Neigh:
-			if rtn != nil {
+			if rtn != nil && rtn.OifPort != nil {
 				IfObj = rtn.OifPort.Name
 			}
 		case *int:

diff --git a/pkg/loxinet/neighbor.go b/pkg/loxinet/neighbor.go
@@ -125,7 +125,7 @@ func NeighInit(zone *Zone) *NeighH {
 func (n *NeighH) Activate(ne *Neigh) {
 
 	interval := NeighAts * time.Second
-	if tk.IsNetIPv6(ne.Addr.String()) || ne.Dummy {
+	if tk.IsNetIPv6(ne.Addr.String()) || ne.Dummy || ne.OifPort == nil {
 		return
 	}
 
@@ -366,6 +366,9 @@ func (n *NeighH) NeighAdd(Addr net.IP, Zone string, Attr NeighAttr) (int, error)
 		tk.LogIt(tk.LogError, "neigh add - %s:%s no oport\n", Addr.String(), Zone)
 		if !found {
 			n.NeighMap[key] = &Neigh{Dummy: true, Attr: Attr, NhRtm: make(map[RtKey]*Rt)}
+		} else {
+			ne.Dummy = true
+			ne.OifPort = nil
 		}
 		return NeighOifErr, errors.New("nh-oif error")
 	}