#define NET_DNS_ADDR_MAX 2
+#define MAX_WIFI_PROFILES 200
+
struct wifi_eap_config {
gchar *anonymous_identity;
gchar *ca_cert;
gchar *security_type;
gboolean favorite;
gboolean autoconnect;
+ GTimeVal modified;
gchar *is_hidden;
+ gboolean is_created;
gchar *proxy_address;
struct wifi_eap_config *eap_config;
wifi_ip_info_s *ip_info;
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) {
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;
ERR("Cannot remove [%s]", pathname);
return FALSE;
}
-
return TRUE;
}
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;
}
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);
DBG("is_hidden [%s]", config->is_hidden);
if (config->ip_info) {
+ GError *error = NULL;
config->ip_info->ip_type = g_key_file_get_string(keyfile, group_name,
- WIFI_CONFIG_IPV4_METHOD, NULL);
+ WIFI_CONFIG_IPV4_METHOD, NULL);
if (config->ip_info->ip_type)
DBG("IPv4.Method:%s", config->ip_info->ip_type);
config->ip_info->ip_address = g_key_file_get_string(keyfile, group_name,
- WIFI_CONFIG_IPV4_ADDRESS, NULL);
+ WIFI_CONFIG_IPV4_ADDRESS, NULL);
if (config->ip_info->ip_address)
DBG("IPv4.Address:%s", config->ip_info->ip_address);
struct in_addr netmask;
char *mask;
prefix_len = g_key_file_get_integer(keyfile, group_name,
- WIFI_CONFIG_IPV4_SUBNET_MASK, NULL);
- 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);
+ WIFI_CONFIG_IPV4_SUBNET_MASK, &error);
+ if (error != NULL) {
+ DBG("g_key_file_get_integer failed error[%d: %s]", error->code, error->message);
+ g_error_free(error);
+ } else {
+ 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);
+ }
config->ip_info->gateway_address = g_key_file_get_string(keyfile,
group_name, WIFI_CONFIG_IPV4_GATEWAY_ADDRESS, NULL);
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;
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;
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;
ret = FALSE;
}
- _save_configuration(config_id, keyfile);
+ wifi_config_save_configuration(config_id, keyfile);
g_key_file_free(keyfile);
g_free(group_name);
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;
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)
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));
} 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));
} 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));
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");
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");
g_key_file_set_boolean(keyfile, group_name, WIFI_CONFIG_FAVORITE, conf->favorite);
g_key_file_set_boolean(keyfile, group_name, WIFI_CONFIG_AUTOCONNECT, conf->autoconnect);
+ g_get_current_time(&conf->modified);
+ gchar *str = g_time_val_to_iso8601(&conf->modified);
+ if (str) {
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_MODIFIED, str);
+ g_free(str);
+ }
/* Optional field */
if (conf->proxy_address != NULL) {
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);
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);
+ char *file;
+ if (get_files_count(CONNMAN_STORAGE) > MAX_WIFI_PROFILES) {
+ file = get_least_recently_profile(CONNMAN_STORAGE);
+ if (file) {
+ gchar *profileName = g_strdup_printf(CONNMAN_STORAGE "/%s", file);
+ INFO("least modified file: %s", profileName);
+ if (profileName) {
+ if (__remove_configuration(profileName) != TRUE)
+ DBG("Failed to remove profile: [%s]", profileName);
+ } else
+ ERR("Profile: [%s] does not exist", profileName);
+
+ g_free(profileName);
+ }
+ }
} else {
INFO("Fail to save configuration [%s]", config_id);
netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailSaveConfiguration");
} 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));
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");
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");
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);
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");