leverage autoconfig ipv4 address for dhcp (tested)

Author: QxBytes

cni/network/network.go

@@ -132,8 +132,9 @@ func NewPlugin(name string,
 
 	nl := netlink.NewNetlink()
 	plc := platform.NewExecClient(logger)
+	netio := &netio.NetIO{}
 	// Setup network manager.
-	nm, err := network.NewNetworkManager(nl, plc, &netio.NetIO{}, network.NewNamespaceClient(), iptables.NewClient(), dhcp.New(logger, plc))
+	nm, err := network.NewNetworkManager(nl, plc, netio, network.NewNamespaceClient(), iptables.NewClient(), dhcp.New(logger, netio))
 	if err != nil {
 		return nil, err
 	}
@@ -145,7 +146,7 @@ func NewPlugin(name string,
 		nm:                 nm,
 		nnsClient:          client,
 		multitenancyClient: multitenancyClient,
-		netClient:          &netio.NetIO{},
+		netClient:          netio,
 	}, nil
 }
 

dhcp/dhcp.go

@@ -51,15 +51,20 @@ type ExecClient interface {
 	ExecuteCommand(ctx context.Context, command string, args ...string) (string, error)
 }
 
+type NetIOClient interface {
+	GetNetworkInterfaceByName(name string) (*net.Interface, error)
+	GetNetworkInterfaceAddrs(iface *net.Interface) ([]net.Addr, error)
+}
+
 type DHCP struct {
-	logger     *zap.Logger
-	execClient ExecClient
+	logger      *zap.Logger
+	netioClient NetIOClient
 }
 
-func New(logger *zap.Logger, plc ExecClient) *DHCP {
+func New(logger *zap.Logger, netio NetIOClient) *DHCP {
 	return &DHCP{
-		logger:     logger,
-		execClient: plc,
+		logger:      logger,
+		netioClient: netio,
 	}
 }
 

dhcp/dhcp_windows.go

@@ -3,31 +3,19 @@ package dhcp
 import (
 	"context"
 	"net"
-	"regexp"
 	"time"
 
-	"github.com/Azure/azure-container-networking/cni/log"
 	"github.com/Azure/azure-container-networking/retry"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"golang.org/x/sys/windows"
 )
 
 const (
-	dummyIPAddressStr    = "169.254.128.10"
-	dummySubnetMask      = "255.255.128.0"
-	addIPAddressDelay    = 4 * time.Second
-	deleteIPAddressDelay = 2 * time.Second
-	returnDelay          = 8 * time.Second // time to wait before returning from DiscoverRequest
-	retryCount           = 5
-	retryDelayMillis     = 500
-	socketTimeoutMillis  = 1000
-)
-
-var (
-	dummyIPAddress = net.IPv4(169, 254, 128, 10) // nolint
-	// matches if the string fully consists of zero or more alphanumeric, dots, dashes, parentheses, spaces, or underscores
-	allowedInput = regexp.MustCompile(`^[a-zA-Z0-9._\-\(\) ]*$`)
+	retryCount               = 5
+	retryDelayMillis         = 500
+	ipAssignRetryDelayMillis = 2000
+	socketTimeoutMillis      = 1000
 )
 
 type Socket struct {
@@ -91,38 +79,57 @@ func (s *Socket) Close() error {
 	return nil
 }
 
-// issues a dhcp discover request on an interface by assigning an ip to that interface
-// then, sends a packet with that interface's dummy ip, and then unassigns the dummy ip
-func (c *DHCP) DiscoverRequest(ctx context.Context, macAddress net.HardwareAddr, ifName string) error {
-	// validate interface name
-	if !allowedInput.MatchString(ifName) {
-		return errors.New("invalid dhcp discover request interface name")
+func (c *DHCP) getIPv4InterfaceAddresses(ifName string) ([]net.IP, error) {
+	nic, err := c.netioClient.GetNetworkInterfaceByName(ifName)
+	if err != nil {
+		return []net.IP{}, err
 	}
-	// delete dummy ip off the interface if it already exists
-	ret, err := c.execClient.ExecuteCommand(ctx, "netsh", "interface", "ipv4", "delete", "address", ifName, dummyIPAddressStr)
+	addresses, err := c.netioClient.GetNetworkInterfaceAddrs(nic)
 	if err != nil {
-		c.logger.Info("Could not remove dummy ip, likely because it doesn't exist", zap.String("output", ret), zap.Error(log.NewErrorWithoutStackTrace(err)))
+		return []net.IP{}, err
+	}
+	ret := []net.IP{}
+	for _, address := range addresses {
+		// check if the ip is ipv4 and parse it
+		ip, _, err := net.ParseCIDR(address.String())
+		if err != nil || ip.To4() == nil {
+			continue
+		}
+		ret = append(ret, ip)
 	}
-	time.Sleep(deleteIPAddressDelay)
 
-	// create dummy ip so we can direct the packet to the correct interface
-	ret, err = c.execClient.ExecuteCommand(ctx, "netsh", "interface", "ipv4", "add", "address", ifName, dummyIPAddressStr, dummySubnetMask)
+	c.logger.Info("Interface addresses found", zap.Any("foundIPs", addresses), zap.Any("selectedIPs", ret))
+	return ret, err
+}
+
+func (c *DHCP) verifyIPv4InterfaceAddressCount(ifName string, count, maxRuns, sleepMs int) error {
+	addressCountErr := retry.Do(func() error {
+		addresses, err := c.getIPv4InterfaceAddresses(ifName)
+		if err != nil || len(addresses) != count {
+			return errors.New("address count found not equal to expected")
+		}
+		return nil
+	}, maxRuns, sleepMs)
+	return addressCountErr
+}
+
+// issues a dhcp discover request on an interface by finding the secondary's ip and sending on its ip
+func (c *DHCP) DiscoverRequest(ctx context.Context, macAddress net.HardwareAddr, ifName string) error {
+	// Find the ipv4 address of the secondary interface (we're betting that this gets autoconfigured)
+	err := c.verifyIPv4InterfaceAddressCount(ifName, 1, retryCount, ipAssignRetryDelayMillis)
 	if err != nil {
-		return errors.Wrap(err, "failed to add dummy ip to interface: "+ret)
+		return errors.Wrap(err, "failed to get auto ip config assigned in apipa range in time")
 	}
-	// ensure we always remove the dummy ip we added from the interface
-	defer func() {
-		// we always want to try to remove the dummy ip, even if the deadline was reached
-		// so we have context.Background()
-		ret, cleanupErr := c.execClient.ExecuteCommand(context.Background(), "netsh", "interface", "ipv4", "delete", "address", ifName, dummyIPAddressStr)
-		if cleanupErr != nil {
-			c.logger.Info("Failed to remove dummy ip on leaving function", zap.String("output", ret), zap.Error(err))
-		}
-		// wait for nic to retrieve autoconfiguration ip
-		time.Sleep(returnDelay)
-	}()
-	// it takes time for the address to be assigned
-	time.Sleep(addIPAddressDelay)
+	ipv4Addresses, err := c.getIPv4InterfaceAddresses(ifName)
+	if err != nil || len(ipv4Addresses) == 0 {
+		return errors.Wrap(err, "failed to get ipv4 addresses on interface")
+	}
+	uniqueAddress := ipv4Addresses[0].To4()
+	if uniqueAddress == nil {
+		return errors.New("invalid ipv4 address")
+	}
+	uniqueAddressStr := uniqueAddress.String()
+	c.logger.Info("Retrieved automatic ip configuration: ", zap.Any("ip", uniqueAddress), zap.String("ipStr", uniqueAddressStr))
 
 	// now begin the dhcp request
 	txid, err := GenerateTransactionID()
@@ -132,7 +139,7 @@ func (c *DHCP) DiscoverRequest(ctx context.Context, macAddress net.HardwareAddr,
 
 	// Prepare an IP and UDP header
 	raddr := &net.UDPAddr{IP: net.IPv4bcast, Port: dhcpServerPort}
-	laddr := &net.UDPAddr{IP: dummyIPAddress, Port: dhcpClientPort}
+	laddr := &net.UDPAddr{IP: uniqueAddress, Port: dhcpClientPort}
 
 	dhcpDiscover, err := buildDHCPDiscover(macAddress, txid)
 	if err != nil {