ipconfig: Rename __connman_ipconfig_get_*(index)

[platform/upstream/connman.git] / src / ipconfig.c

diff --git a/src/ipconfig.c b/src/ipconfig.c
index 8ef564e..8bbe184 100644 (file)
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -77,6 +77,8 @@ struct connman_ipdevice {
 
        struct connman_ipconfig *config_ipv4;
        struct connman_ipconfig *config_ipv6;
+
+       gboolean ipv6_enabled;
 };
 
 static GHashTable *ipdevice_hash = NULL;
@@ -292,6 +294,35 @@ static const char *scope2str(unsigned char scope)
        return "";
 }
 
+static gboolean get_ipv6_state(gchar *ifname)
+{
+       int disabled;
+       gchar *path;
+       FILE *f;
+       gboolean enabled = FALSE;
+
+       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 (path == NULL)
+               return enabled;
+
+       f = fopen(path, "r");
+
+       g_free(path);
+
+       if (f != NULL) {
+               if (fscanf(f, "%d", &disabled) > 0)
+                       enabled = !disabled;
+               fclose(f);
+       }
+
+       return enabled;
+}
+
 static void set_ipv6_state(gchar *ifname, gboolean enable)
 {
        gchar *path;
@@ -344,6 +375,9 @@ static void free_ipdevice(gpointer data)
        g_free(ipdevice->pac);
 
        g_free(ipdevice->address);
+
+       set_ipv6_state(ipdevice->ifname, ipdevice->ipv6_enabled);
+
        g_free(ipdevice->ifname);
        g_free(ipdevice);
 }
@@ -439,6 +473,8 @@ void __connman_ipconfig_newlink(int index, unsigned short type,
        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);
@@ -646,7 +682,8 @@ void __connman_ipconfig_deladdr(int index, int family, 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);
@@ -816,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;
 
@@ -827,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;
 
@@ -838,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;
 
@@ -1735,6 +1778,27 @@ int __connman_ipconfig_load(struct connman_ipconfig *ipconfig,
        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);