Use 'Already exists' error msg if applicable

Change-Id: I9f1db50223a2394cce2fc4e1b7c54f8a8f6c9b4b
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

diff --git a/debian/changelog b/debian/changelog
index 4117aa2..5ae0181 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+capi-network-wifi (0.1.2-23) unstable; urgency=low
+
+  * Use 'Already exists' error msg if applicable
+  * Git: framework/api/wifi
+  * Tag: capi-network-wifi_0.1.2-23
+
+ -- Taesub Kim <taesub.kim@samsung.com>  Fri, 29 Nov 2013 14:35:46 +0900
+
 capi-network-wifi (0.1.2-22) unstable; urgency=low
 
   * Revise wifi_ap_set_eap_private_key_info() - admit to set without password

diff --git a/include/net_wifi_private.h b/include/net_wifi_private.h
index 2cc31d1..3027178 100644 (file)
--- a/include/net_wifi_private.h
+++ b/include/net_wifi_private.h
@@ -51,8 +51,8 @@ extern "C" {
 
 bool _wifi_libnet_init(void);
 bool _wifi_libnet_deinit(void);
-int _wifi_activate(wifi_activated_cb callback, void* user_data);
-int _wifi_deactivate(wifi_deactivated_cb callback, void* user_data);
+int _wifi_activate(wifi_activated_cb callback, void *user_data);
+int _wifi_deactivate(wifi_deactivated_cb callback, void *user_data);
 
 bool _wifi_libnet_check_ap_validity(wifi_ap_h ap_h);
 void _wifi_libnet_add_to_ap_list(wifi_ap_h ap_h);
@@ -62,16 +62,16 @@ bool _wifi_libnet_check_profile_name_validity(const char *profile_name);
 bool _wifi_libnet_get_wifi_device_state(wifi_device_state_e *device_state);
 bool _wifi_libnet_get_wifi_state(wifi_connection_state_e* connection_state);
 int _wifi_libnet_get_intf_name(char** name);
-int _wifi_libnet_scan_request(wifi_scan_finished_cb callback, void* user_data);
+int _wifi_libnet_scan_request(wifi_scan_finished_cb callback, void *user_data);
 int _wifi_libnet_scan_hidden_ap(const char *essid,
-                                       wifi_scan_finished_cb callback, void* user_data);
+                                       wifi_scan_finished_cb callback, void *user_data);
 int _wifi_libnet_get_connected_profile(wifi_ap_h *ap);
 bool _wifi_libnet_foreach_found_aps(wifi_found_ap_cb callback, void *user_data);
 bool _wifi_libnet_foreach_found_hidden_aps(wifi_found_ap_cb callback, void *user_data);
 
-int _wifi_libnet_open_profile(wifi_ap_h ap_h, wifi_connected_cb callback, void* user_data);
-int _wifi_libnet_close_profile(wifi_ap_h ap_h, wifi_disconnected_cb callback, void* user_data);
-int _wifi_libnet_connect_with_wps(wifi_ap_h ap, wifi_connected_cb callback, void* user_data);
+int _wifi_libnet_open_profile(wifi_ap_h ap_h, wifi_connected_cb callback, void *user_data);
+int _wifi_libnet_close_profile(wifi_ap_h ap_h, wifi_disconnected_cb callback, void *user_data);
+int _wifi_libnet_connect_with_wps(wifi_ap_h ap, wifi_connected_cb callback, void *user_data);
 int _wifi_libnet_forget_ap(wifi_ap_h ap);
 
 int _wifi_set_power_on_off_cb(wifi_device_state_changed_cb callback, void *user_data);

diff --git a/packaging/capi-network-wifi.spec b/packaging/capi-network-wifi.spec
index 24a96fc..1c26141 100644 (file)
--- 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:    0.1.2_22
+Version:    0.1.2_23
 Release:    1
 Group:      System/Network
 License:    Apache-2.0

diff --git a/src/libnetwork.c b/src/libnetwork.c
index df10a8a..1198c5f 100755 (executable)
--- a/src/libnetwork.c
+++ b/src/libnetwork.c
@@ -482,25 +482,25 @@ static void __libnet_evt_cb(net_event_info_t *event_cb, void *user_data)
                break;
        case NET_EVENT_WIFI_SCAN_RSP:
        case NET_EVENT_WIFI_SCAN_IND:
-               WIFI_LOG(WIFI_INFO, "Got wifi scan IND\n");
+               WIFI_LOG(WIFI_INFO, "Got Wi-Fi scan IND\n");
                __libnet_scan_cb(event_cb);
                break;
        case NET_EVENT_SPECIFIC_SCAN_RSP:
-               WIFI_LOG(WIFI_INFO, "Got wifi hidden scan RSP\n");
+               WIFI_LOG(WIFI_INFO, "Got Wi-Fi hidden scan RSP\n");
                break;
        case NET_EVENT_SPECIFIC_SCAN_IND:
-               WIFI_LOG(WIFI_INFO, "Got wifi hidden scan IND\n");
+               WIFI_LOG(WIFI_INFO, "Got Wi-Fi hidden scan IND\n");
                __libnet_hidden_scan_cb(event_cb);
                break;
        case NET_EVENT_WIFI_POWER_RSP:
                is_requested = true;
                /* fall through */
        case NET_EVENT_WIFI_POWER_IND:
-               WIFI_LOG(WIFI_INFO, "Got wifi power IND\n");
+               WIFI_LOG(WIFI_INFO, "Got Wi-Fi power IND\n");
                __libnet_power_on_off_cb(event_cb, is_requested);
                break;
        default :
-               WIFI_LOG(WIFI_INFO, "Error! Unknown Event\n\n");
+               WIFI_LOG(WIFI_ERROR, "Error! Unknown Event\n\n");
        }
 }
 
@@ -529,7 +529,7 @@ bool _wifi_libnet_deinit(void)
        return true;
 }
 
-int _wifi_activate(wifi_activated_cb callback, void* user_data)
+int _wifi_activate(wifi_activated_cb callback, void *user_data)
 {
        int rv;
 
@@ -539,11 +539,13 @@ int _wifi_activate(wifi_activated_cb callback, void* user_data)
                return WIFI_ERROR_NONE;
        } else if (rv == NET_ERR_INVALID_OPERATION)
                return WIFI_ERROR_INVALID_OPERATION;
+       else if (rv == NET_ERR_ALREADY_EXISTS)
+               return WIFI_ERROR_ALREADY_EXISTS;
 
        return WIFI_ERROR_OPERATION_FAILED;
 }
 
-int _wifi_deactivate(wifi_deactivated_cb callback, void* user_data)
+int _wifi_deactivate(wifi_deactivated_cb callback, void *user_data)
 {
        int rv;
 
@@ -553,6 +555,8 @@ int _wifi_deactivate(wifi_deactivated_cb callback, void* user_data)
                return WIFI_ERROR_NONE;
        } else if (rv == NET_ERR_INVALID_OPERATION)
                return WIFI_ERROR_INVALID_OPERATION;
+       else if (rv == NET_ERR_ALREADY_EXISTS)
+               return WIFI_ERROR_ALREADY_EXISTS;
 
        return WIFI_ERROR_OPERATION_FAILED;
 }
@@ -621,6 +625,8 @@ bool _wifi_libnet_get_wifi_device_state(wifi_device_state_e *device_state)
        else
                *device_state = WIFI_DEVICE_STATE_DEACTIVATED;
 
+       WIFI_LOG(WIFI_ERROR, "Wi-Fi device state: %d", *device_state);
+
        return true;
 }
 
@@ -673,7 +679,7 @@ int _wifi_libnet_get_intf_name(char** name)
        return WIFI_ERROR_NONE;
 }
 
-int _wifi_libnet_scan_request(wifi_scan_finished_cb callback, void* user_data)
+int _wifi_libnet_scan_request(wifi_scan_finished_cb callback, void *user_data)
 {
        int rv;
        rv = net_scan_wifi();
@@ -689,7 +695,7 @@ int _wifi_libnet_scan_request(wifi_scan_finished_cb callback, void* user_data)
 }
 
 int _wifi_libnet_scan_hidden_ap(const char *essid,
-                                       wifi_scan_finished_cb callback, void* user_data)
+                                       wifi_scan_finished_cb callback, void *user_data)
 {
        int rv;
        rv = net_specific_scan_wifi(essid);
@@ -773,7 +779,7 @@ bool _wifi_libnet_foreach_found_hidden_aps(wifi_found_ap_cb callback, void *user
        return true;
 }
 
-int _wifi_libnet_open_profile(wifi_ap_h ap_h, wifi_connected_cb callback, void* user_data)
+int _wifi_libnet_open_profile(wifi_ap_h ap_h, wifi_connected_cb callback, void *user_data)
 {
        int rv;
        bool valid_profile;
@@ -801,7 +807,7 @@ int _wifi_libnet_open_profile(wifi_ap_h ap_h, wifi_connected_cb callback, void*
        return WIFI_ERROR_NONE;
 }
 
-int _wifi_libnet_close_profile(wifi_ap_h ap_h, wifi_disconnected_cb callback, void* user_data)
+int _wifi_libnet_close_profile(wifi_ap_h ap_h, wifi_disconnected_cb callback, void *user_data)
 {
        net_profile_info_t *ap_info = ap_h;
        net_profile_name_t profile_name;
@@ -816,7 +822,7 @@ int _wifi_libnet_close_profile(wifi_ap_h ap_h, wifi_disconnected_cb callback, vo
        return WIFI_ERROR_NONE;
 }
 
-int _wifi_libnet_connect_with_wps(wifi_ap_h ap_h, wifi_connected_cb callback, void* user_data)
+int _wifi_libnet_connect_with_wps(wifi_ap_h ap_h, wifi_connected_cb callback, void *user_data)
 {
        net_profile_info_t *ap_info = ap_h;
        net_wifi_wps_info_t wps_info;
@@ -923,4 +929,3 @@ int _wifi_update_ap_info(net_profile_info_t *ap_info)
 
        return WIFI_ERROR_NONE;
 }
-

diff --git a/src/net_wifi.c b/src/net_wifi.c
index 0c4abf3..97b87be 100755 (executable)
--- a/src/net_wifi.c
+++ b/src/net_wifi.c
@@ -45,6 +45,8 @@ EXPORT_API int wifi_initialize(void)
 
        is_init = true;
 
+       WIFI_LOG(WIFI_INFO, "Wi-Fi successfully initialized!\n");
+
        return WIFI_ERROR_NONE;
 }
 
@@ -63,6 +65,8 @@ EXPORT_API int wifi_deinitialize(void)
        is_init = false;
        wifi_unset_rssi_level_changed_cb();
 
+       WIFI_LOG(WIFI_INFO, "Wi-Fi successfully de-initialized!\n");
+
        return WIFI_ERROR_NONE;
 }