From 50ca157e26a84325b559ab34525340bf3157f4cc Mon Sep 17 00:00:00 2001 From: omkar Date: Thu, 25 Dec 2014 02:49:53 -0800 Subject: [PATCH] Fixing Token Length issue in HandleCARequests This change also enable Device Discovery. Signed-off-by: omkar Change-Id: I0dfb51dcdba1dbf2dc8f70d71bbaefe79bac1a37 --- resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp | 2 +- resource/csdk/stack/src/ocstack.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp index 78465d3..0ca8da0 100644 --- 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 --- 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) { -- 2.7.4