X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Feasy-setup%2Fsampleapp%2Fenrollee%2Ftizen-sdb%2FEnrolleeSample%2Fenrolleewifi.cpp;h=8c7c58c436487e600d7322d00c7d75304cf6efdf;hb=c315c87e07c4080ecd0ef488e7a1047bc3c509b2;hp=caf002068c3ebc8e4d615b3c9940deb4a700bc2d;hpb=6a9d53f35cae085ba9c147114ab9b8db639a97a6;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
index caf0020..8c7c58c 100755
--- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
+++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
@@ -1,6 +1,6 @@
 //******************************************************************
 //
-// Copyright 2015 Samsung Electronics All Rights Reserved.
+// Copyright 2016 Samsung Electronics All Rights Reserved.
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 //
@@ -20,87 +20,147 @@
 
 
 #include "easysetup.h"
+#include "easysetup_wifi_conn.h"
 
+#include <unistd.h>
 #include <string.h>
 #include <iostream>
 #include <pthread.h>
-
-#define TAG "TS"
+#include <glib.h>
+#include <limits>
+#include <unistd.h>
+#define TAG "TIZEN_ES"
 
 using namespace std;
 
-void *listeningFunc(void*);
+gboolean mainThread(GIOChannel *source, GIOCondition condition, gpointer data);
+void *listeningFunc(void *);
 
-/**
- * @var ssid
- * @brief Target SSID of the Soft Access point to which the device has to connect
- */
-static char ssid[] = "EasySetup123";
+GMainLoop *gMainloop;
+static pthread_t gThreadHandle = 0;
 
-/**
- * @var passwd
- * @brief Password of the Soft Access point to which the device has to connect
- */
-static char passwd[] = "EasySetup123";
 
 /**
  * Secure Virtual Resource database for Iotivity Server
  * It contains Server's Identity and the PSK credentials
  * of other devices which the server trusts
  */
-static char CRED_FILE[] = "oic_svr_db_server.json";
-
-OCPersistentStorage ps ;
+static char CRED_FILE[] = "oic_svr_db_server.dat";
 
+OCPersistentStorage ps;
 
 /**
  * @var gIsSecured
  * @brief Variable to check if secure mode is enabled or not.
  */
 static bool gIsSecured = false;
+static bool gWiFiCBflag = false;
+static char gSSID[OIC_STRING_MAX_VALUE];
+static char gPasswd[OIC_STRING_MAX_VALUE];
 
 void PrintMenu()
 {
-    cout<<"============"<<endl;
-    cout<<"S: Enabled Security"<<endl;
-    cout<<"I: Init easy setup"<<endl;
-    cout<<"P: start provisioning resources"<<endl;
-    cout<<"T: terminate"<<endl;
-    cout<<"Q: quit"<<endl;
-    cout<<"============"<<endl;
+    cout << "========================" << endl;
+    cout << "A: Enabled Security" << endl;
+    cout << "B: Init & Start EasySetup" << endl;
+    cout << "C: Set DeviceInfo" << endl;
+    cout << "D: Connect to TargetAP" << endl;
+    cout << "E: Show Menu......." << endl;
+    cout << "Q: Terminate" << endl;
+    cout << "========================" << endl;
 }
 
-void EventCallbackInApp(ESResult esResult, EnrolleeState enrolleeState)
+void ConnectRequestCbInApp(ESConnectRequest *connectRequest)
 {
-    cout<<"Easy setup event callback"<<endl;
+    cout << "ConnectRequestCbInApp IN" << endl;
 
-    if(esResult == ES_OK)
+    if(connectRequest == NULL)
     {
-        if(enrolleeState == ES_ON_BOARDED_STATE)
-        {
-            cout<<"Device is successfully OnBoared on Adhoc network"<<endl;
-        }
-        else if (enrolleeState == ES_PROVISIONED_STATE)
-        {
-            cout<<"Device is provisioned with target network's credentials"<<endl;
-        }
-        else if (enrolleeState == ES_ON_BOARDED_TARGET_NETWORK_STATE)
-        {
-            cout<<"Device is onboarded/connected with target network"<<endl;
-        }
-        else
-        {
-            cout<<"Wrong state !! Easy setup is failed at Enrollee state = "<<enrolleeState<<endl;
-        }
+        cout << "connectRequest is NULL" << endl;
+        return ;
     }
-    else
+
+    for(int i = 0 ; i < connectRequest->numRequest ; ++i)
+    {
+        cout << "connect : " << connectRequest->connect[i] << endl;
+    }
+
+    cout << "ConnectRequestCbInApp OUT" << endl;
+    PrintMenu();
+}
+
+void WiFiConfProvCbInApp(ESWiFiConfData *eventData)
+{
+    cout << "WiFiConfProvCbInApp IN" << endl;
+    gWiFiCBflag = true;
+
+    ESSetState(ES_STATE_CONNECTING_TO_ENROLLER);
+
+    if(eventData == NULL)
+    {
+        cout << "ESWiFiConfData is NULL" << endl;
+        return ;
+    }
+
+    cout << "SSID : " << eventData->ssid << endl;
+    cout << "Password : " << eventData->pwd << endl;
+    cout << "AuthType : " << eventData->authtype << endl;
+    cout << "EncType : " << eventData->enctype << endl;
+
+    memset(gSSID, 0, OIC_STRING_MAX_VALUE);
+    memset(gPasswd, 0, OIC_STRING_MAX_VALUE);
+    if(eventData->ssid != NULL)
+    {
+        strncpy(gSSID, eventData->ssid, strlen(eventData->ssid));
+    }
+
+    if(eventData->pwd != NULL)
+    {
+        strncpy(gPasswd, eventData->pwd, strlen(eventData->pwd));
+    }
+
+    cout << "WiFiConfProvCbInApp OUT" << endl;
+    PrintMenu();
+}
+
+void DevConfProvCbInApp(ESDevConfData *eventData)
+{
+    cout << "DevConfProvCbInApp IN" << endl;
+
+    if(eventData == NULL)
     {
-        cout<<"Easy stup is failed at Enrollee state = "<<enrolleeState<<endl;
+        cout << "ESDevConfData is NULL" << endl;
+        return ;
     }
 
+    cout << "DevConfProvCbInApp OUT" << endl;
     PrintMenu();
 }
 
+void CoapCloudConfProvCbInApp(ESCoapCloudConfData *eventData)
+{
+    cout << "CoapCloudConfProvCbInApp IN" << endl;
+
+    if(eventData == NULL)
+    {
+        cout << "ESCoapCloudConfData is NULL" << endl;
+        return ;
+    }
+
+    cout << "AuthCode : " << eventData->authCode << endl;
+    cout << "AuthProvider : " << eventData->authProvider << endl;
+    cout << "CI Server : " << eventData->ciServer << endl;
+    cout << "CoapCloudConfProvCbInApp OUT" << endl;
+    PrintMenu();
+}
+
+ESProvisioningCallbacks gCallbacks = {
+    .ConnectRequestCb = &ConnectRequestCbInApp,
+    .WiFiConfProvCb = &WiFiConfProvCbInApp,
+    .DevConfProvCb = &DevConfProvCbInApp,
+    .CoapCloudConfProvCb = &CoapCloudConfProvCbInApp
+};
+
 FILE* server_fopen(const char *path, const char *mode)
 {
     (void) path;
@@ -109,121 +169,233 @@ FILE* server_fopen(const char *path, const char *mode)
 
 void EnableSecurity()
 {
-    cout << "Inside EnableSecurity API.." << endl;
+    printf("Inside EnableSecurity API..\n");
 
     gIsSecured = true;
 
     // Initialize Persistent Storage for SVR database
-    ps = { server_fopen, fread, fwrite, fclose, unlink };
+    ps = (OCPersistentStorage){ server_fopen, fread, fwrite, fclose, unlink };
     OCRegisterPersistentStorageHandler(&ps);
 }
 
 void StartEasySetup()
 {
-    cout<<"StartEasySetup and onboarding started.."<<endl;
+    cout << "StartEasySetup IN" << endl;
+
+    if (OCInit(NULL, 0, OC_SERVER) != OC_STACK_OK)
+    {
+        cout << "OCStack init error!!" << endl;
+        return;
+    }
 
-    if(InitEasySetup(CT_ADAPTER_IP, ssid, passwd, gIsSecured, EventCallbackInApp) == ES_ERROR)
+    ESResourceMask resourcemMask = (ESResourceMask) (ES_WIFICONF_RESOURCE | ES_COAPCLOUDCONF_RESOURCE | ES_DEVCONF_RESOURCE);
+    cout << "resourcemMask : " << resourcemMask << endl;
+    if(ESInitEnrollee(gIsSecured, resourcemMask, gCallbacks) != ES_OK)
     {
-        cout<<"StartEasySetup and onboarding Fail!!"<<endl;
+        cout << "OCStack init error!!" << endl;
         return;
     }
+
+    cout << "ESInitEnrollee Success" << endl;
+
+    if(gThreadHandle == 0) {
+
+        if (pthread_create(&gThreadHandle, NULL, listeningFunc, NULL)) {
+            cout << "Thread creation failed" << endl;
+            return;
+        }
+
+    }
+
+    ESSetState(ES_STATE_INIT);
+    ESSetErrorCode(ES_ERRCODE_NO_ERROR);
+
+    int ret = 0;
+
+    ret = TizenWiFiInit();
+    if(ret != WIFI_NO_ERROR) {
+        cout << "WiFi Init Error" << endl;
+    }
+    else
+        cout << "WiFi Init Success" << endl;
+
+    ret = TizenWiFiScanStart();
+    if(ret != WIFI_NO_ERROR) {
+        cout << "WiFi Scan Error" << endl;
+    }
+    else
+        cout << "WiFi Scan Success" << endl;
+
+    cout << "StartEasySetup OUT" << endl;
 }
 
-void StartOICStackAndStartResources()
+void SetDeviceInfo()
 {
-    cout<<"Starting Enrollee Provisioning"<<endl;
+    cout << "SetDeviceInfo IN" << endl;
 
-    // Initialize the OC Stack in Server mode
-    if (OCInit(NULL, 0, OC_SERVER) != OC_STACK_OK)
+    ESDeviceProperty deviceProperty = {
+        {{WIFI_11G, WIFI_11N, WIFI_11AC, WiFi_EOF}, WIFI_5G}, {"Tizen Device"}
+    };
+
+    if(ESSetDeviceProperty(&deviceProperty) == ES_ERROR)
     {
-        cout<<"OCStack init error!!"<<endl;
-        return;
+        cout << "ESSetDeviceProperty Error" << endl;
     }
 
-    if (InitProvisioning() == ES_ERROR)
+    // Set user properties if needed
+
+    cout << "SetDeviceInfo OUT" << endl;
+}
+
+void StopEasySetup()
+{
+    cout << "StopEasySetup IN" << endl;
+    if (ESTerminateEnrollee() == ES_ERROR)
     {
-        cout<<"Init Provisioning Failed!!"<<endl;
+        cout << "ESTerminateEnrollee Failed!!" << endl;
         return;
     }
 
-    pthread_t thread_handle;
-    if (pthread_create(&thread_handle, NULL, listeningFunc, NULL))
+    // Deinit Tizen Wifi
+    TizenWiFiDeinit();
+
+    // Stop OC Stack
+    if (OCStop() != OC_STACK_OK)
     {
-        cout<<"Thread creation failed"<<endl;
+        cout << "OCStack stop failed!!" << endl;
+        return;
     }
 
-    cout<<"InitProvisioning Success"<<endl;
+    if(gThreadHandle != 0) {
+        pthread_cancel(gThreadHandle);
+        pthread_join(gThreadHandle, NULL);
+    }
+
+    cout << "StopEasySetup OUT" << endl;
 }
 
-void StopEasySetup()
+void ConnectToTargetAP()
 {
-    cout<<"StopEasySetup IN"<<endl;
+    if(!gWiFiCBflag){
+        cout << "WiFi Provisioning is needed to be preceded" << endl;
+        return;
+    }
 
-    if (TerminateEasySetup() == ES_ERROR)
-    {
-        cout<<"TerminateEasySetup Failed!!"<<endl;
+    WiFiConnErrCode ret = WIFI_NO_ERROR;
+    ret = TizenWiFiScanStart();
+    if(ret != WIFI_NO_ERROR){
+        ESSetState(ES_STATE_FAILED_TO_CONNECT_TO_ENROLLER);
+        ESSetErrorCode(ES_ERRCODE_UNKNOWN);
+        cout << "WiFi Scan Error" << endl;
         return;
     }
+    else{
+        cout << "WiFi Scan Succss" << endl;
+    }
 
-    //stop OC Stack
-    if (OCStop() != OC_STACK_OK)
-    {
-        cout<<"OCStack stop failed!!"<<endl;
+    ret = TizenWiFiConn(gSSID, gPasswd);
+    if(ret != WIFI_NO_ERROR) {
+        ESSetState(ES_STATE_FAILED_TO_CONNECT_TO_ENROLLER);
+
+        if(ret == WIFI_NOTFOUND_SSID_ERROR) {
+            ESSetErrorCode(ES_ERRCODE_SSID_NOT_FOUND);
+        }
+        else if(ret == WIFI_WRONG_PWD_ERROR) {
+            ESSetErrorCode(ES_ERRCODE_PW_WRONG);
+        }
+        else {
+            ESSetErrorCode(ES_ERRCODE_TIMEOUT);
+        }
+        cout << "WiFi Connection Error" << endl;
         return;
     }
+    else {
+        cout << "WIFI Connection Success" << endl;
+        ESSetState(ES_STATE_CONNECTED_TO_ENROLLER);
+        ESSetErrorCode(ES_ERRCODE_NO_ERROR);
+    }
+}
+
+gboolean mainThread(GIOChannel *source, GIOCondition condition, gpointer data)
+{
+    char entered;
+    cin >> entered;
+    cin.ignore(numeric_limits<streamsize>::max(), '\n');
+
+    switch (entered) {
+        case 'Q': // quit
+        case 'q':
+            StopEasySetup();
+            break;
+
+        case 'A': // Enable Security
+        case 'a':
+#ifdef __WITH_DTLS__
+            EnableSecurity();
+#else
+            cout << "Sample is not built with secured mode" << endl;
+#endif
+            PrintMenu();
+            break;
+
+        case 'B': // Init EasySetup
+        case 'b':
+            StartEasySetup();
+            PrintMenu();
+            break;
+
+        case 'C': // Set Device Info
+        case 'c':
+            SetDeviceInfo();
+            PrintMenu();
+            break;
+
+        case 'D': // Start to connect target AP
+        case 'd':
+            ConnectToTargetAP();
+            PrintMenu();
+            break;
+
+        case 'E': // Print Menu
+        case 'e':
+            PrintMenu();
+            break;
+
+        default:
+            cout << "Wrong option" << endl;
+            PrintMenu();
+            break;
+    }
 
-    cout<<"StopEasySetup OUT"<<endl;
+    if(entered == 'q' || entered == 'Q'){
+        g_main_loop_quit(gMainloop);
+    }
+
+    return TRUE;
 }
 
 int main()
 {
-    cout<<"#########################"<<endl;
-    cout<<"EasySetup Enrollee SAMPLE"<<endl;
-    cout<<"#########################"<<endl;
+    cout << "#########################" << endl;
+    cout << "EasySetup Enrollee SAMPLE" << endl;
+    cout << "#########################" << endl;
     PrintMenu();
-    char option;
 
-    while(true)
-    {
-        cin>>option;
-        switch (option)
-        {
-            case 'H': // help
-            case 'h':
-                PrintMenu();
-                break;
-
-            case 'Q': // quit
-            case 'q':
-                cout<<"quit";
-                break;
-
-            case 'S': // Enable Security
-            case 's':
-                EnableSecurity();
-                break;
-
-            case 'I': // Init EasySetup
-            case 'i':
-                StartEasySetup();
-                break;
-
-            case 'P': // start provisioning
-            case 'p':
-                StartOICStackAndStartResources();
-                break;
-
-            case 'T': // stop easy setup
-            case 't':
-                StopEasySetup();
-                break;
-
-            default:
-                cout<<"wrong option"<<endl;
-                break;
-        }
-        if (option == 'Q' || option == 'q') break;
+    gMainloop = g_main_loop_new (NULL, FALSE);
+    if(gMainloop == NULL) {
+        cout << "Create Main Loop Error" << endl;
+        return 0;
     }
+
+    GIOChannel *channel = g_io_channel_unix_new(0);
+    g_io_add_watch(channel, (GIOCondition)(G_IO_IN|G_IO_ERR|G_IO_HUP|G_IO_NVAL), mainThread, NULL);
+
+    g_main_loop_run (gMainloop);
+
+    cout << "#########################" << endl;
+    cout << "Terminate Enrollee SAMPLE" << endl;
+    cout << "#########################" << endl;
+
     return 0;
 }