Merge "Using updated clatd's Dbus interface and Path values" into tizen

[platform/core/connectivity/net-config.git] / src / wifi-config.c

diff --git a/src/wifi-config.c b/src/wifi-config.c
index 3b01143..48b898d 100755 (executable)
--- a/src/wifi-config.c
+++ b/src/wifi-config.c
@@ -86,6 +86,7 @@ struct wifi_config {
        gboolean favorite;
        gboolean autoconnect;
        gchar *is_hidden;
+       gboolean is_created;
        gchar *proxy_address;
        struct wifi_eap_config *eap_config;
        wifi_ip_info_s *ip_info;
@@ -123,6 +124,7 @@ static void __free_wifi_configuration(struct wifi_config *conf)
                g_free(conf->ip_info->subnet_mask);
                g_free(conf->ip_info->gateway_address);
                g_free(conf->ip_info->dns_type);
+               conf->ip_info->prefix_length = 0;
 
                int i = 0, count = conf->ip_info->dns_count;
                while (i < count) {
@@ -191,7 +193,7 @@ static gboolean __get_mac_address(gchar **mac_address)
        return TRUE;
 }
 
-static gboolean __get_group_name(const gchar *prefix, const gchar *config_id, gchar **group_name)
+gboolean wifi_config_get_group_name(const gchar *prefix, const gchar *config_id, gchar **group_name)
 {
        gchar *mac_address = NULL;
        gchar *g_name = NULL;
@@ -310,7 +312,7 @@ static gboolean _load_configuration(const gchar *config_id, struct wifi_config *
        gboolean hidden = FALSE;
        gboolean ret = FALSE;
 
-       ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
+       ret = wifi_config_get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
        if (ret != TRUE) {
                ERR("Fail to get_wifi_config_group_name");
                return FALSE;
@@ -335,6 +337,9 @@ static gboolean _load_configuration(const gchar *config_id, struct wifi_config *
        }
        DBG("security_type [%s]", config->security_type);
 
+       config->passphrase = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_PASSPHRASE, NULL);
+       DBG("passphrase []");
+
        config->proxy_address = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_PROXY_SERVER, NULL);
        if (config->proxy_address)
                DBG("proxy_address [%s]", config->proxy_address);
@@ -368,10 +373,12 @@ static gboolean _load_configuration(const gchar *config_id, struct wifi_config *
                        DBG("g_key_file_get_integer failed error[%d: %s]", error->code, error->message);
                        g_error_free(error);
                } else {
-                       addr = 0xffffffff << (32 - prefix_len);
-                       netmask.s_addr = htonl(addr);
-                       mask = inet_ntoa(netmask);
-                       config->ip_info->subnet_mask = g_strdup(mask);
+                       if (prefix_len > 0 && prefix_len < 32) {
+                               addr = 0xffffffff << (32 - prefix_len);
+                               netmask.s_addr = htonl(addr);
+                               mask = inet_ntoa(netmask);
+                               config->ip_info->subnet_mask = g_strdup(mask);
+                       }
                        if (config->ip_info->subnet_mask)
                                DBG("IPv4.SubnetMask:%s", config->ip_info->subnet_mask);
                }
@@ -446,14 +453,14 @@ static gboolean _load_configuration(const gchar *config_id, struct wifi_config *
        return TRUE;
 }
 
-static gboolean _save_configuration(const gchar *config_id, GKeyFile *keyfile)
+gboolean wifi_config_save_configuration(const gchar *config_id, GKeyFile *keyfile)
 {
        gchar *dir;
        gchar *path;
        gchar *group_name;
        gboolean ret = FALSE;
 
-       ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
+       ret = wifi_config_get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
        if (ret != TRUE) {
                ERR("Fail to get_wifi_config_group_name");
                return FALSE;
@@ -491,7 +498,7 @@ static gboolean _remove_configuration(const gchar *config_id)
        gchar *dir;
        gchar *group_name;
 
-       ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
+       ret = wifi_config_get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
        if (ret != TRUE) {
                ERR("Fail to get_wifi_config_group_name");
                return FALSE;
@@ -523,7 +530,7 @@ static gboolean _set_field(const gchar *config_id, const gchar *key, const gchar
        GKeyFile *keyfile;
        gchar *group_name;
 
-       ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
+       ret = wifi_config_get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
        if (ret != TRUE) {
                ERR("Fail to get_wifi_config_group_name");
                return FALSE;
@@ -567,7 +574,7 @@ static gboolean _set_field(const gchar *config_id, const gchar *key, const gchar
                ret = FALSE;
        }
 
-       _save_configuration(config_id, keyfile);
+       wifi_config_save_configuration(config_id, keyfile);
 
        g_key_file_free(keyfile);
        g_free(group_name);
@@ -583,7 +590,7 @@ static gboolean _get_field(const gchar *config_id, const gchar *key, gchar **val
        gboolean hidden = FALSE;
        gboolean ret = FALSE;
 
-       ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
+       ret = wifi_config_get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
        if (ret != TRUE) {
                ERR("Fail to get_wifi_config_group_name");
                return FALSE;
@@ -1069,6 +1076,7 @@ gboolean handle_load_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        b = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
        g_variant_builder_add(b, "{sv}", WIFI_CONFIG_NAME, g_variant_new_string(conf->name));
        g_variant_builder_add(b, "{sv}", WIFI_CONFIG_SECURITY_TYPE, g_variant_new_string(conf->security_type));
+       g_variant_builder_add(b, "{sv}", WIFI_CONFIG_PASSPHRASE, g_variant_new_string(conf->passphrase));
        g_variant_builder_add(b, "{sv}", WIFI_CONFIG_HIDDEN, g_variant_new_string(conf->is_hidden));
 
        if (conf->proxy_address != NULL)
@@ -1085,6 +1093,9 @@ gboolean handle_load_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        if (conf->ip_info->subnet_mask != NULL)
                g_variant_builder_add(b, "{sv}", WIFI_CONFIG_IPV4_SUBNET_MASK, g_variant_new_string(conf->ip_info->subnet_mask));
 
+       if (conf->ip_info->prefix_length > 0)
+               g_variant_builder_add(b, "{sv}", WIFI_CONFIG_IPV6_PREFIX_LEN, g_variant_new_int32(conf->ip_info->prefix_length));
+
        if (conf->ip_info->gateway_address != NULL)
                g_variant_builder_add(b, "{sv}", WIFI_CONFIG_IPV4_GATEWAY_ADDRESS, g_variant_new_string(conf->ip_info->gateway_address));
 
@@ -1186,6 +1197,13 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                        } else {
                                conf->is_hidden = NULL;
                        }
+               } else if (g_strcmp0(field, WIFI_CONFIG_CREATED) == 0) {
+                       if (g_variant_is_of_type(value, G_VARIANT_TYPE_BOOLEAN)) {
+                               conf->is_created = g_variant_get_boolean(value);
+                               DBG("is_created [%d]", conf->is_created);
+                       } else {
+                               conf->is_created = FALSE;
+                       }
                } else if (g_strcmp0(field, WIFI_CONFIG_IPV4_METHOD) == 0) {
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                conf->ip_info->ip_type = g_strdup(g_variant_get_string(value, NULL));
@@ -1207,6 +1225,13 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                        } else {
                                conf->ip_info->subnet_mask = NULL;
                        }
+               } else if (g_strcmp0(field, WIFI_CONFIG_IPV6_PREFIX_LEN) == 0) {
+                       if (g_variant_is_of_type(value, G_VARIANT_TYPE_INT32)) {
+                               conf->ip_info->prefix_length = g_variant_get_int32(value);
+                               DBG("IPv6 Prefix Length [%d]", conf->ip_info->prefix_length);
+                       } else {
+                               conf->ip_info->prefix_length = 0;
+                       }
                } else if (g_strcmp0(field, WIFI_CONFIG_IPV4_GATEWAY_ADDRESS) == 0) {
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                conf->ip_info->gateway_address = g_strdup(g_variant_get_string(value, NULL));
@@ -1242,7 +1267,7 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        conf->favorite = TRUE;
        conf->autoconnect = TRUE;
 
-       ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
+       ret = wifi_config_get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
        if (ret != TRUE) {
                __free_wifi_configuration(conf);
                ERR("Fail to get_wifi_config_group_name");
@@ -1256,7 +1281,11 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
 
        if (conf->passphrase != NULL) {
                gchar *enc_data = NULL;
-               enc_data = _netconfig_encrypt_passphrase(conf->passphrase);
+
+               if (conf->is_created == true)
+                       enc_data = _netconfig_encrypt_passphrase(conf->passphrase);
+               else
+                       enc_data = g_strdup(conf->passphrase);
 
                if (!enc_data) {
                        ERR("Failed to encrypt the passphrase");
@@ -1295,11 +1324,16 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
        if (conf->ip_info->subnet_mask != NULL) {
                unsigned char prefix_len;
                prefix_len = __netconfig_convert_netmask_to_prefixlen(
-                                                                 conf->ip_info->subnet_mask);
-               g_key_file_set_integer(keyfile, group_name,
-                                                WIFI_CONFIG_IPV4_SUBNET_MASK, prefix_len);
+                               conf->ip_info->subnet_mask);
+               if (prefix_len > 0 && prefix_len < 32)
+                       g_key_file_set_integer(keyfile, group_name,
+                                       WIFI_CONFIG_IPV4_SUBNET_MASK, prefix_len);
        }
 
+       if (conf->ip_info->prefix_length > 0)
+               g_key_file_set_integer(keyfile, group_name,
+                               WIFI_CONFIG_IPV6_PREFIX_LEN, conf->ip_info->prefix_length);
+
        if (conf->ip_info->gateway_address != NULL)
                g_key_file_set_string(keyfile, group_name,
                        WIFI_CONFIG_IPV4_GATEWAY_ADDRESS, conf->ip_info->gateway_address);
@@ -1317,7 +1351,7 @@ gboolean handle_save_configuration(Wifi *wifi, GDBusMethodInvocation *context,
                i += 1;
        }
 
-       ret = _save_configuration(config_id, keyfile);
+       ret = wifi_config_save_configuration(config_id, keyfile);
        if (ret == TRUE) {
                INFO("Success to save configuration [%s]", config_id);
                wifi_complete_save_configuration(wifi, context);
@@ -1476,6 +1510,13 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
                        } else {
                                conf->is_hidden = NULL;
                        }
+               } else if (g_strcmp0(field, WIFI_CONFIG_CREATED) == 0) {
+                       if (g_variant_is_of_type(value, G_VARIANT_TYPE_BOOLEAN)) {
+                               conf->is_created = g_variant_get_boolean(value);
+                               DBG("is_created [%d]", conf->is_created);
+                       } else {
+                               conf->is_created = FALSE;
+                       }
                } else if (g_strcmp0(field, WIFI_CONFIG_PROXYADDRESS) == 0) {
                        if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
                                conf->proxy_address = g_strdup(g_variant_get_string(value, NULL));
@@ -1551,7 +1592,7 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
        conf->favorite = TRUE;
        conf->autoconnect = TRUE;
 
-       ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
+       ret = wifi_config_get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
        if (ret != TRUE) {
                __free_wifi_configuration(conf);
                ERR("Fail to get_wifi_config_group_name");
@@ -1564,7 +1605,11 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
 
        if (conf->passphrase != NULL) {
                gchar *enc_data = NULL;
-               enc_data = _netconfig_encrypt_passphrase(conf->passphrase);
+
+               if (conf->is_created == true)
+                       enc_data = _netconfig_encrypt_passphrase(conf->passphrase);
+               else
+                       enc_data = g_strdup(conf->passphrase);
 
                if (!enc_data) {
                        ERR("Failed to encrypt the passphrase");
@@ -1627,7 +1672,7 @@ gboolean handle_save_eap_configuration(Wifi *wifi, GDBusMethodInvocation *contex
                g_key_file_set_string(keyfile, group_name,
                        WIFI_CONFIG_EAP_SUBJECT_MATCH, conf->eap_config->subject_match);
 
-       ret = _save_configuration(config_id, keyfile);
+       ret = wifi_config_save_configuration(config_id, keyfile);
        if (ret == TRUE) {
                INFO("Success to save eap configuration [%s]", config_id);
                wifi_complete_save_eap_configuration(wifi, context);
@@ -1697,7 +1742,7 @@ gboolean handle_set_config_field(Wifi *wifi, GDBusMethodInvocation *context,
        g_return_val_if_fail(config_id != NULL, TRUE);
        g_return_val_if_fail(key != NULL, TRUE);
 
-       DBG("Key[%s] Value[%d]", key, value);
+       DBG("Key[%s] Value[%s]", key, value);
 
        if (g_strcmp0(key, WIFI_CONFIG_PROXYADDRESS) == 0) {
                ret = _set_field(config_id, WIFI_CONFIG_PROXY_METHOD, "manual");