From: Ziran Sun Date: Mon, 11 Jul 2016 13:38:00 +0000 (+0100) Subject: Add support of 'OC_STACK_RESOURCE_CHANGED' return code. X-Git-Tag: 1.2.0+RC1~217 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=268d39eeeff64544195c5bf8a286b1151a214f7d;p=platform%2Fupstream%2Fiotivity.git Add support of 'OC_STACK_RESOURCE_CHANGED' return code. This is to map 'UPDATE' or 'CHANGED' code in coap. JIRA Issue: https://jira.iotivity.org/browse/IOT-1191 Change-Id: Ic5b426cbb1560a989305a600070a77dbe90f01e1 Signed-off-by: Ziran Sun Reviewed-on: https://gerrit.iotivity.org/gerrit/9287 Reviewed-by: Habib Virji Reviewed-by: dongik Lee Tested-by: jenkins-iotivity --- diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h index 9a32a43..43eb1aa 100644 --- a/resource/csdk/stack/include/octypes.h +++ b/resource/csdk/stack/include/octypes.h @@ -708,6 +708,7 @@ typedef enum OC_STACK_RESOURCE_CREATED, OC_STACK_RESOURCE_DELETED, OC_STACK_CONTINUE, + OC_STACK_RESOURCE_CHANGED, /** Success status code - END HERE.*/ /** Error status code - START HERE.*/ diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c index fbd7bd6..86db477 100755 --- a/resource/csdk/stack/src/ocresource.c +++ b/resource/csdk/stack/src/ocresource.c @@ -479,6 +479,9 @@ OCStackResult EntityHandlerCodeToOCStackCode(OCEntityHandlerResult ehResult) case OC_EH_RESOURCE_DELETED: result = OC_STACK_RESOURCE_DELETED; break; + case OC_EH_CHANGED: + result = OC_STACK_RESOURCE_CHANGED; + break; case OC_EH_RESOURCE_NOT_FOUND: result = OC_STACK_NO_RESOURCE; break; diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index a578533..2b7a8fe 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -643,6 +643,8 @@ OCStackResult CAResponseToOCStackResult(CAResponseResult_t caCode) ret = OC_STACK_RESOURCE_DELETED; break; case CA_CHANGED: + ret = OC_STACK_RESOURCE_CHANGED; + break; case CA_CONTENT: case CA_VALID: ret = OC_STACK_OK;