From 33bc594099aa02c35c3721490c3f01a763334933 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 31 Mar 2016 11:47:58 +0200 Subject: [PATCH] android: add AUTHENTICATION_FAILURE error code This error code was added in commit abe4ddd7e4 "Add wrong PIN defence codes in case of PIN based OxM" to IoTivity, but it was not added to the Android error code enum. Change-Id: Id3a0ca22b537fba1d600eecc069fbfb88fcf470d Signed-off-by: Hauke Mehrtens Reviewed-on: https://gerrit.iotivity.org/gerrit/7495 Reviewed-by: Tim Kourt Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- android/android_api/base/jni/JniUtils.h | 3 +++ .../android_api/base/src/main/java/org/iotivity/base/ErrorCode.java | 3 +++ resource/csdk/stack/include/octypes.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/android/android_api/base/jni/JniUtils.h b/android/android_api/base/jni/JniUtils.h index 25e769c..fcfa2a1 100644 --- a/android/android_api/base/jni/JniUtils.h +++ b/android/android_api/base/jni/JniUtils.h @@ -209,6 +209,9 @@ public: return "DUPLICATE_UUID"; case OC_STACK_INCONSISTENT_DB: return "INCONSISTENT_DB"; + /** Error code from OTM */ + case OC_STACK_AUTHENTICATION_FAILURE: + return "AUTHENTICATION_FAILURE"; /** Insert all new error codes here!.*/ #ifdef WITH_PRESENCE case OC_STACK_PRESENCE_STOPPED: diff --git a/android/android_api/base/src/main/java/org/iotivity/base/ErrorCode.java b/android/android_api/base/src/main/java/org/iotivity/base/ErrorCode.java index 5433c86..bba664e 100644 --- a/android/android_api/base/src/main/java/org/iotivity/base/ErrorCode.java +++ b/android/android_api/base/src/main/java/org/iotivity/base/ErrorCode.java @@ -61,6 +61,9 @@ public enum ErrorCode { PDM_IS_NOT_INITIALIZED("PDM_IS_NOT_INITIALIZED", ""), DUPLICATE_UUID("DUPLICATE_UUID", ""), INCONSISTENT_DB("INCONSISTENT_DB", ""), + /** Error code from OTM */ + AUTHENTICATION_FAILURE("AUTHENTICATION_FAILURE", + "This error is pushed from DTLS interface when handshake failure happens"), /** Insert all new error codes here!.*/ PRESENCE_STOPPED("PRESENCE_STOPPED", ""), PRESENCE_TIMEOUT("PRESENCE_TIMEOUT", ""), diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h index ef8d738..f576097 100644 --- a/resource/csdk/stack/include/octypes.h +++ b/resource/csdk/stack/include/octypes.h @@ -733,7 +733,7 @@ typedef enum /** * Error code from OTM - * This error is plused from DTLS interface when handshake failure happens + * This error is pushed from DTLS interface when handshake failure happens */ OC_STACK_AUTHENTICATION_FAILURE, -- 2.7.4