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=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=94a51cd95aa2a88c0a521ddf2b403117063a0226;hpb=2b13d12b41771df9f019e595cc1c71952d5ee3c6;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 94a51cd..8c7c58c 100755
--- a/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
+++ b/service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
@@ -58,16 +58,47 @@ static bool gWiFiCBflag = false;
 static char gSSID[OIC_STRING_MAX_VALUE];
 static char gPasswd[OIC_STRING_MAX_VALUE];
 
-void WiFiProvCbInApp(ESWiFiProvData *eventData)
+void PrintMenu()
+{
+    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 ConnectRequestCbInApp(ESConnectRequest *connectRequest)
 {
-    cout << "WiFiProvCbInApp IN" << endl;
+    cout << "ConnectRequestCbInApp IN" << endl;
+
+    if(connectRequest == NULL)
+    {
+        cout << "connectRequest is NULL" << endl;
+        return ;
+    }
+
+    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 << "ESWiFiProvData is NULL" << endl;
+        cout << "ESWiFiConfData is NULL" << endl;
         return ;
     }
 
@@ -88,61 +119,48 @@ void WiFiProvCbInApp(ESWiFiProvData *eventData)
         strncpy(gPasswd, eventData->pwd, strlen(eventData->pwd));
     }
 
-    cout << "WiFiProvCbInApp OUT" << endl;
+    cout << "WiFiConfProvCbInApp OUT" << endl;
+    PrintMenu();
 }
 
-void DevConfProvCbInApp(ESDevConfProvData *eventData)
+void DevConfProvCbInApp(ESDevConfData *eventData)
 {
     cout << "DevConfProvCbInApp IN" << endl;
 
     if(eventData == NULL)
     {
-        cout << "ESDevConfProvData is NULL" << endl;
+        cout << "ESDevConfData is NULL" << endl;
         return ;
     }
 
-    cout << "Language : " << eventData->language << endl;
-    cout << "Country : " << eventData->country << endl;
-
     cout << "DevConfProvCbInApp OUT" << endl;
+    PrintMenu();
 }
 
-void CloudDataProvCbInApp(ESCloudProvData *eventData)
+void CoapCloudConfProvCbInApp(ESCoapCloudConfData *eventData)
 {
-    cout << "CloudDataProvCbInApp IN" << endl;
+    cout << "CoapCloudConfProvCbInApp IN" << endl;
 
     if(eventData == NULL)
     {
-        cout << "ESCloudProvData is NULL" << endl;
+        cout << "ESCoapCloudConfData is NULL" << endl;
         return ;
     }
 
     cout << "AuthCode : " << eventData->authCode << endl;
     cout << "AuthProvider : " << eventData->authProvider << endl;
     cout << "CI Server : " << eventData->ciServer << endl;
-
-    cout << "CloudDataProvCbInApp OUT" << endl;
-
+    cout << "CoapCloudConfProvCbInApp OUT" << endl;
+    PrintMenu();
 }
 
 ESProvisioningCallbacks gCallbacks = {
-    .WiFiProvCb = &WiFiProvCbInApp,
+    .ConnectRequestCb = &ConnectRequestCbInApp,
+    .WiFiConfProvCb = &WiFiConfProvCbInApp,
     .DevConfProvCb = &DevConfProvCbInApp,
-    .CloudDataProvCb = &CloudDataProvCbInApp
+    .CoapCloudConfProvCb = &CoapCloudConfProvCbInApp
 };
 
-void PrintMenu()
-{
-    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 << "Q: Terminate" << endl;
-    cout << "ENTER : Show Menu......." << endl;
-    cout << "========================" << endl;
-}
-
 FILE* server_fopen(const char *path, const char *mode)
 {
     (void) path;
@@ -170,7 +188,7 @@ void StartEasySetup()
         return;
     }
 
-    ESResourceMask resourcemMask = (ESResourceMask) (ES_WIFI_RESOURCE | ES_CLOUD_RESOURCE | ES_DEVCONF_RESOURCE);
+    ESResourceMask resourcemMask = (ESResourceMask) (ES_WIFICONF_RESOURCE | ES_COAPCLOUDCONF_RESOURCE | ES_DEVCONF_RESOURCE);
     cout << "resourcemMask : " << resourcemMask << endl;
     if(ESInitEnrollee(gIsSecured, resourcemMask, gCallbacks) != ES_OK)
     {
@@ -266,7 +284,7 @@ void ConnectToTargetAP()
     WiFiConnErrCode ret = WIFI_NO_ERROR;
     ret = TizenWiFiScanStart();
     if(ret != WIFI_NO_ERROR){
-        ESSetState(ES_STATE_CONNECTED_FAIL_TO_ENROLLER);
+        ESSetState(ES_STATE_FAILED_TO_CONNECT_TO_ENROLLER);
         ESSetErrorCode(ES_ERRCODE_UNKNOWN);
         cout << "WiFi Scan Error" << endl;
         return;
@@ -277,7 +295,7 @@ void ConnectToTargetAP()
 
     ret = TizenWiFiConn(gSSID, gPasswd);
     if(ret != WIFI_NO_ERROR) {
-        ESSetState(ES_STATE_CONNECTED_FAIL_TO_ENROLLER);
+        ESSetState(ES_STATE_FAILED_TO_CONNECT_TO_ENROLLER);
 
         if(ret == WIFI_NOTFOUND_SSID_ERROR) {
             ESSetErrorCode(ES_ERRCODE_SSID_NOT_FOUND);
@@ -312,7 +330,11 @@ gboolean mainThread(GIOChannel *source, GIOCondition condition, gpointer data)
 
         case 'A': // Enable Security
         case 'a':
-            //EnableSecurity();
+#ifdef __WITH_DTLS__
+            EnableSecurity();
+#else
+            cout << "Sample is not built with secured mode" << endl;
+#endif
             PrintMenu();
             break;
 
@@ -334,6 +356,11 @@ gboolean mainThread(GIOChannel *source, GIOCondition condition, gpointer data)
             PrintMenu();
             break;
 
+        case 'E': // Print Menu
+        case 'e':
+            PrintMenu();
+            break;
+
         default:
             cout << "Wrong option" << endl;
             PrintMenu();
@@ -356,7 +383,7 @@ int main()
 
     gMainloop = g_main_loop_new (NULL, FALSE);
     if(gMainloop == NULL) {
-        cout << "Create Min Loop Error" << endl;
+        cout << "Create Main Loop Error" << endl;
         return 0;
     }