Add server ID property in cloud server resource

Server ID property in cloud server resource is added.

Change-Id: I830a39655e269aa157ca4d6c301d594c1ca13c63
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/easy-setup/enrollee/src/easysetup.c b/service/easy-setup/enrollee/src/easysetup.c
index 466f470..7acd9a8 100755 (executable)
--- a/service/easy-setup/enrollee/src/easysetup.c
+++ b/service/easy-setup/enrollee/src/easysetup.c
@@ -39,28 +39,6 @@
 // Private variables
 //-----------------------------------------------------------------------------
 
-/**
- * @var gTargetSsid
- * @brief Target SSID of the Soft Access point to which the device has to connect
- */
-// static char gTargetSsid[MAXSSIDLEN];
-
-/**
- * @var gTargetPass
- * @brief Password of the target access point to which the device has to connect
- */
-// static char gTargetPass[MAXNETCREDLEN];
-
-/**
- * @var gEnrolleeStatusCb
- * @brief Fucntion pointer holding the callback for intimation of EasySetup Enrollee status callback
- */
-// static ESEnrolleeEventCallback gEnrolleeStatusCb = NULL;
-
-/**
- * @var gIsSecured
- * @brief Variable to check if secure mode is enabled or not.
- */
 static bool gIsSecured = false;
 
 static ESProvisioningCallbacks gESProvisioningCb;

diff --git a/service/easy-setup/enrollee/src/resourcehandler.c b/service/easy-setup/enrollee/src/resourcehandler.c
index 50db8d0..9735f89 100755 (executable)
--- a/service/easy-setup/enrollee/src/resourcehandler.c
+++ b/service/easy-setup/enrollee/src/resourcehandler.c
@@ -348,6 +348,14 @@ void updateCloudResource(OCRepPayload* input)
         OIC_LOG_V(INFO, ES_RH_TAG, "gCloudResource.ciServer %s", gCloudResource.ciServer);
     }
 
+    char *serverID = NULL;
+    if (OCRepPayloadGetPropString(input, OC_RSRVD_ES_SERVERID, &serverID))
+    {
+        OICStrcpy(gCloudResource.serverID, sizeof(gCloudResource.serverID), serverID);
+        OICStrcpy(gCloudData.serverID, sizeof(gCloudData.serverID), serverID);
+        OIC_LOG_V(INFO, ES_RH_TAG, "gCloudResource.serverID %s", gCloudResource.serverID);
+    }
+
     if(authCode || authProvider || ciServer)
     {
         OIC_LOG(INFO, ES_RH_TAG, "Send CloudRsrc Callback To ES");
@@ -439,6 +447,7 @@ OCRepPayload* constructResponseOfCloud()
     OCRepPayloadSetPropString(payload, OC_RSRVD_ES_AUTHCODE, gCloudResource.authCode);
     OCRepPayloadSetPropString(payload, OC_RSRVD_ES_AUTHPROVIDER, gCloudResource.authProvider);
     OCRepPayloadSetPropString(payload, OC_RSRVD_ES_CISERVER, gCloudResource.ciServer);
+    OCRepPayloadSetPropString(payload, OC_RSRVD_ES_SERVERID, gCloudResource.serverID);
 
     return payload;
 }

diff --git a/service/easy-setup/enrollee/src/resourcehandler.h b/service/easy-setup/enrollee/src/resourcehandler.h
index ee04051..596327f 100755 (executable)
--- a/service/easy-setup/enrollee/src/resourcehandler.h
+++ b/service/easy-setup/enrollee/src/resourcehandler.h
@@ -64,6 +64,7 @@ typedef struct
     char authCode[OIC_STRING_MAX_VALUE];
     char authProvider[OIC_STRING_MAX_VALUE];
     char ciServer[OIC_STRING_MAX_VALUE];
+    char serverID[OIC_STRING_MAX_VALUE];
 } CloudResource;
 
 typedef struct

diff --git a/service/easy-setup/inc/escommon.h b/service/easy-setup/inc/escommon.h
index c5fca22..ffd9ee0 100755 (executable)
--- a/service/easy-setup/inc/escommon.h
+++ b/service/easy-setup/inc/escommon.h
@@ -53,7 +53,8 @@ extern "C"
 #define OC_RSRVD_ES_ENCTYPE                "wet"
 #define OC_RSRVD_ES_AUTHCODE               "ac"
 #define OC_RSRVD_ES_AUTHPROVIDER           "apn"
-#define OC_RSRVD_ES_CISERVER               "cisurl"
+#define OC_RSRVD_ES_CISERVER               "cis"
+#define OC_RSRVD_ES_SERVERID               "sid"
 #define OC_RSRVD_ES_DEVNAME                "dn"
 #define OC_RSRVD_ES_LANGUAGE               "lang"
 #define OC_RSRVD_ES_COUNTRY                "ctry"
@@ -153,6 +154,7 @@ typedef struct
     char authCode[OIC_STRING_MAX_VALUE];
     char authProvider[OIC_STRING_MAX_VALUE];
     char ciServer[OIC_STRING_MAX_VALUE];
+    char serverID[OIC_STRING_MAX_VALUE];
 } ESCloudProvData;
 
 typedef struct

diff --git a/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h b/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
index 9285433..45c03f2 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
+++ b/service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
@@ -50,7 +50,8 @@ using namespace std;
 #define OC_RSRVD_ES_ENCTYPE                "wet"
 #define OC_RSRVD_ES_AUTHCODE               "ac"
 #define OC_RSRVD_ES_AUTHPROVIDER           "apn"
-#define OC_RSRVD_ES_CISERVER               "cisurl"
+#define OC_RSRVD_ES_CISERVER               "cis"
+#define OC_RSRVD_ES_SERVERID               "sid"
 #define OC_RSRVD_ES_DEVNAME                "dn"
 #define OC_RSRVD_ES_LANGUAGE               "lang"
 #define OC_RSRVD_ES_COUNTRY                "ctry"