[Arduino Enrollee Application] Additional parameter for security in InitEasySetup.

Arduino warning fix for softap.cpp

Change-Id: I87f9341afbbed78eaf240bd5163349a4f5be517c
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript
index db7a566..47b895e 100644 (file)
--- a/service/easy-setup/enrollee/SConscript
+++ b/service/easy-setup/enrollee/SConscript
@@ -138,6 +138,7 @@ if target_os == 'arduino':
        es_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', [
                                        enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/easysetup.cpp',
                                        enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/onboarding.cpp',
+                                       enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/softap.cpp',
                                        enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/resourcehandler.cpp',
                                        enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp'])
        enrollee_env.InstallTarget(es_sdk_static, 'libESEnrolleeSDK')

diff --git a/service/easy-setup/enrollee/src/onboarding.cpp b/service/easy-setup/enrollee/src/onboarding.cpp
index c9ea323..82131f5 100644 (file)
--- a/service/easy-setup/enrollee/src/onboarding.cpp
+++ b/service/easy-setup/enrollee/src/onboarding.cpp
@@ -68,12 +68,12 @@ bool ESOnboard(const char * ssid, const char* passwd, NetworkEventCallback cb)
     {
         if (ESSoftapAtEnrollee())
         {
-            OC_LOG(DEBUG, ES_ENROLLEE_TAG, "Create softap at enrollee");
+            OC_LOG(DEBUG, ES_ENROLLEE_TAG, "Create SoftAp at enrollee");
             ESCreateSoftap(ssid, passwd, cb);
         }
         else
         {
-            OC_LOG(DEBUG, ES_ENROLLEE_TAG, "Connecting to SoftAp");
+            OC_LOG(DEBUG, ES_ENROLLEE_TAG, "Connecting to Mediator SoftAp");
             ConnectToWiFiNetwork(ssid, passwd, cb);
         }
         return true;

diff --git a/service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp b/service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
index b783a17..f00c889 100644 (file)
--- a/service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
+++ b/service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
@@ -173,7 +173,8 @@ void StartEasySetup()
 {
     OC_LOG(DEBUG, TAG, "OCServer is starting...");
 
-    if(InitEasySetup(CT_ADAPTER_IP, ssid, passwd, EventCallbackInApp) == ES_ERROR)
+    //InitEasySetup with sercurity mode disabled for arduino
+    if(InitEasySetup(CT_ADAPTER_IP, ssid, passwd, false, EventCallbackInApp) == ES_ERROR)
     {
         OC_LOG(ERROR, TAG, "OnBoarding Failed");
         return;