dhcp4: apply config uuid to lease and offer early

openSUSE · May 7, 2014 · e9cf3d9 · e9cf3d9
1 parent 7197e04
commit e9cf3d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/dhcp4/device.c b/dhcp4/device.c
@@ -185,6 +185,8 @@ ni_dhcp4_device_set_lease(ni_dhcp4_device_t *dev, ni_addrconf_lease_t *lease)
 		if (dev->lease)
 			ni_addrconf_lease_free(dev->lease);
 		dev->lease = lease;
+		if (dev->config && lease)
+			lease->uuid = dev->config->uuid;
 	}
 }
 
@@ -210,6 +212,8 @@ ni_dhcp4_device_set_best_offer(ni_dhcp4_device_t *dev, ni_addrconf_lease_t *leas
 		ni_addrconf_lease_free(dev->best_offer.lease);
 	dev->best_offer.lease = lease;
 	dev->best_offer.weight = weight;
+	if (dev->config && lease)
+		lease->uuid = dev->config->uuid;
 }
 
 void

diff --git a/dhcp4/fsm.c b/dhcp4/fsm.c
@@ -274,6 +274,7 @@ __ni_dhcp4_fsm_discover(ni_dhcp4_device_t *dev, int scan_offers)
 	 */
 	if ((lease = dev->lease) == NULL)
 		lease = ni_addrconf_lease_new(NI_ADDRCONF_DHCP, AF_INET);
+	lease->uuid = dev->config->uuid;
 
 	dev->fsm.state = NI_DHCP4_STATE_SELECTING;
 	rv = ni_dhcp4_device_send_message(dev, DHCP4_DISCOVER, lease);