From 61494058cfd0b851c5feb5a544161518899769f1 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Wed, 12 Oct 2016 16:53:46 +0900 Subject: [PATCH] added error code (4.03 / 5.00) in ocstack result Change-Id: I311c0b76a2faa7704be8f4a8b89088a0ae471c6a Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/13135 Tested-by: jenkins-iotivity Reviewed-by: byonggon chun Reviewed-by: Ashok Babu Channa --- resource/csdk/stack/include/octypes.h | 5 +++++ resource/csdk/stack/src/ocresource.c | 5 ++++- resource/csdk/stack/src/ocstack.c | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h index 5a9c893..a104f16 100644 --- a/resource/csdk/stack/include/octypes.h +++ b/resource/csdk/stack/include/octypes.h @@ -985,6 +985,11 @@ typedef enum OC_STACK_PRESENCE_TIMEOUT, OC_STACK_PRESENCE_DO_NOT_HANDLE, #endif + + /** ERROR code from server */ + OC_STACK_FORBIDDEN_REQ, /** 403*/ + OC_STACK_INTERNAL_SERVER_ERROR, /** 500*/ + /** ERROR in stack.*/ OC_STACK_ERROR = 255 /** Error status code - END HERE.*/ diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c index 485cc64..39a1933 100755 --- a/resource/csdk/stack/src/ocresource.c +++ b/resource/csdk/stack/src/ocresource.c @@ -483,7 +483,10 @@ OCStackResult EntityHandlerCodeToOCStackCode(OCEntityHandlerResult ehResult) result = OC_STACK_ERROR; break; case OC_EH_FORBIDDEN: - result = OC_STACK_RESOURCE_ERROR; + result = OC_STACK_FORBIDDEN_REQ; + break; + case OC_EH_INTERNAL_SERVER_ERROR: + result = OC_STACK_INTERNAL_SERVER_ERROR; break; case OC_EH_RESOURCE_CREATED: result = OC_STACK_RESOURCE_CREATED; diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index b382b9d..1dd43aa 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -728,6 +728,12 @@ OCStackResult CAResponseToOCStackResult(CAResponseResult_t caCode) case CA_REQUEST_ENTITY_TOO_LARGE: ret = OC_STACK_TOO_LARGE_REQ; break; + case CA_FORBIDDEN_REQ: + ret = OC_STACK_FORBIDDEN_REQ; + break; + case CA_INTERNAL_SERVER_ERROR: + ret = OC_STACK_INTERNAL_SERVER_ERROR; + break; default: break; } @@ -786,6 +792,12 @@ CAResponseResult_t OCToCAStackResult(OCStackResult ocCode, OCMethod method) case OC_STACK_UNAUTHORIZED_REQ: ret = CA_UNAUTHORIZED_REQ; break; + case OC_STACK_FORBIDDEN_REQ: + ret = CA_FORBIDDEN_REQ; + break; + case OC_STACK_INTERNAL_SERVER_ERROR: + ret = CA_INTERNAL_SERVER_ERROR; + break; default: break; } -- 2.7.4