#include "caleutils.h"
#include "caleinterface.h"
#include "caadapterutils.h"
+#include "calestate.h"
#include "logger.h"
#include "oic_malloc.h"
#include "cathreadpool.h"
-#include "camutex.h"
+#include "octhread.h"
#include "uarraylist.h"
#include "org_iotivity_ca_CaLeServerInterface.h"
#define TAG PCF("OIC_CA_LE_SERVER")
#define WAIT_TIME_WRITE_CHARACTERISTIC 10000000
+#define INVALID_STATE -1
static JavaVM *g_jvm = NULL;
static jobject g_context = NULL;
static CABLEErrorHandleCallback g_serverErrorCallback;
static u_arraylist_t *g_connectedDeviceList = NULL;
+static u_arraylist_t *g_deviceStateList = NULL;
static bool g_isStartServer = false;
static bool g_isInitializedServer = false;
static jobject g_obj_bluetoothDevice = NULL;
static CABLEDataReceivedCallback g_CABLEServerDataReceivedCallback = NULL;
-static ca_mutex g_bleReqRespCbMutex = NULL;
-static ca_mutex g_bleClientBDAddressMutex = NULL;
-static ca_mutex g_connectedDeviceListMutex = NULL;
+static oc_mutex g_bleReqRespCbMutex = NULL;
+static oc_mutex g_bleClientBDAddressMutex = NULL;
+static oc_mutex g_connectedDeviceListMutex = NULL;
-static ca_mutex g_threadSendMutex = NULL;
-static ca_mutex g_threadSendNotifyMutex = NULL;
-static ca_cond g_threadSendNotifyCond = NULL;
+static oc_mutex g_threadSendMutex = NULL;
+static oc_mutex g_threadSendNotifyMutex = NULL;
+static oc_cond g_threadSendNotifyCond = NULL;
static bool g_isSignalSetFlag = false;
+static oc_mutex g_deviceStateListMutex = NULL;
+
+static jint g_state_connected = INVALID_STATE;
+static jint g_state_disconnected = INVALID_STATE;
+
+static const char CLASSPATH_BT_ADVERTISE_CB[] = "android/bluetooth/le/AdvertiseCallback";
+static const char CLASSPATH_BT_GATTSERVER[] = "android/bluetooth/BluetoothGattServer";
+
+static bool g_setHighQoS = true;
+
void CALEServerJNISetContext()
{
OIC_LOG(DEBUG, TAG, "CALEServerJNISetContext");
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
VERIFY_NON_NULL_RET(env, TAG, "env", -1);
VERIFY_NON_NULL_RET(device, TAG, "device", -1);
- jclass jni_cid_bluetoothManager = (*env)->FindClass(env, "android/bluetooth/BluetoothManager");
- if (!jni_cid_bluetoothManager)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothManager is null");
- return -1;
- }
-
- jmethodID jni_mid_getConnectionState = (*env)->GetMethodID(env, jni_cid_bluetoothManager,
- "getConnectionState",
- "(Landroid/bluetooth/BluetoothDevice"
- ";I)I");
+ jmethodID jni_mid_getConnectionState = CAGetJNIMethodID(env, "android/bluetooth"
+ "/BluetoothManager",
+ "getConnectionState",
+ "(Landroid/bluetooth/BluetoothDevice"
+ ";I)I");
if (!jni_mid_getConnectionState)
{
OIC_LOG(ERROR, TAG, "jni_mid_getConnectionState is null");
jint jni_state = (jint)(*env)->CallIntMethod(env, g_bluetoothManager,
jni_mid_getConnectionState,
device, GATT_PROFILE);
+ if (CACheckJNIException(env))
+ {
+ OIC_LOG(ERROR, TAG, "getConnectionState has failed");
+ return -1;
+ }
+
OIC_LOG_V(INFO, TAG, "connection state is %d", jni_state);
return jni_state;
}
}
OIC_LOG(DEBUG, TAG, "CALEServerSetResponseData");
-
- jclass jni_cid_bluetoothGattServer = (*env)->FindClass(env,
- "android/bluetooth/BluetoothGattServer");
- if (!jni_cid_bluetoothGattServer)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattServer is null");
- return NULL;
- }
-
- jclass jni_cid_bluetoothGattService = (*env)->FindClass(env, "android/bluetooth/"
- "BluetoothGattService");
- if (!jni_cid_bluetoothGattService)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattService is null");
- return NULL;
- }
-
- jclass jni_cid_bluetoothGattCharacteristic = (*env)->FindClass(env, "android/bluetooth/"
- "BluetoothGattCharacteristic");
- if (!jni_cid_bluetoothGattCharacteristic)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattCharacteristic is null");
- return NULL;
- }
-
- jmethodID jni_mid_getService = (*env)->GetMethodID(env, jni_cid_bluetoothGattServer,
- "getService",
- "(Ljava/util/UUID;)Landroid/bluetooth/"
- "BluetoothGattService;");
+ jmethodID jni_mid_getService = CAGetJNIMethodID(env, CLASSPATH_BT_GATTSERVER,
+ "getService",
+ "(Ljava/util/UUID;)Landroid/bluetooth/"
+ "BluetoothGattService;");
if (!jni_mid_getService)
{
OIC_LOG(ERROR, TAG, "jni_mid_getService is null");
if (!jni_obj_bluetoothGattService)
{
OIC_LOG(ERROR, TAG, "jni_obj_bluetoothGattService is null");
+ CACheckJNIException(env);
return NULL;
}
- jmethodID jni_mid_getCharacteristic = (*env)->GetMethodID(env, jni_cid_bluetoothGattService,
- "getCharacteristic",
- "(Ljava/util/UUID;)"
- "Landroid/bluetooth/"
- "BluetoothGattCharacteristic;");
+ jmethodID jni_mid_getCharacteristic = CAGetJNIMethodID(env, "android/bluetooth/"
+ "BluetoothGattService",
+ "getCharacteristic",
+ "(Ljava/util/UUID;)"
+ "Landroid/bluetooth/"
+ "BluetoothGattCharacteristic;");
if (!jni_mid_getCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_mid_getCharacteristic is null");
if (!jni_obj_bluetoothGattCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_obj_bluetoothGattCharacteristic is null");
+ CACheckJNIException(env);
return NULL;
}
- jmethodID jni_mid_setValue = (*env)->GetMethodID(env, jni_cid_bluetoothGattCharacteristic,
- "setValue", "([B)Z");
+ jmethodID jni_mid_setValue = CAGetJNIMethodID(env, "android/bluetooth/"
+ "BluetoothGattCharacteristic",
+ "setValue", "([B)Z");
if (!jni_mid_setValue)
{
OIC_LOG(ERROR, TAG, "jni_mid_setValue is null");
if (JNI_FALSE == jni_boolean_setValue)
{
OIC_LOG(ERROR, TAG, "Fail to set response data");
+ CACheckJNIException(env);
}
OIC_LOG(DEBUG, TAG, "OUT - CALEServerSetResponseData");
return CA_ADAPTER_NOT_ENABLED;
}
- if (STATE_CONNECTED != CALEServerGetConnectionState(env, device))
+ if (!g_bluetoothGattServer)
{
- OIC_LOG(ERROR, TAG, "it is not connected state");
+ OIC_LOG(ERROR, TAG, "g_bluetoothGattServer is not available");
return CA_STATUS_FAILED;
}
- jclass jni_cid_bluetoothGattServer = (*env)->FindClass(env,
- "android/bluetooth/BluetoothGattServer");
- if (!jni_cid_bluetoothGattServer)
+ if (g_state_connected != CALEServerGetConnectionState(env, device))
{
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattServer is null");
+ OIC_LOG(ERROR, TAG, "it is not connected state");
return CA_STATUS_FAILED;
}
- jmethodID jni_mid_notifyCharacteristicChanged = (*env)->GetMethodID(
- env, jni_cid_bluetoothGattServer, "notifyCharacteristicChanged",
- "(Landroid/bluetooth/BluetoothDevice;"
- "Landroid/bluetooth/BluetoothGattCharacteristic;Z)Z");
+ jmethodID jni_mid_notifyCharacteristicChanged = CAGetJNIMethodID(env,
+ CLASSPATH_BT_GATTSERVER,
+ "notifyCharacteristicChanged",
+ "(Landroid/bluetooth/BluetoothDevice;"
+ "Landroid/bluetooth/"
+ "BluetoothGattCharacteristic;Z)Z");
if (!jni_mid_notifyCharacteristicChanged)
{
OIC_LOG(ERROR, TAG, "jni_mid_notifyCharacteristicChanged is null");
return CA_STATUS_FAILED;
}
+ OIC_LOG(DEBUG, TAG, "CALL API - notifyCharacteristicChanged");
+
jboolean jni_boolean_notifyCharacteristicChanged = (*env)->CallBooleanMethod(
env, g_bluetoothGattServer, jni_mid_notifyCharacteristicChanged, device, responseData,
JNI_FALSE);
if (JNI_FALSE == jni_boolean_notifyCharacteristicChanged)
{
OIC_LOG(ERROR, TAG, "Fail to notify characteristic");
+ CACheckJNIException(env);
return CA_SEND_FAILED;
}
OIC_LOG_V(DEBUG, TAG, "callback flag is %d", g_isSignalSetFlag);
- ca_mutex_lock(g_threadSendNotifyMutex);
+ oc_mutex_lock(g_threadSendNotifyMutex);
if (!g_isSignalSetFlag)
{
OIC_LOG(DEBUG, TAG, "wait for callback to notify notifyCharacteristic is success");
- if (0 != ca_cond_wait_for(g_threadSendNotifyCond, g_threadSendNotifyMutex,
+ if (0 != oc_cond_wait_for(g_threadSendNotifyCond, g_threadSendNotifyMutex,
WAIT_TIME_WRITE_CHARACTERISTIC))
{
OIC_LOG(ERROR, TAG, "there is no response. notifyCharacteristic has failed");
- ca_mutex_unlock(g_threadSendNotifyMutex);
+ oc_mutex_unlock(g_threadSendNotifyMutex);
return CA_STATUS_FAILED;
}
}
// reset flag set by writeCharacteristic Callback
g_isSignalSetFlag = false;
- ca_mutex_unlock(g_threadSendNotifyMutex);
+ oc_mutex_unlock(g_threadSendNotifyMutex);
OIC_LOG(INFO, TAG, "notifyCharacteristic success");
return CA_STATUS_OK;
}
return CA_ADAPTER_NOT_ENABLED;
}
- jclass jni_cid_bluetoothGattServer = (*env)->FindClass(env,
- "android/bluetooth/BluetoothGattServer");
- if (!jni_cid_bluetoothGattServer)
+ if (!g_bluetoothGattServer)
{
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattServer is null");
+ OIC_LOG(ERROR, TAG, "g_bluetoothGattServer is not available");
return CA_STATUS_FAILED;
}
- jmethodID jni_mid_sendResponse = (*env)->GetMethodID(env, jni_cid_bluetoothGattServer,
- "sendResponse",
- "(Landroid/bluetooth/BluetoothDevice;"
- "III[B)Z");
+ jmethodID jni_mid_sendResponse = CAGetJNIMethodID(env, CLASSPATH_BT_GATTSERVER,
+ "sendResponse",
+ "(Landroid/bluetooth/BluetoothDevice;"
+ "III[B)Z");
if (!jni_mid_sendResponse)
{
OIC_LOG(ERROR, TAG, "jni_mid_sendResponse is null");
if (JNI_FALSE == jni_boolean_sendResponse)
{
OIC_LOG(ERROR, TAG, "Fail to send response for gatt characteristic write request");
+ CACheckJNIException(env);
return CA_SEND_FAILED;
}
return CA_STATUS_OK;
}
-CAResult_t CALEStartAdvertise()
+CAResult_t CALEServerStartAdvertise()
{
+ if ((caglobals.bleFlags & CA_LE_ADV_DISABLE) || CA_DEFAULT_BT_FLAGS == caglobals.bleFlags)
+ {
+ OIC_LOG_V(INFO, TAG, "the advertisement of the bleFlags is disable[%d]",
+ caglobals.bleFlags);
+ return CA_STATUS_OK;
+ }
+
if (!g_jvm)
{
OIC_LOG(ERROR, TAG, "g_jvm is null");
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
}
// start advertise
- CAResult_t ret = CALEServerStartAdvertise(env, g_leAdvertiseCallback);
+ CAResult_t ret = CALEServerStartAdvertiseImpl(env, g_leAdvertiseCallback);
if (CA_STATUS_OK != ret)
{
- OIC_LOG(ERROR, TAG, "CALEServerStartAdvertise has failed");
+ OIC_LOG(ERROR, TAG, "CALEServerStartAdvertiseImpl has failed");
}
if (isAttached)
return ret;
}
-CAResult_t CALEServerStartAdvertise(JNIEnv *env, jobject advertiseCallback)
+CAResult_t CALEServerStartAdvertiseImpl(JNIEnv *env, jobject advertiseCallback)
{
- OIC_LOG(DEBUG, TAG, "IN - CALEServerStartAdvertise");
+ OIC_LOG(DEBUG, TAG, "IN - CALEServerStartAdvertiseImpl");
VERIFY_NON_NULL(env, TAG, "env is null");
VERIFY_NON_NULL(advertiseCallback, TAG, "advertiseCallback is null");
if (!jni_cid_AdvertiseSettings)
{
OIC_LOG(ERROR, TAG, "jni_cid_AdvertiseSettings is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_AdvertiseSettings = (*env)->GetMethodID(env, jni_cid_AdvertiseSettings,
if (!jni_mid_AdvertiseSettings)
{
OIC_LOG(ERROR, TAG, "jni_mid_AdvertiseSettings is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_AdvertiseSettings = (*env)->NewObject(env, jni_cid_AdvertiseSettings,
if (!jni_AdvertiseSettings)
{
OIC_LOG(ERROR, TAG, "jni_AdvertiseSettings is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_setAdvertiseMode = (*env)->GetMethodID(env, jni_cid_AdvertiseSettings,
if (!jni_mid_setAdvertiseMode)
{
OIC_LOG(ERROR, TAG, "jni_mid_setAdvertiseMode is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
// 0: Low power, 1: Balanced
if (!jni_obj_setAdvertiseMode)
{
OIC_LOG(ERROR, TAG, "jni_obj_setAdvertiseMode is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_setConnectable = (*env)->GetMethodID(env, jni_cid_AdvertiseSettings,
if (!jni_mid_setConnectable)
{
OIC_LOG(ERROR, TAG, "jni_mid_setConnectable is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_setConnectable = (*env)->CallObjectMethod(env, jni_AdvertiseSettings,
if (!jni_obj_setConnectable)
{
OIC_LOG(ERROR, TAG, "jni_obj_setConnectable is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_setTimeout = (*env)->GetMethodID(env, jni_cid_AdvertiseSettings, "setTimeout",
if (!jni_mid_setTimeout)
{
OIC_LOG(ERROR, TAG, "jni_mid_setTimeout is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
//A value of 0 will disable the time limit
if (!jni_obj_setTimeout)
{
OIC_LOG(ERROR, TAG, "jni_obj_setTimeout is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jclass jni_cid_AdvertiseDataBuilder = (*env)->FindClass(env,
if (!jni_cid_AdvertiseDataBuilder)
{
OIC_LOG(ERROR, TAG, "jni_cid_AdvertiseDataBuilder is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_AdvertiseDataBuilder = (*env)->GetMethodID(env, jni_cid_AdvertiseDataBuilder,
if (!jni_mid_AdvertiseDataBuilder)
{
OIC_LOG(ERROR, TAG, "jni_mid_AdvertiseDataBuilder is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_AdvertiseDataBuilder = (*env)->NewObject(env, jni_cid_AdvertiseDataBuilder,
if (!jni_AdvertiseDataBuilder)
{
OIC_LOG(ERROR, TAG, "jni_AdvertiseDataBuilder is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
+ }
+
+ jobject jni_AdvertiseDataBuilderForScanRsp = (*env)->NewObject(env,
+ jni_cid_AdvertiseDataBuilder,
+ jni_mid_AdvertiseDataBuilder);
+ if (!jni_AdvertiseDataBuilderForScanRsp)
+ {
+ OIC_LOG(ERROR, TAG, "jni_AdvertiseDataBuilderForScanRsp is null");
+ goto error_exit;
}
jobject jni_obj_serviceUUID = CALEGetUuidFromString(env, OIC_GATT_SERVICE_UUID);
if (!jni_mid_addServiceUuid)
{
OIC_LOG(ERROR, TAG, "jni_mid_addServiceUuid is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_addServiceUuid = (*env)->CallObjectMethod(env, jni_AdvertiseDataBuilder,
if (!jni_obj_addServiceUuid)
{
OIC_LOG(ERROR, TAG, "jni_obj_addServiceUuid is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
+ }
+
+ // Device name has to be included in advertise packet after Android API 23
+ OIC_LOG(DEBUG, TAG, "device name will be added into advertise packet");
+ jmethodID jni_mid_setIncludeDeviceName = (*env)->GetMethodID(env, jni_cid_AdvertiseDataBuilder,
+ "setIncludeDeviceName",
+ "(Z)Landroid/"
+ "bluetooth/le/"
+ "AdvertiseData$Builder;");
+ if (!jni_mid_setIncludeDeviceName)
+ {
+ OIC_LOG(ERROR, TAG, "jni_mid_setIncludeDeviceName is null");
+ goto error_exit;
+ }
+
+ jobject jni_obj_setIncludeDeviceName = (*env)->CallObjectMethod(env,
+ jni_AdvertiseDataBuilderForScanRsp,
+ jni_mid_setIncludeDeviceName,
+ JNI_TRUE);
+ if (!jni_obj_setIncludeDeviceName)
+ {
+ OIC_LOG(ERROR, TAG, "jni_obj_setIncludeDeviceName is null");
+ goto error_exit;
}
jclass jni_cid_BTAdapter = (*env)->FindClass(env, "android/bluetooth/BluetoothAdapter");
if (!jni_mid_getDefaultAdapter)
{
OIC_LOG(ERROR, TAG, "jni_mid_getDefaultAdapter is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_BTAdapter = (*env)->CallStaticObjectMethod(env, jni_cid_BTAdapter,
if (!jni_obj_BTAdapter)
{
OIC_LOG(ERROR, TAG, "jni_obj_BTAdapter is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_getBluetoothLeAdvertiser = (*env)->GetMethodID(env, jni_cid_BTAdapter,
if (!jni_mid_getBluetoothLeAdvertiser)
{
OIC_LOG(ERROR, TAG, "jni_mid_getBluetoothLeAdvertiser is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_getBluetoothLeAdvertiser = (*env)->CallObjectMethod(
if (!jni_obj_getBluetoothLeAdvertiser)
{
OIC_LOG(ERROR, TAG, "jni_obj_getBluetoothLeAdvertiser is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_build_LeAdvertiseSettings = (*env)->GetMethodID(env,
if (!jni_mid_build_LeAdvertiseSettings)
{
OIC_LOG(ERROR, TAG, "jni_mid_build_LeAdvertiseSettings is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_build_LeAdvertiseSettings = (*env)->CallObjectMethod(
if (!jni_obj_build_LeAdvertiseSettings)
{
OIC_LOG(ERROR, TAG, "jni_obj_build_LeAdvertiseSettings is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_build_LeAdvertiseData = (*env)->GetMethodID(env, jni_cid_AdvertiseDataBuilder,
if (!jni_mid_build_LeAdvertiseData)
{
OIC_LOG(ERROR, TAG, "jni_mid_build_LeAdvertiseData is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_build_LeAdvertiseData = (*env)->CallObjectMethod(env, jni_AdvertiseDataBuilder,
if (!jni_obj_build_LeAdvertiseData)
{
OIC_LOG(ERROR, TAG, "jni_obj_build_LeAdvertiseData is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
- jclass jni_cid_leAdvertiser = (*env)->FindClass(env,
- "android/bluetooth/le/BluetoothLeAdvertiser");
- if (!jni_cid_leAdvertiser)
+ jobject jni_obj_build_LeAdvertiseDataForScanRsp = (*env)->CallObjectMethod(env,
+ jni_AdvertiseDataBuilderForScanRsp,
+ jni_mid_build_LeAdvertiseData);
+ if (!jni_obj_build_LeAdvertiseDataForScanRsp)
{
- OIC_LOG(ERROR, TAG, "jni_cid_leAdvertiser is null");
- return CA_STATUS_FAILED;
+ OIC_LOG(ERROR, TAG, "jni_obj_build_LeAdvertiseDataForScanRsp is null");
+ goto error_exit;
}
- jmethodID jni_mid_startAdvertising = (*env)->GetMethodID(env, jni_cid_leAdvertiser,
- "startAdvertising",
- "(Landroid/bluetooth/le/"
- "AdvertiseSettings;Landroid/bluetooth/"
- "le/AdvertiseData;Landroid/bluetooth/"
- "le/AdvertiseCallback;)V");
+ jmethodID jni_mid_startAdvertising = CAGetJNIMethodID(env, "android/bluetooth/le/"
+ "BluetoothLeAdvertiser",
+ "startAdvertising",
+ "(Landroid/bluetooth/le/"
+ "AdvertiseSettings;Landroid/bluetooth/"
+ "le/AdvertiseData;Landroid/bluetooth/"
+ "le/AdvertiseData;Landroid/bluetooth/"
+ "le/AdvertiseCallback;)V");
if (!jni_mid_startAdvertising)
{
- OIC_LOG(ERROR, TAG, "jni_mid_startAdvertising is null");
- return CA_STATUS_FAILED;
+ OIC_LOG(ERROR, TAG, "jni_mid_startAdvertising is null");
+ return CA_STATUS_FAILED;
}
(*env)->CallVoidMethod(env, jni_obj_getBluetoothLeAdvertiser, jni_mid_startAdvertising,
jni_obj_build_LeAdvertiseSettings, jni_obj_build_LeAdvertiseData,
- advertiseCallback);
-
- if ((*env)->ExceptionCheck(env))
+ jni_obj_build_LeAdvertiseDataForScanRsp, advertiseCallback);
+ if (CACheckJNIException(env))
{
OIC_LOG(ERROR, TAG, "StartAdvertising has failed");
- (*env)->ExceptionDescribe(env);
- (*env)->ExceptionClear(env);
return CA_STATUS_FAILED;
}
OIC_LOG(DEBUG, TAG, "Advertising started!!");
-
OIC_LOG(DEBUG, TAG, "OUT - CALEServerStartAdvertise");
return CA_STATUS_OK;
+
+error_exit:
+ CACheckJNIException(env);
+ return CA_STATUS_FAILED;
}
-CAResult_t CALEServerStopAdvertise(JNIEnv *env, jobject advertiseCallback)
+CAResult_t CALEServerStopAdvertise()
{
- OIC_LOG(DEBUG, TAG, "LEServerStopAdvertise");
+ if (!g_jvm)
+ {
+ OIC_LOG(ERROR, TAG, "g_jvm is null");
+ return CA_STATUS_FAILED;
+ }
+
+ bool isAttached = false;
+ JNIEnv* env = NULL;
+ jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
+ if (JNI_OK != res)
+ {
+ OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer");
+ res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL);
+
+ if (JNI_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "AttachCurrentThread has failed");
+ return CA_STATUS_FAILED;
+ }
+ isAttached = true;
+ }
+
+ CAResult_t ret = CALEServerStopAdvertiseImpl(env, g_leAdvertiseCallback);
+ if (CA_STATUS_OK != ret)
+ {
+ OIC_LOG(ERROR, TAG, "CALEServerStopAdvertise has failed");
+ }
+
+ if (isAttached)
+ {
+ (*g_jvm)->DetachCurrentThread(g_jvm);
+ }
+
+ return ret;
+}
+
+CAResult_t CALEServerStopAdvertiseImpl(JNIEnv *env, jobject advertiseCallback)
+{
+ OIC_LOG(DEBUG, TAG, "CALEServerStopAdvertiseImpl");
VERIFY_NON_NULL(env, TAG, "env is null");
VERIFY_NON_NULL(advertiseCallback, TAG, "advertiseCallback is null");
if (!jni_cid_BTAdapter)
{
OIC_LOG(ERROR, TAG, "jni_cid_BTAdapter is null");
- return CA_STATUS_FAILED;
- }
-
- jclass jni_cid_leAdvertiser = (*env)->FindClass(env,
- "android/bluetooth/le/BluetoothLeAdvertiser");
- if (!jni_cid_leAdvertiser)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_leAdvertiser is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_getDefaultAdapter = (*env)->GetStaticMethodID(env, jni_cid_BTAdapter,
if (!jni_mid_getDefaultAdapter)
{
OIC_LOG(ERROR, TAG, "jni_mid_getDefaultAdapter is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_getBTLeAdvertiser = (*env)->GetMethodID(env, jni_cid_BTAdapter,
if (!jni_mid_getBTLeAdvertiser)
{
OIC_LOG(ERROR, TAG, "jni_mid_getBTLeAdvertiser is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
- jmethodID jni_mid_stopAdvertising = (*env)->GetMethodID(env, jni_cid_leAdvertiser,
- "stopAdvertising",
- "(Landroid/bluetooth/le/"
- "AdvertiseCallback;)V");
+ jmethodID jni_mid_stopAdvertising = CAGetJNIMethodID(env, "android/bluetooth/le/"
+ "BluetoothLeAdvertiser",
+ "stopAdvertising",
+ "(Landroid/bluetooth/le/"
+ "AdvertiseCallback;)V");
if (!jni_mid_stopAdvertising)
{
OIC_LOG(ERROR, TAG, "jni_mid_stopAdvertising is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_BTAdapter = (*env)->CallStaticObjectMethod(env, jni_cid_BTAdapter,
if (!jni_obj_BTAdapter)
{
OIC_LOG(ERROR, TAG, "jni_obj_BTAdapter is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_getBluetoothLeAdvertiser = (*env)->CallObjectMethod(env, jni_obj_BTAdapter,
if (!jni_obj_getBluetoothLeAdvertiser)
{
OIC_LOG(ERROR, TAG, "jni_obj_getBluetoothLeAdvertiser is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
(*env)->CallVoidMethod(env, jni_obj_getBluetoothLeAdvertiser, jni_mid_stopAdvertising,
advertiseCallback);
- if ((*env)->ExceptionCheck(env))
+ if (CACheckJNIException(env))
{
OIC_LOG(ERROR, TAG, "getBluetoothLeAdvertiser has failed");
- (*env)->ExceptionDescribe(env);
- (*env)->ExceptionClear(env);
return CA_STATUS_FAILED;
}
OIC_LOG(DEBUG, TAG, "Advertising stopped!!");
return CA_STATUS_OK;
+
+error_exit:
+ CACheckJNIException(env);
+ return CA_STATUS_FAILED;
}
CAResult_t CALEServerStartGattServer(JNIEnv *env, jobject gattServerCallback)
if (!CALEIsEnableBTAdapter(env))
{
OIC_LOG(ERROR, TAG, "BT adapter is not enabled");
- return NULL;
+ goto error_exit;
}
jclass jni_cid_context = (*env)->FindClass(env, "android/content/Context");
if (!jni_cid_context)
{
OIC_LOG(ERROR, TAG, "jni_cid_context is null");
- return NULL;
- }
-
- jclass jni_cid_bluetoothManager = (*env)->FindClass(env, "android/bluetooth/BluetoothManager");
- if (!jni_cid_bluetoothManager)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothManager is null");
- return NULL;
+ goto error_exit;
}
jfieldID jni_fid_bluetoothService = (*env)->GetStaticFieldID(env, jni_cid_context,
if (!jni_fid_bluetoothService)
{
OIC_LOG(ERROR, TAG, "jni_fid_bluetoothService is null");
- return NULL;
+ goto error_exit;
}
jmethodID jni_mid_getSystemService = (*env)->GetMethodID(env, jni_cid_context,
if (!jni_mid_getSystemService)
{
OIC_LOG(ERROR, TAG, "jni_mid_getSystemService is null");
- return NULL;
+ goto error_exit;
}
- jmethodID jni_mid_openGattServer = (*env)->GetMethodID(env, jni_cid_bluetoothManager,
- "openGattServer",
- "(Landroid/content/Context;"
- "Landroid/bluetooth/"
- "BluetoothGattServerCallback;)"
- "Landroid/bluetooth/"
- "BluetoothGattServer;");
+ jmethodID jni_mid_openGattServer = CAGetJNIMethodID(env, "android/bluetooth/"
+ "BluetoothManager",
+ "openGattServer",
+ "(Landroid/content/Context;"
+ "Landroid/bluetooth/"
+ "BluetoothGattServerCallback;)"
+ "Landroid/bluetooth/"
+ "BluetoothGattServer;");
if (!jni_mid_openGattServer)
{
OIC_LOG(ERROR, TAG, "jni_mid_openGattServer is null");
if (!jni_obj_bluetoothService)
{
OIC_LOG(ERROR, TAG, "jni_obj_bluetoothService is null");
- return NULL;
+ goto error_exit;
}
jobject jni_obj_bluetoothManager = (*env)->CallObjectMethod(env, g_context,
if (!jni_obj_bluetoothManager)
{
OIC_LOG(ERROR, TAG, "jni_obj_bluetoothManager is null");
- return NULL;
+ goto error_exit;
}
if (g_bluetoothManager)
if (!jni_obj_bluetoothGattServer)
{
OIC_LOG(ERROR, TAG, "jni_obj_bluetoothGattServer is null");
- return NULL;
+ goto error_exit;
}
OIC_LOG(DEBUG, TAG, "OUT - CALEServerOpenGattServer");
return jni_obj_bluetoothGattServer;
+
+error_exit:
+ CACheckJNIException(env);
+ return NULL;
}
jobject CALEServerCreateGattService(JNIEnv *env)
if (!jni_cid_bluetoothGattService)
{
OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattService is null");
- return NULL;
+ goto error_exit;
}
jclass jni_cid_bluetoothGattCharacteristic = (*env)->FindClass(env, "android/bluetooth/"
if (!jni_cid_bluetoothGattCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattCharacteristic is null");
- return NULL;
+ goto error_exit;
}
jfieldID jni_fid_serviceType = (*env)->GetStaticFieldID(env, jni_cid_bluetoothGattService,
if (!jni_fid_serviceType)
{
OIC_LOG(ERROR, TAG, "jni_fid_serviceType is null");
- return NULL;
+ goto error_exit;
}
- jfieldID jni_fid_readProperties = (*env)->GetStaticFieldID(env,
- jni_cid_bluetoothGattCharacteristic,
- "PROPERTY_NOTIFY", "I");
- if (!jni_fid_readProperties)
+ jfieldID jni_fid_readProperties = NULL;
+ jfieldID jni_fid_writeProperties = NULL;
+ if (g_setHighQoS)
{
- OIC_LOG(ERROR, TAG, "jni_fid_readProperties is null");
- return NULL;
- }
+ jni_fid_readProperties = (*env)->GetStaticFieldID(env,
+ jni_cid_bluetoothGattCharacteristic,
+ "PROPERTY_INDICATE", "I");
+ if (!jni_fid_readProperties)
+ {
+ OIC_LOG(ERROR, TAG, "jni_fid_readProperties is null");
+ goto error_exit;
+ }
- jfieldID jni_fid_writeProperties = (*env)->GetStaticFieldID(env,
- jni_cid_bluetoothGattCharacteristic,
- "PROPERTY_WRITE_NO_RESPONSE", "I");
- if (!jni_fid_writeProperties)
+ jni_fid_writeProperties = (*env)->GetStaticFieldID(env,
+ jni_cid_bluetoothGattCharacteristic,
+ "PROPERTY_WRITE", "I");
+ if (!jni_fid_writeProperties)
+ {
+ OIC_LOG(ERROR, TAG, "jni_fid_writeProperties is null");
+ goto error_exit;
+ }
+ }
+ else
{
- OIC_LOG(ERROR, TAG, "jni_fid_writeProperties is null");
- return NULL;
+ jni_fid_readProperties = (*env)->GetStaticFieldID(env,
+ jni_cid_bluetoothGattCharacteristic,
+ "PROPERTY_NOTIFY", "I");
+ if (!jni_fid_readProperties)
+ {
+ OIC_LOG(ERROR, TAG, "jni_fid_readProperties is null");
+ goto error_exit;
+ }
+
+ jni_fid_writeProperties = (*env)->GetStaticFieldID(env,
+ jni_cid_bluetoothGattCharacteristic,
+ "PROPERTY_WRITE_NO_RESPONSE", "I");
+ if (!jni_fid_writeProperties)
+ {
+ OIC_LOG(ERROR, TAG, "jni_fid_writeProperties is null");
+ goto error_exit;
+ }
}
jfieldID jni_fid_readPermissions = (*env)->GetStaticFieldID(env,
if (!jni_fid_readPermissions)
{
OIC_LOG(ERROR, TAG, "jni_fid_readPermissions is null");
- return NULL;
+ goto error_exit;
}
jfieldID jni_fid_writePermissions = (*env)->GetStaticFieldID(
if (!jni_fid_writePermissions)
{
OIC_LOG(ERROR, TAG, "jni_fid_writePermissions is null");
- return NULL;
+ goto error_exit;
}
jmethodID jni_mid_bluetoothGattService = (*env)->GetMethodID(env, jni_cid_bluetoothGattService,
if (!jni_mid_bluetoothGattService)
{
OIC_LOG(ERROR, TAG, "jni_mid_bluetoothGattService is null");
- return NULL;
+ goto error_exit;
}
jmethodID jni_mid_addCharacteristic = (*env)->GetMethodID(env, jni_cid_bluetoothGattService,
if (!jni_mid_addCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_mid_addCharacteristic is null");
- return NULL;
+ goto error_exit;
}
jmethodID jni_mid_bluetoothGattCharacteristic = (*env)->GetMethodID(
if (!jni_mid_bluetoothGattCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_mid_bluetoothGattCharacteristic is null");
- return NULL;
+ goto error_exit;
}
jobject jni_obj_serviceUUID = CALEGetUuidFromString(env, OIC_GATT_SERVICE_UUID);
if (!jni_bluetoothGattService)
{
OIC_LOG(ERROR, TAG, "jni_bluetoothGattService is null");
- return NULL;
+ goto error_exit;
}
jobject jni_obj_readUuid = CALEGetUuidFromString(env, OIC_GATT_CHARACTERISTIC_RESPONSE_UUID);
jint jni_int_readProperties = (*env)->GetStaticIntField(env,
jni_cid_bluetoothGattCharacteristic,
jni_fid_readProperties);
+ CACheckJNIException(env);
jint jni_int_readPermissions = (*env)->GetStaticIntField(env,
jni_cid_bluetoothGattCharacteristic,
jni_fid_readPermissions);
+ CACheckJNIException(env);
jint jni_int_writePermissions = (*env)->GetStaticIntField(env,
jni_cid_bluetoothGattCharacteristic,
jni_fid_writePermissions);
+ CACheckJNIException(env);
jobject jni_readCharacteristic = (*env)->NewObject(env, jni_cid_bluetoothGattCharacteristic,
jni_mid_bluetoothGattCharacteristic,
if (!jni_readCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_readCharacteristic is null");
- return NULL;
+ goto error_exit;
}
jboolean jni_boolean_addReadCharacteristic = (*env)->CallBooleanMethod(
if (!jni_boolean_addReadCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_boolean_addReadCharacteristic is null");
- return NULL;
+ goto error_exit;
}
jobject jni_obj_writeUuid = CALEGetUuidFromString(env, OIC_GATT_CHARACTERISTIC_REQUEST_UUID);
jint jni_int_writeProperties = (*env)->GetStaticIntField(env,
jni_cid_bluetoothGattCharacteristic,
jni_fid_writeProperties);
+ CACheckJNIException(env);
jobject jni_writeCharacteristic = (*env)->NewObject(env, jni_cid_bluetoothGattCharacteristic,
jni_mid_bluetoothGattCharacteristic,
if (!jni_writeCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_writeCharacteristic is null");
- return NULL;
+ goto error_exit;
}
jboolean jni_boolean_addWriteCharacteristic = (*env)->CallBooleanMethod(
if (JNI_FALSE == jni_boolean_addWriteCharacteristic)
{
OIC_LOG(ERROR, TAG, "Fail to add jni_boolean_addReadCharacteristic");
- return NULL;
+ goto error_exit;
}
OIC_LOG(DEBUG, TAG, "OUT - CALEServerCreateGattService");
return jni_bluetoothGattService;
+
+error_exit:
+ CACheckJNIException(env);
+ return NULL;
}
CAResult_t CALEServerAddDescriptor(JNIEnv *env, jobject characteristic)
if (!jni_cid_bluetoothGattDescriptor)
{
OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattDescriptor is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_bluetoothGattDescriptor = (*env)->GetMethodID(env,
if (!jni_mid_bluetoothGattDescriptor)
{
OIC_LOG(ERROR, TAG, "jni_mid_bluetoothGattDescriptor is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jfieldID jni_fid_readPermissions = (*env)->GetStaticFieldID(env,
if (!jni_fid_readPermissions)
{
OIC_LOG(ERROR, TAG, "jni_fid_readPermissions is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jobject jni_obj_readUuid = CALEGetUuidFromString(env, OIC_GATT_CHARACTERISTIC_CONFIG_UUID);
jint jni_int_readPermissions = (*env)->GetStaticIntField(env, jni_cid_bluetoothGattDescriptor,
jni_fid_readPermissions);
+ CACheckJNIException(env);
OIC_LOG(DEBUG, TAG, "initialize new Descriptor");
if (!jni_readDescriptor)
{
OIC_LOG(ERROR, TAG, "jni_readDescriptor is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jclass jni_cid_GattCharacteristic = (*env)->FindClass(env, "android/bluetooth/"
if (!jni_cid_GattCharacteristic)
{
OIC_LOG(ERROR, TAG, "jni_cid_GattCharacteristic is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jmethodID jni_mid_addDescriptor = (*env)->GetMethodID(env, jni_cid_GattCharacteristic,
if (!jni_mid_addDescriptor)
{
OIC_LOG(ERROR, TAG, "jni_mid_addDescriptor is null");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
jboolean jni_boolean_addDescriptor = (*env)->CallBooleanMethod(env, characteristic,
if (JNI_FALSE == jni_boolean_addDescriptor)
{
OIC_LOG(ERROR, TAG, "addDescriptor has failed");
- return CA_STATUS_FAILED;
+ goto error_exit;
}
else
{
OIC_LOG(DEBUG, TAG, "addDescriptor success");
}
return CA_STATUS_OK;
+
+error_exit:
+ CACheckJNIException(env);
+ return CA_STATUS_FAILED;
}
CAResult_t CALEServerAddGattService(JNIEnv *env, jobject bluetoothGattServer,
return CA_ADAPTER_NOT_ENABLED;
}
- jclass jni_cid_bluetoothGattServer = (*env)->FindClass(env,
- "android/bluetooth/BluetoothGattServer");
- if (!jni_cid_bluetoothGattServer)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattServer is null");
- return CA_STATUS_FAILED;
- }
-
- jmethodID jni_mid_addService = (*env)->GetMethodID(env, jni_cid_bluetoothGattServer,
- "addService",
- "(Landroid/bluetooth/BluetoothGattService;)"
- "Z");
- if (!jni_mid_addService)
- {
- OIC_LOG(ERROR, TAG, "jni_mid_addService is null");
- return CA_STATUS_FAILED;
- }
+ jmethodID jni_mid_addService = CAGetJNIMethodID(env, CLASSPATH_BT_GATTSERVER,
+ "addService",
+ "(Landroid/bluetooth/BluetoothGattService;)"
+ "Z");
+ if (!jni_mid_addService)
+ {
+ OIC_LOG(ERROR, TAG, "jni_mid_addService is null");
+ return CA_STATUS_FAILED;
+ }
jboolean jni_boolean_addService = (*env)->CallBooleanMethod(env, bluetoothGattServer,
jni_mid_addService,
if (JNI_FALSE == jni_boolean_addService)
{
OIC_LOG(ERROR, TAG, "Fail to add GATT service");
+ CACheckJNIException(env);
return CA_STATUS_FAILED;
}
return CA_ADAPTER_NOT_ENABLED;
}
- jclass jni_cid_bluetoothGattServer = (*env)->FindClass(env,
- "android/bluetooth/BluetoothGattServer");
- if (!jni_cid_bluetoothGattServer)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattServer is null");
- return CA_STATUS_FAILED;
- }
-
- jmethodID jni_mid_connect = (*env)->GetMethodID(env, jni_cid_bluetoothGattServer, "connect",
- "(Landroid/bluetooth/BluetoothDevice;Z)Z");
+ jmethodID jni_mid_connect = CAGetJNIMethodID(env, CLASSPATH_BT_GATTSERVER,
+ "connect",
+ "(Landroid/bluetooth/BluetoothDevice;Z)Z");
if (!jni_mid_connect)
{
OIC_LOG(ERROR, TAG, "jni_mid_connect is null");
if (JNI_FALSE == jni_boolean_connect)
{
OIC_LOG(ERROR, TAG, "Fail to connect");
+ CACheckJNIException(env);
return CA_STATUS_FAILED;
}
OIC_LOG(DEBUG, TAG, "IN - CALEServerDisconnectAllDevices");
VERIFY_NON_NULL(env, TAG, "env is null");
- ca_mutex_lock(g_connectedDeviceListMutex);
+ oc_mutex_lock(g_connectedDeviceListMutex);
if (!g_connectedDeviceList)
{
OIC_LOG(ERROR, TAG, "g_connectedDeviceList is null");
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_FAILED;
}
}
}
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
OIC_LOG(DEBUG, TAG, "OUT - CALEServerDisconnectAllDevices");
return CA_STATUS_OK;
}
return CA_ADAPTER_NOT_ENABLED;
}
- jclass jni_cid_bluetoothGattServer = (*env)->FindClass(env,
- "android/bluetooth/BluetoothGattServer");
- if (!jni_cid_bluetoothGattServer)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_bluetoothGattServer is null");
- return CA_STATUS_FAILED;
- }
-
- jmethodID jni_mid_cancelConnection = (*env)->GetMethodID(env, jni_cid_bluetoothGattServer,
- "cancelConnection",
- "(Landroid/bluetooth/BluetoothDevice;)"
- "V");
+ jmethodID jni_mid_cancelConnection = CAGetJNIMethodID(env, CLASSPATH_BT_GATTSERVER,
+ "cancelConnection",
+ "(Landroid/bluetooth/BluetoothDevice;)"
+ "V");
if (!jni_mid_cancelConnection)
{
OIC_LOG(ERROR, TAG, "jni_mid_cancelConnection is null");
(*env)->CallVoidMethod(env, g_bluetoothGattServer, jni_mid_cancelConnection, bluetoothDevice);
- if ((*env)->ExceptionCheck(env))
+ if (CACheckJNIException(env))
{
OIC_LOG(ERROR, TAG, "cancelConnection has failed");
- (*env)->ExceptionDescribe(env);
- (*env)->ExceptionClear(env);
return CA_STATUS_FAILED;
}
// get BluetoothGatt class
OIC_LOG(DEBUG, TAG, "get BluetoothGatt class");
- jclass jni_cid_BluetoothGatt = (*env)->FindClass(env, "android/bluetooth/BluetoothGattServer");
- if (!jni_cid_BluetoothGatt)
- {
- OIC_LOG(ERROR, TAG, "jni_cid_BluetoothGatt is null");
- return CA_STATUS_FAILED;
- }
-
- jmethodID jni_mid_closeGatt = (*env)->GetMethodID(env, jni_cid_BluetoothGatt, "close", "()V");
+ jmethodID jni_mid_closeGatt = CAGetJNIMethodID(env, CLASSPATH_BT_GATTSERVER,
+ "close", "()V");
if (!jni_mid_closeGatt)
{
OIC_LOG(ERROR, TAG, "jni_mid_closeGatt is null");
OIC_LOG(DEBUG, TAG, "request to close GATT");
(*env)->CallVoidMethod(env, bluetoothGattServer, jni_mid_closeGatt);
- if ((*env)->ExceptionCheck(env))
+ if (CACheckJNIException(env))
{
OIC_LOG(ERROR, TAG, "closeGATT has failed");
- (*env)->ExceptionDescribe(env);
- (*env)->ExceptionClear(env);
return CA_STATUS_FAILED;
}
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
return ret;
}
- g_threadSendNotifyCond = ca_cond_new();
+ g_threadSendNotifyCond = oc_cond_new();
ret = CALEServerInitMutexVaraibles();
if (CA_STATUS_OK != ret)
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
g_bluetoothManager = NULL;
}
- ca_cond_free(g_threadSendNotifyCond);
+ oc_cond_free(g_threadSendNotifyCond);
g_threadSendNotifyCond = NULL;
CALEServerTerminateMutexVaraibles();
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
}
// start advertise
- ret = CALEServerStartAdvertise(env, g_leAdvertiseCallback);
+ ret = CALEServerStartAdvertise();
if (CA_STATUS_OK != ret)
{
OIC_LOG(ERROR, TAG, "CALEServerStartAdvertise has failed");
}
+ // get Constants Value from Android Platform
+ g_state_connected = CALEGetConstantsValue(env, CLASSPATH_BT_PROFILE, "STATE_CONNECTED");
+ g_state_disconnected = CALEGetConstantsValue(env, CLASSPATH_BT_PROFILE, "STATE_DISCONNECTED");
+
if (isAttached)
{
(*g_jvm)->DetachCurrentThread(g_jvm);
return CA_STATUS_FAILED;
}
- if (!g_jvm)
- {
- OIC_LOG(ERROR, TAG, "g_jvm is null");
- return CA_STATUS_FAILED;
- }
-
- bool isAttached = false;
- JNIEnv* env;
- jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
- if (JNI_OK != res)
- {
- OIC_LOG(INFO, TAG, "Could not get JNIEnv pointer");
- res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL);
-
- if (JNI_OK != res)
- {
- OIC_LOG(ERROR, TAG, "AttachCurrentThread has failed");
- return CA_STATUS_FAILED;
- }
- isAttached = true;
- }
-
- CAResult_t ret = CALEServerStopAdvertise(env, g_leAdvertiseCallback);
+ CAResult_t ret = CALEServerStopAdvertise();
if (CA_STATUS_OK != ret)
{
OIC_LOG(ERROR, TAG, "CALEServerStopAdvertise has failed");
g_isStartServer = false;
- if (isAttached)
- {
- (*g_jvm)->DetachCurrentThread(g_jvm);
- }
-
OIC_LOG(DEBUG, TAG, "OUT - CALEServerStopMulticastServer");
return ret;
}
return CA_STATUS_FAILED;
}
- ca_mutex_lock(g_threadSendMutex);
+ oc_mutex_lock(g_threadSendMutex);
uint32_t length = u_arraylist_length(g_connectedDeviceList);
for (uint32_t index = 0; index < length; index++)
OIC_LOG_V(DEBUG, TAG, "setAddress : %s", setAddress);
OIC_LOG_V(DEBUG, TAG, "address : %s", address);
- if (!strcmp(setAddress, address))
+ if (!strcasecmp(setAddress, address))
{
OIC_LOG(DEBUG, TAG, "found the device");
if (g_obj_bluetoothDevice)
{
(*env)->DeleteGlobalRef(env, g_obj_bluetoothDevice);
+ g_obj_bluetoothDevice = NULL;
+ }
+
+ if (jarrayObj)
+ {
+ g_obj_bluetoothDevice = (*env)->NewGlobalRef(env, jarrayObj);
+ CACheckJNIException(env);
}
- g_obj_bluetoothDevice = (*env)->NewGlobalRef(env, jarrayObj);
(*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
break;
}
if (g_obj_bluetoothDevice)
{
jbyteArray jni_arr = (*env)->NewByteArray(env, dataLen);
+ CACheckJNIException(env);
(*env)->SetByteArrayRegion(env, jni_arr, 0, dataLen, (jbyte*) data);
+ CACheckJNIException(env);
g_sendBuffer = (jbyteArray)(*env)->NewGlobalRef(env, jni_arr);
+ CACheckJNIException(env);
CAResult_t res = CALEServerSend(env, g_obj_bluetoothDevice, g_sendBuffer);
if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "send has failed");
- if (g_obj_bluetoothDevice)
- {
- (*env)->DeleteGlobalRef(env, g_obj_bluetoothDevice);
- g_obj_bluetoothDevice = NULL;
- }
goto error_exit;
}
}
g_sendBuffer = NULL;
}
- ca_mutex_unlock(g_threadSendMutex);
+ oc_mutex_unlock(g_threadSendMutex);
OIC_LOG(INFO, TAG, "unicast - send request is successful");
return CA_STATUS_OK;
g_sendBuffer = NULL;
}
- ca_mutex_unlock(g_threadSendMutex);
+ if (g_obj_bluetoothDevice)
+ {
+ (*env)->DeleteGlobalRef(env, g_obj_bluetoothDevice);
+ g_obj_bluetoothDevice = NULL;
+ }
+
+ oc_mutex_unlock(g_threadSendMutex);
return CA_SEND_FAILED;
}
return CA_STATUS_FAILED;
}
- ca_mutex_lock(g_threadSendMutex);
+ oc_mutex_lock(g_threadSendMutex);
OIC_LOG(DEBUG, TAG, "set data into g_sendBuffer for notify");
if (g_sendBuffer)
g_sendBuffer = NULL;
}
jbyteArray jni_arr = (*env)->NewByteArray(env, dataLen);
+ CACheckJNIException(env);
(*env)->SetByteArrayRegion(env, jni_arr, 0, dataLen, (jbyte*) data);
+ CACheckJNIException(env);
g_sendBuffer = (jbyteArray)(*env)->NewGlobalRef(env, jni_arr);
+ CACheckJNIException(env);
uint32_t length = u_arraylist_length(g_connectedDeviceList);
for (uint32_t index = 0; index < length; index++)
// send data for all device
jbyteArray jni_bytearr_data = (*env)->NewByteArray(env, dataLen);
+ CACheckJNIException(env);
(*env)->SetByteArrayRegion(env, jni_bytearr_data, 0, dataLen, (jbyte*) data);
+ CACheckJNIException(env);
jstring jni_address = CALEGetAddressFromBTDevice(env, jarrayObj);
if (!jni_address)
if (g_obj_bluetoothDevice)
{
(*env)->DeleteGlobalRef(env, g_obj_bluetoothDevice);
+ g_obj_bluetoothDevice = NULL;
+ }
+
+ if (jarrayObj)
+ {
+ g_obj_bluetoothDevice = (*env)->NewGlobalRef(env, jarrayObj);
+ CACheckJNIException(env);
}
- g_obj_bluetoothDevice = (*env)->NewGlobalRef(env, jarrayObj);
CAResult_t res = CALEServerSend(env, g_obj_bluetoothDevice, jni_bytearr_data);
if (CA_STATUS_OK != res)
g_sendBuffer = NULL;
}
- ca_mutex_unlock(g_threadSendMutex);
+ oc_mutex_unlock(g_threadSendMutex);
return CA_STATUS_OK;
}
void CALEServerCreateCachedDeviceList()
{
- ca_mutex_lock(g_connectedDeviceListMutex);
+ oc_mutex_lock(g_connectedDeviceListMutex);
// create new object array
if (!g_connectedDeviceList)
{
OIC_LOG(DEBUG, TAG, "Create device list");
g_connectedDeviceList = u_arraylist_create();
}
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
+
+ oc_mutex_lock(g_deviceStateListMutex);
+ // create new object array
+ if (!g_deviceStateList)
+ {
+ OIC_LOG(DEBUG, TAG, "Create device list");
+ g_deviceStateList = u_arraylist_create();
+ }
+ oc_mutex_unlock(g_deviceStateListMutex);
}
bool CALEServerIsDeviceInList(JNIEnv *env, const char* remoteAddress)
return false;
}
- if (!strcmp(remoteAddress, setAddress))
+ if (!strcasecmp(remoteAddress, setAddress))
{
OIC_LOG(ERROR, TAG, "the device is already set");
(*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
VERIFY_NON_NULL(device, TAG, "device is null");
VERIFY_NON_NULL(env, TAG, "env is null");
- ca_mutex_lock(g_connectedDeviceListMutex);
+ oc_mutex_lock(g_connectedDeviceListMutex);
if (!g_connectedDeviceList)
{
OIC_LOG(ERROR, TAG, "list is null");
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_FAILED;
}
if (!jni_remoteAddress)
{
OIC_LOG(ERROR, TAG, "jni_remoteAddress is null");
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_FAILED;
}
if (!remoteAddress)
{
OIC_LOG(ERROR, TAG, "remoteAddress is null");
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_FAILED;
}
}
(*env)->ReleaseStringUTFChars(env, jni_remoteAddress, remoteAddress);
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
OIC_LOG(DEBUG, TAG, "OUT - CALEServerAddDeviceToList");
return CA_STATUS_OK;
}
OIC_LOG(DEBUG, TAG, "IN - CALEServerRemoveAllDevices");
VERIFY_NON_NULL(env, TAG, "env is null");
- ca_mutex_lock(g_connectedDeviceListMutex);
+ oc_mutex_lock(g_connectedDeviceListMutex);
if (!g_connectedDeviceList)
{
OIC_LOG(ERROR, TAG, "g_connectedDeviceList is null");
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_FAILED;
}
OICFree(g_connectedDeviceList);
g_connectedDeviceList = NULL;
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
OIC_LOG(DEBUG, TAG, "OUT - CALEServerRemoveAllDevices");
return CA_STATUS_OK;
VERIFY_NON_NULL(env, TAG, "env is null");
VERIFY_NON_NULL(address, TAG, "address is null");
- ca_mutex_lock(g_connectedDeviceListMutex);
+ oc_mutex_lock(g_connectedDeviceListMutex);
if (!g_connectedDeviceList)
{
OIC_LOG(ERROR, TAG, "no deviceList");
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_FAILED;
}
continue;
}
- if (!strcmp(setAddress, remoteAddress))
+ if (!strcasecmp(setAddress, remoteAddress))
{
OIC_LOG_V(DEBUG, TAG, "device address : %s", remoteAddress);
(*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
(*env)->ReleaseStringUTFChars(env, address, remoteAddress);
(*env)->DeleteGlobalRef(env, jarrayObj);
+ jarrayObj = NULL;
if (NULL == u_arraylist_remove(g_connectedDeviceList, index))
{
OIC_LOG(ERROR, TAG, "List removal failed.");
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_FAILED;
}
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_OK;
}
(*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
}
}
- ca_mutex_unlock(g_connectedDeviceListMutex);
+ oc_mutex_unlock(g_connectedDeviceListMutex);
OIC_LOG(DEBUG, TAG, "there are no device in the device list");
VERIFY_NON_NULL_VOID(callback, TAG, "callback");
g_bluetoothGattServerCallback = (*env)->NewGlobalRef(env, callback);
+ CACheckJNIException(env);
}
JNIEXPORT void JNICALL
VERIFY_NON_NULL_VOID(callback, TAG, "callback");
g_leAdvertiseCallback = (*env)->NewGlobalRef(env, callback);
+ CACheckJNIException(env);
}
JNIEXPORT void JNICALL
VERIFY_NON_NULL_VOID(obj, TAG, "obj");
VERIFY_NON_NULL_VOID(device, TAG, "device");
- // STATE_CONNECTED
- jint state_connected = CALEGetConstantsValue(env, CLASSPATH_BT_PROFILE, "STATE_CONNECTED");
-
- // STATE_DISCONNECTED
- jint state_disconnected = CALEGetConstantsValue(env, CLASSPATH_BT_PROFILE, "STATE_DISCONNECTED");
+ jstring jni_remoteAddress = CALEGetAddressFromBTDevice(env, device);
+ if (!jni_remoteAddress)
+ {
+ OIC_LOG(ERROR, TAG, "jni_remoteAddress is null");
+ return;
+ }
- if (newState == state_connected)
+ const char* remoteAddress = (*env)->GetStringUTFChars(env, jni_remoteAddress, NULL);
+ if (!remoteAddress)
{
+ OIC_LOG(ERROR, TAG, "remoteAddress is null");
+ CACheckJNIException(env);
+ return;
+ }
+ if (newState == g_state_connected)
+ {
OIC_LOG(DEBUG, TAG, "LE CONNECTED");
- jstring jni_remoteAddress = CALEGetAddressFromBTDevice(env, device);
- if (!jni_remoteAddress)
+ if (false == CALEServerIsDeviceInList(env, remoteAddress))
{
- OIC_LOG(ERROR, TAG, "jni_remoteAddress is null");
- return;
+ OIC_LOG(DEBUG, TAG, "add connected device to cache");
+ CALEServerAddDeviceToList(env, device);
}
- const char* remoteAddress = (*env)->GetStringUTFChars(env, jni_remoteAddress, NULL);
- if (!remoteAddress)
+ CAResult_t res = CALEUpdateDeviceState(remoteAddress,
+ CA_LE_CONNECTION_STATE,
+ STATE_CONNECTED,
+ g_deviceStateList,
+ g_deviceStateListMutex);
+ if (CA_STATUS_OK != res)
{
- OIC_LOG(ERROR, TAG, "remoteAddress is null");
- return;
+ OIC_LOG(ERROR, TAG, "CALEUpdateDeviceState has failed");
}
- if (false == CALEServerIsDeviceInList(env, remoteAddress))
+ res = CALEServerStopAdvertise();
+ if (CA_STATUS_OK != res)
{
- OIC_LOG(DEBUG, TAG, "add connected device to cache");
- CALEServerAddDeviceToList(env, device);
+ OIC_LOG(DEBUG, TAG, "CALEServerStopAdvertise has failed");
}
- (*env)->ReleaseStringUTFChars(env, jni_remoteAddress, remoteAddress);
}
- else if (newState == state_disconnected)
+ else if (newState == g_state_disconnected)
{
OIC_LOG(DEBUG, TAG, "LE DISCONNECTED");
jstring jni_remoteAddress = CALEGetAddressFromBTDevice(env, device);
- CAResult_t ret = CALEServerRemoveDevice(env, jni_remoteAddress);
- if (CA_STATUS_OK != ret)
+ CAResult_t res = CALEServerRemoveDevice(env, jni_remoteAddress);
+ if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "CALEServerRemoveDevice has failed");
}
+ res = CALEUpdateDeviceState(remoteAddress,
+ CA_LE_CONNECTION_STATE,
+ STATE_DISCONNECTED,
+ g_deviceStateList,
+ g_deviceStateListMutex);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "CALEUpdateDeviceState has failed");
+ }
+
// start advertise
- ret = CALEServerStartAdvertise(env, g_leAdvertiseCallback);
- if (CA_STATUS_OK != ret)
+ res = CALEServerStartAdvertise();
+ if (CA_STATUS_OK != res)
{
OIC_LOG(ERROR, TAG, "CALEServerStartAdvertise has failed");
}
}
else
{
+#ifndef TB_LOG
+ (void)status;
+#endif
OIC_LOG_V(DEBUG, TAG, "LE Connection state is [newState : %d, status %d]", newState,
status);
}
+ (*env)->ReleaseStringUTFChars(env, jni_remoteAddress, remoteAddress);
+ (*env)->DeleteLocalRef(env, jni_remoteAddress);
}
JNIEXPORT void JNICALL
VERIFY_NON_NULL_VOID(env, TAG, "env");
VERIFY_NON_NULL_VOID(obj, TAG, "obj");
VERIFY_NON_NULL_VOID(gattService, TAG, "gattService");
-
+#ifndef TB_LOG
+ (void)status;
+#endif
OIC_LOG_V(DEBUG, TAG, "Gatt Service Added Callback(%d)", status);
}
JNIEXPORT void JNICALL
Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerCharacteristicWriteRequestCallback(
- JNIEnv *env, jobject obj, jobject device, jbyteArray data)
+ JNIEnv *env, jobject obj, jobject device, jbyteArray data,
+ jint requestId, jint offset, jbyteArray value)
{
OIC_LOG_V(DEBUG, TAG, "Gatt Server Characteristic Write Request Callback");
VERIFY_NON_NULL_VOID(env, TAG, "env");
VERIFY_NON_NULL_VOID(device, TAG, "device");
VERIFY_NON_NULL_VOID(data, TAG, "data");
+ if (g_setHighQoS)
+ {
+ CALEServerSendResponse(env, device, requestId, 0, offset, value);
+ }
+ else
+ {
+ (void)requestId;
+ (void)offset;
+ (void)value;
+ }
+
// get Byte Array and covert to uint8_t*
jint length = (*env)->GetArrayLength(env, data);
+ CACheckJNIException(env);
jboolean isCopy;
jbyte *jni_byte_requestData = (jbyte *) (*env)->GetByteArrayElements(env, data, &isCopy);
+ CACheckJNIException(env);
uint8_t* requestData = NULL;
requestData = OICMalloc(length);
if (!address)
{
OIC_LOG(ERROR, TAG, "address is null");
+ CACheckJNIException(env);
OICFree(requestData);
return;
}
OIC_LOG_V(DEBUG, TAG, "remote device address : %s, %p, %d", address, requestData, length);
- ca_mutex_lock(g_bleClientBDAddressMutex);
+ oc_mutex_lock(g_bleClientBDAddressMutex);
uint32_t sentLength = 0;
g_CABLEServerDataReceivedCallback(address, requestData, length,
&sentLength);
- ca_mutex_unlock(g_bleClientBDAddressMutex);
+ oc_mutex_unlock(g_bleClientBDAddressMutex);
(*env)->ReleaseStringUTFChars(env, jni_address, address);
}
OIC_LOG_V(DEBUG, TAG, "Gatt Server Notification Sent Callback (status : %d)",
status);
+ jstring jni_address = CALEGetAddressFromBTDevice(env, device);
+ if (!jni_address)
+ {
+ OIC_LOG(ERROR, TAG, "jni_address is null");
+ return;
+ }
+
+ const char* address = (*env)->GetStringUTFChars(env, jni_address, NULL);
+ if (!address)
+ {
+ OIC_LOG(ERROR, TAG, "address is not available");
+ (*env)->DeleteLocalRef(env, jni_address);
+ return;
+ }
+
jint gatt_success = CALEGetConstantsValue(env, CLASSPATH_BT_GATT, "GATT_SUCCESS");
if (gatt_success != status) // error case
{
g_obj_bluetoothDevice = NULL;
}
- ca_mutex_lock(g_threadSendNotifyMutex);
+ oc_mutex_lock(g_threadSendNotifyMutex);
g_isSignalSetFlag = true;
- ca_cond_signal(g_threadSendNotifyCond);
- ca_mutex_unlock(g_threadSendNotifyMutex);
+ oc_cond_signal(g_threadSendNotifyCond);
+ oc_mutex_unlock(g_threadSendNotifyMutex);
+
+ (*env)->ReleaseStringUTFChars(env, jni_address, address);
+ (*env)->DeleteLocalRef(env, jni_address);
return;
}
+
+ CALogSendStateInfo(CA_ADAPTER_GATT_BTLE, address, 0, -1,
+ false, "notifyChar failure");
}
else
{
}
// next data can be sent
- ca_mutex_lock(g_threadSendNotifyMutex);
+ oc_mutex_lock(g_threadSendNotifyMutex);
OIC_LOG(DEBUG, TAG, "g_isSignalSetFlag is set true and signal");
g_isSignalSetFlag = true;
- ca_cond_signal(g_threadSendNotifyCond);
- ca_mutex_unlock(g_threadSendNotifyMutex);
+ oc_cond_signal(g_threadSendNotifyCond);
+ oc_mutex_unlock(g_threadSendNotifyMutex);
+
+ CALogSendStateInfo(CA_ADAPTER_GATT_BTLE, address, 0, -1,
+ true, "notifyChar success");
}
+ (*env)->ReleaseStringUTFChars(env, jni_address, address);
+ (*env)->DeleteLocalRef(env, jni_address);
}
VERIFY_NON_NULL_VOID(obj, TAG, "obj");
OIC_LOG_V(INFO, TAG, "LE Advertise Start Failure Callback(%d)", errorCode);
+
+ jint data_too_large = CALEGetConstantsValue(env, CLASSPATH_BT_ADVERTISE_CB,
+ "ADVERTISE_FAILED_DATA_TOO_LARGE");
+ jint already_started = CALEGetConstantsValue(env, CLASSPATH_BT_ADVERTISE_CB,
+ "ADVERTISE_FAILED_ALREADY_STARTED");
+
+ if (data_too_large == errorCode)
+ {
+ OIC_LOG_V(ERROR, TAG, "advertise data too large. please check length of device name");
+ }
+ else if (already_started == errorCode)
+ {
+ OIC_LOG_V(INFO, TAG, "advertising is already started");
+ }
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaLeServerInterface_caLeGattServerMtuChangedCallback(JNIEnv * env,
+ jobject obj,
+ jobject device,
+ jint mtu)
+{
+ VERIFY_NON_NULL_VOID(env, TAG, "env");
+ VERIFY_NON_NULL_VOID(obj, TAG, "obj");
+ VERIFY_NON_NULL_VOID(device, TAG, "device");
+
+ OIC_LOG_V(INFO, TAG, "gatt MTU size is changed (%d byte)", mtu);
+
+ jstring jni_address = CALEGetAddressFromBTDevice(env, device);
+ if (!jni_address)
+ {
+ OIC_LOG(ERROR, TAG, "jni_address is null");
+ return;
+ }
+
+ const char* address = (*env)->GetStringUTFChars(env, jni_address, NULL);
+ if (!address)
+ {
+ OIC_LOG(ERROR, TAG, "address is not available");
+ (*env)->DeleteLocalRef(env, jni_address);
+ return;
+ }
+
+ // update mtu size
+ CAResult_t res = CALESetMtuSize(address, mtu - CA_BLE_MTU_HEADER_SIZE,
+ g_deviceStateList, g_deviceStateListMutex);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "CALESetMtuSize has failed");
+ }
+
+ res = CALEUpdateDeviceState(address, CA_LE_SEND_STATE,
+ STATE_SEND_MTU_NEGO_SUCCESS,
+ g_deviceStateList,
+ g_deviceStateListMutex);
+ if (CA_STATUS_OK != res)
+ {
+ OIC_LOG(ERROR, TAG, "CALEUpdateDeviceState has failed");
+ }
+
+ (*env)->ReleaseStringUTFChars(env, jni_address, address);
+ (*env)->DeleteLocalRef(env, jni_address);
}
/**
}
bool isAttached = false;
- JNIEnv* env;
+ JNIEnv* env = NULL;
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
if (JNI_OK != res)
{
g_obj_bluetoothDevice = NULL;
}
- ca_mutex_lock(g_threadSendNotifyMutex);
- ca_cond_signal(g_threadSendNotifyCond);
- ca_mutex_unlock(g_threadSendNotifyMutex);
+ oc_mutex_lock(g_threadSendNotifyMutex);
+ oc_cond_signal(g_threadSendNotifyCond);
+ oc_mutex_unlock(g_threadSendNotifyMutex);
g_isStartServer = false;
void CASetLEReqRespServerCallback(CABLEDataReceivedCallback callback)
{
- ca_mutex_lock(g_bleReqRespCbMutex);
+ oc_mutex_lock(g_bleReqRespCbMutex);
g_CABLEServerDataReceivedCallback = callback;
- ca_mutex_unlock(g_bleReqRespCbMutex);
+ oc_mutex_unlock(g_bleReqRespCbMutex);
}
void CASetBLEServerErrorHandleCallback(CABLEErrorHandleCallback callback)
{
if (NULL == g_bleReqRespCbMutex)
{
- g_bleReqRespCbMutex = ca_mutex_new();
+ g_bleReqRespCbMutex = oc_mutex_new();
if (NULL == g_bleReqRespCbMutex)
{
- OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
if (NULL == g_bleClientBDAddressMutex)
{
- g_bleClientBDAddressMutex = ca_mutex_new();
+ g_bleClientBDAddressMutex = oc_mutex_new();
if (NULL == g_bleClientBDAddressMutex)
{
- OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
if (NULL == g_connectedDeviceListMutex)
{
- g_connectedDeviceListMutex = ca_mutex_new();
+ g_connectedDeviceListMutex = oc_mutex_new();
if (NULL == g_connectedDeviceListMutex)
{
- OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
if (NULL == g_threadSendMutex)
{
- g_threadSendMutex = ca_mutex_new();
+ g_threadSendMutex = oc_mutex_new();
if (NULL == g_threadSendMutex)
{
- OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
if (NULL == g_threadSendNotifyMutex)
{
- g_threadSendNotifyMutex = ca_mutex_new();
+ g_threadSendNotifyMutex = oc_mutex_new();
if (NULL == g_threadSendNotifyMutex)
{
- OIC_LOG(ERROR, TAG, "ca_mutex_new has failed");
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
+ return CA_STATUS_FAILED;
+ }
+ }
+
+ if (NULL == g_deviceStateListMutex)
+ {
+ g_deviceStateListMutex = oc_mutex_new();
+ if (NULL == g_deviceStateListMutex)
+ {
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
return CA_STATUS_FAILED;
}
}
void CALEServerTerminateMutexVaraibles()
{
- ca_mutex_free(g_bleReqRespCbMutex);
+ oc_mutex_free(g_bleReqRespCbMutex);
g_bleReqRespCbMutex = NULL;
- ca_mutex_free(g_bleClientBDAddressMutex);
+ oc_mutex_free(g_bleClientBDAddressMutex);
g_bleClientBDAddressMutex = NULL;
- ca_mutex_free(g_connectedDeviceListMutex);
+ oc_mutex_free(g_connectedDeviceListMutex);
g_connectedDeviceListMutex = NULL;
- ca_mutex_free(g_threadSendMutex);
+ oc_mutex_free(g_threadSendMutex);
g_threadSendMutex = NULL;
- ca_mutex_free(g_threadSendNotifyMutex);
+ oc_mutex_free(g_threadSendNotifyMutex);
g_threadSendNotifyMutex = NULL;
+
+ oc_mutex_free(g_deviceStateListMutex);
+ g_deviceStateListMutex = NULL;
}
void CALEServerTerminateConditionVaraibles()
{
OIC_LOG(DEBUG, TAG, "this method is not supported");
}
+
+bool CALEServerIsConnected(const char* address)
+{
+ if (CALEIsValidState(address, CA_LE_CONNECTION_STATE,
+ STATE_SERVICE_CONNECTED,
+ g_deviceStateList,
+ g_deviceStateListMutex))
+ {
+ OIC_LOG(DEBUG, TAG, "current state is connected");
+ return true;
+ }
+ OIC_LOG(DEBUG, TAG, "current state is not connected");
+ return false;
+}
+
+uint16_t CALEServerGetMtuSize(const char* address)
+{
+ return CALEGetMtuSize(address, g_deviceStateList, g_deviceStateListMutex);
+}
+
projects / platform / upstream / iotivity.git / blobdiff