From: Jaehyun Kim Date: Mon, 22 Apr 2013 06:20:37 +0000 (+0900) Subject: Fix to avoid setting agent passphrase in case of open hidden AP X-Git-Tag: 2.1b_release~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=946195a627632f8203c2c24a641f916c6b2bce6f;p=platform%2Fcore%2Fconnectivity%2Flibnet-client.git Fix to avoid setting agent passphrase in case of open hidden AP --- diff --git a/packaging/libnet-client.spec b/packaging/libnet-client.spec index 8d29115..5ea58be 100644 --- a/packaging/libnet-client.spec +++ b/packaging/libnet-client.spec @@ -1,6 +1,6 @@ Name: libnet-client Summary: Network Client library (Shared library) -Version: 0.1.77_24 +Version: 0.1.77_25 Release: 1 Group: System/Network License: Flora License diff --git a/src/include/network-dbus-request.h b/src/include/network-dbus-request.h index 77e180c..7262360 100644 --- a/src/include/network-dbus-request.h +++ b/src/include/network-dbus-request.h @@ -91,7 +91,7 @@ int _net_dbus_set_bgscan_mode(net_wifi_background_scan_mode_t mode); int _net_dbus_get_state(char* state); int _net_dbus_set_agent_passphrase(const char *passphrase); int _net_dbus_set_agent_wps_pbc(void); -int _net_dbus_set_agent_wps_pin(char *wps_pin); +int _net_dbus_set_agent_wps_pin(const char *wps_pin); int _net_dbus_open_connection(const char* profile_name); int _net_dbus_close_connection(const char* profile_name); int _net_dbus_get_network_status(net_device_t device_type, net_cm_network_status_t* network_status); diff --git a/src/network-dbus-request.c b/src/network-dbus-request.c index e7aacfe..5916a46 100644 --- a/src/network-dbus-request.c +++ b/src/network-dbus-request.c @@ -633,7 +633,7 @@ static inline void __net_dict_append_strings(DBusMessageIter *dict, dbus_message_iter_close_container(dict, &entry); } -static int __net_dbus_set_agent_field(char *field_name, char *field_value) +static int __net_dbus_set_agent_field(const char *key, const char *value) { DBusConnection* conn = NULL; net_err_t Error = NET_ERR_NONE; @@ -647,6 +647,7 @@ static int __net_dbus_set_agent_field(char *field_name, char *field_value) conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); if (NULL == conn) { NETWORK_LOG(NETWORK_ERROR, "Failed to get a system bus\n"); + __NETWORK_FUNC_EXIT__; return NET_ERR_UNKNOWN; } @@ -658,6 +659,7 @@ static int __net_dbus_set_agent_field(char *field_name, char *field_value) NETWORK_LOG(NETWORK_ERROR, "dbus_message_new_method_call() " "failed\n"); dbus_connection_unref(conn); + __NETWORK_FUNC_EXIT__; return NET_ERR_UNKNOWN; } @@ -670,8 +672,9 @@ static int __net_dbus_set_agent_field(char *field_name, char *field_value) DBUS_TYPE_STRING_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING), &dict); - __net_dict_append_strings(&dict, field_name, field_value); - NETWORK_LOG(NETWORK_HIGH, "Adding - %s %s\n", field_name, field_value); + __net_dict_append_strings(&dict, key, value); + + NETWORK_LOG(NETWORK_HIGH, "Adding - %s %s\n", key, value); dbus_message_iter_close_container(&itr, &dict); @@ -683,15 +686,16 @@ static int __net_dbus_set_agent_field(char *field_name, char *field_value) Error = NET_ERR_UNKNOWN; if (dbus_error_is_set (&error) == TRUE) { NETWORK_LOG(NETWORK_ERROR, - "dbus_connection_send_with_reply_and_block() " - "failed, Error[%s: %s]\n", error.name, - error.message); + "dbus_connection_send_with_reply_and_block() failed, " + "Error[%s: %s]\n", error.name, error.message); Error = __net_error_string_to_enum(error.name); + dbus_error_free(&error); } dbus_message_unref(message); dbus_connection_unref(conn); + __NETWORK_FUNC_EXIT__; return Error; } @@ -1379,7 +1383,7 @@ int _net_dbus_set_agent_wps_pbc(void) return NET_ERR_NONE; } -int _net_dbus_set_agent_wps_pin(char *wps_pin) +int _net_dbus_set_agent_wps_pin(const char *wps_pin) { __NETWORK_FUNC_ENTER__; @@ -1460,7 +1464,7 @@ int _net_dbus_connect_service(const net_wifi_connect_service_info_t *wifi_connec goto done; } - } else { + } else if (g_strcmp0(wifi_connection_info->security, "none") != 0) { Error = _net_dbus_set_agent_passphrase(wifi_connection_info->passphrase); if (NET_ERR_NONE != Error) { NETWORK_LOG(NETWORK_ERROR, "Fail to set agent_passphrase\n"); diff --git a/src/network-signal-handler.c b/src/network-signal-handler.c index 0ee00c6..53624be 100644 --- a/src/network-signal-handler.c +++ b/src/network-signal-handler.c @@ -136,12 +136,13 @@ static int __net_handle_specific_scan_resp(GSList *bss_info_list) _net_dbus_clear_pending_call(); - event_data.Event = NET_EVENT_SPECIFIC_SCAN_IND; NETWORK_LOG(NETWORK_LOW, - "Sending NET_EVENT_SPECIFIC_SCAN_IND wifi state : %d\n", - NetworkInfo.wifi_state); + "Sending NET_EVENT_SPECIFIC_SCAN_IND" + "wifi state: %d\n", NetworkInfo.wifi_state); + NETWORK_LOG(NETWORK_LOW, "bss_info_list: 0x%x\n", + bss_info_list); - NETWORK_LOG(NETWORK_LOW, "bss_info_list : 0x%x\n", bss_info_list); + event_data.Event = NET_EVENT_SPECIFIC_SCAN_IND; event_data.Data = bss_info_list; _net_client_callback(&event_data);