Merge pull request #26 from LK4D4/vet_fmt_fixes

Fixes for gofmt and vet

subnet/subnet.go

@@ -147,7 +147,7 @@ func parseSubnetKey(s string) (ip.IP4Net, error) {
 		snIp := net.ParseIP(parts[1]).To4()
 		prefixLen, err := strconv.ParseUint(parts[2], 10, 5)
 		if snIp != nil && err == nil {
-			return ip.IP4Net{ip.FromIP(snIp), uint(prefixLen)}, nil
+			return ip.IP4Net{IP: ip.FromIP(snIp), PrefixLen: uint(prefixLen)}, nil
 		}
 	}
 
@@ -311,7 +311,7 @@ func (sm *SubnetManager) allocateSubnet() (ip.IP4Net, error) {
 	log.Infof("Picking subnet in range %s ... %s", sm.config.SubnetMin, sm.config.SubnetMax)
 
 	var bag []ip.IP4
-	sn := ip.IP4Net{sm.config.SubnetMin, sm.config.SubnetLen}
+	sn := ip.IP4Net{IP: sm.config.SubnetMin, PrefixLen: sm.config.SubnetLen}
 
 OuterLoop:
 	for ; sn.IP <= sm.config.SubnetMax && len(bag) < 100; sn = sn.Next() {
@@ -327,7 +327,7 @@ OuterLoop:
 		return ip.IP4Net{}, errors.New("out of subnets")
 	} else {
 		i := randInt(0, len(bag))
-		return ip.IP4Net{bag[i], sm.config.SubnetLen}, nil
+		return ip.IP4Net{IP: bag[i], PrefixLen: sm.config.SubnetLen}, nil
 	}
 }
 
@@ -405,7 +405,7 @@ func (sm *SubnetManager) parseSubnetWatchError(err error) (batch *EventBatch, ou
 			out = fmt.Errorf("Failed to retrieve subnet leases: %v", err)
 		}
 	} else {
-		out = fmt.Errorf("Watch of subnet leases failed: ", err)
+		out = fmt.Errorf("Watch of subnet leases failed: %v", err)
 	}
 
 	return

udp/run.go

@@ -35,7 +35,7 @@ func configureIface(ifname string, ipn ip.IP4Net, mtu int) error {
 
 	err = netlink.NetworkSetMTU(iface, mtu)
 	if err != nil {
-		log.Errorf("Failed to set MTU for %s: ", ifname, err)
+		log.Errorf("Failed to set MTU for %s: %v", ifname, err)
 		return err
 	}
 
@@ -49,7 +49,7 @@ func configureIface(ifname string, ipn ip.IP4Net, mtu int) error {
 	// installed by Docker and then it won't get auto added
 	err = netlink.AddRoute(ipn.Network().String(), "", "", ifname)
 	if err != nil && err != syscall.EEXIST {
-		log.Errorf("Failed to add route (%s -> %s): ", ipn.Network().String(), ifname, err)
+		log.Errorf("Failed to add route (%s -> %s): %v", ipn.Network().String(), ifname, err)
 		return err
 	}
 
@@ -71,13 +71,13 @@ func setupIpMasq(ipn ip.IP4Net, iface string) error {
 
 	rules := [][]string{
 		// This rule makes sure we don't NAT traffic within overlay network (e.g. coming out of docker0)
-		[]string{ "RUDDER", "-d", ipn.String(), "-j", "ACCEPT" },
+		[]string{"RUDDER", "-d", ipn.String(), "-j", "ACCEPT"},
 		// This rule makes sure we don't NAT multicast traffic within overlay network
-		[]string{ "RUDDER", "-d", "224.0.0.0/4", "-j", "ACCEPT" },
-		// This rule will NAT everything originating from our overlay network and 
-		[]string{ "RUDDER", "!", "-o", iface, "-j", "MASQUERADE" },
+		[]string{"RUDDER", "-d", "224.0.0.0/4", "-j", "ACCEPT"},
+		// This rule will NAT everything originating from our overlay network and
+		[]string{"RUDDER", "!", "-o", iface, "-j", "MASQUERADE"},
 		// This rule will take everything coming from overlay and sent it to RUDDER chain
-		[]string{ "POSTROUTING", "-s", ipn.String(), "-j", "RUDDER" },
+		[]string{"POSTROUTING", "-s", ipn.String(), "-j", "RUDDER"},
 	}
 
 	for _, args := range rules {