summaryrefslogtreecommitdiff
path: root/src/ipconfig.c
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2011-06-22 13:37:46 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2011-06-27 16:15:09 +0200
commit80de85a6242c7b2957401dbf75520862798b8d16 (patch)
tree2c1b56b8720865bc8d6c876b1171293d7b0caf0e /src/ipconfig.c
parent3d761a0d18626e1ac8610a73d1cccf74af8988b2 (diff)
downloadconnman-80de85a6242c7b2957401dbf75520862798b8d16.tar.gz
connman-80de85a6242c7b2957401dbf75520862798b8d16.tar.bz2
connman-80de85a6242c7b2957401dbf75520862798b8d16.zip
ipconfig: Add function to remove address from interface.
The new function removes the address from interface but does not touch internal data structures.
Diffstat (limited to 'src/ipconfig.c')
-rw-r--r--src/ipconfig.c30
1 files changed, 28 insertions, 2 deletions
diff --git a/src/ipconfig.c b/src/ipconfig.c
index c8466d98..4d74ca82 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -1401,6 +1401,34 @@ int __connman_ipconfig_address_remove(struct connman_ipconfig *ipconfig)
case CONNMAN_IPCONFIG_METHOD_FIXED:
case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_MANUAL:
+ err = __connman_ipconfig_address_unset(ipconfig);
+ connman_ipaddress_clear(ipconfig->address);
+
+ return err;
+ }
+
+ return 0;
+}
+
+int __connman_ipconfig_address_unset(struct connman_ipconfig *ipconfig)
+{
+ int err;
+
+ DBG("");
+
+ if (ipconfig == NULL)
+ return 0;
+
+ DBG("method %d", ipconfig->method);
+
+ switch (ipconfig->method) {
+ case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ break;
+ case CONNMAN_IPCONFIG_METHOD_FIXED:
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
err = connman_inet_clear_address(ipconfig->index,
ipconfig->address);
@@ -1412,8 +1440,6 @@ int __connman_ipconfig_address_remove(struct connman_ipconfig *ipconfig)
else
err = -EINVAL;
- connman_ipaddress_clear(ipconfig->address);
-
return err;
}