Merge pull request #33 from r2d4/leases

dhiltgen · web-flow · commit b14a80ebb515 · 2017-03-01T17:31:49.000-08:00
Use last entry when parsing DHCP status file
diff --git a/kvm.go b/kvm.go
@@ -638,13 +638,18 @@ func (d *Driver) getIPByMacFromSettings(mac string) (string, error) {
 		log.Warnf("Failed to decode dnsmasq lease status: %s", err)
 		return "", err
 	}
+	ipAddr := ""
 	for _, value := range s {
 		if strings.ToLower(value.Mac_address) == strings.ToLower(mac) {
-			log.Debugf("IP address: %s", value.Ip_address)
-			return value.Ip_address, nil
+			// If there are multiple entries,
+			// the last one is the most current
+			ipAddr = value.Ip_address
 		}
 	}
-	return "", nil
+	if ipAddr != "" {
+		log.Debugf("IP address: %s", ipAddr)
+	}
+	return ipAddr, nil
 }
 
 func (d *Driver) GetIP() (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -638,13 +638,18 @@ func (d *Driver) getIPByMacFromSettings(mac string) (string, error) {`
`638`	`638`	`log.Warnf("Failed to decode dnsmasq lease status: %s", err)`
`639`	`639`	`return "", err`
`640`	`640`	`}`
	`641`	`+ ipAddr := ""`
`641`	`642`	`for _, value := range s {`
`642`	`643`	`if strings.ToLower(value.Mac_address) == strings.ToLower(mac) {`
`643`		`- log.Debugf("IP address: %s", value.Ip_address)`
`644`		`- return value.Ip_address, nil`
	`644`	`+ // If there are multiple entries,`
	`645`	`+ // the last one is the most current`
	`646`	`+ ipAddr = value.Ip_address`
`645`	`647`	`}`
`646`	`648`	`}`
`647`		`- return "", nil`
	`649`	`+ if ipAddr != "" {`
	`650`	`+ log.Debugf("IP address: %s", ipAddr)`
	`651`	`+ }`
	`652`	`+ return ipAddr, nil`
`648`	`653`	`}`
`649`	`654`
`650`	`655`	`func (d *Driver) GetIP() (string, error) {`