From d51d9c7ab4a95d1061d7d4b11b77ea2541f48ade Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 19 Mar 2012 13:50:39 +0100 Subject: [PATCH] ipconfig: Track ipconfigs enabled/disabled state --- src/ipconfig.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ipconfig.c b/src/ipconfig.c index 65ea278..399e492 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -49,6 +49,7 @@ struct connman_ipconfig { const struct connman_ipconfig_ops *ops; void *ops_data; + connman_bool_t enabled; enum connman_ipconfig_method method; struct connman_ipaddress *address; struct connman_ipaddress *system; @@ -1240,6 +1241,7 @@ static struct connman_ipconfig *create_ipv6config(int index) ipv6config->refcount = 1; ipv6config->index = index; + ipv6config->enabled = FALSE; ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6; ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO; ipv6config->ipv6_privacy_config = 0; @@ -1281,6 +1283,7 @@ struct connman_ipconfig *__connman_ipconfig_create(int index, ipconfig->refcount = 1; ipconfig->index = index; + ipconfig->enabled = FALSE; ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4; ipconfig->address = connman_ipaddress_alloc(AF_INET); @@ -1672,6 +1675,8 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig) } else return -EINVAL; + ipconfig->enabled = TRUE; + if (type == CONNMAN_IPCONFIG_TYPE_IPV4 && ipdevice->config_ipv4 != NULL) { ipconfig_list = g_list_remove(ipconfig_list, @@ -1740,6 +1745,8 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig) if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL) return -EINVAL; + ipconfig->enabled = FALSE; + if (ipdevice->config_ipv4 == ipconfig) { ipconfig_list = g_list_remove(ipconfig_list, ipconfig); -- 2.7.4