Updated a code value of CAResponseResult_t.

since there is no code in CoAP Spec.
I have removed CA_SUCCESS code from CA.

According to CoAP Spec, 2.05 Content code is like HTTP 200 "OK"
thur 2.05 will be used instead of 2.00.

---------------------------------------------------------

5.9.1.5.  2.05 Content

This Response Code is like HTTP 200 "OK" but only used
in response to GET requests.

---------------------------------------------------------

Change-Id: I9f4d3c09661c4dec967f2bb91f51941b93084a93
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h
index 2a6aecc..29ac9cc 100644 (file)
--- a/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h
@@ -284,7 +284,6 @@ typedef enum
 {
     /* Response status code - START HERE */
     CA_EMPTY = 0,                    /**< Empty */
-    CA_SUCCESS = 200,                /**< Success */
     CA_CREATED = 201,                /**< Created */
     CA_DELETED = 202,                /**< Deleted */
     CA_VALID = 203,                  /**< Valid */

diff --git a/resource/csdk/connectivity/common/src/caremotehandler.c b/resource/csdk/connectivity/common/src/caremotehandler.c
index df7d7f7..91b7199 100644 (file)
--- a/resource/csdk/connectivity/common/src/caremotehandler.c
+++ b/resource/csdk/connectivity/common/src/caremotehandler.c
@@ -107,8 +107,6 @@ CAResponseInfo_t *CACloneResponseInfo(const CAResponseInfo_t *rep)
         case CA_INTERNAL_SERVER_ERROR:
         case CA_RETRANSMIT_TIMEOUT:
             break;
-
-        case CA_SUCCESS:
         default:
             OIC_LOG_V(ERROR, TAG, "Response code  %u is invalid", rep->result);
             return NULL;

diff --git a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java
index 35a2d25..abd6b11 100755 (executable)
--- a/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java
+++ b/resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java
@@ -37,12 +37,11 @@ public class MainActivity extends Activity {
             MsgType.NON.name(), MsgType.ACK.name(), MsgType.RESET.name() };
 
     private final CharSequence[] mResponseResultCheckBoxItems = {
-            ResponseResult.CA_SUCCESS.name(), ResponseResult.CA_CREATED.name(),
-            ResponseResult.CA_DELETED.name(), ResponseResult.CA_VALID.name(),
-            ResponseResult.CA_CHANGED.name(), ResponseResult.CA_CONTENT.name(),
-            ResponseResult.CA_EMPTY.name(), ResponseResult.CA_BAD_REQ.name(),
-            ResponseResult.CA_BAD_OPT.name(), ResponseResult.CA_NOT_FOUND.name(),
-            ResponseResult.CA_INTERNAL_SERVER_ERROR.name(),
+            ResponseResult.CA_CREATED.name(), ResponseResult.CA_DELETED.name(),
+            ResponseResult.CA_VALID.name(), ResponseResult.CA_CHANGED.name(),
+            ResponseResult.CA_CONTENT.name(), ResponseResult.CA_EMPTY.name(),
+            ResponseResult.CA_BAD_REQ.name(), ResponseResult.CA_BAD_OPT.name(),
+            ResponseResult.CA_NOT_FOUND.name(), ResponseResult.CA_INTERNAL_SERVER_ERROR.name(),
             ResponseResult.CA_RETRANSMIT_TIMEOUT.name() };
 
     private enum Mode {
@@ -62,7 +61,7 @@ public class MainActivity extends Activity {
     };
 
     private enum ResponseResult {
-        CA_SUCCESS, CA_CREATED, CA_DELETED, CA_VALID, CA_CHANGED, CA_CONTENT, CA_EMPTY,
+        CA_CREATED, CA_DELETED, CA_VALID, CA_CHANGED, CA_CONTENT, CA_EMPTY,
         CA_BAD_REQ, CA_BAD_OPT, CA_NOT_FOUND, CA_INTERNAL_SERVER_ERROR, CA_RETRANSMIT_TIMEOUT
     }
 
@@ -619,11 +618,7 @@ public class MainActivity extends Activity {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
-                        if (selectedResponseValue == ResponseResult.CA_SUCCESS.ordinal()) {
-                            responseValue = 200;
-                            DLog.v(TAG, "Response Value is CA_SUCCESS");
-                        } else if (selectedResponseValue == ResponseResult.CA_CREATED
-                                .ordinal()) {
+                        if (selectedResponseValue == ResponseResult.CA_CREATED.ordinal()) {
                             responseValue = 201;
                             DLog.v(TAG, "Response Value is CA_CREATED");
                         } else if (selectedResponseValue == ResponseResult.CA_DELETED

diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c
index 509da33..b59556a 100644 (file)
--- a/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@ -294,7 +294,7 @@ static OCStackResult CAToOCStackResult(CAResponseResult_t caCode);
  *
  * @param caCode OCStackResult code.
  * @param method OCMethod method the return code replies to.
- * @return ::CA_SUCCESS on success, some other value upon failure.
+ * @return ::CA_CONTENT on OK, some other value upon failure.
  */
 static CAResponseResult_t OCToCAStackResult(OCStackResult ocCode, OCMethod method);