From: hyunuk.tak Date: Mon, 5 Oct 2020 23:38:03 +0000 (+0900) Subject: Modify parameter to delete eap profile appropriately X-Git-Tag: submit/tizen/20201008.064833~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61e33516132a0dc8b17d3d5d971dbc20ee2cfc17;p=platform%2Fcore%2Fapi%2Fwifi-manager.git Modify parameter to delete eap profile appropriately Change-Id: I07cc6922b3c057ad45d52c064ee2178fa062348e --- diff --git a/include/network_info.h b/include/network_info.h index 3e44192..f576829 100755 --- a/include/network_info.h +++ b/include/network_info.h @@ -75,7 +75,7 @@ typedef enum { typedef struct { net_event_e Event; /** CM Asynchronous event */ - char ProfileName[NET_PROFILE_NAME_LEN_MAX+1]; /** Profile Identifier corresponding to the event */ + char ProfileName[NET_PROFILE_NAME_LEN_MAX + 1]; /** Profile Identifier corresponding to the event */ net_err_e Error; /** Event Status */ int Datalength; /** Event data length */ void *Data; /** Event data: Depending on the event, Event Data will be diff --git a/src/network_dbus.c b/src/network_dbus.c index 6f8f969..96e9c21 100755 --- a/src/network_dbus.c +++ b/src/network_dbus.c @@ -1356,7 +1356,7 @@ int _net_dbus_connect_service(network_info_s *network_info, for (list = profile_list; list; list = list->next) { prof_info = (net_profile_info_s *)list->data; if (g_strstr_len(prof_info->ProfileName, - NET_PROFILE_NAME_LEN_MAX+1, grp_name) != NULL) { + NET_PROFILE_NAME_LEN_MAX + 1, grp_name) != NULL) { WIFI_LOG(WIFI_INFO, "Found profile %s", prof_info->ProfileName); if (prof_info->ProfileState == NET_STATE_TYPE_READY || @@ -1386,13 +1386,13 @@ int _net_dbus_connect_service(network_info_s *network_info, WIFI_LOG(WIFI_INFO, "Hidden target name %s", target_name); g_strlcpy(network_info->request_table[NETWORK_REQUEST_TYPE_OPEN_CONNECTION].ProfileName, - target_name, NET_PROFILE_NAME_LEN_MAX+1); + target_name, NET_PROFILE_NAME_LEN_MAX + 1); g_free(target_name); //LCOV_EXCL_STOP } else { g_strlcpy(network_info->request_table[NETWORK_REQUEST_TYPE_OPEN_CONNECTION].ProfileName, - prof_info->ProfileName, NET_PROFILE_NAME_LEN_MAX+1); + prof_info->ProfileName, NET_PROFILE_NAME_LEN_MAX + 1); } //LCOV_EXCL_START diff --git a/src/network_interface.c b/src/network_interface.c index 886049c..5334926 100755 --- a/src/network_interface.c +++ b/src/network_interface.c @@ -649,14 +649,14 @@ static int __net_wifi_modify_profile(network_info_s *network_info, net_err_e Error = NET_ERR_NONE; int i = 0; - char profilePath[NET_PROFILE_NAME_LEN_MAX+1] = ""; + char profilePath[NET_PROFILE_NAME_LEN_MAX + 1] = ""; wlan_security_info_s *security_info = &(ProfInfo->security_info); wlan_security_info_s *ex_security_info = &(exProfInfo->security_info); net_dev_info_s *net_info = &(ProfInfo->net_info); net_dev_info_s *ex_net_info = &(exProfInfo->net_info); - g_strlcpy(profilePath, ProfileName, NET_PROFILE_NAME_LEN_MAX+1); + g_strlcpy(profilePath, ProfileName, NET_PROFILE_NAME_LEN_MAX + 1); /* Compare and Set 'Passphrase' */ if (ex_security_info->sec_mode == WLAN_SEC_MODE_WEP) { @@ -772,7 +772,7 @@ static int __net_wifi_delete_profile(network_info_s *network_info, net_err_e Error = NET_ERR_NONE; GVariant *message = NULL; - char param0[NET_PROFILE_NAME_LEN_MAX + 8] = ""; + char param0[NET_PROFILE_NAME_LEN_MAX + 1] = ""; GVariant *params; if (passpoint == TRUE && WLAN_SEC_MODE_IEEE8021X == sec_mode) { @@ -789,7 +789,7 @@ static int __net_wifi_delete_profile(network_info_s *network_info, g_variant_unref(message); - g_snprintf(param0, NET_PROFILE_NAME_LEN_MAX + 8, "string:%s", + g_snprintf(param0, NET_PROFILE_NAME_LEN_MAX + 1, "%s", WifiProfName->ProfileName); params = g_variant_new("(s)", param0); @@ -803,7 +803,7 @@ static int __net_wifi_delete_profile(network_info_s *network_info, CONNMAN_SERVICE_INTERFACE, "Remove", NULL, &Error); } else { - g_snprintf(param0, NET_PROFILE_NAME_LEN_MAX + 8, "string:%s", + g_snprintf(param0, NET_PROFILE_NAME_LEN_MAX + 1, "%s", WifiProfName->ProfileName); params = g_variant_new("(s)", param0); @@ -2339,7 +2339,7 @@ int net_wifi_enroll_wps(network_info_s *network_info, network_info->request_table[NETWORK_REQUEST_TYPE_ENROLL_WPS].flag = TRUE; g_strlcpy(network_info->request_table[NETWORK_REQUEST_TYPE_ENROLL_WPS].ProfileName, - profile_name, NET_PROFILE_NAME_LEN_MAX+1); + profile_name, NET_PROFILE_NAME_LEN_MAX + 1); if (wps_info->type == WIFI_WPS_PBC) Error = _net_dbus_set_agent_wps_pbc_and_connect(network_info, profile_name); @@ -2932,7 +2932,7 @@ int net_open_connection(network_info_s *network_info, const char *profile_name) network_info->request_table[NETWORK_REQUEST_TYPE_OPEN_CONNECTION].flag = TRUE; g_strlcpy(network_info->request_table[NETWORK_REQUEST_TYPE_OPEN_CONNECTION].ProfileName, - profile_name, NET_PROFILE_NAME_LEN_MAX+1); + profile_name, NET_PROFILE_NAME_LEN_MAX + 1); Error = _net_dbus_open_connection(network_info, profile_name); if (Error != NET_ERR_NONE) { @@ -2973,7 +2973,7 @@ int net_close_connection(network_info_s *network_info, const char *profile_name) network_info->request_table[NETWORK_REQUEST_TYPE_CLOSE_CONNECTION].flag = TRUE; g_strlcpy(network_info->request_table[NETWORK_REQUEST_TYPE_CLOSE_CONNECTION].ProfileName, - profile_name, NET_PROFILE_NAME_LEN_MAX+1); + profile_name, NET_PROFILE_NAME_LEN_MAX + 1); Error = _net_dbus_close_connection(network_info, profile_name); if (Error != NET_ERR_NONE) { @@ -3130,7 +3130,7 @@ int net_delete_profile_async(network_info_s *network_info, const char* profile_n /* Get service details */ network_info->request_table[NETWORK_REQUEST_TYPE_FORGET_AP].flag = TRUE; g_strlcpy(network_info->request_table[NETWORK_REQUEST_TYPE_FORGET_AP].ProfileName, - profile_name, NET_PROFILE_NAME_LEN_MAX+1); + profile_name, NET_PROFILE_NAME_LEN_MAX + 1); Error = _net_invoke_dbus_method_nonblock(network_info, CONNMAN_SERVICE, CONNMAN_MANAGER_PATH, diff --git a/src/network_signal.c b/src/network_signal.c index 3a3c6d6..bc79340 100755 --- a/src/network_signal.c +++ b/src/network_signal.c @@ -655,7 +655,7 @@ static void __net_handle_failure_ind(network_info_s *network_info, } g_strlcpy(event_data->ProfileName, - profile_name, NET_PROFILE_NAME_LEN_MAX+1); + profile_name, NET_PROFILE_NAME_LEN_MAX + 1); if (network_info->net_service_error != NET_ERR_NONE) event_data->Error = network_info->net_service_error; @@ -705,7 +705,7 @@ static void __net_handle_disconnect_ind(network_info_s *network_info, /** Send Open Resp */ event_data->Error = NET_ERR_OPERATION_ABORTED; event_data->Event = NET_EVENT_OPEN_RSP; - g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX+1); + g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX + 1); WIFI_LOG(WIFI_INFO, "Sending NET_EVENT_OPEN_RSP"); @@ -725,7 +725,7 @@ static void __net_handle_disconnect_ind(network_info_s *network_info, /** Send WPS Resp */ event_data->Error = NET_ERR_OPERATION_ABORTED; event_data->Event = NET_EVENT_WIFI_WPS_RSP; - g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX+1); + g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX + 1); WIFI_LOG(WIFI_INFO, "Sending NET_EVENT_WIFI_WPS_RSP"); @@ -745,7 +745,7 @@ static void __net_handle_disconnect_ind(network_info_s *network_info, /** Send Close Resp */ event_data->Error = NET_ERR_NONE; event_data->Event = NET_EVENT_CLOSE_RSP; - g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX+1); + g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX + 1); WIFI_LOG(WIFI_INFO, "Sending NET_EVENT_CLOSE_RSP"); @@ -760,7 +760,7 @@ static void __net_handle_disconnect_ind(network_info_s *network_info, /** Send Close Ind */ event_data->Error = NET_ERR_NONE; event_data->Event = NET_EVENT_CLOSE_IND; - g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX+1); + g_strlcpy(event_data->ProfileName, profile_name, NET_PROFILE_NAME_LEN_MAX + 1); WIFI_LOG(WIFI_INFO, "Sending NET_EVENT_CLOSE_IND"); @@ -869,7 +869,7 @@ static int __net_handle_service_state_changed(network_info_s *network_info, } event_data->Error = Error; - g_strlcpy(event_data->ProfileName, sig_path, NET_PROFILE_NAME_LEN_MAX+1); + g_strlcpy(event_data->ProfileName, sig_path, NET_PROFILE_NAME_LEN_MAX + 1); if (network_info->event_callback) network_info->event_callback(event_data, network_info->user_data);