dhcp: Call ipconfig_address_remove from dhcp_invalidate

Clearing the ipconfig fields is not enough, the actual rntl command needs
to be sent for the IP to be cleared.

diff --git a/src/dhcp.c b/src/dhcp.c
index b391ddf..ab8ee5a 100644 (file)
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -101,6 +101,8 @@ static void dhcp_invalidate(struct connman_dhcp *dhcp, connman_bool_t callback)
                                                dhcp->nameservers[i]);
        }
 
+       __connman_ipconfig_address_remove(ipconfig);
+
        __connman_ipconfig_set_local(ipconfig, NULL);
        __connman_ipconfig_set_broadcast(ipconfig, NULL);
        __connman_ipconfig_set_gateway(ipconfig, NULL);

diff --git a/src/network.c b/src/network.c
index 1fa62ee..95b4d4a 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -683,15 +683,11 @@ err:
 static void dhcp_failure(struct connman_network *network)
 {
        struct connman_service *service;
-       struct connman_ipconfig *ipconfig_ipv4;
 
        service = __connman_service_lookup_from_network(network);
        if (service == NULL)
                return;
 
-       ipconfig_ipv4 = __connman_service_get_ip4config(service);
-       __connman_ipconfig_address_remove(ipconfig_ipv4);
-
        __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_IDLE,
                                                CONNMAN_IPCONFIG_TYPE_IPV4);
 }