summaryrefslogtreecommitdiff
path: root/src/dhcp.c
diff options
context:
space:
mode:
authorZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
committerZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
commit1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7 (patch)
tree6e991827d28537f7f40f20786c2354fd04a9fdad /src/dhcp.c
parentfbe905ab58ecc31fe64c410c5f580cadc30e7f04 (diff)
downloadconnman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.zip
connman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.tar.gz
connman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.tar.bz2
Imported Upstream version 1.24upstream/1.24
Diffstat (limited to 'src/dhcp.c')
-rw-r--r--src/dhcp.c400
1 files changed, 255 insertions, 145 deletions
diff --git a/src/dhcp.c b/src/dhcp.c
index f32bfae..83d7dfb 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -2,7 +2,7 @@
*
* Connection Manager
*
- * Copyright (C) 2007-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2013 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -36,6 +36,8 @@
#include "connman.h"
+#define RATE_LIMIT_INTERVAL 60 /* delay between successive attempts */
+
struct connman_dhcp {
struct connman_network *network;
dhcp_cb callback;
@@ -44,10 +46,16 @@ struct connman_dhcp {
char **timeservers;
char *pac;
+ unsigned int timeout;
+
+ GDHCPClient *ipv4ll_client;
GDHCPClient *dhcp_client;
+ char *ipv4ll_debug_prefix;
+ char *dhcp_debug_prefix;
};
static GHashTable *network_table;
+static bool ipv4ll_running;
static void dhcp_free(struct connman_dhcp *dhcp)
{
@@ -58,6 +66,8 @@ static void dhcp_free(struct connman_dhcp *dhcp)
dhcp->nameservers = NULL;
dhcp->timeservers = NULL;
dhcp->pac = NULL;
+
+ g_free(dhcp);
}
/**
@@ -72,7 +82,7 @@ static void dhcp_free(struct connman_dhcp *dhcp)
* service state due to the IP configuration change implied by this
* invalidation.
*/
-static void dhcp_invalidate(struct connman_dhcp *dhcp, connman_bool_t callback)
+static void dhcp_invalidate(struct connman_dhcp *dhcp, bool callback)
{
struct connman_service *service;
struct connman_ipconfig *ipconfig;
@@ -80,33 +90,33 @@ static void dhcp_invalidate(struct connman_dhcp *dhcp, connman_bool_t callback)
DBG("dhcp %p callback %u", dhcp, callback);
- if (dhcp == NULL)
+ if (!dhcp)
return;
service = connman_service_lookup_from_network(dhcp->network);
- if (service == NULL)
- goto out;
+ if (!service)
+ return;
ipconfig = __connman_service_get_ip4config(service);
- if (ipconfig == NULL)
- goto out;
+ if (!ipconfig)
+ return;
__connman_6to4_remove(ipconfig);
__connman_service_set_domainname(service, NULL);
__connman_service_set_pac(service, NULL);
- if (dhcp->timeservers != NULL) {
- for (i = 0; dhcp->timeservers[i] != NULL; i++) {
+ if (dhcp->timeservers) {
+ for (i = 0; dhcp->timeservers[i]; i++) {
__connman_service_timeserver_remove(service,
dhcp->timeservers[i]);
}
}
- if (dhcp->nameservers != NULL) {
- for (i = 0; dhcp->nameservers[i] != NULL; i++) {
+ if (dhcp->nameservers) {
+ for (i = 0; dhcp->nameservers[i]; i++) {
__connman_service_nameserver_remove(service,
- dhcp->nameservers[i], FALSE);
+ dhcp->nameservers[i], false);
}
}
@@ -121,26 +131,125 @@ static void dhcp_invalidate(struct connman_dhcp *dhcp, connman_bool_t callback)
__connman_ipconfig_set_gateway(ipconfig, NULL);
__connman_ipconfig_set_prefixlen(ipconfig, 0);
- if (dhcp->callback != NULL && callback)
- dhcp->callback(dhcp->network, FALSE);
-
-out:
- dhcp_free(dhcp);
+ if (dhcp->callback && callback)
+ dhcp->callback(dhcp->network, false, NULL);
}
static void dhcp_valid(struct connman_dhcp *dhcp)
{
- if (dhcp->callback != NULL)
- dhcp->callback(dhcp->network, TRUE);
+ if (dhcp->callback)
+ dhcp->callback(dhcp->network, true, NULL);
+}
+
+static void dhcp_debug(const char *str, void *data)
+{
+ connman_info("%s: %s", (const char *) data, str);
+}
+
+static void ipv4ll_stop_client(struct connman_dhcp *dhcp)
+{
+ if (!dhcp->ipv4ll_client)
+ return;
+
+ g_dhcp_client_stop(dhcp->ipv4ll_client);
+ g_dhcp_client_unref(dhcp->ipv4ll_client);
+ dhcp->ipv4ll_client = NULL;
+ ipv4ll_running = false;
+
+ g_free(dhcp->ipv4ll_debug_prefix);
+ dhcp->ipv4ll_debug_prefix = NULL;
+}
+
+static void ipv4ll_lost_cb(GDHCPClient *dhcp_client, gpointer user_data);
+static void ipv4ll_available_cb(GDHCPClient *ipv4ll_client, gpointer user_data);
+
+static int ipv4ll_start_client(struct connman_dhcp *dhcp)
+{
+ GDHCPClient *ipv4ll_client;
+ GDHCPClientError error;
+ const char *hostname;
+ int index;
+ int err;
+
+ if (dhcp->ipv4ll_client)
+ return -EALREADY;
+
+ index = connman_network_get_index(dhcp->network);
+
+ ipv4ll_client = g_dhcp_client_new(G_DHCP_IPV4LL, index, &error);
+ if (error != G_DHCP_CLIENT_ERROR_NONE)
+ return -EINVAL;
+
+ if (getenv("CONNMAN_DHCP_DEBUG")) {
+ dhcp->ipv4ll_debug_prefix = g_strdup_printf("IPv4LL index %d",
+ index);
+ g_dhcp_client_set_debug(ipv4ll_client, dhcp_debug,
+ dhcp->ipv4ll_debug_prefix);
+ }
+
+ g_dhcp_client_set_id(ipv4ll_client);
+
+ hostname = connman_utsname_get_hostname();
+ if (hostname)
+ g_dhcp_client_set_send(ipv4ll_client, G_DHCP_HOST_NAME,
+ hostname);
+
+ g_dhcp_client_register_event(ipv4ll_client,
+ G_DHCP_CLIENT_EVENT_IPV4LL_LOST, ipv4ll_lost_cb, dhcp);
+
+ g_dhcp_client_register_event(ipv4ll_client,
+ G_DHCP_CLIENT_EVENT_IPV4LL_AVAILABLE,
+ ipv4ll_available_cb, dhcp);
+
+ dhcp->ipv4ll_client = ipv4ll_client;
+
+ err = g_dhcp_client_start(dhcp->ipv4ll_client, NULL);
+ if (err < 0) {
+ ipv4ll_stop_client(dhcp);
+ return err;
+ }
+
+ ipv4ll_running = true;
+ return 0;
+}
+
+static gboolean dhcp_retry_cb(gpointer user_data)
+{
+ struct connman_dhcp *dhcp = user_data;
+ struct connman_service *service;
+ struct connman_ipconfig *ipconfig;
+
+ dhcp->timeout = 0;
+
+ service = connman_service_lookup_from_network(dhcp->network);
+ ipconfig = __connman_service_get_ip4config(service);
+
+ g_dhcp_client_start(dhcp->dhcp_client,
+ __connman_ipconfig_get_dhcp_address(ipconfig));
+
+ return FALSE;
}
static void no_lease_cb(GDHCPClient *dhcp_client, gpointer user_data)
{
struct connman_dhcp *dhcp = user_data;
+ int err;
- DBG("No lease available");
+ DBG("No lease available ipv4ll %d client %p", ipv4ll_running,
+ dhcp->ipv4ll_client);
- dhcp_invalidate(dhcp, TRUE);
+ dhcp->timeout = g_timeout_add_seconds(RATE_LIMIT_INTERVAL,
+ dhcp_retry_cb,
+ dhcp);
+ if (ipv4ll_running)
+ return;
+
+ err = ipv4ll_start_client(dhcp);
+ if (err < 0)
+ DBG("Cannot start ipv4ll client (%d/%s)", err, strerror(-err));
+
+ /* Only notify upper layer if we have a problem */
+ dhcp_invalidate(dhcp, !ipv4ll_running);
}
static void lease_lost_cb(GDHCPClient *dhcp_client, gpointer user_data)
@@ -149,7 +258,8 @@ static void lease_lost_cb(GDHCPClient *dhcp_client, gpointer user_data)
DBG("Lease lost");
- dhcp_invalidate(dhcp, TRUE);
+ /* Upper layer will decide what to do, e.g. nothing or retry. */
+ dhcp_invalidate(dhcp, true);
}
static void ipv4ll_lost_cb(GDHCPClient *dhcp_client, gpointer user_data)
@@ -158,27 +268,32 @@ static void ipv4ll_lost_cb(GDHCPClient *dhcp_client, gpointer user_data)
DBG("Lease lost");
- dhcp_invalidate(dhcp, TRUE);
-}
+ ipv4ll_stop_client(dhcp);
+ /*
+ * Since we lost our IPv4LL configuration we might as notify
+ * the upper layers.
+ */
+ dhcp_invalidate(dhcp, true);
+}
-static gboolean compare_string_arrays(char **array_a, char **array_b)
+static bool compare_string_arrays(char **array_a, char **array_b)
{
int i;
- if (array_a == NULL || array_b == NULL)
- return FALSE;
+ if (!array_a || !array_b)
+ return false;
if (g_strv_length(array_a) != g_strv_length(array_b))
- return FALSE;
+ return false;
- for (i = 0; array_a[i] != NULL &&
- array_b[i] != NULL; i++) {
+ for (i = 0; array_a[i] &&
+ array_b[i]; i++) {
if (g_strcmp0(array_a[i], array_b[i]) != 0)
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
@@ -187,25 +302,29 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
GList *list, *option = NULL;
char *address, *netmask = NULL, *gateway = NULL;
const char *c_address, *c_gateway;
- char *domainname = NULL, *hostname = NULL;
char **nameservers, **timeservers, *pac = NULL;
int ns_entries;
struct connman_ipconfig *ipconfig;
struct connman_service *service;
unsigned char prefixlen, c_prefixlen;
- gboolean ip_change;
+ bool ip_change;
int i;
DBG("Lease available");
+ if (dhcp->ipv4ll_client) {
+ ipv4ll_stop_client(dhcp);
+ dhcp_invalidate(dhcp, false);
+ }
+
service = connman_service_lookup_from_network(dhcp->network);
- if (service == NULL) {
+ if (!service) {
connman_error("Can not lookup service");
return;
}
ipconfig = __connman_service_get_ip4config(service);
- if (ipconfig == NULL) {
+ if (!ipconfig) {
connman_error("Could not lookup ipconfig");
return;
}
@@ -220,11 +339,11 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
DBG("last address %s", address);
option = g_dhcp_client_get_option(dhcp_client, G_DHCP_SUBNET);
- if (option != NULL)
+ if (option)
netmask = g_strdup(option->data);
option = g_dhcp_client_get_option(dhcp_client, G_DHCP_ROUTER);
- if (option != NULL)
+ if (option)
gateway = g_strdup(option->data);
prefixlen = __connman_ipaddress_netmask_prefix_len(netmask);
@@ -233,83 +352,78 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
DBG("c_address %s", c_address);
- if (address != NULL && c_address != NULL &&
- g_strcmp0(address, c_address) != 0)
- ip_change = TRUE;
- else if (gateway != NULL && c_gateway != NULL &&
- g_strcmp0(gateway, c_gateway) != 0)
- ip_change = TRUE;
+ if (address && c_address && g_strcmp0(address, c_address) != 0)
+ ip_change = true;
+ else if (gateway && c_gateway && g_strcmp0(gateway, c_gateway) != 0)
+ ip_change = true;
else if (prefixlen != c_prefixlen)
- ip_change = TRUE;
- else if (c_address == NULL || c_gateway == NULL)
- ip_change = TRUE;
+ ip_change = true;
+ else if (!c_address || !c_gateway)
+ ip_change = true;
else
- ip_change = FALSE;
+ ip_change = false;
option = g_dhcp_client_get_option(dhcp_client, G_DHCP_DNS_SERVER);
ns_entries = g_list_length(option);
nameservers = g_try_new0(char *, ns_entries + 1);
- if (nameservers != NULL) {
+ if (nameservers) {
for (i = 0, list = option; list; list = list->next, i++)
nameservers[i] = g_strdup(list->data);
nameservers[ns_entries] = NULL;
}
option = g_dhcp_client_get_option(dhcp_client, G_DHCP_DOMAIN_NAME);
- if (option != NULL)
- domainname = g_strdup(option->data);
-
- if (connman_setting_get_bool("AllowHostnameUpdates") == TRUE) {
- option = g_dhcp_client_get_option(dhcp_client,
- G_DHCP_HOST_NAME);
- if (option != NULL)
- hostname = g_strdup(option->data);
- }
+ if (option)
+ __connman_service_set_domainname(service, option->data);
+
+ option = g_dhcp_client_get_option(dhcp_client, G_DHCP_HOST_NAME);
+ if (option)
+ __connman_service_set_hostname(service, option->data);
option = g_dhcp_client_get_option(dhcp_client, G_DHCP_NTP_SERVER);
ns_entries = g_list_length(option);
timeservers = g_try_new0(char *, ns_entries + 1);
- if (timeservers != NULL) {
+ if (timeservers) {
for (i = 0, list = option; list; list = list->next, i++)
timeservers[i] = g_strdup(list->data);
timeservers[ns_entries] = NULL;
}
option = g_dhcp_client_get_option(dhcp_client, 252);
- if (option != NULL)
+ if (option)
pac = g_strdup(option->data);
__connman_ipconfig_set_method(ipconfig, CONNMAN_IPCONFIG_METHOD_DHCP);
- if (ip_change == TRUE) {
+ if (ip_change) {
__connman_ipconfig_set_local(ipconfig, address);
__connman_ipconfig_set_prefixlen(ipconfig, prefixlen);
__connman_ipconfig_set_gateway(ipconfig, gateway);
}
- if (compare_string_arrays(nameservers, dhcp->nameservers) == FALSE) {
- if (dhcp->nameservers != NULL) {
- for (i = 0; dhcp->nameservers[i] != NULL; i++) {
+ if (!compare_string_arrays(nameservers, dhcp->nameservers)) {
+ if (dhcp->nameservers) {
+ for (i = 0; dhcp->nameservers[i]; i++) {
__connman_service_nameserver_remove(service,
- dhcp->nameservers[i], FALSE);
+ dhcp->nameservers[i], false);
}
g_strfreev(dhcp->nameservers);
}
dhcp->nameservers = nameservers;
- for (i = 0; dhcp->nameservers != NULL &&
- dhcp->nameservers[i] != NULL; i++) {
+ for (i = 0; dhcp->nameservers &&
+ dhcp->nameservers[i]; i++) {
__connman_service_nameserver_append(service,
- dhcp->nameservers[i], FALSE);
+ dhcp->nameservers[i], false);
}
} else {
g_strfreev(nameservers);
}
- if (compare_string_arrays(timeservers, dhcp->timeservers) == FALSE) {
- if (dhcp->timeservers != NULL) {
- for (i = 0; dhcp->timeservers[i] != NULL; i++) {
+ if (!compare_string_arrays(timeservers, dhcp->timeservers)) {
+ if (dhcp->timeservers) {
+ for (i = 0; dhcp->timeservers[i]; i++) {
__connman_service_timeserver_remove(service,
dhcp->timeservers[i]);
}
@@ -318,8 +432,8 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
dhcp->timeservers = timeservers;
- for (i = 0; dhcp->timeservers != NULL &&
- dhcp->timeservers[i] != NULL; i++) {
+ for (i = 0; dhcp->timeservers &&
+ dhcp->timeservers[i]; i++) {
__connman_service_timeserver_append(service,
dhcp->timeservers[i]);
}
@@ -334,15 +448,7 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
__connman_service_set_pac(service, dhcp->pac);
}
- __connman_service_set_domainname(service, domainname);
-
- if (domainname != NULL)
- __connman_utsname_set_domainname(domainname);
-
- if (hostname != NULL)
- __connman_utsname_set_hostname(hostname);
-
- if (ip_change == TRUE)
+ if (ip_change)
dhcp_valid(dhcp);
__connman_6to4_probe(service);
@@ -350,11 +456,9 @@ static void lease_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
g_free(address);
g_free(netmask);
g_free(gateway);
- g_free(domainname);
- g_free(hostname);
}
-static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
+static void ipv4ll_available_cb(GDHCPClient *ipv4ll_client, gpointer user_data)
{
struct connman_dhcp *dhcp = user_data;
char *address, *netmask;
@@ -365,15 +469,15 @@ static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
DBG("IPV4LL available");
service = connman_service_lookup_from_network(dhcp->network);
- if (service == NULL)
+ if (!service)
return;
ipconfig = __connman_service_get_ip4config(service);
- if (ipconfig == NULL)
+ if (!ipconfig)
return;
- address = g_dhcp_client_get_address(dhcp_client);
- netmask = g_dhcp_client_get_netmask(dhcp_client);
+ address = g_dhcp_client_get_address(ipv4ll_client);
+ netmask = g_dhcp_client_get_netmask(ipv4ll_client);
prefixlen = __connman_ipaddress_netmask_prefix_len(netmask);
@@ -388,15 +492,9 @@ static void ipv4ll_available_cb(GDHCPClient *dhcp_client, gpointer user_data)
g_free(netmask);
}
-static void dhcp_debug(const char *str, void *data)
-{
- connman_info("%s: %s\n", (const char *) data, str);
-}
-
-static int dhcp_request(struct connman_dhcp *dhcp)
+static int dhcp_initialize(struct connman_dhcp *dhcp)
{
struct connman_service *service;
- struct connman_ipconfig *ipconfig;
GDHCPClient *dhcp_client;
GDHCPClientError error;
const char *hostname;
@@ -410,13 +508,22 @@ static int dhcp_request(struct connman_dhcp *dhcp)
if (error != G_DHCP_CLIENT_ERROR_NONE)
return -EINVAL;
- if (getenv("CONNMAN_DHCP_DEBUG"))
- g_dhcp_client_set_debug(dhcp_client, dhcp_debug, "DHCP");
+ if (getenv("CONNMAN_DHCP_DEBUG")) {
+ dhcp->dhcp_debug_prefix = g_strdup_printf("DHCP index %d",
+ index);
+ g_dhcp_client_set_debug(dhcp_client, dhcp_debug,
+ dhcp->dhcp_debug_prefix);
+ }
g_dhcp_client_set_id(dhcp_client);
- hostname = connman_utsname_get_hostname();
- if (hostname != NULL)
+ service = connman_service_lookup_from_network(dhcp->network);
+
+ hostname = __connman_service_get_hostname(service);
+ if (!hostname)
+ hostname = connman_utsname_get_hostname();
+
+ if (hostname)
g_dhcp_client_set_send(dhcp_client, G_DHCP_HOST_NAME, hostname);
g_dhcp_client_set_request(dhcp_client, G_DHCP_HOST_NAME);
@@ -432,89 +539,92 @@ static int dhcp_request(struct connman_dhcp *dhcp)
lease_available_cb, dhcp);
g_dhcp_client_register_event(dhcp_client,
- G_DHCP_CLIENT_EVENT_IPV4LL_AVAILABLE,
- ipv4ll_available_cb, dhcp);
-
- g_dhcp_client_register_event(dhcp_client,
G_DHCP_CLIENT_EVENT_LEASE_LOST, lease_lost_cb, dhcp);
g_dhcp_client_register_event(dhcp_client,
- G_DHCP_CLIENT_EVENT_IPV4LL_LOST, ipv4ll_lost_cb, dhcp);
-
- g_dhcp_client_register_event(dhcp_client,
G_DHCP_CLIENT_EVENT_NO_LEASE, no_lease_cb, dhcp);
dhcp->dhcp_client = dhcp_client;
- service = connman_service_lookup_from_network(dhcp->network);
- ipconfig = __connman_service_get_ip4config(service);
-
- /*
- * Clear the addresses at startup so that lease callback will
- * take the lease and set ip address properly.
- */
- __connman_ipconfig_clear_address(ipconfig);
-
- return g_dhcp_client_start(dhcp_client,
- __connman_ipconfig_get_dhcp_address(ipconfig));
+ return 0;
}
static int dhcp_release(struct connman_dhcp *dhcp)
{
DBG("dhcp %p", dhcp);
- if (dhcp->dhcp_client == NULL)
- return 0;
+ if (dhcp->timeout > 0)
+ g_source_remove(dhcp->timeout);
- g_dhcp_client_stop(dhcp->dhcp_client);
- g_dhcp_client_unref(dhcp->dhcp_client);
+ if (dhcp->dhcp_client) {
+ g_dhcp_client_stop(dhcp->dhcp_client);
+ g_dhcp_client_unref(dhcp->dhcp_client);
+ }
dhcp->dhcp_client = NULL;
- return 0;
-}
+ g_free(dhcp->dhcp_debug_prefix);
+ dhcp->dhcp_debug_prefix = NULL;
-static void remove_network(gpointer user_data)
-{
- struct connman_dhcp *dhcp = user_data;
-
- DBG("dhcp %p", dhcp);
+ ipv4ll_stop_client(dhcp);
- dhcp_invalidate(dhcp, FALSE);
- dhcp_release(dhcp);
-
- g_free(dhcp);
+ return 0;
}
int __connman_dhcp_start(struct connman_network *network, dhcp_cb callback)
{
+ struct connman_service *service;
+ struct connman_ipconfig *ipconfig;
+ const char *last_addr = NULL;
struct connman_dhcp *dhcp;
DBG("");
- dhcp = g_try_new0(struct connman_dhcp, 1);
- if (dhcp == NULL)
- return -ENOMEM;
+ service = connman_service_lookup_from_network(network);
+ if (!service)
+ return -EINVAL;
- dhcp->network = network;
- dhcp->callback = callback;
+ ipconfig = __connman_service_get_ip4config(service);
+ if (ipconfig)
+ last_addr = __connman_ipconfig_get_dhcp_address(ipconfig);
+
+ dhcp = g_hash_table_lookup(network_table, network);
+ if (!dhcp) {
- connman_network_ref(network);
+ dhcp = g_try_new0(struct connman_dhcp, 1);
+ if (!dhcp)
+ return -ENOMEM;
- g_hash_table_replace(network_table, network, dhcp);
+ dhcp->network = network;
+ connman_network_ref(network);
- return dhcp_request(dhcp);
+ g_hash_table_insert(network_table, network, dhcp);
+
+ dhcp_initialize(dhcp);
+ }
+
+ dhcp->callback = callback;
+
+ return g_dhcp_client_start(dhcp->dhcp_client, last_addr);
}
void __connman_dhcp_stop(struct connman_network *network)
{
- DBG("");
+ struct connman_dhcp *dhcp;
+
+ DBG("network_table %p network %p", network_table, network);
- if (network_table == NULL)
+ if (!network_table)
return;
- if (g_hash_table_remove(network_table, network) == TRUE)
+ dhcp = g_hash_table_lookup(network_table, network);
+ if (dhcp) {
+ g_hash_table_remove(network_table, network);
connman_network_unref(network);
+ dhcp_release(dhcp);
+ dhcp_invalidate(dhcp, false);
+ dhcp_free(dhcp);
+ }
}
int __connman_dhcp_init(void)
@@ -522,7 +632,7 @@ int __connman_dhcp_init(void)
DBG("");
network_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
- NULL, remove_network);
+ NULL, NULL);
return 0;
}