ipconfig: Rename __connman_ipconfig_get_*(index)

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

diff --git a/src/ipconfig.c b/src/ipconfig.c
index 3610d46..8bbe184 100644 (file)
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <linux/if_link.h>
@@ -76,6 +77,8 @@ struct connman_ipdevice {
 
        struct connman_ipconfig *config_ipv4;
        struct connman_ipconfig *config_ipv6;
+
+       gboolean ipv6_enabled;
 };
 
 static GHashTable *ipdevice_hash = NULL;
@@ -291,6 +294,64 @@ 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;
+       FILE *f;
+
+       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;
+
+       f = fopen(path, "r+");
+
+       g_free(path);
+
+       if (f == NULL)
+               return;
+
+       if (enable == FALSE)
+               fprintf(f, "1");
+       else
+               fprintf(f, "0");
+
+       fclose(f);
+}
+
 static void free_ipdevice(gpointer data)
 {
        struct connman_ipdevice *ipdevice = data;
@@ -314,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);
 }
@@ -409,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);
@@ -616,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);
@@ -786,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;
 
@@ -797,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;
 
@@ -808,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;
 
@@ -852,7 +925,7 @@ static struct connman_ipconfig *create_ipv6config(int index)
 
        ipv6config->index = index;
        ipv6config->type = CONNMAN_IPCONFIG_TYPE_IPV6;
-       ipv6config->method = CONNMAN_IPCONFIG_METHOD_OFF;
+       ipv6config->method = CONNMAN_IPCONFIG_METHOD_AUTO;
 
        ipv6config->address = connman_ipaddress_alloc(AF_INET6);
        if (ipv6config->address == NULL) {
@@ -1512,8 +1585,36 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
                                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);
+}
+
+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,
-               enum connman_ipconfig_type type, DBusMessageIter *array)
+                                                       DBusMessageIter *array)
 {
        enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
        const char *address = NULL, *netmask = NULL, *gateway = NULL,
@@ -1521,11 +1622,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
        int prefix_length = 0;
        DBusMessageIter dict;
 
-       DBG("ipconfig %p type %d", ipconfig, type);
-
-       if (type != CONNMAN_IPCONFIG_TYPE_IPV4 &&
-                       type != CONNMAN_IPCONFIG_TYPE_IPV6)
-               return -EINVAL;
+       DBG("ipconfig %p", ipconfig);
 
        if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
                return -EINVAL;
@@ -1590,18 +1687,30 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
 
        switch (method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-       case CONNMAN_IPCONFIG_METHOD_OFF:
        case CONNMAN_IPCONFIG_METHOD_FIXED:
-       case CONNMAN_IPCONFIG_METHOD_AUTO:
                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;
 
-               if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
                        connman_ipaddress_set_ipv4(ipconfig->address,
                                                address, netmask, gateway);
                else
@@ -1611,8 +1720,8 @@ int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
                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;
@@ -1669,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);