Fixing Token Length issue in HandleCARequests

This change also enable Device Discovery.

Signed-off-by: omkar <omkar.m.hegde@intel.com>
Change-Id: I0dfb51dcdba1dbf2dc8f70d71bbaefe79bac1a37

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
index 78465d3..0ca8da0 100644 (file)
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
@@ -582,7 +582,7 @@ int InitDeviceDiscovery()
     }
 
 #ifdef CA_INT
-    ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, (OC_ETHERNET | OC_WIFI),
+    ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, (OC_WIFI),
                         OC_LOW_QOS, &cbData, NULL, 0);
 #else
     ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, OC_LOW_QOS, &cbData, NULL, 0);

diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c
index 7442464..c32deb9 100644 (file)
--- a/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@ -462,8 +462,8 @@ void HandleCARequests(const CARemoteEndpoint_t* endPoint, const CARequestInfo_t*
     // TODO-CA: For CA integration currently copying CAToken to OCCoapToken:
     // Need to remove OCCoapToken
     memcpy (&(serverRequest.requestToken.token), requestInfo->info.token,
-            strlen(requestInfo->info.token));
-    serverRequest.requestToken.tokenLength = strlen(requestInfo->info.token);
+            MAX_TOKEN_LENGTH);
+    serverRequest.requestToken.tokenLength = MAX_TOKEN_LENGTH;
 
     if (requestInfo->info.type == CA_MSG_CONFIRM)
     {