*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <dirent.h>
g_free(conf->security_type);
g_free(conf->is_hidden);
g_free(conf->proxy_address);
+ g_free(conf->last_error);
if (conf->eap_config) {
g_free(conf->eap_config->anonymous_identity);
g_free(conf->eap_config->ca_cert);
gchar *tmp = NULL;
gchar mac[13] = { 0, };
gint i = 0, j = 0;
-#if defined TIZEN_TV
- FILE *fp = NULL;
- char buf[WIFI_MAC_ADD_LENGTH + 1];
- if (0 == access(WIFI_MAC_ADD_PATH, F_OK))
- fp = fopen(WIFI_MAC_ADD_PATH, "r");
-
- if (fp == NULL) {
- ERR("Failed to open file %s\n", WIFI_MAC_ADD_PATH);
- *mac_address = NULL;
- return FALSE;
- }
- if (fgets(buf, sizeof(buf), fp) == NULL) {
- ERR("Failed to get MAC info from %s\n", WIFI_MAC_ADD_PATH);
- *mac_address = NULL;
- fclose(fp);
- return FALSE;
- }
- tmp_mac = (char *)g_try_malloc0(WIFI_MAC_ADD_LENGTH + 1);
- if (tmp_mac == NULL) {
- ERR("malloc() failed");
- *mac_address = NULL;
+ if (TIZEN_TV) {
+ FILE *fp = NULL;
+ char buf[WIFI_MAC_ADD_LENGTH + 1];
+ if (0 == access(WIFI_MAC_ADD_PATH, F_OK))
+ fp = fopen(WIFI_MAC_ADD_PATH, "r");
+
+ if (fp == NULL) {
+ ERR("Failed to open file %s\n", WIFI_MAC_ADD_PATH);
+ *mac_address = NULL;
+ return FALSE;
+ }
+
+ if (fgets(buf, sizeof(buf), fp) == NULL) {
+ ERR("Failed to get MAC info from %s\n", WIFI_MAC_ADD_PATH);
+ *mac_address = NULL;
+ fclose(fp);
+ return FALSE;
+ }
+ tmp_mac = (gchar *)malloc(WIFI_MAC_ADD_LENGTH + 1);
+ if (tmp_mac == NULL) {
+ ERR("malloc() failed");
+ *mac_address = NULL;
+ fclose(fp);
+ return FALSE;
+ }
+ memset(tmp_mac, 0, WIFI_MAC_ADD_LENGTH + 1);
+ g_strlcpy(tmp_mac, buf, WIFI_MAC_ADD_LENGTH + 1);
fclose(fp);
- return FALSE;
- }
- g_strlcpy(tmp_mac, buf, WIFI_MAC_ADD_LENGTH + 1);
- fclose(fp);
-#else
- tmp_mac = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
- if (tmp_mac == NULL) {
- ERR("vconf_get_str(WIFI_BSSID_ADDRESS) Failed");
- *mac_address = NULL;
- return FALSE;
+ } else {
+ tmp_mac = vconf_get_str(VCONFKEY_WIFI_BSSID_ADDRESS);
+ if (tmp_mac == NULL) {
+ ERR("vconf_get_str(WIFI_BSSID_ADDRESS) Failed");
+ *mac_address = NULL;
+ return FALSE;
+ }
}
-#endif
tmp = g_ascii_strdown(tmp_mac, (gssize)strlen(tmp_mac));
- g_free(tmp_mac);
- while (tmp[i]) {
+ free(tmp_mac);
+ while (tmp && tmp[i]) {
if (tmp[i] != ':')
mac[j++] = tmp[i];
i++;
keyfile = netconfig_keyfile_load(path);
if (keyfile == NULL) {
ERR("keyfile[%s] is NULL", path);
- g_free(path);
}
+ g_free(path);
+
return keyfile;
}
}
config->name = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_NAME, NULL);
+ DBG("name [%s]", config->name);
+
ret = __get_security_type(config_id, &config->security_type);
if (ret != TRUE) {
ERR("Fail to _get_security_type");
g_free(group_name);
return FALSE;
}
+ DBG("security_type [%s]", config->security_type);
+
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);
+
hidden = g_key_file_get_boolean(keyfile, group_name, WIFI_CONFIG_HIDDEN, NULL);
if (hidden)
config->is_hidden = g_strdup("TRUE");
else
config->is_hidden = g_strdup("FALSE");
+ DBG("is_hidden [%s]", config->is_hidden);
if (g_strcmp0(config->security_type, WIFI_SECURITY_EAP) == 0) {
config->eap_config->anonymous_identity = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_ANONYMOUS_IDENTITY, NULL);
config->eap_config->eap_type = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_TYPE, NULL);
config->eap_config->eap_auth_type = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_AUTH_TYPE, NULL);
config->eap_config->subject_match = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_EAP_SUBJECT_MATCH, NULL);
+
+ if (config->eap_config->anonymous_identity)
+ DBG("anonymous_identity [%s]", config->eap_config->anonymous_identity);
+ if (config->eap_config->ca_cert)
+ DBG("ca_cert [%s]", config->eap_config->ca_cert);
+ if (config->eap_config->client_cert)
+ DBG("client_cert [%s]", config->eap_config->client_cert);
+ if (config->eap_config->private_key)
+ DBG("private_key [%s]", config->eap_config->private_key);
+ if (config->eap_config->identity)
+ DBG("identity [%s]", config->eap_config->identity);
+ if (config->eap_config->eap_type)
+ DBG("eap_type [%s]", config->eap_config->eap_type);
+ if (config->eap_config->eap_auth_type)
+ DBG("eap_auth_type [%s]", config->eap_config->eap_auth_type);
+ if (config->eap_config->subject_match)
+ DBG("subject_match [%s]", config->eap_config->subject_match);
}
config->last_error = g_key_file_get_string(keyfile, group_name, WIFI_CONFIG_FAILURE, NULL);
+ if (config->last_error)
+ DBG("last_error [%s]", config->last_error);
g_key_file_free(keyfile);
g_free(group_name);
keyfile = __get_configuration_keyfile(group_name);
if (keyfile == NULL) {
ERR("Fail to __get_configuration_keyfile");
+ g_free(group_name);
return FALSE;
}
keyfile = __get_configuration_keyfile(group_name);
if (keyfile == NULL) {
ERR("Fail to __get_configuration_keyfile");
+ g_free(group_name);
return FALSE;
}
static GSList *_get_list(void)
{
GSList *list = NULL;
- struct dirent ent_struct;
struct dirent *dp = NULL;
DIR *dir;
return NULL;
}
- while ((readdir_r(dir, &ent_struct, &dp) == 0) && dp) {
+ while ((dp = readdir(dir)) != NULL) {
if (g_strcmp0(dp->d_name, ".") == 0 || g_strcmp0(dp->d_name, "..") == 0 ||
strncmp(dp->d_name, WIFI_CONFIG_PREFIX, strlen(WIFI_CONFIG_PREFIX)) != 0) {
continue;
wifi_complete_get_config_ids(wifi, context, (const gchar * const *)result);
+ for (i = 0; i < length; i++)
+ if (result[i])
+ g_free(result[i]);
+
if (result)
g_free(result);
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_HIDDEN, g_variant_new_string(conf->is_hidden));
- if (conf->proxy_address != NULL) {
+
+ if (conf->proxy_address != NULL)
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_PROXYADDRESS, g_variant_new_string(conf->proxy_address));
- g_free(conf->proxy_address);
- } else {
+ else
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_PROXYADDRESS, g_variant_new_string("NONE"));
- }
- if (conf->last_error != NULL) {
+
+ if (conf->last_error != NULL)
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_FAILURE, g_variant_new_string(conf->last_error));
- g_free(conf->last_error);
- } else {
+ else
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_FAILURE, g_variant_new_string("ERROR_NONE"));
- }
+ g_free(conf->proxy_address);
+ g_free(conf->last_error);
g_free(conf->name);
g_free(conf->security_type);
g_free(conf->is_hidden);
if ((wifi == NULL) || (config_id == NULL) || (configuration == NULL)) {
ERR("Invalid parameter");
netconfig_error_invalid_parameter(context);
- SLOG(LOG_INFO, "MDM_LOG_USER", "Object=wifi-profile, AccessType=Create, Result=Failed");
return FALSE;
}
- ERR("save_configuration [%s]", config_id);
-
conf = g_new0(struct wifi_config, 1);
g_variant_get(configuration, "a{sv}", &iter);
if (g_strcmp0(field, WIFI_CONFIG_NAME) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->name = g_strdup(g_variant_get_string(value, NULL));
- ERR("name [%s]", conf->name);
+ DBG("name [%s]", conf->name);
} else {
conf->name = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_SSID) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->ssid = g_strdup(g_variant_get_string(value, NULL));
- ERR("ssid [%s]", conf->ssid);
+ DBG("ssid [%s]", conf->ssid);
} else {
conf->ssid = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_PASSPHRASE) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->passphrase = g_strdup(g_variant_get_string(value, NULL));
- ERR("passphrase []");
+ DBG("passphrase []");
} else {
conf->passphrase = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_HIDDEN) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->is_hidden = g_strdup(g_variant_get_string(value, NULL));
- ERR("is_hidden [%s]", conf->is_hidden);
+ DBG("is_hidden [%s]", conf->is_hidden);
} else {
conf->is_hidden = NULL;
}
} 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));
- ERR("proxy_address [%s]", conf->proxy_address);
+ DBG("proxy_address [%s]", conf->proxy_address);
} else {
conf->proxy_address = NULL;
}
ret = __get_group_name(WIFI_CONFIG_PREFIX, config_id, &group_name);
if (ret != TRUE) {
+ g_free(conf->name);
+ g_free(conf->ssid);
+ g_free(conf->passphrase);
+ g_free(conf->is_hidden);
+ g_free(conf->proxy_address);
+ g_free(conf);
ERR("Fail to get_wifi_config_group_name");
return FALSE;
}
ret = _save_configuration(config_id, keyfile);
if (ret == TRUE) {
- SLOG(LOG_INFO, "MDM_LOG_USER", "Object=wifi-profile, AccessType=Create, Result=Succeed");
+ INFO("Success to save configuration [%s]", config_id);
wifi_complete_save_configuration(wifi, context);
} else {
- SLOG(LOG_INFO, "MDM_LOG_USER", "Object=wifi-profile, AccessType=Create, Result=Failed");
+ INFO("Fail to save configuration [%s]", config_id);
netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailSaveConfiguration");
}
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_HIDDEN, g_variant_new_string(conf->is_hidden));
- if (conf->proxy_address != NULL) {
+ if (conf->proxy_address != NULL)
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_PROXYADDRESS, g_variant_new_string(conf->proxy_address));
- g_free(conf->proxy_address);
- } else
+ else
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_PROXYADDRESS, g_variant_new_string("NONE"));
- if (conf->last_error != NULL) {
+ if (conf->last_error != NULL)
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_FAILURE, g_variant_new_string(conf->last_error));
- g_free(conf->last_error);
- } else
+ else
g_variant_builder_add(b, "{sv}", WIFI_CONFIG_FAILURE, g_variant_new_string("ERROR_NONE"));
if (conf->eap_config != NULL) {
if ((wifi == NULL) || (config_id == NULL) || (configuration == NULL)) {
ERR("Invalid parameter");
netconfig_error_invalid_parameter(context);
- SLOG(LOG_INFO, "MDM_LOG_USER", "Object=wifi-profile, AccessType=Create, Result=Failed");
return FALSE;
}
- INFO("save [%s]", config_id);
-
conf = g_new0(struct wifi_config, 1);
conf->eap_config = g_new0(struct wifi_eap_config, 1);
if (g_strcmp0(field, WIFI_CONFIG_NAME) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->name = g_strdup(g_variant_get_string(value, NULL));
- ERR("name [%s]", conf->name);
+ DBG("name [%s]", conf->name);
} else {
conf->name = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_SSID) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->ssid = g_strdup(g_variant_get_string(value, NULL));
- ERR("ssid [%s]", conf->ssid);
+ DBG("ssid [%s]", conf->ssid);
} else {
conf->ssid = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_PASSPHRASE) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->passphrase = g_strdup(g_variant_get_string(value, NULL));
- ERR("passphrase [%s]", conf->passphrase);
+ DBG("passphrase [%s]", conf->passphrase);
} else {
conf->passphrase = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_HIDDEN) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->is_hidden = g_strdup(g_variant_get_string(value, NULL));
- ERR("is_hidden [%s]", conf->is_hidden);
+ DBG("is_hidden [%s]", conf->is_hidden);
} else {
conf->is_hidden = NULL;
}
} 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));
- ERR("proxy_address [%s]", conf->proxy_address);
+ DBG("proxy_address [%s]", conf->proxy_address);
} else {
conf->proxy_address = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_ANONYMOUS_IDENTITY) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->anonymous_identity = g_strdup(g_variant_get_string(value, NULL));
- ERR("anonymous_identity [%s]", conf->eap_config->anonymous_identity);
+ DBG("anonymous_identity [%s]", conf->eap_config->anonymous_identity);
} else {
conf->eap_config->anonymous_identity = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_CACERT) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->ca_cert = g_strdup(g_variant_get_string(value, NULL));
- ERR("ca_cert [%s]", conf->eap_config->ca_cert);
+ DBG("ca_cert [%s]", conf->eap_config->ca_cert);
} else {
conf->eap_config->ca_cert = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_CLIENTCERT) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->client_cert = g_strdup(g_variant_get_string(value, NULL));
- ERR("client_cert [%s]", conf->eap_config->client_cert);
+ DBG("client_cert [%s]", conf->eap_config->client_cert);
} else {
conf->eap_config->client_cert = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_PRIVATEKEY) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->private_key = g_strdup(g_variant_get_string(value, NULL));
- ERR("private_key [%s]", conf->eap_config->private_key);
+ DBG("private_key [%s]", conf->eap_config->private_key);
} else {
conf->eap_config->private_key = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_IDENTITY) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->identity = g_strdup(g_variant_get_string(value, NULL));
- ERR("identity [%s]", conf->eap_config->identity);
+ DBG("identity [%s]", conf->eap_config->identity);
} else {
conf->eap_config->identity = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_TYPE) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->eap_type = g_strdup(g_variant_get_string(value, NULL));
- ERR("eap_type [%s]", conf->eap_config->eap_type);
+ DBG("eap_type [%s]", conf->eap_config->eap_type);
} else {
conf->eap_config->eap_type = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_AUTH_TYPE) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->eap_auth_type = g_strdup(g_variant_get_string(value, NULL));
- ERR("eap_auth_type [%s]", conf->eap_config->eap_auth_type);
+ DBG("eap_auth_type [%s]", conf->eap_config->eap_auth_type);
} else {
conf->eap_config->eap_auth_type = NULL;
}
} else if (g_strcmp0(field, WIFI_CONFIG_EAP_SUBJECT_MATCH) == 0) {
if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) {
conf->eap_config->subject_match = g_strdup(g_variant_get_string(value, NULL));
- ERR("subject_match [%s]", conf->eap_config->subject_match);
+ DBG("subject_match [%s]", conf->eap_config->subject_match);
} else {
conf->eap_config->subject_match = NULL;
}
g_key_file_set_boolean(keyfile, group_name, WIFI_CONFIG_HIDDEN, hidden);
}
+ if (conf->eap_config->anonymous_identity != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_ANONYMOUS_IDENTITY, conf->eap_config->anonymous_identity);
+
+ if (conf->eap_config->ca_cert != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_CACERT, conf->eap_config->ca_cert);
+
+ if (conf->eap_config->client_cert != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_CLIENTCERT, conf->eap_config->client_cert);
+
+ if (conf->eap_config->private_key != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_PRIVATEKEY, conf->eap_config->private_key);
+
+ if (conf->eap_config->identity != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_IDENTITY, conf->eap_config->identity);
+
+ if (conf->eap_config->eap_type != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_TYPE, conf->eap_config->eap_type);
+
+ if (conf->eap_config->eap_auth_type != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_AUTH_TYPE, conf->eap_config->eap_auth_type);
+
+ if (conf->eap_config->subject_match != NULL)
+ g_key_file_set_string(keyfile, group_name,
+ WIFI_CONFIG_EAP_SUBJECT_MATCH, conf->eap_config->subject_match);
+
ret = _save_configuration(config_id, keyfile);
if (ret == TRUE) {
- SLOG(LOG_INFO, "MDM_LOG_USER", "Object=wifi-profile, AccessType=Create, Result=Succeed");
+ INFO("Success to save eap configuration [%s]", config_id);
wifi_complete_save_eap_configuration(wifi, context);
} else {
- SLOG(LOG_INFO, "MDM_LOG_USER", "Object=wifi-profile, AccessType=Create, Result=Failed");
+ INFO("Fail to save eap configuration [%s]", config_id);
netconfig_error_dbus_method_return(context, NETCONFIG_ERROR_INTERNAL, "FailSaveEapConfiguration");
}
projects / platform / core / connectivity / net-config.git / blobdiff