]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-dhcp6-client: Fix unreferencing DHCPv6 lease on client reset
authorPatrik Flykt <patrik.flykt@linux.intel.com>
Fri, 10 Jul 2015 08:25:21 +0000 (11:25 +0300)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Fri, 21 Aug 2015 08:23:21 +0000 (11:23 +0300)
When the DHCPv6 client is started by the library user or stopped for
any reason, unref the DHCPv6 lease when resetting the DHCPv6 client
data structure. This makes the DHCPv6 client always start from a clean
state and not keep unnecessary an lease structure around when stopped.

If this is not done, a previously existing lease information can be
interpreted to be from another server when restarting DHCPv6.

src/libsystemd-network/sd-dhcp6-client.c

index e2f58628514ceedfa2f9012bb598069b0ff25538..85bb1f3a8f5fbecb55bdf793d9692e2ec47444df 100644 (file)
@@ -272,6 +272,11 @@ static void client_notify(sd_dhcp6_client *client, int event) {
 static int client_reset(sd_dhcp6_client *client) {
         assert_return(client, -EINVAL);
 
+        if (client->lease) {
+                dhcp6_lease_clear_timers(&client->lease->ia);
+                client->lease = sd_dhcp6_lease_unref(client->lease);
+        }
+
         client->receive_message =
                 sd_event_source_unref(client->receive_message);