bug fixes

Author: clinta

docker/core/core.go

@@ -117,21 +117,21 @@ func (c *Core) Uncache(poolid string) {
 	c.delNrInCache(pool)
 }
 
-func (c *Core) connectIfNotConnected(addr, nrID string) error {
+func (c *Core) connectIfNotConnected(addr, nrID string) (bool, error) {
 	ip := net.ParseIP(addr)
 	numRoutes, err := host.VxroutesTo(ip)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if numRoutes > 0 {
-		return nil
+		return false, nil
 	}
 	nr, err := c.getNetworkResourceByID(nrID)
 	if err != nil {
-		return err
+		return false, err
 	}
 	_, err = c.connectAndGetAddress(ip, nr)
-	return err
+	return true, err
 }
 
 // ConnectAndGetAddress connects the host to the network for the

docker/core/reconcile.go

@@ -4,14 +4,15 @@ import (
 	log "github.com/Sirupsen/logrus"
 
 	"context"
+	"net"
 
 	"github.com/TrilliumIT/vxrouter/host"
 	"github.com/docker/docker/api/types"
 )
 
 // Reconcile adds missing routes and deletes orphaned routes
 func (c *Core) Reconcile() {
-	log := log.WithField("func", "DelOrphanedRoutes()")
+	log := log.WithField("func", "Reconcile()")
 
 	// This is possibly racy, if a container starts up after containers are listed
 	// I might delete it's routes
@@ -23,10 +24,14 @@ func (c *Core) Reconcile() {
 
 	// Make sure all containers are connected
 	for ip, subnet := range es {
-		err = c.connectIfNotConnected(ip, subnet)
+		var connected bool
+		connected, err = c.connectIfNotConnected(ip, subnet)
 		if err != nil {
 			log.WithError(err).Error("Error connecting container")
 		}
+		if connected {
+			log.WithField("ip", ip).Debug("added missing route")
+		}
 	}
 
 	// remove errant routes
@@ -37,9 +42,10 @@ func (c *Core) Reconcile() {
 	}
 
 	for _, n := range nets {
-		if _, ok := es[n.String()]; ok {
+		if _, ok := es[n.IP.String()]; ok {
 			continue
 		}
+		log.WithField("IP", n.IP.String()).Debug("Deleting orphaned Route")
 		err = c.deleteRoute(n.IP)
 		if err != nil {
 			log.WithError(err).Error("error deleting orphaned route")
@@ -87,10 +93,21 @@ func (c *Core) getContainerIPsAndSubnets() (map[string]string, error) {
 			if es.IPAMConfig == nil {
 				continue
 			}
-			if es.IPAMConfig.IPv4Address == "" {
-				continue
+			// This is necessary because docker is stupid, this could be
+			// "10.1.141.01" for example
+			ip := net.ParseIP(es.IPAMConfig.IPv4Address)
+			if ip != nil {
+				ret[ip.String()] = es.NetworkID
+				log.WithField("Container", ctr.Names[0]).WithField("net", es.NetworkID).
+					WithField("ip", ip.String()).Debug("Appending to es list")
+			}
+
+			ip = net.ParseIP(es.IPAddress)
+			if ip != nil {
+				ret[ip.String()] = es.NetworkID
+				log.WithField("Container", ctr.Names[0]).WithField("net", es.NetworkID).
+					WithField("ip", ip.String()).Debug("Appending to es list")
 			}
-			ret[es.IPAMConfig.IPv4Address] = es.NetworkID
 		}
 	}
 	return ret, nil

docker/vxrnet/main.go

@@ -92,6 +92,7 @@ func Run(ctx *cli.Context) {
 	}
 
 	go func(ri time.Duration) {
+		core.Reconcile()
 		if ri <= 0 {
 			return
 		}

host/functions.go

@@ -8,22 +8,24 @@ import (
 )
 
 func getIPNets(address net.IP, subnet *net.IPNet) (*net.IPNet, *net.IPNet) {
-	var sna, a *net.IPNet
+	sna := &net.IPNet{
+		IP:   address,
+		Mask: address.DefaultMask(),
+	}
 
 	//address in big subnet
 	if subnet != nil {
-		sna = &net.IPNet{
-			IP:   address,
-			Mask: subnet.Mask,
-		}
+		sna.Mask = subnet.Mask
+	}
+
+	if sna.Mask == nil {
+		sna.Mask = net.CIDRMask(128, 128)
 	}
 
-	//address as host route (like /32 or /128)
-	a = &net.IPNet{IP: address}
-	if a.IP.To4() != nil {
-		a.Mask = net.CIDRMask(32, 32)
-	} else {
-		a.Mask = net.CIDRMask(128, 128)
+	_, ml := sna.Mask.Size()
+	a := &net.IPNet{
+		IP:   address,
+		Mask: net.CIDRMask(ml, ml),
 	}
 
 	return sna, a

host/interface.go

@@ -286,7 +286,7 @@ func (hi *Interface) selectAddress(reqAddress net.IP, propTime time.Duration, xf
 		return nil, nil
 	}
 
-	log = log.WithField("ip", addrOnly.IP.String())
+	log = log.WithField("ip", addrOnly.String())
 
 	// add host route to routing table
 	log.Debug("adding route to")