use a routing protocol number to identify vxrnet routes

Author: clinta

const.go

@@ -2,8 +2,10 @@ package vxrouter
 
 // usefule constants for the whole project
 const (
-	Version       = "0.0.4"
-	EnvPrefix     = "VXR_"
-	NetworkDriver = "vxrNet"
-	IpamDriver    = "vxrIpam"
+	Version                   = "0.0.4"
+	EnvPrefix                 = "VXR_"
+	NetworkDriver             = "vxrNet"
+	IpamDriver                = "vxrIpam"
+	DefaultReqAddrSleepTimeMS = 100
+	DefaultRouteProto         = 192
 )

docker/core/core.go

@@ -171,8 +171,8 @@ func (c *Core) ConnectAndGetAddress(addr, poolid string) (*net.IPNet, error) {
 	}
 
 	//exclude network and (normal) broadcast addresses by default
-	xf := getEnvIntWithDefault(envPrefix+"excludefirst", nr.Options["excludefirst"], 1)
-	xl := getEnvIntWithDefault(envPrefix+"excludelast", nr.Options["excludelast"], 1)
+	xf := vxrouter.GetEnvIntWithDefault(envPrefix+"excludefirst", nr.Options["excludefirst"], 1)
+	xl := vxrouter.GetEnvIntWithDefault(envPrefix+"excludelast", nr.Options["excludelast"], 1)
 
 	hi, err := host.GetOrCreateInterface(nr.Name, gw, nr.Options)
 	if err != nil {

docker/core/functions.go

@@ -3,11 +3,8 @@ package core
 import (
 	"fmt"
 	"net"
-	"os"
-	"strconv"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/types"
 )
 
@@ -20,22 +17,6 @@ func poolFromNR(nr *types.NetworkResource) (string, error) {
 	return "", fmt.Errorf("pool not found")
 }
 
-func getEnvIntWithDefault(val, opt string, def int) int { //nolint: unparam
-	e := os.Getenv(val)
-	if e == "" {
-		e = opt
-	}
-	if e == "" {
-		return def
-	}
-	ei, err := strconv.Atoi(e)
-	if err != nil {
-		log.WithField("string", e).WithError(err).Warnf("failed to convert string to int, using default")
-		return def
-	}
-	return ei
-}
-
 func poolFromID(poolid string) string {
 	return strings.TrimPrefix(poolid, ipamDriverName+"/")
 }

funcs.go

@@ -0,0 +1,25 @@
+package vxrouter
+
+import (
+	"os"
+	"strconv"
+
+	log "github.com/Sirupsen/logrus"
+)
+
+// GetEnvIntWithDefault gets value, prioritizing first opt, if it is not empty, then the environment variable specified by val, and lastly the default.
+func GetEnvIntWithDefault(val, opt string, def int) int { //nolint: unparam
+	e := os.Getenv(val)
+	if e == "" {
+		e = opt
+	}
+	if e == "" {
+		return def
+	}
+	ei, err := strconv.Atoi(e)
+	if err != nil {
+		log.WithField("string", e).WithError(err).Warnf("failed to convert string to int, using default")
+		return def
+	}
+	return ei
+}

host/interface.go

@@ -10,13 +10,16 @@ import (
 	"github.com/vishvananda/netlink"
 
 	"github.com/TrilliumIT/iputil"
+	"github.com/TrilliumIT/vxrouter"
 	"github.com/TrilliumIT/vxrouter/macvlan"
 	"github.com/TrilliumIT/vxrouter/vxlan"
 )
 
 var (
-	rwm     = make(map[string]*sync.RWMutex)
-	rwmLock sync.Mutex
+	rwm              = make(map[string]*sync.RWMutex)
+	rwmLock          sync.Mutex
+	routeProto       = vxrouter.GetEnvIntWithDefault(vxrouter.EnvPrefix+"ROUTE_PROTO", "", vxrouter.DefaultRouteProto)
+	reqAddrSleepTime = time.Duration(vxrouter.GetEnvIntWithDefault(vxrouter.EnvPrefix+"REQ_ADDR_SLEEP", "", vxrouter.DefaultReqAddrSleepTimeMS)) * time.Millisecond
 )
 
 // Interface holds a vxlan and a host macvlan interface used for the gateway interface on a container network
@@ -172,25 +175,13 @@ func (hi *Interface) Delete() error {
 		return nil
 	}
 
-	sn, err := hi.getSubnet()
-	if err != nil {
-		hi.log.WithError(err).Debug("failed to get subnet for host interface")
-		return err
-	}
-
 	// if there are any other routes, don't delete
-	routes, err := netlink.RouteListFiltered(netlink.FAMILY_ALL, &netlink.Route{LinkIndex: hi.mvl.GetIndex()}, netlink.RT_FILTER_OIF)
+	routes, err := netlink.RouteListFiltered(netlink.FAMILY_ALL, &netlink.Route{LinkIndex: hi.mvl.GetIndex(), Protocol: routeProto}, netlink.RT_FILTER_OIF|netlink.RT_FILTER_PROTOCOL)
 	if err != nil {
 		hi.log.WithError(err).Error("failed to get routes")
 		return err
 	}
 	for _, r := range routes {
-		if r.Dst.IP.IsLinkLocalUnicast() {
-			continue
-		}
-		if iputil.SubnetEqualSubnet(r.Dst, sn) {
-			continue
-		}
 		hi.log.WithField("r.Dst", r.Dst.String()).Debug("other routes found on this device, not deleting")
 		return nil
 	}
@@ -228,6 +219,11 @@ func (hi *Interface) SelectAddress(reqAddress net.IP, propTime, respTime time.Du
 	var ip *net.IPNet
 	var err error
 
+	var sleepTime time.Duration
+	if reqAddress != nil {
+		sleepTime = reqAddrSleepTime
+	}
+
 	stop := time.Now().Add(respTime)
 	for time.Now().Before(stop) {
 		ip, err = hi.selectAddress(reqAddress, propTime, xf, xl)
@@ -238,9 +234,7 @@ func (hi *Interface) SelectAddress(reqAddress net.IP, propTime, respTime time.Du
 		if ip != nil {
 			break
 		}
-		if reqAddress != nil {
-			time.Sleep(100 * time.Millisecond)
-		}
+		time.Sleep(sleepTime)
 	}
 
 	if ip == nil {
@@ -289,6 +283,7 @@ func (hi *Interface) selectAddress(reqAddress net.IP, propTime time.Duration, xf
 	err = netlink.RouteAdd(&netlink.Route{
 		LinkIndex: hi.mvl.GetIndex(),
 		Dst:       addrOnly,
+		Protocol:  routeProto,
 	})
 	if err != nil {
 		log.WithError(err).Error("failed to add route")
@@ -332,5 +327,6 @@ func (hi *Interface) DelRoute(ip net.IP) error {
 	return netlink.RouteDel(&netlink.Route{
 		LinkIndex: hi.mvl.GetIndex(),
 		Dst:       addrOnly,
+		Protocol:  routeProto,
 	})
 }