From 7207a508411754209c54628b1c9d7c3bc6eec329 Mon Sep 17 00:00:00 2001 From: "saurabh.s9" Date: Thu, 18 May 2017 12:52:19 +0530 Subject: [PATCH] [IOT-2265] [IOT-2142] [IOT-2164] Resolved Unowned device discovery in Android Change-Id: Ic4327443832798ed3ce093566f1994216b84dad4 Signed-off-by: saurabh.s9 Reviewed-on: https://gerrit.iotivity.org/gerrit/20019 Tested-by: jenkins-iotivity Reviewed-by: Jihun Ha Reviewed-by: Kevin Kane Reviewed-by: George Nash Reviewed-by: Rick Bell Reviewed-by: dongik Lee Reviewed-by: Randeep Singh --- java/jni/JniOcProvisioning.cpp | 2 +- resource/csdk/security/provisioning/src/SConscript | 4 ---- resource/csdk/security/provisioning/src/pmutility.c | 2 +- resource/src/SConscript | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/java/jni/JniOcProvisioning.cpp b/java/jni/JniOcProvisioning.cpp index abd358e..abe51b8 100644 --- a/java/jni/JniOcProvisioning.cpp +++ b/java/jni/JniOcProvisioning.cpp @@ -110,7 +110,7 @@ JNIEXPORT void JNICALL Java_org_iotivity_base_OcProvisioning_ownershipTransferCB if (OIC_JUST_WORKS == (OicSecOxm_t)OxmType) { /*NO callback required for JUST_WORKS*/ - result = OCSecure::setInputPinCallback(NULL); + return; } if (OIC_RANDOM_DEVICE_PIN == (OicSecOxm_t)OxmType) { diff --git a/resource/csdk/security/provisioning/src/SConscript b/resource/csdk/security/provisioning/src/SConscript index 1c93b32..27e286f 100644 --- a/resource/csdk/security/provisioning/src/SConscript +++ b/resource/csdk/security/provisioning/src/SConscript @@ -32,10 +32,6 @@ if target_os not in ['msys_nt', 'windows']: provisioning_lib_env.PrependUnique(LIBS = ['octbstack']) -if target_os not in ['msys_nt', 'windows']: - # octbstack.dll is exporting ocpmapi and ocsrm APIs on Windows. - provisioning_lib_env.PrependUnique(LIBS = ['ocsrm']) - provisioning_lib_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto']) if target_os in ['android']: diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c index cadb51d..f57095a 100644 --- a/resource/csdk/security/provisioning/src/pmutility.c +++ b/resource/csdk/security/provisioning/src/pmutility.c @@ -762,7 +762,7 @@ static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle ((OC_IP_USE_V6 == clientResponse->devAddr.flags && strchr(eps->addr, ':')) || (OC_IP_USE_V4 == clientResponse->devAddr.flags && - strchr(eps->addr, ',')))) + strchr(eps->addr, '.')))) { securePort = eps->port; break; diff --git a/resource/src/SConscript b/resource/src/SConscript index 290496b..d1a0c77 100644 --- a/resource/src/SConscript +++ b/resource/src/SConscript @@ -57,7 +57,7 @@ oclib_env.AppendUnique(CPPPATH = [ ]) oclib_env.AppendUnique(LIBS = ['oc_logger']) -oclib_env.PrependUnique(LIBS = ['octbstack', 'connectivity_abstraction', 'ocsrm']) +oclib_env.PrependUnique(LIBS = ['octbstack', 'connectivity_abstraction']) if 'g++' in oclib_env.get('CXX'): oclib_env.AppendUnique(CXXFLAGS = ['-std=c++0x']) -- 2.7.4