---  src/dhcp.c | 19 +++++++++++++------  1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/dhcp.c b/src/dhcp.c index 1d2cd48..54d98db 100644 --- a/src/dhcp.c +++ b/src/dhcp.c @@ -435,7 +435,7 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)   char *address, *netmask = NULL, *gateway = NULL;   const char *c_address, *c_gateway;   unsigned char prefixlen, c_prefixlen; - bool ip_change; + bool ip_change = false;     DBG("Lease available");   @@ -467,14 +467,21 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)     DBG("c_address %s", c_address);   - if (g_strcmp0(address, c_address)) + if (g_strcmp0(address, c_address)) {   ip_change = true; - else if (g_strcmp0(gateway, c_gateway)) + if (c_address) { + /* Remove old ip address */ + __connman_ipconfig_address_remove(dhcp- >ipconfig); + } + } + if (g_strcmp0(gateway, c_gateway)) {   ip_change = true; - else if (prefixlen != c_prefixlen) + if (c_gateway) { + /* Remove gateway ip address */ + __connman_ipconfig_gateway_remove(dhcp- >ipconfig); + } + } else if (prefixlen != c_prefixlen)   ip_change = true; - else - ip_change = false;     __connman_ipconfig_set_method(dhcp->ipconfig,   CONNMAN_IPCONFIG_MET HOD_DHCP);