projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
connectivity
/
src
/
bt_edr_adapter
/
android
/
caedrclient.c
diff --git
a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
index
5ff9200
..
d29de99
100644
(file)
--- a/
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
+++ b/
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
@@
-29,7
+29,7
@@
#include "oic_malloc.h"
#include "oic_string.h"
#include "cathreadpool.h" /* for thread pool */
#include "oic_malloc.h"
#include "oic_string.h"
#include "cathreadpool.h" /* for thread pool */
-#include "
camutex
.h"
+#include "
octhread
.h"
#include "uarraylist.h"
#include "caadapterutils.h"
#include "caremotehandler.h"
#include "uarraylist.h"
#include "caadapterutils.h"
#include "caremotehandler.h"
@@
-57,13
+57,13
@@
static jobject g_context;
* @var g_mutexStateList
* @brief Mutex to synchronize device state list
*/
* @var g_mutexStateList
* @brief Mutex to synchronize device state list
*/
-static
ca
_mutex g_mutexStateList = NULL;
+static
oc
_mutex g_mutexStateList = NULL;
/**
* @var g_mutexObjectList
* @brief Mutex to synchronize device object list
*/
/**
* @var g_mutexObjectList
* @brief Mutex to synchronize device object list
*/
-static
ca
_mutex g_mutexObjectList = NULL;
+static
oc
_mutex g_mutexObjectList = NULL;
/**
* @var g_edrErrorHandler
/**
* @var g_edrErrorHandler
@@
-281,20
+281,20
@@
static void CAEDRDestroyMutex()
{
if (g_mutexStateList)
{
{
if (g_mutexStateList)
{
-
ca
_mutex_free(g_mutexStateList);
+
oc
_mutex_free(g_mutexStateList);
g_mutexStateList = NULL;
}
if (g_mutexObjectList)
{
g_mutexStateList = NULL;
}
if (g_mutexObjectList)
{
-
ca
_mutex_free(g_mutexObjectList);
+
oc
_mutex_free(g_mutexObjectList);
g_mutexObjectList = NULL;
}
}
static CAResult_t CAEDRCreateMutex()
{
g_mutexObjectList = NULL;
}
}
static CAResult_t CAEDRCreateMutex()
{
- g_mutexStateList =
ca
_mutex_new();
+ g_mutexStateList =
oc
_mutex_new();
if (!g_mutexStateList)
{
OIC_LOG(ERROR, TAG, "Failed to created mutex!");
if (!g_mutexStateList)
{
OIC_LOG(ERROR, TAG, "Failed to created mutex!");
@@
-303,7
+303,7
@@
static CAResult_t CAEDRCreateMutex()
return CA_STATUS_FAILED;
}
return CA_STATUS_FAILED;
}
- g_mutexObjectList =
ca
_mutex_new();
+ g_mutexObjectList =
oc
_mutex_new();
if (!g_mutexObjectList)
{
OIC_LOG(ERROR, TAG, "Failed to created mutex!");
if (!g_mutexObjectList)
{
OIC_LOG(ERROR, TAG, "Failed to created mutex!");
@@
-355,13
+355,13
@@
CAResult_t CAEDRInitialize()
}
(*env)->DeleteLocalRef(env, jni_address);
}
(*env)->DeleteLocalRef(env, jni_address);
-
ca
_mutex_lock(g_mutexStateList);
+
oc
_mutex_lock(g_mutexStateList);
CAEDRNativeCreateDeviceStateList();
CAEDRNativeCreateDeviceStateList();
-
ca
_mutex_unlock(g_mutexStateList);
+
oc
_mutex_unlock(g_mutexStateList);
-
ca
_mutex_lock(g_mutexObjectList);
+
oc
_mutex_lock(g_mutexObjectList);
CAEDRNativeCreateDeviceSocketList();
CAEDRNativeCreateDeviceSocketList();
-
ca
_mutex_unlock(g_mutexObjectList);
+
oc
_mutex_unlock(g_mutexObjectList);
if (isAttached)
{
if (isAttached)
{
@@
-854,6
+854,7
@@
CAResult_t CAEDRNativeSendData(JNIEnv *env, const char *address, const uint8_t *
if ((*env)->ExceptionCheck(env))
{
OIC_LOG(ERROR, TAG, "Failed to write data in outputStram");
if ((*env)->ExceptionCheck(env))
{
OIC_LOG(ERROR, TAG, "Failed to write data in outputStram");
+ CALogSendStateInfo(CA_ADAPTER_RFCOMM_BTEDR, address, 0, dataLength, false, NULL);
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
return CA_STATUS_FAILED;
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
return CA_STATUS_FAILED;
@@
-861,12
+862,14
@@
CAResult_t CAEDRNativeSendData(JNIEnv *env, const char *address, const uint8_t *
OIC_LOG_V(INFO, TAG, "EDR sendTo is successful: %u bytes, to %s",
dataLength, address);
OIC_LOG_V(INFO, TAG, "EDR sendTo is successful: %u bytes, to %s",
dataLength, address);
+ CALogSendStateInfo(CA_ADAPTER_RFCOMM_BTEDR, address, 0, dataLength, true, NULL);
}
else
{
}
else
{
+ OIC_LOG(ERROR, TAG, "error!!");
+ CALogSendStateInfo(CA_ADAPTER_RFCOMM_BTEDR, address, 0, dataLength, false, NULL);
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
- OIC_LOG(ERROR, TAG, "error!!");
return CA_STATUS_FAILED;
}
}
return CA_STATUS_FAILED;
}
}
@@
-1029,6
+1032,7
@@
CAResult_t CAEDRNativeConnect(JNIEnv *env, const char *address)
if ((*env)->ExceptionCheck(env))
{
if ((*env)->ExceptionCheck(env))
{
+ CALogSendStateInfo(CA_ADAPTER_RFCOMM_BTEDR, address, 0, 0, false, "Connect has Failed");
OIC_LOG(ERROR, TAG, "Connect is Failed!!!");
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
OIC_LOG(ERROR, TAG, "Connect is Failed!!!");
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
@@
-1043,16
+1047,16
@@
CAResult_t CAEDRNativeConnect(JNIEnv *env, const char *address)
(*env)->DeleteLocalRef(env, jni_obj_BTSocket);
return CA_STATUS_FAILED;
}
(*env)->DeleteLocalRef(env, jni_obj_BTSocket);
return CA_STATUS_FAILED;
}
-
ca
_mutex_lock(g_mutexObjectList);
+
oc
_mutex_lock(g_mutexObjectList);
CAEDRNativeAddDeviceSocketToList(env, jni_socket);
(*env)->DeleteGlobalRef(env, jni_socket);
(*env)->DeleteLocalRef(env, jni_obj_BTSocket);
CAEDRNativeAddDeviceSocketToList(env, jni_socket);
(*env)->DeleteGlobalRef(env, jni_socket);
(*env)->DeleteLocalRef(env, jni_obj_BTSocket);
-
ca
_mutex_unlock(g_mutexObjectList);
+
oc
_mutex_unlock(g_mutexObjectList);
// update state
// update state
-
ca
_mutex_lock(g_mutexStateList);
+
oc
_mutex_lock(g_mutexStateList);
CAEDRUpdateDeviceState(STATE_CONNECTED, address);
CAEDRUpdateDeviceState(STATE_CONNECTED, address);
-
ca
_mutex_unlock(g_mutexStateList);
+
oc
_mutex_unlock(g_mutexStateList);
OIC_LOG(DEBUG, TAG, "successfully connected");
OIC_LOG(DEBUG, TAG, "successfully connected");
@@
-1098,9
+1102,9
@@
void CAEDRNativeSocketClose(JNIEnv *env, const char *address)
CAEDRNativeRemoveDeviceSocket(env, jni_obj_socket);
// update state
CAEDRNativeRemoveDeviceSocket(env, jni_obj_socket);
// update state
-
ca
_mutex_lock(g_mutexStateList);
+
oc
_mutex_lock(g_mutexStateList);
CAEDRUpdateDeviceState(STATE_DISCONNECTED, address);
CAEDRUpdateDeviceState(STATE_DISCONNECTED, address);
-
ca
_mutex_unlock(g_mutexStateList);
+
oc
_mutex_unlock(g_mutexStateList);
OIC_LOG_V(DEBUG, TAG, "disconnected with [%s]", address);
}
OIC_LOG_V(DEBUG, TAG, "disconnected with [%s]", address);
}