Remove a dependency of the deprecated wifi API

[platform/upstream/iotivity.git] / service / easy-setup / sampleapp / enrollee / tizen-sdb / EnrolleeSample / easysetup_wifi_conn.c

diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/easysetup_wifi_conn.c b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/easysetup_wifi_conn.c
index d8ff9fd..3f9abb5 100644 (file)
--- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/easysetup_wifi_conn.c
+++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/easysetup_wifi_conn.c
@@ -24,7 +24,7 @@
 #include "logger.h"
 #include "escommon.h"
 
-#include <wifi.h>
+#include <wifi-manager.h>
 #include <tizen_error.h>
 #include <glib.h>
 #include <unistd.h>
@@ -41,48 +41,49 @@ typedef struct{
 } TargetWifiInfo;
 
 static bool gWiFiConnFlag;
+static wifi_manager_h *wifi_handle;
 
-char* PrintWifiErr(wifi_error_e errType)
+char* PrintWifiErr(wifi_manager_error_e errType)
 {
     switch (errType) {
-        case WIFI_ERROR_NONE:
+        case WIFI_MANAGER_ERROR_NONE:
             return "NONE";
-        case WIFI_ERROR_INVALID_PARAMETER:
+        case WIFI_MANAGER_ERROR_INVALID_PARAMETER:
             return "INVALID_PARAMETER";
-        case WIFI_ERROR_OUT_OF_MEMORY:
+        case WIFI_MANAGER_ERROR_OUT_OF_MEMORY:
             return "OUT_OF_MEMORY";
-        case WIFI_ERROR_INVALID_OPERATION:
+        case WIFI_MANAGER_ERROR_INVALID_OPERATION:
             return "INVALID_OPERATION";
-        case WIFI_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED:
+        case WIFI_MANAGER_ERROR_ADDRESS_FAMILY_NOT_SUPPORTED:
             return "ADDRESS_FAMILY_NOT_SUPPORTED";
-        case WIFI_ERROR_OPERATION_FAILED:
+        case WIFI_MANAGER_ERROR_OPERATION_FAILED:
             return "OPERATION_FAILED";
-        case WIFI_ERROR_NO_CONNECTION:
+        case WIFI_MANAGER_ERROR_NO_CONNECTION:
             return "NO_CONNECTION";
-        case WIFI_ERROR_NOW_IN_PROGRESS:
+        case WIFI_MANAGER_ERROR_NOW_IN_PROGRESS:
             return "NOW_IN_PROGRESS";
-        case WIFI_ERROR_ALREADY_EXISTS:
+        case WIFI_MANAGER_ERROR_ALREADY_EXISTS:
             return "ALREADY_EXISTS";
-        case WIFI_ERROR_OPERATION_ABORTED:
+        case WIFI_MANAGER_ERROR_OPERATION_ABORTED:
             return "OPERATION_ABORTED";
-        case WIFI_ERROR_DHCP_FAILED:
+        case WIFI_MANAGER_ERROR_DHCP_FAILED:
             return "DHCP_FAILED";
-        case WIFI_ERROR_INVALID_KEY:
+        case WIFI_MANAGER_ERROR_INVALID_KEY:
             return "INVALID_KEY";
-        case WIFI_ERROR_NO_REPLY:
+        case WIFI_MANAGER_ERROR_NO_REPLY:
             return "NO_REPLY";
-        case WIFI_ERROR_SECURITY_RESTRICTED:
+        case WIFI_MANAGER_ERROR_SECURITY_RESTRICTED:
             return "SECURITY_RESTRICTED";
-        case WIFI_ERROR_PERMISSION_DENIED:
+        case WIFI_MANAGER_ERROR_PERMISSION_DENIED:
             return "PERMISSION_DENIED";
-        case WIFI_ERROR_NOT_SUPPORTED:
+        case WIFI_MANAGER_ERROR_NOT_SUPPORTED:
             return "NOT_SUPPORTED";
     }
 
     return "UNKNOWN";
 }
 
-static void WiFiScanCallback(wifi_error_e err, void* data)
+static void WiFiScanCallback(wifi_manager_error_e err, void* data)
 {
     if(data != NULL) {
         OIC_LOG_V(INFO, ES_WIFICONN_TAG, "UserData : %s", (char *) data);
@@ -91,23 +92,23 @@ static void WiFiScanCallback(wifi_error_e err, void* data)
     OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Scan Callback Res : %s", PrintWifiErr(err));
 }
 
-static void WiFiActivateCallback(wifi_error_e result, void* user_data)
+static void WiFiActivateCallback(wifi_manager_error_e result, void* user_data)
 {
     OIC_LOG(DEBUG, ES_WIFICONN_TAG, "__test_activated_callback IN");
 
-    int ret = wifi_scan(WiFiScanCallback, NULL);
-    if (ret != WIFI_ERROR_NONE) {
+    int ret = wifi_manager_scan(wifi_handle, WiFiScanCallback, NULL);
+    if (ret != WIFI_MANAGER_ERROR_NONE) {
         OIC_LOG(ERROR, ES_WIFICONN_TAG, "WiFi Scan Error");
-        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Scan Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Scan Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
     }
 
     OIC_LOG(DEBUG, ES_WIFICONN_TAG, "__test_activated_callback OUT");
 
 }
 
-static void ConnectedCallback(wifi_error_e err, void* data)
+static void ConnectedCallback(wifi_manager_error_e err, void* data)
 {
-    if(err == WIFI_ERROR_NONE) {
+    if(err == WIFI_MANAGER_ERROR_NONE) {
         OIC_LOG(DEBUG, ES_WIFICONN_TAG, "Success to Connect AP");        
     }
     else {
@@ -123,9 +124,9 @@ static bool WiFiFoundCallback(wifi_ap_h ap, void *data)
 
     int ret = wifi_ap_get_essid(ap, &foundAP);
 
-    if(ret != WIFI_ERROR_NONE) {
+    if(ret != WIFI_MANAGER_ERROR_NONE) {
         OIC_LOG(ERROR, ES_WIFICONN_TAG, "Fail to get AP");
-        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
         return false;
     }
 
@@ -135,27 +136,27 @@ static bool WiFiFoundCallback(wifi_ap_h ap, void *data)
 
         bool needPasswd = false;
 
-        if (wifi_ap_is_passphrase_required(ap, &needPasswd) == WIFI_ERROR_NONE) {
+        if (wifi_ap_is_passphrase_required(ap, &needPasswd) == WIFI_MANAGER_ERROR_NONE) {
 
             OIC_LOG(DEBUG, ES_WIFICONN_TAG, "Passsword required");
 
             ret = wifi_ap_set_passphrase(ap, targetInfo->wifiPasswd);
-            if (ret != WIFI_ERROR_NONE) {
+            if (ret != WIFI_MANAGER_ERROR_NONE) {
                 OIC_LOG(ERROR, ES_WIFICONN_TAG, "Fail to Set Password");
-                OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+                OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
                 g_free(foundAP);
                 return false;
             }
 
-            ret = wifi_connect(ap, ConnectedCallback, targetInfo);
-            if (ret != WIFI_ERROR_NONE) {
+            ret = wifi_manager_connect(wifi_handle, ap, ConnectedCallback, targetInfo);
+            if (ret != WIFI_MANAGER_ERROR_NONE) {
                 OIC_LOG(ERROR, ES_WIFICONN_TAG, "Fail to connect wifi");
-                OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Connect Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+                OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Connect Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
                 g_free(foundAP);
                 return false;                
             }
             else {
-                OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Success to connect wifi : %s", PrintWifiErr((wifi_error_e) ret));
+                OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Success to connect wifi : %s", PrintWifiErr((wifi_manager_error_e) ret));
                 gWiFiConnFlag = true;
                 g_free(foundAP);
                 return false;                
@@ -165,7 +166,7 @@ static bool WiFiFoundCallback(wifi_ap_h ap, void *data)
         }
         else {
             OIC_LOG(ERROR, ES_WIFICONN_TAG, "Fail to get Passphrase Required");
-            OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+            OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
             return false;
         }
 
@@ -184,10 +185,12 @@ WiFiConnErrCode TizenWiFiDeinit()
 {
     OIC_LOG(DEBUG, ES_WIFICONN_TAG, "TizenWiFiDeinit IN");
 
-    int ret = wifi_deinitialize();
-    if(ret != WIFI_ERROR_NONE) {
+    int ret = wifi_manager_deinitialize(&wifi_handle);
+       wifi_handle = null;
+
+    if(ret != WIFI_MANAGER_ERROR_NONE) {
         OIC_LOG(ERROR, ES_WIFICONN_TAG, "wifi deinit error");
-        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
         return WIFI_DEINIT_ERROR;
     }
 
@@ -200,10 +203,10 @@ WiFiConnErrCode TizenWiFiInit()
     OIC_LOG(DEBUG, ES_WIFICONN_TAG, "TizenWiFiInit IN");
 
     gWiFiConnFlag = false;
-    int ret = wifi_initialize();
-    if (ret != WIFI_ERROR_NONE) {
+    int ret = wifi_mananger_initialize(&wifi_handle);
+    if (ret != WIFI_MANAGER_ERROR_NONE) {
         OIC_LOG(ERROR, ES_WIFICONN_TAG, "WiFi Init Error");
-        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Init Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Init Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
         return WIFI_INIT_ERROR;
     }
 
@@ -218,23 +221,23 @@ WiFiConnErrCode TizenWiFiScanStart()
     int ret;
 
     bool wifiState = false;
-    wifi_is_activated(&wifiState);
+    wifi_manager_is_activated(wifi_handle, &wifiState);
 
     // if wifi is not activated, actviate & scan
     if (wifiState == false) {
         OIC_LOG(ERROR, ES_WIFICONN_TAG, "WiFi Not Activated...Activate it!");
-        ret = wifi_activate(WiFiActivateCallback, NULL);
+        ret = wifi_manager_activate(wifi_handle, WiFiActivateCallback, NULL);
 
-        if(ret != WIFI_ERROR_NONE) {
+        if(ret != WIFI_MANAGER_ERROR_NONE) {
             OIC_LOG(ERROR, ES_WIFICONN_TAG, "wifi activate error");
             return WIFI_ACTIVATE_ERROR;
         }
     }
     else{
-        ret = wifi_scan(WiFiScanCallback, NULL);
-        if (ret != WIFI_ERROR_NONE) {
+        ret = wifi_manager_scan(wifi_handle, WiFiScanCallback, NULL);
+        if (ret != WIFI_MANAGER_ERROR_NONE) {
             OIC_LOG(ERROR, ES_WIFICONN_TAG, "WiFi Scan Error");
-            OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Scan Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+            OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Scan Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
             return WIFI_SCAN_ERROR;
         }
     }
@@ -261,10 +264,10 @@ WiFiConnErrCode TizenWiFiConn(char *ssid, char* passwd)
         strncpy(targetInfo.wifiPasswd, passwd, strlen(passwd));
     }
 
-    int ret = wifi_foreach_found_aps(WiFiFoundCallback, &targetInfo);
-    if(ret != WIFI_ERROR_NONE) {
+    int ret = wifi_manager_foreach_found_ap(wifi_handle, WiFiFoundCallback, &targetInfo);
+    if(ret != WIFI_MANAGER_ERROR_NONE) {
         OIC_LOG(ERROR, ES_WIFICONN_TAG, "wifi_foreach_found_aps Error");
-        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_error_e) ret));
+        OIC_LOG_V(INFO, ES_WIFICONN_TAG, "Fail Status : %s", PrintWifiErr((wifi_manager_error_e) ret));
         memset(targetInfo.wifiName, 0, OIC_STRING_MAX_VALUE);
         memset(targetInfo.wifiPasswd, 0, OIC_STRING_MAX_VALUE);