From: hyunuktak Date: Wed, 5 Oct 2016 02:30:56 +0000 (+0900) Subject: Modify to load configurations X-Git-Tag: accepted/tizen/3.0/common/20161114.105354^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bd88ba31ec168cf4bb3f1fa6a022a9261fee71d;hp=3dad6b6c62cb081b93943b4c9f13a90f89b22d4e;p=platform%2Fcore%2Fapi%2Fwifi.git Modify to load configurations When there is configuration ID without settings file, it is not error, just no profile. Change-Id: Id2767c5d436ddef95d1f65697ca9814c715fc7e1 Signed-off-by: hyunuktak --- diff --git a/packaging/capi-network-wifi.spec b/packaging/capi-network-wifi.spec index 9005f0e..6dac075 100755 --- a/packaging/capi-network-wifi.spec +++ b/packaging/capi-network-wifi.spec @@ -1,6 +1,6 @@ Name: capi-network-wifi Summary: Network Wi-Fi library in TIZEN C API -Version: 1.0.81 +Version: 1.0.82 Release: 1 Group: System/Network License: Apache-2.0 diff --git a/src/net_wifi_config.c b/src/net_wifi_config.c index d25e499..20c80c4 100755 --- a/src/net_wifi_config.c +++ b/src/net_wifi_config.c @@ -302,28 +302,27 @@ EXPORT_API int wifi_config_foreach_configuration(wifi_config_list_cb callback, v if (ret != WIFI_ERROR_NONE) { WIFI_LOG(WIFI_ERROR, "Fail to load configurations [%d]", ret); //LCOV_EXCL_LINE - return ret; //LCOV_EXCL_LINE - } + } else { + h->address_family = WIFI_ADDRESS_FAMILY_IPV4; + h->is_saved = TRUE; + rv = callback((wifi_config_h)h, user_data); + g_free(h->name); + g_free(h->proxy_address); + if (h->eap_config) { + g_free(h->eap_config->ca_cert); + g_free(h->eap_config->client_cert); + g_free(h->eap_config->private_key); + g_free(h->eap_config->anonymous_identity); + g_free(h->eap_config->identity); + g_free(h->eap_config->subject_match); + g_free(h->eap_config); + } + g_free(h); + h = NULL; - h->address_family = WIFI_ADDRESS_FAMILY_IPV4; - h->is_saved = TRUE; - rv = callback((wifi_config_h)h, user_data); - g_free(h->name); - g_free(h->proxy_address); - if (h->eap_config) { - g_free(h->eap_config->ca_cert); - g_free(h->eap_config->client_cert); - g_free(h->eap_config->private_key); - g_free(h->eap_config->anonymous_identity); - g_free(h->eap_config->identity); - g_free(h->eap_config->subject_match); - g_free(h->eap_config); + if (rv == false) + break; } - g_free(h); - h = NULL; - - if (rv == false) - break; config_ids = config_ids->next; } @@ -331,7 +330,7 @@ EXPORT_API int wifi_config_foreach_configuration(wifi_config_list_cb callback, v config_ids = g_slist_nth(config_ids, 0); g_slist_free_full(config_ids, g_free); - return ret; + return WIFI_ERROR_NONE; } EXPORT_API int wifi_config_get_name(wifi_config_h config, char **name)