provide timeout error of server(504) value in ocstack.

Change-Id: I5ad6b44c188b97fd60e65dc7d47259058520e2f7
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17731
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

diff --git a/resource/csdk/include/octypes.h b/resource/csdk/include/octypes.h
index 008d931..52b17b6 100755 (executable)
--- a/resource/csdk/include/octypes.h
+++ b/resource/csdk/include/octypes.h
@@ -1126,6 +1126,7 @@ typedef enum
     /** ERROR code from server */
     OC_STACK_FORBIDDEN_REQ,          /** 403*/
     OC_STACK_INTERNAL_SERVER_ERROR,  /** 500*/
+    OC_STACK_GATEWAY_TIMEOUT,        /** 504*/
 
     /** ERROR in stack.*/
     OC_STACK_ERROR = 255

diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c
index 9a55134..7ca22af 100644 (file)
--- a/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@ -792,7 +792,7 @@ OCStackResult CAResponseToOCStackResult(CAResponseResult_t caCode)
             ret = OC_STACK_NO_RESOURCE;
             break;
         case CA_RETRANSMIT_TIMEOUT:
-            ret = OC_STACK_COMM_ERROR;
+            ret = OC_STACK_GATEWAY_TIMEOUT;
             break;
         case CA_REQUEST_ENTITY_TOO_LARGE:
             ret = OC_STACK_TOO_LARGE_REQ;
@@ -861,6 +861,9 @@ CAResponseResult_t OCToCAStackResult(OCStackResult ocCode, OCMethod method)
         case OC_STACK_COMM_ERROR:
             ret = CA_RETRANSMIT_TIMEOUT;
             break;
+        case OC_STACK_GATEWAY_TIMEOUT:
+            ret = CA_RETRANSMIT_TIMEOUT;
+            break;
         case OC_STACK_NOT_ACCEPTABLE:
             ret = CA_NOT_ACCEPTABLE;
             break;