Merge pull request #609 from TrekkieCoder/main

PR - Support for static interface routes

api/loxinlp/ipvs.go

@@ -53,16 +53,16 @@ type ipVSEntry struct {
 	EndPoints []ipvsEndPoint
 }
 
-type IpVSH struct {
+type IPVSH struct {
 	RMap   map[ipVSKey]*ipVSEntry
 	ticker *time.Ticker
 	tDone  chan bool
 	handle *ipvs.Handle
 }
 
-var ipVSCtx *IpVSH
+var ipVSCtx *IPVSH
 
-func (ctx *IpVSH) BuildIpVSDB() []*ipVSEntry {
+func (ctx *IPVSH) buildIPVSDB() []*ipVSEntry {
 
 	var ipVSList []*ipVSEntry
 	svcs, err := ctx.handle.GetServices()
@@ -128,7 +128,7 @@ func (ctx *IpVSH) BuildIpVSDB() []*ipVSEntry {
 	return ipVSList
 }
 
-func IpVSSync() {
+func IPVSSync() {
 	for {
 		select {
 		case <-ipVSCtx.tDone:
@@ -139,7 +139,7 @@ func IpVSSync() {
 				ent.InValid = true
 			}
 
-			ipVSList := ipVSCtx.BuildIpVSDB()
+			ipVSList := ipVSCtx.buildIPVSDB()
 
 			for _, ent := range ipVSCtx.RMap {
 				if ent.InValid {
@@ -173,8 +173,8 @@ func IpVSSync() {
 	}
 }
 
-func IpVSInit() {
-	ipVSCtx = new(IpVSH)
+func IPVSInit() {
+	ipVSCtx = new(IPVSH)
 	ipVSCtx.ticker = time.NewTicker(10 * time.Second)
 	ipVSCtx.RMap = make(map[ipVSKey]*ipVSEntry)
 	ipVSCtx.tDone = make(chan bool)
@@ -184,5 +184,5 @@ func IpVSInit() {
 		os.Exit(1)
 	}
 	ipVSCtx.handle = handle
-	go IpVSSync()
+	go IPVSSync()
 }

api/loxinlp/nlp.go

@@ -19,10 +19,6 @@ 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"
@@ -32,6 +28,11 @@ import (
 	"strings"
 	"syscall"
 	"time"
+
+	cmn "github.com/loxilb-io/loxilb/common"
+	tk "github.com/loxilb-io/loxilib"
+	nlp "github.com/vishvananda/netlink"
+	"golang.org/x/sys/unix"
 )
 
 const (
@@ -86,7 +87,10 @@ type NlH struct {
 	BLRgx     *regexp.Regexp
 }
 
-var hooks cmn.NetHookInterface
+var (
+	skipIfRoute bool
+	hooks       cmn.NetHookInterface
+)
 
 func NlpRegister(hook cmn.NetHookInterface) {
 	hooks = hook
@@ -1342,8 +1346,10 @@ func RUWorkSingle(m nlp.RouteUpdate) int {
 		return -1
 	}
 
-	if m.Route.Scope.String() == "link" && tk.IsNetIPv4(m.Dst.IP.String()) {
-		return -1
+	if skipIfRoute {
+		if m.Route.Scope.String() == "link" && tk.IsNetIPv4(m.Dst.IP.String()) {
+			return -1
+		}
 	}
 
 	if m.Type == syscall.RTM_NEWROUTE {
@@ -1550,8 +1556,10 @@ func NlpGet(ch chan bool) int {
 			tk.LogIt(tk.LogDebug, "[NLP] No STATIC routes found for intf %s\n", link.Attrs().Name)
 		} else {
 			for _, route := range routes {
-				if route.Scope.String() == "link" && tk.IsNetIPv4(route.Dst.IP.String()) {
-					continue
+				if skipIfRoute {
+					if route.Scope.String() == "link" && tk.IsNetIPv4(route.Dst.IP.String()) {
+						continue
+					}
 				}
 
 				AddRoute(route)
@@ -1690,7 +1698,7 @@ func NlpInit(bgpPeerMode bool, blackList string, ipvsCompat bool) *NlH {
 	go LbSessionGet(done)
 
 	if ipvsCompat {
-		IpVSInit()
+		IPVSInit()
 	}
 
 	return nNl

loxinet/apiclient.go

@@ -282,10 +282,19 @@ func (na *NetAPIStruct) NetRouteAdd(rm *cmn.RouteMod) (int, error) {
 	if na.BgpPeerMode {
 		return RtNhErr, errors.New("running in bgp only mode")
 	}
+	intfRt := false
+	mlen, _ := rm.Dst.Mask.Size()
+	if rm.Gw == nil {
+		// This is an interface route
+		if (tk.IsNetIPv4(rm.Dst.IP.String()) && mlen == 32) || (tk.IsNetIPv6(rm.Dst.IP.String()) && mlen == 128) {
+			intfRt = true
+			rm.Gw = rm.Dst.IP
+		}
+	}
 	mh.mtx.Lock()
 	defer mh.mtx.Unlock()
 
-	ra := RtAttr{rm.Protocol, rm.Flags, false, rm.LinkIndex}
+	ra := RtAttr{Protocol: rm.Protocol, OSFlags: rm.Flags, HostRoute: false, Ifi: rm.LinkIndex, IfRoute: intfRt}
 	if rm.Gw != nil {
 		na := []RtNhAttr{{rm.Gw, rm.LinkIndex}}
 		ret, err = mh.zr.Rt.RtAdd(rm.Dst, RootZone, ra, na)

loxinet/layer3.go

@@ -105,7 +105,7 @@ func (l3 *L3H) IfaAdd(Obj string, Cidr string) (int, error) {
 		l3.IfaMap[key] = ifa
 
 		// ifa needs related self-routes
-		ra := RtAttr{0, 0, false, ifObjID}
+		ra := RtAttr{0, 0, false, ifObjID, false}
 		_, err = mh.zr.Rt.RtAdd(*network, RootZone, ra, nil)
 		if err != nil {
 			tk.LogIt(tk.LogDebug, "ifa add - %s:%s subnet-rt error\n", addr.String(), Obj)
@@ -155,7 +155,7 @@ func (l3 *L3H) IfaAdd(Obj string, Cidr string) (int, error) {
 
 	// ifa needs to related self-routes
 	// FIXME - Code duplication with primary address route above
-	ra := RtAttr{0, 0, false, ifObjID}
+	ra := RtAttr{0, 0, false, ifObjID, false}
 	_, err = mh.zr.Rt.RtAdd(*network, RootZone, ra, nil)
 	if err != nil {
 		tk.LogIt(tk.LogDebug, " - %s:%s subnet-rt error\n", addr.String(), Obj)

loxinet/loxinettest.go

@@ -229,7 +229,7 @@ func TestLoxinet(t *testing.T) {
 	mask := net.CIDRMask(24, 32)
 	route = route.Mask(mask)
 	ipnet := net.IPNet{IP: route, Mask: mask}
-	ra := RtAttr{0, 0, false, -1}
+	ra := RtAttr{0, 0, false, -1, false}
 	na := []RtNhAttr{{net.IPv4(8, 8, 8, 8), 12}}
 	_, err = mh.zr.Rt.RtAdd(ipnet, "default", ra, na)
 	if err != nil {

loxinet/neighbor.go

@@ -221,7 +221,7 @@ func (ne *Neigh) NeighRemoveTunEP(i int) []*NeighTunEp {
 
 // NeighDelAllTunEP - delete all tun-eps from a neighbor
 func (n *NeighH) NeighDelAllTunEP(ne *Neigh) int {
-	var i int = 0
+	i := 0
 	for _, tep := range ne.TunEps {
 		tep.DP(DpRemove)
 		n.NeighTID.PutCounter(tep.Mark)
@@ -385,7 +385,7 @@ func (n *NeighH) NeighAdd(Addr net.IP, Zone string, Attr NeighAttr) (int, error)
 		mask = net.CIDRMask(128, 128)
 	}
 	ipnet := net.IPNet{IP: Addr, Mask: mask}
-	ra := RtAttr{0, 0, true, Attr.OSLinkIndex}
+	ra := RtAttr{0, 0, true, Attr.OSLinkIndex, false}
 	na := []RtNhAttr{{Addr, Attr.OSLinkIndex}}
 
 	if found == true {
@@ -462,7 +462,7 @@ NhExist:
 
 		code, err := n.Zone.L2.L2FdbAdd(fdbKey, fdbAttr)
 		if err != nil && code != L2SameFdbErr {
-			n.Zone.Rt.RtDelete(ipnet, Zone)
+			n.Zone.Rt.RtDeleteHost(ipnet, Zone)
 			n.NeighDelete(Addr, Zone)
 			tk.LogIt(tk.LogError, "neigh add - %s:%s mac fail\n", Addr.String(), Zone)
 			return NeighMacErr, errors.New("nh-mac error")
@@ -525,7 +525,7 @@ func (n *NeighH) NeighDelete(Addr net.IP, Zone string) (int, error) {
 
 	// Delete the host specific to this NH
 	ipnet := net.IPNet{IP: Addr, Mask: mask}
-	_, err := n.Zone.Rt.RtDelete(ipnet, Zone)
+	_, err := n.Zone.Rt.RtDeleteHost(ipnet, Zone)
 	if err != nil {
 		tk.LogIt(tk.LogError, "neigh delete - %s:%s host-rt fail\n", Addr.String(), Zone)
 		/*return NeighHostRtErr, errors.New("nh-hostrt error" + err.Error())*/
@@ -582,7 +582,7 @@ func (n *NeighH) NeighFind(Addr net.IP, Zone string) (*Neigh, int) {
 		return nil, -1
 	}
 
-	return ne, -1
+	return ne, 0
 }
 
 // NeighPairRt - Associate a route with the given neighbor