ipconfig: Rename __connman_ipconfig_get_*(index)
[platform/upstream/connman.git] / src / ipconfig.c
index 2fff6c7..8bbe184 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2010  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
 #include <config.h>
 #endif
 
+#include <stdio.h>
 #include <net/if.h>
 #include <net/if_arp.h>
+#include <linux/if_link.h>
+#include <string.h>
+#include <stdlib.h>
 
 #ifndef IFF_LOWER_UP
 #define IFF_LOWER_UP   0x10000
@@ -37,6 +41,7 @@
 struct connman_ipconfig {
        gint refcount;
        int index;
+       enum connman_ipconfig_type type;
 
        struct connman_ipconfig *origin;
 
@@ -46,9 +51,6 @@ struct connman_ipconfig {
        enum connman_ipconfig_method method;
        struct connman_ipaddress *address;
        struct connman_ipaddress *system;
-
-       char *eth;
-       uint16_t mtu;
 };
 
 struct connman_ipdevice {
@@ -56,20 +58,33 @@ struct connman_ipdevice {
        char *ifname;
        unsigned short type;
        unsigned int flags;
+       char *address;
+       uint16_t mtu;
+       uint32_t rx_packets;
+       uint32_t tx_packets;
+       uint32_t rx_bytes;
+       uint32_t tx_bytes;
+       uint32_t rx_errors;
+       uint32_t tx_errors;
+       uint32_t rx_dropped;
+       uint32_t tx_dropped;
 
        GSList *address_list;
-       char *gateway;
+       char *ipv4_gateway;
+       char *ipv6_gateway;
+
+       char *pac;
 
-       struct connman_ipconfig *config;
+       struct connman_ipconfig *config_ipv4;
+       struct connman_ipconfig *config_ipv6;
 
-       struct connman_ipconfig_driver *driver;
-       struct connman_ipconfig *driver_config;
+       gboolean ipv6_enabled;
 };
 
 static GHashTable *ipdevice_hash = NULL;
 static GList *ipconfig_list = NULL;
 
-struct connman_ipaddress *connman_ipaddress_alloc(void)
+struct connman_ipaddress *connman_ipaddress_alloc(int family)
 {
        struct connman_ipaddress *ipaddress;
 
@@ -77,6 +92,13 @@ struct connman_ipaddress *connman_ipaddress_alloc(void)
        if (ipaddress == NULL)
                return NULL;
 
+       ipaddress->family = family;
+       ipaddress->prefixlen = 0;
+       ipaddress->local = NULL;
+       ipaddress->peer = NULL;
+       ipaddress->broadcast = NULL;
+       ipaddress->gateway = NULL;
+
        return ipaddress;
 }
 
@@ -88,38 +110,85 @@ void connman_ipaddress_free(struct connman_ipaddress *ipaddress)
        g_free(ipaddress->broadcast);
        g_free(ipaddress->peer);
        g_free(ipaddress->local);
+       g_free(ipaddress->gateway);
        g_free(ipaddress);
 }
 
-static unsigned char netmask2prefixlen(const char *netmask)
+unsigned char __connman_ipconfig_netmask_prefix_len(const char *netmask)
 {
-       unsigned char bits = 0;
-       in_addr_t mask = inet_network(netmask);
-       in_addr_t host = ~mask;
+       unsigned char bits;
+       in_addr_t mask;
+       in_addr_t host;
+
+       if (netmask == NULL)
+               return 32;
+
+       mask = inet_network(netmask);
+       host = ~mask;
 
        /* a valid netmask must be 2^n - 1 */
        if ((host & (host + 1)) != 0)
                return -1;
 
+       bits = 0;
        for (; mask; mask <<= 1)
                ++bits;
 
        return bits;
 }
 
-void connman_ipaddress_set(struct connman_ipaddress *ipaddress,
-                               const char *address, const char *netmask)
+static gboolean check_ipv6_address(const char *address)
+{
+       unsigned char buf[sizeof(struct in6_addr)];
+       int err;
+
+       err = inet_pton(AF_INET6, address, buf);
+       if (err > 0)
+               return TRUE;
+
+       return FALSE;
+}
+
+int connman_ipaddress_set_ipv6(struct connman_ipaddress *ipaddress,
+                               const char *address, const char *gateway,
+                                               unsigned char prefix_length)
+{
+       if (ipaddress == NULL)
+               return -EINVAL;
+
+       if (check_ipv6_address(address) == FALSE)
+               return -EINVAL;
+
+       if (check_ipv6_address(gateway) == FALSE)
+               return -EINVAL;
+
+       DBG("prefix_len %d address %s gateway %s",
+                       prefix_length, address, gateway);
+
+       ipaddress->prefixlen = prefix_length;
+
+       g_free(ipaddress->local);
+       ipaddress->local = g_strdup(address);
+
+       g_free(ipaddress->gateway);
+       ipaddress->gateway = g_strdup(gateway);
+
+       return 0;
+}
+
+void connman_ipaddress_set_ipv4(struct connman_ipaddress *ipaddress,
+               const char *address, const char *netmask, const char *gateway)
 {
        if (ipaddress == NULL)
                return;
 
-       if (netmask != NULL)
-               ipaddress->prefixlen = netmask2prefixlen(netmask);
-       else
-               ipaddress->prefixlen = 32;
+       ipaddress->prefixlen = __connman_ipconfig_netmask_prefix_len(netmask);
 
        g_free(ipaddress->local);
        ipaddress->local = g_strdup(address);
+
+       g_free(ipaddress->gateway);
+       ipaddress->gateway = g_strdup(gateway);
 }
 
 void connman_ipaddress_clear(struct connman_ipaddress *ipaddress)
@@ -137,6 +206,9 @@ void connman_ipaddress_clear(struct connman_ipaddress *ipaddress)
 
        g_free(ipaddress->broadcast);
        ipaddress->broadcast = NULL;
+
+       g_free(ipaddress->gateway);
+       ipaddress->gateway = NULL;
 }
 
 void connman_ipaddress_copy(struct connman_ipaddress *ipaddress,
@@ -145,6 +217,7 @@ void connman_ipaddress_copy(struct connman_ipaddress *ipaddress,
        if (ipaddress == NULL || source == NULL)
                return;
 
+       ipaddress->family = source->family;
        ipaddress->prefixlen = source->prefixlen;
 
        g_free(ipaddress->local);
@@ -155,6 +228,9 @@ void connman_ipaddress_copy(struct connman_ipaddress *ipaddress,
 
        g_free(ipaddress->broadcast);
        ipaddress->broadcast = g_strdup(source->broadcast);
+
+       g_free(ipaddress->gateway);
+       ipaddress->gateway = g_strdup(source->gateway);
 }
 
 static void free_address_list(struct connman_ipdevice *ipdevice)
@@ -218,135 +294,167 @@ static const char *scope2str(unsigned char scope)
        return "";
 }
 
-static void free_ipdevice(gpointer data)
+static gboolean get_ipv6_state(gchar *ifname)
 {
-       struct connman_ipdevice *ipdevice = data;
+       int disabled;
+       gchar *path;
+       FILE *f;
+       gboolean enabled = FALSE;
 
-       connman_info("%s {remove} index %d", ipdevice->ifname,
-                                                       ipdevice->index);
+       if (ifname == NULL)
+               path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+       else
+               path = g_strdup_printf(
+                       "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
 
-       if (ipdevice->config != NULL)
-               connman_ipconfig_unref(ipdevice->config);
+       if (path == NULL)
+               return enabled;
 
-       free_address_list(ipdevice);
-       g_free(ipdevice->gateway);
+       f = fopen(path, "r");
 
-       g_free(ipdevice->ifname);
-       g_free(ipdevice);
-}
+       g_free(path);
 
-static GSList *driver_list = NULL;
-
-static gint compare_priority(gconstpointer a, gconstpointer b)
-{
-       const struct connman_ipconfig_driver *driver1 = a;
-       const struct connman_ipconfig_driver *driver2 = b;
+       if (f != NULL) {
+               if (fscanf(f, "%d", &disabled) > 0)
+                       enabled = !disabled;
+               fclose(f);
+       }
 
-       return driver2->priority - driver1->priority;
+       return enabled;
 }
 
-/**
- * connman_ipconfig_driver_register:
- * @driver: IP configuration driver
- *
- * Register a new IP configuration driver
- *
- * Returns: %0 on success
- */
-int connman_ipconfig_driver_register(struct connman_ipconfig_driver *driver)
+static void set_ipv6_state(gchar *ifname, gboolean enable)
 {
-       DBG("driver %p name %s", driver, driver->name);
+       gchar *path;
+       FILE *f;
 
-       driver_list = g_slist_insert_sorted(driver_list, driver,
-                                                       compare_priority);
+       if (ifname == NULL)
+               path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+       else
+               path = g_strdup_printf(
+                       "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
 
-       return 0;
-}
+       if (path == NULL)
+               return;
 
-/**
- * connman_ipconfig_driver_unregister:
- * @driver: IP configuration driver
- *
- * Remove a previously registered IP configuration driver.
- */
-void connman_ipconfig_driver_unregister(struct connman_ipconfig_driver *driver)
-{
-       DBG("driver %p name %s", driver, driver->name);
+       f = fopen(path, "r+");
+
+       g_free(path);
+
+       if (f == NULL)
+               return;
+
+       if (enable == FALSE)
+               fprintf(f, "1");
+       else
+               fprintf(f, "0");
 
-       driver_list = g_slist_remove(driver_list, driver);
+       fclose(f);
 }
 
-static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
+static void free_ipdevice(gpointer data)
 {
-       GSList *list;
+       struct connman_ipdevice *ipdevice = data;
 
-       DBG("ipconfig %p", ipdevice->config);
+       connman_info("%s {remove} index %d", ipdevice->ifname,
+                                                       ipdevice->index);
 
-       if (ipdevice->config == NULL)
-               return;
+       if (ipdevice->config_ipv4 != NULL) {
+               connman_ipconfig_unref(ipdevice->config_ipv4);
+               ipdevice->config_ipv4 = NULL;
+       }
 
-       switch (ipdevice->config->method) {
-       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-       case CONNMAN_IPCONFIG_METHOD_FIXED:
-       case CONNMAN_IPCONFIG_METHOD_MANUAL:
-               return;
-       case CONNMAN_IPCONFIG_METHOD_DHCP:
-               break;
+       if (ipdevice->config_ipv6 != NULL) {
+               connman_ipconfig_unref(ipdevice->config_ipv6);
+               ipdevice->config_ipv6 = NULL;
        }
 
-       if (ipdevice->driver != NULL)
-               return;
+       free_address_list(ipdevice);
+       g_free(ipdevice->ipv4_gateway);
+       g_free(ipdevice->ipv6_gateway);
+       g_free(ipdevice->pac);
 
-       ipdevice->driver_config = connman_ipconfig_clone(ipdevice->config);
-       if (ipdevice->driver_config == NULL)
-               return;
+       g_free(ipdevice->address);
 
-       for (list = driver_list; list; list = list->next) {
-               struct connman_ipconfig_driver *driver = list->data;
+       set_ipv6_state(ipdevice->ifname, ipdevice->ipv6_enabled);
 
-               if (driver->request(ipdevice->driver_config) == 0) {
-                       ipdevice->driver = driver;
-                       break;
-               }
-       }
+       g_free(ipdevice->ifname);
+       g_free(ipdevice);
+}
 
-       if (ipdevice->driver == NULL) {
-               connman_ipconfig_unref(ipdevice->driver_config);
-               ipdevice->driver_config = NULL;
-       }
+static void __connman_ipconfig_lower_up(struct connman_ipdevice *ipdevice)
+{
+       DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+                                       ipdevice->config_ipv6);
 }
 
 static void __connman_ipconfig_lower_down(struct connman_ipdevice *ipdevice)
 {
-       DBG("ipconfig %p", ipdevice->config);
+       DBG("ipconfig ipv4 %p ipv6 %p", ipdevice->config_ipv4,
+                                       ipdevice->config_ipv6);
 
-       if (ipdevice->config == NULL)
-               return;
+       if (ipdevice->config_ipv4)
+               connman_inet_clear_address(ipdevice->index,
+                                       ipdevice->config_ipv4->address);
+
+       if (ipdevice->config_ipv6)
+               connman_inet_clear_ipv6_address(ipdevice->index,
+                               ipdevice->config_ipv6->address->local,
+                               ipdevice->config_ipv6->address->prefixlen);
+}
+
+static void update_stats(struct connman_ipdevice *ipdevice,
+                                               struct rtnl_link_stats *stats)
+{
+       struct connman_service *service;
 
-       if (ipdevice->driver == NULL)
+       if (stats->rx_packets == 0 && stats->tx_packets == 0)
                return;
 
-       ipdevice->driver->release(ipdevice->driver_config);
+       connman_info("%s {RX} %u packets %u bytes", ipdevice->ifname,
+                                       stats->rx_packets, stats->rx_bytes);
+       connman_info("%s {TX} %u packets %u bytes", ipdevice->ifname,
+                                       stats->tx_packets, stats->tx_bytes);
 
-       ipdevice->driver = NULL;
+       if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
+               return;
+
+       if (ipdevice->config_ipv4)
+               service = connman_ipconfig_get_data(ipdevice->config_ipv4);
+       else if (ipdevice->config_ipv6)
+               service = connman_ipconfig_get_data(ipdevice->config_ipv6);
+       else
+               return;
 
-       connman_ipconfig_unref(ipdevice->driver_config);
-       ipdevice->driver_config = NULL;
+       if (service == NULL)
+               return;
 
-       connman_inet_clear_address(ipdevice->index);
+       ipdevice->rx_packets = stats->rx_packets;
+       ipdevice->tx_packets = stats->tx_packets;
+       ipdevice->rx_bytes = stats->rx_bytes;
+       ipdevice->tx_bytes = stats->tx_bytes;
+       ipdevice->rx_errors = stats->rx_errors;
+       ipdevice->tx_errors = stats->tx_errors;
+       ipdevice->rx_dropped = stats->rx_dropped;
+       ipdevice->tx_dropped = stats->tx_dropped;
+
+       __connman_service_notify(service,
+                               ipdevice->rx_packets, ipdevice->tx_packets,
+                               ipdevice->rx_bytes, ipdevice->tx_bytes,
+                               ipdevice->rx_errors, ipdevice->tx_errors,
+                               ipdevice->rx_dropped, ipdevice->tx_dropped);
 }
 
 void __connman_ipconfig_newlink(int index, unsigned short type,
                                unsigned int flags, const char *address,
-                                                       unsigned short mtu)
+                                                       unsigned short mtu,
+                                               struct rtnl_link_stats *stats)
 {
        struct connman_ipdevice *ipdevice;
        GList *list;
        GString *str;
        gboolean up = FALSE, down = FALSE;
        gboolean lower_up = FALSE, lower_down = FALSE;
-       char *ifname;
 
        DBG("index %d", index);
 
@@ -357,35 +465,27 @@ void __connman_ipconfig_newlink(int index, unsigned short type,
        if (ipdevice != NULL)
                goto update;
 
-       ifname = connman_inet_ifname(index);
-
-       if (__connman_element_device_isfiltered(ifname) == TRUE) {
-               connman_info("Ignoring interface %s (filtered)", ifname);
-               g_free(ifname);
-               return;
-       }
-
        ipdevice = g_try_new0(struct connman_ipdevice, 1);
-       if (ipdevice == NULL) {
-               g_free(ifname);
+       if (ipdevice == NULL)
                return;
-       }
 
        ipdevice->index = index;
-       ipdevice->ifname = ifname;
+       ipdevice->ifname = connman_inet_ifname(index);
        ipdevice->type = type;
 
+       ipdevice->ipv6_enabled = get_ipv6_state(ipdevice->ifname);
+
+       ipdevice->address = g_strdup(address);
+
        g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(index), ipdevice);
 
        connman_info("%s {create} index %d type %d <%s>", ipdevice->ifname,
                                                index, type, type2str(type));
 
 update:
-       if (ipdevice->config != NULL) {
-               g_free(ipdevice->config->eth);
-               ipdevice->config->eth = g_strdup(address);
-               ipdevice->config->mtu = mtu;
-       }
+       ipdevice->mtu = mtu;
+
+       update_stats(ipdevice, stats);
 
        if (flags == ipdevice->flags)
                return;
@@ -435,6 +535,9 @@ update:
                if (index != ipconfig->index)
                        continue;
 
+               if (ipconfig->ops == NULL)
+                       continue;
+
                if (up == TRUE && ipconfig->ops->up)
                        ipconfig->ops->up(ipconfig);
                if (lower_up == TRUE && ipconfig->ops->lower_up)
@@ -452,7 +555,7 @@ update:
                __connman_ipconfig_lower_down(ipdevice);
 }
 
-void __connman_ipconfig_dellink(int index)
+void __connman_ipconfig_dellink(int index, struct rtnl_link_stats *stats)
 {
        struct connman_ipdevice *ipdevice;
        GList *list;
@@ -463,6 +566,8 @@ void __connman_ipconfig_dellink(int index)
        if (ipdevice == NULL)
                return;
 
+       update_stats(ipdevice, stats);
+
        for (list = g_list_first(ipconfig_list); list;
                                                list = g_list_next(list)) {
                struct connman_ipconfig *ipconfig = list->data;
@@ -472,6 +577,9 @@ void __connman_ipconfig_dellink(int index)
 
                ipconfig->index = -1;
 
+               if (ipconfig->ops == NULL)
+                       continue;
+
                if (ipconfig->ops->lower_down)
                        ipconfig->ops->lower_down(ipconfig);
                if (ipconfig->ops->down)
@@ -483,7 +591,18 @@ void __connman_ipconfig_dellink(int index)
        g_hash_table_remove(ipdevice_hash, GINT_TO_POINTER(index));
 }
 
-void __connman_ipconfig_newaddr(int index, const char *label,
+static inline gint check_duplicate_address(gconstpointer a, gconstpointer b)
+{
+       const struct connman_ipaddress *addr1 = a;
+       const struct connman_ipaddress *addr2 = b;
+
+       if (addr1->prefixlen != addr2->prefixlen)
+               return addr2->prefixlen - addr1->prefixlen;
+
+       return g_strcmp0(addr1->local, addr2->local);
+}
+
+void __connman_ipconfig_newaddr(int index, int family, const char *label,
                                unsigned char prefixlen, const char *address)
 {
        struct connman_ipdevice *ipdevice;
@@ -496,26 +615,36 @@ void __connman_ipconfig_newaddr(int index, const char *label,
        if (ipdevice == NULL)
                return;
 
-       ipaddress = connman_ipaddress_alloc();
+       ipaddress = connman_ipaddress_alloc(family);
        if (ipaddress == NULL)
                return;
 
        ipaddress->prefixlen = prefixlen;
        ipaddress->local = g_strdup(address);
 
+       if (g_slist_find_custom(ipdevice->address_list, ipaddress,
+                                       check_duplicate_address)) {
+               connman_ipaddress_free(ipaddress);
+               return;
+       }
+
        ipdevice->address_list = g_slist_append(ipdevice->address_list,
                                                                ipaddress);
 
-       connman_info("%s {add} address %s/%u label %s", ipdevice->ifname,
-                                               address, prefixlen, label);
+       connman_info("%s {add} address %s/%u label %s family %d",
+               ipdevice->ifname, address, prefixlen, label, family);
 
-       if (ipdevice->config != NULL)
-               connman_ipaddress_copy(ipdevice->config->system, ipaddress);
+       if (ipdevice->config_ipv4 != NULL && family == AF_INET)
+               connman_ipaddress_copy(ipdevice->config_ipv4->system,
+                                       ipaddress);
 
-       if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
+       else if (ipdevice->config_ipv6 != NULL && family == AF_INET6)
+               connman_ipaddress_copy(ipdevice->config_ipv6->system,
+                                       ipaddress);
+       else
                return;
 
-       if (g_slist_length(ipdevice->address_list) > 1)
+       if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) != (IFF_RUNNING | IFF_LOWER_UP))
                return;
 
        for (list = g_list_first(ipconfig_list); list;
@@ -525,12 +654,15 @@ void __connman_ipconfig_newaddr(int index, const char *label,
                if (index != ipconfig->index)
                        continue;
 
+               if (ipconfig->ops == NULL)
+                       continue;
+
                if (ipconfig->ops->ip_bound)
                        ipconfig->ops->ip_bound(ipconfig);
        }
 }
 
-void __connman_ipconfig_deladdr(int index, const char *label,
+void __connman_ipconfig_deladdr(int index, int family, const char *label,
                                unsigned char prefixlen, const char *address)
 {
        struct connman_ipdevice *ipdevice;
@@ -550,7 +682,8 @@ void __connman_ipconfig_deladdr(int index, const char *label,
        ipdevice->address_list = g_slist_remove(ipdevice->address_list,
                                                                ipaddress);
 
-       connman_ipaddress_free(ipaddress);
+       connman_ipaddress_clear(ipaddress);
+       g_free(ipaddress);
 
        connman_info("%s {del} address %s/%u label %s", ipdevice->ifname,
                                                address, prefixlen, label);
@@ -568,12 +701,15 @@ void __connman_ipconfig_deladdr(int index, const char *label,
                if (index != ipconfig->index)
                        continue;
 
+               if (ipconfig->ops == NULL)
+                       continue;
+
                if (ipconfig->ops->ip_release)
                        ipconfig->ops->ip_release(ipconfig);
        }
 }
 
-void __connman_ipconfig_newroute(int index, unsigned char scope,
+void __connman_ipconfig_newroute(int index, int family, unsigned char scope,
                                        const char *dst, const char *gateway)
 {
        struct connman_ipdevice *ipdevice;
@@ -585,8 +721,51 @@ void __connman_ipconfig_newroute(int index, unsigned char scope,
                return;
 
        if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
-               g_free(ipdevice->gateway);
-               ipdevice->gateway = g_strdup(gateway);
+               GSList *list;
+               GList *config_list;
+
+               if (family == AF_INET6) {
+                       g_free(ipdevice->ipv6_gateway);
+                       ipdevice->ipv6_gateway = g_strdup(gateway);
+
+                       if (ipdevice->config_ipv6 != NULL &&
+                               ipdevice->config_ipv6->system != NULL) {
+                               g_free(ipdevice->config_ipv6->system->gateway);
+                               ipdevice->config_ipv6->system->gateway =
+                                       g_strdup(gateway);
+                       }
+               } else {
+                       g_free(ipdevice->ipv4_gateway);
+                       ipdevice->ipv4_gateway = g_strdup(gateway);
+
+                       if (ipdevice->config_ipv4 != NULL &&
+                               ipdevice->config_ipv4->system != NULL) {
+                               g_free(ipdevice->config_ipv4->system->gateway);
+                               ipdevice->config_ipv4->system->gateway =
+                                       g_strdup(gateway);
+                       }
+               }
+
+               for (list = ipdevice->address_list; list; list = list->next) {
+                       struct connman_ipaddress *ipaddress = list->data;
+
+                       g_free(ipaddress->gateway);
+                       ipaddress->gateway = g_strdup(gateway);
+               }
+
+               for (config_list = g_list_first(ipconfig_list); config_list;
+                                       config_list = g_list_next(config_list)) {
+                       struct connman_ipconfig *ipconfig = config_list->data;
+
+                       if (index != ipconfig->index)
+                               continue;
+
+                       if (ipconfig->ops == NULL)
+                               continue;
+
+                       if (ipconfig->ops->ip_bound)
+                               ipconfig->ops->ip_bound(ipconfig);
+               }
        }
 
        connman_info("%s {add} route %s gw %s scope %u <%s>",
@@ -594,7 +773,7 @@ void __connman_ipconfig_newroute(int index, unsigned char scope,
                                                scope, scope2str(scope));
 }
 
-void __connman_ipconfig_delroute(int index, unsigned char scope,
+void __connman_ipconfig_delroute(int index, int family, unsigned char scope,
                                        const char *dst, const char *gateway)
 {
        struct connman_ipdevice *ipdevice;
@@ -606,8 +785,49 @@ void __connman_ipconfig_delroute(int index, unsigned char scope,
                return;
 
        if (scope == 0 && g_strcmp0(dst, "0.0.0.0") == 0) {
-               g_free(ipdevice->gateway);
-               ipdevice->gateway = NULL;
+               GSList *list;
+               GList *config_list;
+
+               if (family == AF_INET6) {
+                       g_free(ipdevice->ipv6_gateway);
+                       ipdevice->ipv6_gateway = NULL;
+
+                       if (ipdevice->config_ipv6 != NULL &&
+                               ipdevice->config_ipv6->system != NULL) {
+                               g_free(ipdevice->config_ipv6->system->gateway);
+                               ipdevice->config_ipv6->system->gateway = NULL;
+                       }
+               } else {
+                       g_free(ipdevice->ipv4_gateway);
+                       ipdevice->ipv4_gateway = NULL;
+
+                       if (ipdevice->config_ipv4 != NULL &&
+                               ipdevice->config_ipv4->system != NULL) {
+                               g_free(ipdevice->config_ipv4->system->gateway);
+                               ipdevice->config_ipv4->system->gateway = NULL;
+                       }
+               }
+
+               for (list = ipdevice->address_list; list; list = list->next) {
+                       struct connman_ipaddress *ipaddress = list->data;
+
+                       g_free(ipaddress->gateway);
+                       ipaddress->gateway = NULL;
+               }
+
+               for (config_list = g_list_first(ipconfig_list); config_list;
+                                       config_list = g_list_next(config_list)) {
+                       struct connman_ipconfig *ipconfig = config_list->data;
+
+                       if (index != ipconfig->index)
+                               continue;
+
+                       if (ipconfig->ops == NULL)
+                               continue;
+
+                       if (ipconfig->ops->ip_release)
+                               ipconfig->ops->ip_release(ipconfig);
+               }
        }
 
        connman_info("%s {del} route %s gw %s scope %u <%s>",
@@ -633,7 +853,13 @@ void __connman_ipconfig_foreach(void (*function) (int index, void *user_data),
        g_list_free(keys);
 }
 
-unsigned short __connman_ipconfig_get_type(int index)
+enum connman_ipconfig_type __connman_ipconfig_get_config_type(
+                                       struct connman_ipconfig *ipconfig)
+{
+       return ipconfig ? ipconfig->type : CONNMAN_IPCONFIG_TYPE_UNKNOWN;
+}
+
+unsigned short __connman_ipconfig_get_type_from_index(int index)
 {
        struct connman_ipdevice *ipdevice;
 
@@ -644,7 +870,7 @@ unsigned short __connman_ipconfig_get_type(int index)
        return ipdevice->type;
 }
 
-unsigned int __connman_ipconfig_get_flags(int index)
+unsigned int __connman_ipconfig_get_flags_from_index(int index)
 {
        struct connman_ipdevice *ipdevice;
 
@@ -655,7 +881,7 @@ unsigned int __connman_ipconfig_get_flags(int index)
        return ipdevice->flags;
 }
 
-const char *__connman_ipconfig_get_gateway(int index)
+const char *__connman_ipconfig_get_gateway_from_index(int index)
 {
        struct connman_ipdevice *ipdevice;
 
@@ -663,7 +889,55 @@ const char *__connman_ipconfig_get_gateway(int index)
        if (ipdevice == NULL)
                return NULL;
 
-       return ipdevice->gateway;
+       if (ipdevice->ipv4_gateway != NULL)
+               return ipdevice->ipv4_gateway;
+
+       if (ipdevice->config_ipv4 != NULL &&
+                       ipdevice->config_ipv4->address != NULL)
+               return ipdevice->config_ipv4->address->gateway;
+
+       if (ipdevice->ipv6_gateway != NULL)
+               return ipdevice->ipv6_gateway;
+
+       if (ipdevice->config_ipv6 != NULL &&
+                       ipdevice->config_ipv6->address != NULL)
+               return ipdevice->config_ipv6->address->gateway;
+
+       return NULL;
+}
+
+void __connman_ipconfig_set_index(struct connman_ipconfig *ipconfig, int index)
+{
+       ipconfig->index = index;
+}
+
+static struct connman_ipconfig *create_ipv6config(int index)
+{
+       struct connman_ipconfig *ipv6config;
+
+       DBG("index %d", index);
+
+       ipv6config = g_try_new0(struct connman_ipconfig, 1);
+       if (ipv6config == NULL)
+               return NULL;
+
+       ipv6config->refcount = 1;
+
+       ipv6config->index = index;
+       ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
+       ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
+
+       ipv6config->address = connman_ipaddress_alloc(AF_INET6);
+       if (ipv6config->address == NULL) {
+               g_free(ipv6config);
+               return NULL;
+       }
+
+       ipv6config->system = connman_ipaddress_alloc(AF_INET6);
+
+       DBG("ipconfig %p", ipv6config);
+
+       return ipv6config;
 }
 
 /**
@@ -673,10 +947,14 @@ const char *__connman_ipconfig_get_gateway(int index)
  *
  * Returns: a newly-allocated #connman_ipconfig structure
  */
-struct connman_ipconfig *connman_ipconfig_create(int index)
+struct connman_ipconfig *connman_ipconfig_create(int index,
+                                       enum connman_ipconfig_type type)
 {
        struct connman_ipconfig *ipconfig;
 
+       if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+               return create_ipv6config(index);
+
        DBG("index %d", index);
 
        ipconfig = g_try_new0(struct connman_ipconfig, 1);
@@ -686,45 +964,21 @@ struct connman_ipconfig *connman_ipconfig_create(int index)
        ipconfig->refcount = 1;
 
        ipconfig->index = index;
+       ipconfig->type = CONNMAN_IPCONFIG_TYPE_IPV4;
 
-       ipconfig->address = connman_ipaddress_alloc();
+       ipconfig->address = connman_ipaddress_alloc(AF_INET);
        if (ipconfig->address == NULL) {
                g_free(ipconfig);
                return NULL;
        }
 
-       ipconfig->system = connman_ipaddress_alloc();
+       ipconfig->system = connman_ipaddress_alloc(AF_INET);
 
        DBG("ipconfig %p", ipconfig);
 
        return ipconfig;
 }
 
-/**
- * connman_ipconfig_clone:
- *
- * Clone an ipconfig structure and create new reference.
- *
- * Returns: a newly-allocated #connman_ipconfig structure
- */
-struct connman_ipconfig *connman_ipconfig_clone(struct connman_ipconfig *ipconfig)
-{
-       struct connman_ipconfig *ipconfig_clone;
-
-       DBG("ipconfig %p", ipconfig);
-
-       ipconfig_clone = g_try_new0(struct connman_ipconfig, 1);
-       if (ipconfig_clone == NULL)
-               return NULL;
-
-       ipconfig_clone->refcount = 1;
-
-       ipconfig_clone->origin = connman_ipconfig_ref(ipconfig);
-
-       ipconfig_clone->index = -1;
-
-       return ipconfig_clone;
-}
 
 /**
  * connman_ipconfig_ref:
@@ -734,6 +988,9 @@ struct connman_ipconfig *connman_ipconfig_clone(struct connman_ipconfig *ipconfi
  */
 struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
 {
+       DBG("ipconfig %p refcount %d", ipconfig,
+                               g_atomic_int_get(&ipconfig->refcount) + 1);
+
        g_atomic_int_inc(&ipconfig->refcount);
 
        return ipconfig;
@@ -747,7 +1004,15 @@ struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig)
  */
 void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
 {
+       if (ipconfig == NULL)
+               return;
+
+       DBG("ipconfig %p refcount %d", ipconfig,
+                       g_atomic_int_get(&ipconfig->refcount) - 1);
+
        if (g_atomic_int_dec_and_test(&ipconfig->refcount) == TRUE) {
+               __connman_ipconfig_disable(ipconfig);
+
                connman_ipconfig_set_ops(ipconfig, NULL);
 
                if (ipconfig->origin != NULL) {
@@ -757,7 +1022,6 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
 
                connman_ipaddress_free(ipconfig->system);
                connman_ipaddress_free(ipconfig->address);
-               g_free(ipconfig->eth);
                g_free(ipconfig);
        }
 }
@@ -770,6 +1034,9 @@ void connman_ipconfig_unref(struct connman_ipconfig *ipconfig)
  */
 void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig)
 {
+       if (ipconfig == NULL)
+               return NULL;
+
        return ipconfig->ops_data;
 }
 
@@ -793,6 +1060,9 @@ void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data)
  */
 int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig)
 {
+       if (ipconfig == NULL)
+               return -1;
+
        if (ipconfig->origin != NULL)
                return ipconfig->origin->index;
 
@@ -809,6 +1079,9 @@ const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig)
 {
        struct connman_ipdevice *ipdevice;
 
+       if (ipconfig == NULL)
+               return NULL;
+
        if (ipconfig->index < 0)
                return NULL;
 
@@ -830,13 +1103,7 @@ const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig)
 void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig,
                                const struct connman_ipconfig_ops *ops)
 {
-       if (ipconfig->ops != NULL)
-               ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
-
        ipconfig->ops = ops;
-
-       if (ops != NULL)
-               ipconfig_list = g_list_append(ipconfig_list, ipconfig);
 }
 
 /**
@@ -854,6 +1121,14 @@ int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig,
        return 0;
 }
 
+enum connman_ipconfig_method __connman_ipconfig_get_method(struct connman_ipconfig *ipconfig)
+{
+       if (ipconfig == NULL)
+               return CONNMAN_IPCONFIG_METHOD_UNKNOWN;
+
+       return ipconfig->method;
+}
+
 /**
  * connman_ipconfig_bind:
  * @ipconfig: ipconfig structure
@@ -873,9 +1148,138 @@ void connman_ipconfig_bind(struct connman_ipconfig *ipconfig,
        connman_inet_set_address(origin->index, origin->address);
 }
 
+void __connman_ipconfig_set_element_ipv6_gateway(
+                       struct connman_ipconfig *ipconfig,
+                               struct connman_element *element)
+{
+       if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+               element->ipv6.gateway = ipconfig->address->gateway;
+}
+
+/*
+ * FIXME: The element soulution should be removed in the future
+ * Set IPv4 and IPv6 gateway
+ */
+int __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig,
+                                               struct connman_element *parent)
+{
+       struct connman_element *connection;
+
+       connection = connman_element_create(NULL);
+
+       DBG("ipconfig %p", ipconfig);
+
+       connection->type  = CONNMAN_ELEMENT_TYPE_CONNECTION;
+       connection->index = ipconfig->index;
+
+       if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+               connection->ipv4.gateway = ipconfig->address->gateway;
+       else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+               connection->ipv6.gateway = ipconfig->address->gateway;
+
+       if (connman_element_register(connection, parent) < 0)
+               connman_element_unref(connection);
+
+       return 0;
+}
+
+int __connman_ipconfig_set_address(struct connman_ipconfig *ipconfig)
+{
+       DBG("");
+
+       switch (ipconfig->method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               break;
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                       return connman_inet_set_address(ipconfig->index,
+                                                       ipconfig->address);
+               else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+                       return connman_inet_set_ipv6_address(
+                                       ipconfig->index, ipconfig->address);
+       }
+
+       return 0;
+}
+
+int __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig)
+{
+       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_FIXED:
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               break;
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                       return connman_inet_clear_address(ipconfig->index,
+                                                       ipconfig->address);
+               else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+                       return connman_inet_clear_ipv6_address(
+                                               ipconfig->index,
+                                               ipconfig->address->local,
+                                               ipconfig->address->prefixlen);
+       }
+
+       return 0;
+}
+
+int __connman_ipconfig_set_proxy_autoconfig(struct connman_ipconfig *ipconfig,
+                                                        const char *url)
+{
+       struct connman_ipdevice *ipdevice;
+
+       DBG("ipconfig %p", ipconfig);
+
+       if (ipconfig == NULL || ipconfig->index < 0)
+               return -ENODEV;
+
+       ipdevice = g_hash_table_lookup(ipdevice_hash,
+                                       GINT_TO_POINTER(ipconfig->index));
+       if (ipdevice == NULL)
+               return -ENXIO;
+
+       g_free(ipdevice->pac);
+       ipdevice->pac = g_strdup(url);
+
+       return 0;
+}
+
+const char *__connman_ipconfig_get_proxy_autoconfig(struct connman_ipconfig *ipconfig)
+{
+       struct connman_ipdevice *ipdevice;
+
+       DBG("ipconfig %p", ipconfig);
+
+       if (ipconfig == NULL || ipconfig->index < 0)
+               return NULL;
+
+       ipdevice = g_hash_table_lookup(ipdevice_hash,
+                                       GINT_TO_POINTER(ipconfig->index));
+       if (ipdevice == NULL)
+               return NULL;
+
+       return ipdevice->pac;
+}
+
 int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig)
 {
        struct connman_ipdevice *ipdevice;
+       gboolean up = FALSE, down = FALSE;
+       gboolean lower_up = FALSE, lower_down = FALSE;
+       enum connman_ipconfig_type type;
 
        DBG("ipconfig %p", ipconfig);
 
@@ -887,13 +1291,64 @@ int __connman_ipconfig_enable(struct connman_ipconfig *ipconfig)
        if (ipdevice == NULL)
                return -ENXIO;
 
-       if (ipdevice->config != NULL) {
-               connman_ipaddress_clear(ipdevice->config->system);
+       if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+               if (ipdevice->config_ipv4 == ipconfig)
+                       return -EALREADY;
+               type = CONNMAN_IPCONFIG_TYPE_IPV4;
+       } else if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+               if (ipdevice->config_ipv6 == ipconfig)
+                       return -EALREADY;
+               type = CONNMAN_IPCONFIG_TYPE_IPV6;
+       } else
+               return -EINVAL;
+
+       if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
+                                       ipdevice->config_ipv4 != NULL) {
+               ipconfig_list = g_list_remove(ipconfig_list,
+                                                       ipdevice->config_ipv4);
+
+               connman_ipaddress_clear(ipdevice->config_ipv4->system);
+
+               connman_ipconfig_unref(ipdevice->config_ipv4);
+       }
+
+       if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
+                                       ipdevice->config_ipv6 != NULL) {
+               ipconfig_list = g_list_remove(ipconfig_list,
+                                                       ipdevice->config_ipv6);
+
+               connman_ipaddress_clear(ipdevice->config_ipv6->system);
 
-               connman_ipconfig_unref(ipdevice->config);
+               connman_ipconfig_unref(ipdevice->config_ipv6);
        }
 
-       ipdevice->config = connman_ipconfig_ref(ipconfig);
+       if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+               ipdevice->config_ipv4 = connman_ipconfig_ref(ipconfig);
+       else if (type == CONNMAN_IPCONFIG_TYPE_IPV6)
+               ipdevice->config_ipv6 = connman_ipconfig_ref(ipconfig);
+
+       ipconfig_list = g_list_append(ipconfig_list, ipconfig);
+
+       if (ipdevice->flags & IFF_UP)
+               up = TRUE;
+       else
+               down = TRUE;
+
+       if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) ==
+                       (IFF_RUNNING | IFF_LOWER_UP))
+               lower_up = TRUE;
+       else if ((ipdevice->flags & (IFF_RUNNING | IFF_LOWER_UP)) == 0)
+               lower_down = TRUE;
+
+       if (up == TRUE && ipconfig->ops->up)
+               ipconfig->ops->up(ipconfig);
+       if (lower_up == TRUE && ipconfig->ops->lower_up)
+               ipconfig->ops->lower_up(ipconfig);
+
+       if (lower_down == TRUE && ipconfig->ops->lower_down)
+               ipconfig->ops->lower_down(ipconfig);
+       if (down == TRUE && ipconfig->ops->down)
+               ipconfig->ops->down(ipconfig);
 
        return 0;
 }
@@ -912,15 +1367,28 @@ int __connman_ipconfig_disable(struct connman_ipconfig *ipconfig)
        if (ipdevice == NULL)
                return -ENXIO;
 
-       if (ipdevice->config == NULL || ipdevice->config != ipconfig)
+       if (ipdevice->config_ipv4 == NULL && ipdevice->config_ipv6 == NULL)
                return -EINVAL;
 
-       connman_ipaddress_clear(ipdevice->config->system);
+       if (ipdevice->config_ipv4 == ipconfig) {
+               ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
 
-       connman_ipconfig_unref(ipdevice->config);
-       ipdevice->config = NULL;
+               connman_ipaddress_clear(ipdevice->config_ipv4->system);
+               connman_ipconfig_unref(ipdevice->config_ipv4);
+               ipdevice->config_ipv4 = NULL;
+               return 0;
+       }
 
-       return 0;
+       if (ipdevice->config_ipv6 == ipconfig) {
+               ipconfig_list = g_list_remove(ipconfig_list, ipconfig);
+
+               connman_ipaddress_clear(ipdevice->config_ipv6->system);
+               connman_ipconfig_unref(ipdevice->config_ipv6);
+               ipdevice->config_ipv6 = NULL;
+               return 0;
+       }
+
+       return -EINVAL;
 }
 
 const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method)
@@ -936,6 +1404,8 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method
                return "manual";
        case CONNMAN_IPCONFIG_METHOD_DHCP:
                return "dhcp";
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               return "auto";
        }
 
        return NULL;
@@ -951,6 +1421,8 @@ enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method
                return CONNMAN_IPCONFIG_METHOD_MANUAL;
        else if (g_strcmp0(method, "dhcp") == 0)
                return CONNMAN_IPCONFIG_METHOD_DHCP;
+       else if (g_strcmp0(method, "auto") == 0)
+               return CONNMAN_IPCONFIG_METHOD_AUTO;
        else
                return CONNMAN_IPCONFIG_METHOD_UNKNOWN;
 }
@@ -960,6 +1432,11 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
 {
        const char *str;
 
+       DBG("");
+
+       if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
+               return;
+
        str = __connman_ipconfig_method2string(ipconfig->method);
        if (str == NULL)
                return;
@@ -983,6 +1460,82 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
                connman_dbus_dict_append_basic(iter, "Netmask",
                                                DBUS_TYPE_STRING, &mask);
        }
+
+       if (ipconfig->system->gateway != NULL)
+               connman_dbus_dict_append_basic(iter, "Gateway",
+                               DBUS_TYPE_STRING, &ipconfig->system->gateway);
+}
+
+void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig,
+                                                       DBusMessageIter *iter)
+{
+       const char *str;
+
+       DBG("");
+
+       if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+               return;
+
+       str = __connman_ipconfig_method2string(ipconfig->method);
+       if (str == NULL)
+               return;
+
+       connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
+
+       if (ipconfig->system == NULL)
+               return;
+
+       if (ipconfig->system->local != NULL) {
+               connman_dbus_dict_append_basic(iter, "Address",
+                               DBUS_TYPE_STRING, &ipconfig->system->local);
+               connman_dbus_dict_append_basic(iter, "PrefixLength",
+                                               DBUS_TYPE_BYTE,
+                                               &ipconfig->system->prefixlen);
+       }
+
+       if (ipconfig->system->gateway != NULL)
+               connman_dbus_dict_append_basic(iter, "Gateway",
+                               DBUS_TYPE_STRING, &ipconfig->system->gateway);
+}
+
+void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig,
+                                                       DBusMessageIter *iter)
+{
+       const char *str;
+
+       DBG("");
+
+       str = __connman_ipconfig_method2string(ipconfig->method);
+       if (str == NULL)
+               return;
+
+       connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
+
+       switch (ipconfig->method) {
+       case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+               return;
+       case CONNMAN_IPCONFIG_METHOD_FIXED:
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               break;
+       }
+
+       if (ipconfig->address == NULL)
+               return;
+
+       if (ipconfig->address->local != NULL) {
+               connman_dbus_dict_append_basic(iter, "Address",
+                               DBUS_TYPE_STRING, &ipconfig->address->local);
+               connman_dbus_dict_append_basic(iter, "PrefixLength",
+                                               DBUS_TYPE_BYTE,
+                                               &ipconfig->address->prefixlen);
+       }
+
+       if (ipconfig->address->gateway != NULL)
+               connman_dbus_dict_append_basic(iter, "Gateway",
+                               DBUS_TYPE_STRING, &ipconfig->address->gateway);
 }
 
 void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
@@ -990,6 +1543,8 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
 {
        const char *str;
 
+       DBG("");
+
        str = __connman_ipconfig_method2string(ipconfig->method);
        if (str == NULL)
                return;
@@ -1001,6 +1556,7 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
        case CONNMAN_IPCONFIG_METHOD_OFF:
        case CONNMAN_IPCONFIG_METHOD_FIXED:
        case CONNMAN_IPCONFIG_METHOD_DHCP:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
                return;
        case CONNMAN_IPCONFIG_METHOD_MANUAL:
                break;
@@ -1023,13 +1579,47 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
                connman_dbus_dict_append_basic(iter, "Netmask",
                                                DBUS_TYPE_STRING, &mask);
        }
+
+       if (ipconfig->address->gateway != NULL)
+               connman_dbus_dict_append_basic(iter, "Gateway",
+                               DBUS_TYPE_STRING, &ipconfig->address->gateway);
+}
+
+static void disable_ipv6(struct connman_ipconfig *ipconfig)
+{
+       struct connman_ipdevice *ipdevice;
+
+       DBG("");
+
+       ipdevice = g_hash_table_lookup(ipdevice_hash,
+                                       GINT_TO_POINTER(ipconfig->index));
+       if (ipdevice == NULL)
+               return;
+
+       set_ipv6_state(ipdevice->ifname, FALSE);
 }
 
-int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig,
+static void enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+       struct connman_ipdevice *ipdevice;
+
+       DBG("");
+
+       ipdevice = g_hash_table_lookup(ipdevice_hash,
+                                       GINT_TO_POINTER(ipconfig->index));
+       if (ipdevice == NULL)
+               return;
+
+       set_ipv6_state(ipdevice->ifname, TRUE);
+}
+
+int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
                                                        DBusMessageIter *array)
 {
        enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
-       const char *address = NULL, *netmask = NULL;
+       const char *address = NULL, *netmask = NULL, *gateway = NULL,
+                       *prefix_length_string = NULL;
+       int prefix_length = 0;
        DBusMessageIter dict;
 
        DBG("ipconfig %p", ipconfig);
@@ -1067,35 +1657,71 @@ int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig,
                                return -EINVAL;
 
                        dbus_message_iter_get_basic(&entry, &address);
+               } else if (g_str_equal(key, "PrefixLength") == TRUE) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&entry,
+                                                       &prefix_length_string);
+
+                       prefix_length = atoi(prefix_length_string);
+                       if (prefix_length < 0 || prefix_length > 128)
+                               return -EINVAL;
+
                } else if (g_str_equal(key, "Netmask") == TRUE) {
                        if (type != DBUS_TYPE_STRING)
                                return -EINVAL;
 
                        dbus_message_iter_get_basic(&entry, &netmask);
-               }
+               } else if (g_str_equal(key, "Gateway") == TRUE) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
 
+                       dbus_message_iter_get_basic(&entry, &gateway);
+               }
                dbus_message_iter_next(&dict);
        }
 
-       DBG("method %d address %s netmask %s", method, address, netmask);
+       DBG("method %d address %s netmask %s gateway %s prefix_length %d",
+                       method, address, netmask, gateway, prefix_length);
 
        switch (method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
        case CONNMAN_IPCONFIG_METHOD_FIXED:
                return -EINVAL;
 
+       case CONNMAN_IPCONFIG_METHOD_OFF:
+               ipconfig->method = method;
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+                       disable_ipv6(ipconfig);
+               break;
+
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
+               if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
+                       return -EINVAL;
+
+               ipconfig->method = method;
+               enable_ipv6(ipconfig);
+               break;
+
        case CONNMAN_IPCONFIG_METHOD_MANUAL:
                if (address == NULL)
                        return -EINVAL;
 
                ipconfig->method = method;
-               connman_ipaddress_set(ipconfig->address, address, netmask);
+
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                       connman_ipaddress_set_ipv4(ipconfig->address,
+                                               address, netmask, gateway);
+               else
+                       return connman_ipaddress_set_ipv6(
+                                       ipconfig->address, address,
+                                               gateway, prefix_length);
                break;
 
        case CONNMAN_IPCONFIG_METHOD_DHCP:
-               if (ipconfig->method == method)
-                       return 0;
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6)
+                       return -EOPNOTSUPP;
 
                ipconfig->method = method;
                break;
@@ -1104,38 +1730,149 @@ int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig,
        return 0;
 }
 
-int __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig,
+void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig,
                                                        DBusMessageIter *iter)
 {
+       struct connman_ipdevice *ipdevice;
        const char *method = "auto";
 
        connman_dbus_dict_append_basic(iter, "Method",
                                                DBUS_TYPE_STRING, &method);
 
-       if (ipconfig->eth != NULL)
+       ipdevice = g_hash_table_lookup(ipdevice_hash,
+                                       GINT_TO_POINTER(ipconfig->index));
+       if (ipdevice == NULL)
+               return;
+
+       if (ipdevice->ifname != NULL)
+               connman_dbus_dict_append_basic(iter, "Interface",
+                                       DBUS_TYPE_STRING, &ipdevice->ifname);
+
+       if (ipdevice->address != NULL)
                connman_dbus_dict_append_basic(iter, "Address",
-                                       DBUS_TYPE_STRING, &ipconfig->eth);
+                                       DBUS_TYPE_STRING, &ipdevice->address);
 
-       if (ipconfig->mtu > 0)
+       if (ipdevice->mtu > 0)
                connman_dbus_dict_append_basic(iter, "MTU",
-                                       DBUS_TYPE_UINT16, &ipconfig->mtu);
-
-       return 0;
+                                       DBUS_TYPE_UINT16, &ipdevice->mtu);
 }
 
 int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
                GKeyFile *keyfile, const char *identifier, const char *prefix)
 {
+       char *method;
+       char *key;
+
        DBG("ipconfig %p identifier %s", ipconfig, identifier);
 
+       key = g_strdup_printf("%smethod", prefix);
+       method = g_key_file_get_string(keyfile, identifier, key, NULL);
+       if (method == NULL) {
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                       ipconfig->method = CONNMAN_IPCONFIG_METHOD_DHCP;
+               else
+                       ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+       } else
+               ipconfig->method = __connman_ipconfig_string2method(method);
+
+       if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_UNKNOWN)
+               ipconfig->method = CONNMAN_IPCONFIG_METHOD_OFF;
+
+       if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV6) {
+               if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_OFF)
+                       disable_ipv6(ipconfig);
+               else if (ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO ||
+                       ipconfig->method == CONNMAN_IPCONFIG_METHOD_MANUAL) {
+                       enable_ipv6(ipconfig);
+                       __connman_ipconfig_enable(ipconfig);
+
+                       if (ipconfig->ops_data) {
+                               struct connman_service *service =
+                                                       ipconfig->ops_data;
+                               struct connman_network *network;
+                               network = __connman_service_get_network(
+                                                               service);
+                               if (network)
+                                       __connman_network_set_ipconfig(network,
+                                                       NULL, ipconfig);
+                       }
+               }
+       }
+
+       g_free(method);
+       g_free(key);
+
+       key = g_strdup_printf("%snetmask_prefixlen", prefix);
+       ipconfig->address->prefixlen = g_key_file_get_integer(
+                               keyfile, identifier, key, NULL);
+       g_free(key);
+
+       key = g_strdup_printf("%slocal_address", prefix);
+       ipconfig->address->local = g_key_file_get_string(
+                       keyfile, identifier, key, NULL);
+       g_free(key);
+
+       key = g_strdup_printf("%speer_address", prefix);
+       ipconfig->address->peer = g_key_file_get_string(
+                               keyfile, identifier, key, NULL);
+       g_free(key);
+
+       key = g_strdup_printf("%sbroadcast_address", prefix);
+       ipconfig->address->broadcast = g_key_file_get_string(
+                               keyfile, identifier, key, NULL);
+       g_free(key);
+
+       key = g_strdup_printf("%sgateway", prefix);
+       ipconfig->address->gateway = g_key_file_get_string(
+                               keyfile, identifier, key, NULL);
+       g_free(key);
+
        return 0;
 }
 
 int __connman_ipconfig_save(struct connman_ipconfig *ipconfig,
                GKeyFile *keyfile, const char *identifier, const char *prefix)
 {
+       const char *method;
+       char *key;
+
        DBG("ipconfig %p identifier %s", ipconfig, identifier);
 
+       method = __connman_ipconfig_method2string(ipconfig->method);
+
+       key = g_strdup_printf("%smethod", prefix);
+       g_key_file_set_string(keyfile, identifier, key, method);
+       g_free(key);
+
+       key = g_strdup_printf("%snetmask_prefixlen", prefix);
+       g_key_file_set_integer(keyfile, identifier,
+                       key, ipconfig->address->prefixlen);
+       g_free(key);
+
+       key = g_strdup_printf("%slocal_address", prefix);
+       if (ipconfig->address->local != NULL)
+               g_key_file_set_string(keyfile, identifier,
+                               key, ipconfig->address->local);
+       g_free(key);
+
+       key = g_strdup_printf("%speer_address", prefix);
+       if (ipconfig->address->peer != NULL)
+               g_key_file_set_string(keyfile, identifier,
+                               key, ipconfig->address->peer);
+       g_free(key);
+
+       key = g_strdup_printf("%sbroadcast_address", prefix);
+       if (ipconfig->address->broadcast != NULL)
+               g_key_file_set_string(keyfile, identifier,
+                       key, ipconfig->address->broadcast);
+       g_free(key);
+
+       key = g_strdup_printf("%sgateway", prefix);
+       if (ipconfig->address->gateway != NULL)
+               g_key_file_set_string(keyfile, identifier,
+                       key, ipconfig->address->gateway);
+       g_free(key);
+
        return 0;
 }