From c0445e36283e4dea3f0a700288037113ad1d5390 Mon Sep 17 00:00:00 2001 From: Chul Lee Date: Fri, 5 Aug 2016 10:09:27 +0900 Subject: [PATCH] Add specified response type according to https://gerrit.iotivity.org/gerrit/#/c/9255/. Change-Id: I4b5a23f8c42084de369dbb5af7a64b7a8d0679c8 Signed-off-by: Chul Lee Reviewed-on: https://gerrit.iotivity.org/gerrit/10057 Tested-by: jenkins-iotivity Reviewed-by: jihwan seo Reviewed-by: Jihun Ha Reviewed-by: Madan Lanka --- resource/csdk/connectivity/src/cablockwisetransfer.c | 1 + resource/csdk/security/src/secureresourcemanager.c | 2 ++ resource/csdk/stack/src/ocserverrequest.c | 1 + 3 files changed, 4 insertions(+) diff --git a/resource/csdk/connectivity/src/cablockwisetransfer.c b/resource/csdk/connectivity/src/cablockwisetransfer.c index 5463b32..60882e7 100644 --- a/resource/csdk/connectivity/src/cablockwisetransfer.c +++ b/resource/csdk/connectivity/src/cablockwisetransfer.c @@ -593,6 +593,7 @@ static CAResult_t CASendDirectEmptyResponse(const CAEndpoint_t *endpoint, uint16 }; respInfo.info.type = CA_MSG_ACKNOWLEDGE; respInfo.info.messageId = messageId; + respInfo.info.dataType = CA_RESPONSE_DATA; CAResult_t caResult = CASendResponse(endpoint, &respInfo); diff --git a/resource/csdk/security/src/secureresourcemanager.c b/resource/csdk/security/src/secureresourcemanager.c index 10b46a8..9806813 100644 --- a/resource/csdk/security/src/secureresourcemanager.c +++ b/resource/csdk/security/src/secureresourcemanager.c @@ -85,6 +85,7 @@ static void SRMSendUnAuthorizedAccessresponse(PEContext_t *context) sizeof(responseInfo.info)); responseInfo.info.payload = NULL; responseInfo.result = CA_UNAUTHORIZED_REQ; + responseInfo.info.dataType = CA_RESPONSE_DATA; if (CA_STATUS_OK == CASendResponse(context->amsMgrContext->endpoint, &responseInfo)) { @@ -191,6 +192,7 @@ void SRMRequestHandler(const CAEndpoint_t *endPoint, const CARequestInfo_t *requ CAResponseInfo_t responseInfo = {.result = CA_EMPTY}; memcpy(&responseInfo.info, &(requestInfo->info), sizeof(responseInfo.info)); responseInfo.info.payload = NULL; + responseInfo.info.dataType = CA_RESPONSE_DATA; VERIFY_NON_NULL(TAG, gRequestHandler, ERROR); diff --git a/resource/csdk/stack/src/ocserverrequest.c b/resource/csdk/stack/src/ocserverrequest.c index 55a83d6..3be4a73 100644 --- a/resource/csdk/stack/src/ocserverrequest.c +++ b/resource/csdk/stack/src/ocserverrequest.c @@ -519,6 +519,7 @@ OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse) responseInfo.info.messageId = serverRequest->coapID; responseInfo.info.resourceUri = serverRequest->resourceUrl; responseInfo.result = ConvertEHResultToCAResult(ehResponse->ehResult, serverRequest->method); + responseInfo.info.dataType = CA_RESPONSE_DATA; if(serverRequest->notificationFlag && serverRequest->qos == OC_HIGH_QOS) { -- 2.7.4