*/
#define TAG "OIC_CA_LE_CLIENT"
+#define RETRY_COUNT 1
#define MICROSECS_PER_SEC 1000000
#define WAIT_TIME_WRITE_CHARACTERISTIC 10 * MICROSECS_PER_SEC
#define CA_GATT_CUSTOM_UUID "4209"
#define CA_GATT_CUSTOM_UUID2 "4204"
#define CUSTOM_UUID_LEN 4
+#define MICROSECS_PER_SEC 1000000
static const int samsung_code = 117;
-
+static int g_retrycount = 0;
+static int retry_flag = 0;
uint64_t const TIMEOUT = 30 * MICROSECS_PER_SEC;
/**
+ * Mutex to call connect only after disconnect during retry
+ */
+static oc_mutex g_isDisconnectedMutex = NULL;
+
+/**
+ * Condition for calling connect during connection retry
+ */
+static oc_cond g_LEDisconnectedCond = NULL;
+
+/**
* Flag to check if scanning is in progress
*/
static bool g_isScanningInProgress = false;
return CA_STATUS_FAILED;
}
g_isConnectionInProgress = true;
+ // Set gatt connect retry count
+ g_retrycount = RETRY_COUNT;
oc_mutex_unlock(g_isConnectionInProgressMutex);
// Pause the scanning
if (!connected)
{
OIC_LOG_V(DEBUG, TAG, "DisConnected from [%s] ", remoteAddress);
- oc_mutex_lock(g_LEServerListMutex);
- CARemoveLEServerInfoFromList(&g_LEServerList, remoteAddress);
- oc_mutex_unlock(g_LEServerListMutex);
+ if(!retry_flag)
+ {
+ oc_mutex_lock(g_LEServerListMutex);
+ CARemoveLEServerInfoFromList(&g_LEServerList, remoteAddress);
+ oc_mutex_unlock(g_LEServerListMutex);
+ }
+ else
+ {
+ oc_mutex_lock(g_isDisconnectedMutex);
+ oc_cond_signal(g_LEDisconnectedCond);
+ oc_mutex_unlock(g_isDisconnectedMutex);
+ }
+ retry_flag = 0;
}
else
{
if (CA_STATUS_OK != CAGetLEServerInfo(g_LEServerList, remoteAddress, &serverInfo))
{
oc_mutex_unlock(g_LEServerListMutex);
- OIC_LOG_V(ERROR, TAG, "Could not get server info!");
+ OIC_LOG_V(ERROR, TAG, "Could not get server info for [%s]", remoteAddress);
return;
}
serverInfo->status = LE_STATUS_CONNECTED;
oc_mutex_unlock(g_LEServerListMutex);
-
oc_mutex_lock(g_LEClientThreadPoolMutex);
if (NULL == g_LEClientThreadPool)
{
int man_id;
result = bt_adapter_le_get_scan_result_manufacturer_data(scanInfo,
pkt_type, &man_id, &man_data, &man_data_len);
-
+
if (result == BT_ERROR_NONE && NULL != man_data)
{
- char *compare_man_data = OICMalloc((man_data_len*2)+1);
int pos =0;
+ char *compare_man_data = OICCalloc(1, (man_data_len*2)+1);
+ if (!compare_man_data)
+ {
+ OIC_LOG(ERROR, TAG, "Memory allocation failed for compare_man_data");
+ OICFree(man_data);
+ return false;
+ }
+
for(int i=0;i<man_data_len;i++){
- pos += sprintf(compare_man_data+pos, "%.2x", man_data[i]);
+ pos += snprintf(compare_man_data+pos, 2, "%.2x", man_data[i]);
}
- compare_man_data[(man_data_len*2)+1]='\0';
- OIC_LOG_V(DEBUG, TAG, "Manufacture Id %d Manufacture Data[%s]" ,man_id,compare_man_data);
+
if (man_id == samsung_code && 0 == strncasecmp(compare_man_data, service_uuid, CUSTOM_UUID_LEN))
{
OIC_LOG_V(DEBUG, TAG, "Manufacture Data[%s] Found in %s",
void *userData)
{
(void)userData;
-
OIC_LOG(DEBUG, TAG, "IN");
VERIFY_NON_NULL_VOID(scanInfo, TAG, "scanInfo");
CADestroyLEDataList(&serverInfo->pendingDataList);
oc_mutex_unlock(g_LEServerListMutex);
return ;
- }
- }
- }
+ }
+ }
+ }
+ oc_mutex_unlock(g_LEServerListMutex);
}
- oc_mutex_unlock(g_LEServerListMutex);
OIC_LOG(DEBUG, TAG, "OUT");
}
oc_mutex_unlock(g_LEClientThreadPoolMutex);
return CA_STATUS_FAILED;
}
+
+#ifdef TIZEN_VD
+ result= ca_thread_pool_add_task(g_LEClientThreadPool, CALEClientScanThread,
+ NULL, NULL);
+ if (CA_STATUS_OK != result)
+ {
+ OIC_LOG(ERROR, TAG, "ca_thread_pool_add_task failed");
+ CATerminateGattClientMutexVariables();
+ oc_mutex_unlock(g_LEClientThreadPoolMutex);
+ return CA_STATUS_FAILED;
+ }
+#endif
oc_mutex_unlock(g_LEClientThreadPoolMutex);
OIC_LOG(DEBUG, TAG, "OUT");
return CA_STATUS_OK;
}
+#ifdef TIZEN_VD
+void CALEClientScanThread()
+{
+ oc_mutex_lock(g_scanMutex);
+ if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
+ {
+ CAResult_t result = CALEGattStartDeviceScanning();
+ if (CA_STATUS_OK != result)
+ {
+ oc_mutex_unlock(g_scanMutex);
+ OIC_LOG(ERROR, TAG, "CALEGattStartDeviceScanning failed");
+ return ;
+ }
+ g_isUnicastScanInProgress = true;
+ // Start Timer
+ oc_cond_signal(g_startTimerCond);
+ }
+ else
+ {
+ g_isUnicastScanInProgress = true;
+ // Reset Timer
+ oc_cond_signal(g_scanningTimeCond);
+ }
+ oc_mutex_unlock(g_scanMutex);
+
+ OIC_LOG(DEBUG, TAG, "OUT");
+ return ;
+}
+#endif
+
void CAStartTimerThread(void *data)
{
(void)data;
}
}
+ if (NULL == g_isDisconnectedMutex)
+ {
+ g_isDisconnectedMutex = oc_mutex_new();
+ if (NULL == g_isDisconnectedMutex)
+ {
+ OIC_LOG(ERROR, TAG, "oc_mutex_new has failed");
+ return CA_STATUS_FAILED;
+ }
+ }
+
+ if (NULL == g_LEDisconnectedCond)
+ {
+ g_LEDisconnectedCond = oc_cond_new();
+ if (NULL == g_LEDisconnectedCond)
+ {
+ OIC_LOG(ERROR, TAG, "oc_cond_new failed");
+ return CA_STATUS_FAILED;
+ }
+ }
+
if (NULL == g_startTimerCond)
{
g_startTimerCond = oc_cond_new();
oc_mutex_free(g_threadMTUChangedMutex);
g_threadMTUChangedMutex = NULL;
+ oc_mutex_free(g_isDisconnectedMutex);
+ g_isDisconnectedMutex = NULL;
+
+ oc_cond_free(g_LEDisconnectedCond);
+ g_LEDisconnectedCond = NULL;
+
oc_cond_free(g_startTimerCond);
g_startTimerCond = NULL;
oc_mutex_lock(g_LEClientConnectMutex);
CAResult_t result = CA_STATUS_OK;
+#ifdef TIZEN_VD
+ int ret = bt_gatt_connect(remoteAddress, true);
+#else
int ret = bt_gatt_connect(remoteAddress, false);
+#endif
if (BT_ERROR_NONE != ret)
{
OIC_LOG_V(ERROR, TAG, "bt_gatt_connect Failed with ret value [%s] ",
OIC_LOG(DEBUG, TAG, "OUT");
}
+static int CALEWaittillDisconnect(oc_mutex mutex, oc_cond cv, int wait_seconds)
+{
+ OIC_LOG(DEBUG, TAG, "Waiting for server to be disconnected...");
+ oc_mutex_lock(mutex);
+ uint64_t wait_time = wait_seconds * MICROSECS_PER_SEC;
+ int ret = oc_cond_wait_for(cv, mutex, wait_time);
+ oc_mutex_unlock(mutex);
+ return ret;
+}
+
+static CAResult_t CALEGattConnectionRetry(const char *remoteAddress)
+{
+ OIC_LOG(DEBUG, TAG, "IN");
+
+ VERIFY_NON_NULL_RET(remoteAddress, TAG,
+ "remote address is NULL", CA_STATUS_FAILED);
+
+ CALEGattDisConnect(remoteAddress);
+ CALEWaittillDisconnect(g_isDisconnectedMutex, g_LEDisconnectedCond, 10);
+ CAResult_t result = CALEGattConnect(remoteAddress);
+ OIC_LOG(DEBUG, TAG, "OUT");
+ return result;
+}
+
CAResult_t CALEGattDiscoverServices(const char *remoteAddress)
{
OIC_LOG(DEBUG, TAG, "IN");
{
OIC_LOG_V(ERROR, TAG,
"bt_gatt_client_get_service Failed with ret value [%s] ", CALEGetErrorMsg(ret));
- goto error_exit;
+
+ if(g_retrycount)
+ {
+ OIC_LOG(DEBUG, TAG, "Retry will be attempted to connect Gatt Server");
+ g_retrycount--;
+ retry_flag = 1;
+ OIC_LOG_V(DEBUG, TAG, "Retry count left %d time(s)", g_retrycount);
+ CAResult_t result = CALEGattConnectionRetry(remoteAddress);
+ if(result == CA_STATUS_FAILED)
+ {
+ goto error_exit;
+ }
+ else
+ {
+ oc_mutex_unlock(g_LEServerListMutex);
+ OIC_LOG(ERROR, TAG, "Previous connection attempt failed, attempting to retry again");
+ OIC_LOG_V(DEBUG, TAG, "Retry count left %d time(s)", g_retrycount);
+ return CA_STATUS_FAILED;
+ }
+ }
}
+ retry_flag = 0;
// Server will read data on this characteristic.
bt_gatt_h writeChrHandle = NULL;
ret = bt_gatt_service_get_characteristic(serviceHandle, CA_GATT_REQUEST_CHRC_UUID,
VERIFY_NON_NULL(data, TAG, "data is NULL");
- if (0 >= dataLen)
+ if (0 == dataLen)
{
OIC_LOG(ERROR, TAG, "dataLen is less than or equal zero. Invalid input!");
return CA_STATUS_INVALID_PARAM;
}
LEServerInfo *serverInfo = NULL;
+ bool isConnected = false;
oc_mutex_lock(g_LEServerListMutex);
if (LE_UNICAST == type)
{
OIC_LOG(ERROR, TAG, "Device address is NULL");
return CA_STATUS_FAILED;
}
-
serverInfo = (LEServerInfo *)OICCalloc(1, sizeof(LEServerInfo));
if (NULL == serverInfo)
{
OICFree(addr);
return CA_STATUS_FAILED;
}
-
serverInfo->remoteAddress = addr;
serverInfo->status = LE_STATUS_UNICAST_PENDING;
if(serverInfo->status == LE_STATUS_UNICAST_PENDING)
{
- oc_mutex_lock(g_scanMutex);
- if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
+
+ int ret = bt_device_is_profile_connected(remoteAddress, BT_PROFILE_GATT, &isConnected);
+ if (BT_ERROR_NONE != ret)
{
- CAResult_t result = CALEGattStartDeviceScanning();
- if (CA_STATUS_OK != result)
+ OIC_LOG_V(ERROR, TAG, "bt_device_is_profile_connected Failed with ret value [%s] ",
+ CALEGetErrorMsg(ret));
+ oc_mutex_unlock(g_LEServerListMutex);
+ return CA_STATUS_FAILED;
+ }
+
+ if (isConnected){
+ OIC_LOG_V(DEBUG, TAG, "Already connected to address [%s]", remoteAddress);
+ serverInfo->status = LE_STATUS_CONNECTED;
+ } else {
+ oc_mutex_lock(g_scanMutex);
+ if (!g_isMulticastInProgress && !g_isUnicastScanInProgress)
+ {
+ CAResult_t result = CALEGattStartDeviceScanning();
+ if (CA_STATUS_OK != result)
+ {
+ oc_mutex_unlock(g_scanMutex);
+ OIC_LOG(ERROR, TAG, "CALEGattStartDeviceScanning failed");
+ oc_mutex_unlock(g_LEServerListMutex);
+ return CA_STATUS_FAILED;
+ }
+ g_isUnicastScanInProgress = true;
+ // Start Timer
+ oc_cond_signal(g_startTimerCond);
+ }
+ else
{
- oc_mutex_unlock(g_scanMutex);
- OIC_LOG(ERROR, TAG, "CALEGattStartDeviceScanning failed");
- return CA_STATUS_FAILED;
+ g_isUnicastScanInProgress = true;
+ // Reset Timer
+ oc_cond_signal(g_scanningTimeCond);
}
- g_isUnicastScanInProgress = true;
- // Start Timer
- oc_cond_signal(g_startTimerCond);
+ oc_mutex_unlock(g_scanMutex);
+ }
+
+ }
+
+ if (serverInfo->status == LE_STATUS_CONNECTED)
+ {
+ oc_mutex_lock(g_LEClientThreadPoolMutex);
+ if (NULL == g_LEClientThreadPool)
+ {
+ oc_mutex_unlock(g_LEClientThreadPoolMutex);
+ OIC_LOG(ERROR, TAG, "g_LEClientThreadPool is NULL");
+ oc_mutex_unlock(g_LEServerListMutex);
+ return CA_STATUS_FAILED;
}
- else
+ char *addr = OICStrdup(remoteAddress);
+ if (NULL == addr)
{
- g_isUnicastScanInProgress = true;
- // Reset Timer
- oc_cond_signal(g_scanningTimeCond);
+ oc_mutex_unlock(g_LEClientThreadPoolMutex);
+ OIC_LOG(ERROR, TAG, "addr is NULL");
+ oc_mutex_unlock(g_LEServerListMutex);
+ return CA_STATUS_FAILED;
+ }
+ CAResult_t ret = ca_thread_pool_add_task(g_LEClientThreadPool, CADiscoverLEServicesThread,
+ addr, NULL);
+ oc_mutex_unlock(g_LEClientThreadPoolMutex);
+ if (CA_STATUS_OK != ret)
+ {
+ OIC_LOG_V(ERROR, TAG, "ca_thread_pool_add_task failed with ret [%d]", ret);
+ OICFree(addr);
}
- oc_mutex_unlock(g_scanMutex);
-
}
if (serverInfo->status == LE_STATUS_DISCOVERED)
OIC_LOG_V(ERROR, TAG,
"bt_gatt_client_create Failed with ret value [%s] ", CALEGetErrorMsg(ret));
CALEGattDisConnect(serverInfo->remoteAddress);
+ oc_mutex_unlock(g_LEServerListMutex);
return CA_STATUS_FAILED;
}
serverInfo->clientHandle = clientHandle;
VERIFY_NON_NULL(data, TAG, "data is NULL");
- if (0 >= dataLen)
+ if (0 == dataLen)
{
OIC_LOG(ERROR, TAG, "dataLen is less than or equal zero. Invalid input !");
return CA_STATUS_INVALID_PARAM;
//@Todo
//it will be implemented when tizen public 3.0 is released.
return CA_NOT_SUPPORTED;
-}
\ No newline at end of file
+}
projects / platform / upstream / iotivity.git / blobdiff