CA Integration: Sending observe register/deregister request from client to server...

Change-Id: I78ae3d916607ef994cb8d042611f7771b1ada501
Signed-off-by: Vijay <vijay.s.kesavan@intel.com>

diff --git a/resource/csdk/stack/include/internal/ocobserve.h b/resource/csdk/stack/include/internal/ocobserve.h
index ba8730669c93d97eaddc2eb65c0c2163cc866e8e..50db45d34e631c3305253e80be9144f785f02ec5 100644 (file)
--- a/resource/csdk/stack/include/internal/ocobserve.h
+++ b/resource/csdk/stack/include/internal/ocobserve.h
@@ -27,6 +27,13 @@
 #define MAX_OBSERVER_FAILED_COMM         (2)
 #define MAX_OBSERVER_NON_COUNT           (3)
 
+#ifdef CA_INT
+// NOTE: These values are based on the observe option values as defined in the CoAP RFC
+// The values should not be changed unless there is a change in the RFC.
+#define OC_RESOURCE_OBSERVE_REGISTER      (0)
+#define OC_RESOURCE_OBSERVE_DEREGISTER    (1)
+#endif // CA_INT
+
 /* This information is stored for each registerd observer */
 typedef struct ResourceObserver {
     // Observation Identifier for request
@@ -83,4 +90,12 @@ ResourceObserver* GetObserverUsingToken (const OCCoAPToken * token);
 
 ResourceObserver* GetObserverUsingId (const OCObservationId observeId);
 
+#ifdef CA_INT
+OCStackResult
+CreateObserveHeaderOption (CAHeaderOption_t **caHdrOpt,
+                           OCHeaderOption *ocHdrOpt,
+                           uint8_t numOptions,
+                           uint8_t observeFlag);
+#endif // CA_INT
+
 #endif //OC_OBSERVE_H

diff --git a/resource/csdk/stack/src/ocobserve.c b/resource/csdk/stack/src/ocobserve.c
index e8e58d436a0a85445cde6f9e386dba177c462bb9..6053120b0d58b52dea6d72917a61e729cac49267 100644 (file)
--- a/resource/csdk/stack/src/ocobserve.c
+++ b/resource/csdk/stack/src/ocobserve.c
@@ -394,3 +394,34 @@ void DeleteObserverList()
     }
     serverObsList = NULL;
 }
+
+#ifdef CA_INT
+OCStackResult
+CreateObserveHeaderOption (CAHeaderOption_t **caHdrOpt,
+                           OCHeaderOption *ocHdrOpt,
+                           uint8_t numOptions,
+                           uint8_t observeFlag)
+{
+    CAHeaderOption_t *tmpHdrOpt = NULL;
+
+    tmpHdrOpt = (CAHeaderOption_t *) OCMalloc ((numOptions+1)*sizeof(CAHeaderOption_t));
+    if (NULL == tmpHdrOpt)
+    {
+        return OC_STACK_NO_MEMORY;
+    }
+    tmpHdrOpt[0].protocolID = CA_COAP_ID;
+    // TODO-CA: COAP_OPTION_OBSERVE is defined in CoAP header files which will be abstracted
+    // from resource model. We have to define a new macro for this in the stack layer.
+    tmpHdrOpt[0].optionID = COAP_OPTION_OBSERVE;
+    // Length is one byte
+    tmpHdrOpt[0].optionLength = 1;
+    tmpHdrOpt[0].optionData[0] = observeFlag;
+    for (uint8_t i = 0; i < numOptions; i++)
+    {
+        memcpy (&(tmpHdrOpt[i+1]), &(ocHdrOpt[i]), sizeof(CAHeaderOption_t));
+    }
+
+    *caHdrOpt = tmpHdrOpt;
+    return OC_STACK_OK;
+}
+#endif // CA_INT

diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c
index 3324da5ad29dc22b64444255f6cd1ecee2aeddd9..e5b5d73e641e487b7082f06df319c4bebecbac2a 100644 (file)
--- a/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@ -1242,8 +1242,22 @@ OCStackResult OCDoResource(OCDoHandle *handle, OCMethod method, const char *requ
     // TODO-CA: Map QoS to the right CA msg type
     requestData.type = CA_MSG_NONCONFIRM;
     requestData.token = caToken;
-    requestData.options = (CAHeaderOption_t*)options;
-    requestData.numOptions = numOptions;
+    if ((method == OC_REST_OBSERVE) || (method == OC_REST_OBSERVE_ALL))
+    {
+        result = CreateObserveHeaderOption (&(requestData.options), options, 
+                                    numOptions, OC_RESOURCE_OBSERVE_REGISTER);
+        if (result != OC_STACK_OK)
+        {
+            goto exit;
+        }
+        hdrOptionMemAlloc = 1;
+        requestData.numOptions = numOptions + 1;
+    }
+    else
+    {
+        requestData.options = (CAHeaderOption_t*)options;
+        requestData.numOptions = numOptions;
+    }
     requestData.payload = (char *)request;
 
     requestInfo.info = requestData;