char *addr; /* Remote GATT Server address */
};
+struct gatt_client_info_t {
+ int connection_id; /* This value will uniquely identify a GATT client-server connection */
+ int instance_id; /* This value unique identifies a GATT server instance */
+ char *addr; /* Remote GATT client address */
+};
+
+/* TODO:
+ * Remove this feature if code is verified
+ * Remove gatt_client/server_info_t and use gatt_conn_info_t
+ * Remove gatt_client/server_info_list and use gatt_conn_info_list
+ */
+#define __INTEGRATE_GATT_INFO__
+#ifndef __INTEGRATE_GATT_INFO__
/* Linked List of connected Remote GATT Servers */
static GSList *gatt_server_info_list = NULL;
+/* Linked List of connected Remote GATT clients */
+static GSList *gatt_client_info_list = NULL;
+#else
+/* GATT Connection Info List Structure */
+struct gatt_conn_info_t {
+ char *addr; /* Remote GATT address */
+ int connection_id; /* This value will uniquely identify a GATT client-server connection */
+ int client_id; /* This value unique identifies a GATT Client instance */
+ int instance_id; /* This value unique identifies a GATT Server instance */
+};
+
+/* Linked List of connected Remote GATT info */
+static GSList *gatt_conn_info_list = NULL;
+#define gatt_server_info_t gatt_conn_info_t
+#define gatt_client_info_t gatt_conn_info_t
+#define gatt_server_info_list gatt_conn_info_list
+#define gatt_client_info_list gatt_conn_info_list
+#endif
typedef struct {
gboolean is_changed;
int inst_id;
} bt_gatt_included_service_info_t;
-GSList *list_gatt_info;
-
+static GSList *list_gatt_info = NULL;
#endif
char *addr; /* Remote GATT client address */
};
-/* GATT Client Info List Structure */
-struct gatt_client_info_t {
- int connection_id; /* This value will uniquely identify a GATT client-server connection */
- int instance_id; /* This value unique identifies a GATT server instance */
- char *addr; /* Remote GATT client address */
-};
-
/* GATT Indicate confirm result */
struct gatt_indicate_cfm_result_info_t {
int result; /* Result of event */
static int __bt_gatt_send_indication_to_all_connected_clients(bluetooth_gatt_att_data_t *data,
bluetooth_gatt_server_indication_params_t *param);
-static void __bt_remove_all_service_handles(int instance_id);
+static void __bt_remove_all_service_handles(bt_service_app_info_t *app_info);
+
static void __bt_free_service_info(bt_gatt_service_info_t *service_info);
+static int __bt_unregister_gatt_client_instance(int client_if);
+
+static void __bt_service_reset_gatt_data(void);
+
#ifdef TIZEN_GATT_CLIENT
static void __bt_handle_client_instance_registered(event_gattc_register_t *data);
static void __bt_handle_client_connected(event_gattc_conn_t *event_data);
static void __bt_handle_client_notification_data(event_gattc_notify_data *event_data);
static void __bt_handle_client_service_changed_ind(event_gattc_service_changed_data *event_data);
static void __bt_handle_client_mtu_exchange_completed(event_gattc_mtu_configured_t *event_data);
-
#endif
+
static int __bt_unregister_gatt_server_instance(int server_instance);
+static void __bt_cleanup_remote_services(struct gatt_server_info_t *conn_info);
/*mtu device list*/
struct gatt_mtu_info_t {
/* Linked List of GATT requests from Remote GATT Clients */
static GSList *gatt_server_requests = NULL;
-/* Linked List of connected Remote GATT clients */
-static GSList *gatt_client_info_list = NULL;
-
/* Number of clients to be notified to */
static int num_indicate_clients;
static void __bt_gatt_event_handler(int event_type, gpointer event_data);
+typedef enum {
+ BT_GATT_SERVER = 1,
+ BT_GATT_CLIENT,
+} bt_gatt_type_e;
+
void _bt_check_adv_app_termination(const char *name)
{
bt_service_app_info_t *app = NULL;
int k;
- int apps[MAX_APPS_SUPPORTED];
+ int apps[MAX_APPS_SUPPORTED] = { 0, };
ret_if(NULL == name);
app = &numapps[k];
/* Search for a app which has same sender and stop adv is running */
- if (!strncasecmp(app->sender, name, strlen(name)) && app->is_initialized == TRUE) {
- BT_DBG("Match found, name: %s", name);
-
- /* Unregister all service handles with stack */
- __bt_remove_all_service_handles(app->instance_id);
+ if (strcasecmp(app->sender, name) == 0 && app->is_initialized == TRUE) {
+ BT_DBG("numapps[%d] Match found, name: %s", k, name);
- /* If Advertising is enabled, stop it */
- if (app->adv_handle > 0) {
- BT_INFO("Stop advertising on instance ID [%d]", app->instance_id);
- /* Disable adv if running */
- BT_INFO("Disable Advertising Adv Handle [%d] sender [%s]",
- app->adv_handle, name);
- _bt_set_advertising(app->sender, app->adv_handle, FALSE, FALSE);
- }
+ /* TODO 2: Need to manage app info as list, not array.
+ This loop always run for MAX count if any apps are terminated.
+ */
/* Save instances of all apps that need to be unregistered */
- apps[app->instance_id] = 1;
+ if (app->instance_id != -1) {
+ /* GATT server */
+ /* Unregister all service handles with stack */
+ __bt_remove_all_service_handles(app);
+
+ /* If Advertising is enabled, stop it */
+ if (app->adv_handle != 0) {
+ BT_INFO("Stop advertising on instance ID [%d]", app->instance_id);
+ /* Disable adv if running */
+ BT_INFO("Disable Advertising Adv Handle [%d] sender [%s]",
+ app->adv_handle, name);
+ _bt_set_advertising(app->sender, app->adv_handle, FALSE, FALSE);
+ }
+
+ apps[app->instance_id] = BT_GATT_SERVER; /* App holds a GATT server Instance */
+ } else if (app->client_id != -1) {
+ /* GATT client */
+ apps[app->client_id] = BT_GATT_CLIENT; /* App holds a GATT client Instance */
+ }
}
}
/* Unregister all apps one by one */
for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
- if (apps[k] == 1) {
- BT_INFO("Unregister app[%d]", k);
+ if (apps[k] == BT_GATT_SERVER) {
+ BT_INFO("Unregister server app[%d]", k);
/* Unregister server instance */
__bt_unregister_gatt_server_instance(k);
+ } else if (apps[k] == BT_GATT_CLIENT) {
+ BT_INFO("Unregister client app[%d]", k);
+ /* Unregister client instance */
+ __bt_unregister_gatt_client_instance(k);
}
}
}
int _bt_gatt_init(void)
{
+ const char *stack_name = NULL;
+
BT_DBG("+");
if (OAL_STATUS_SUCCESS != gatt_enable()) {
/* Register gatt event handler */
_bt_service_register_event_handler_callback(BT_GATT_MODULE, __bt_gatt_event_handler);
-#ifdef TIZEN_GATT_CLIENT
- /*In bluedroid product, defacult gatt client is handled differently*/
- __bt_register_default_gatt_client();
-#endif
+
+ __bt_service_reset_gatt_data();
+
+ stack_name = oal_get_stack_name();
+
+ if (stack_name && g_strcmp0(stack_name, "bluez") == 0) {
+ /*In the platform, defacult gatt client should be registered */
+ __bt_register_default_gatt_client();
+ }
+
BT_DBG("-");
return BLUETOOTH_ERROR_NONE;
}
-static void __bt_service_reset_gatt_data()
+static void __bt_service_reset_gatt_data(void)
{
int k;
memset(numapps[k].scan_rsp.data, 0x00, BLUETOOTH_ADVERTISING_DATA_LENGTH_MAX);
numapps[k].adv_data_len = 0;
numapps[k].scan_rsp_len = 0;
+
+ /* GATT client */
+ numapps[k].client_id = -1;
+ memset(numapps[k].address.addr, 0x00, BLUETOOTH_ADDRESS_LENGTH);
+ numapps[k].is_watcher_enabled = FALSE;
}
}
{
BT_INFO("GATT deinit");
+ /* Un-register the default gatt client before */
+ __bt_unregister_gatt_client_instance(gatt_default_client);
+
if (OAL_STATUS_SUCCESS != gatt_disable())
BT_ERR("gatt deinit failed");
for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
info = &numapps[k];
+ /* Do not update client instance */
+ if (info->instance_id == -1)
+ continue;
/* Search for a app which has same sender and adv handle as 0 */
if (!g_strcmp0(info->sender, sender) && info->adv_handle == 0)
info->adv_handle = adv_handle;
for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
info = &numapps[k];
- if (info->instance_id == server_instance && info->adv_handle != -1) {
+ if (info->instance_id == server_instance && info->adv_handle != 0) {
*adv_handle = info->adv_handle;
BT_DBG("Server instance [%d] Adv handle [%d] Sender [%s]", server_instance, *adv_handle, info->sender);
return g_strdup(info->sender);
}
}
+static int __bt_unregister_gatt_client_instance(int client_if)
+{
+ int ret = OAL_STATUS_SUCCESS;
+ int k;
+
+ BT_INFO("DeAllocate client instance ID [%d]", client_if);
+
+ /* Reset data: instance_id parameter could be either for GATT Server or for GATT client */
+ for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
+ if (numapps[k].client_id == client_if) {
+ BT_INFO("This is a GATT client app, unregister: Slot [%d] vacant", k);
+ numapps[k].client_id = -1;
+ numapps[k].is_initialized = FALSE;
+ memset(numapps[k].sender, 0x00, sizeof(numapps[k].sender));
+ memset(numapps[k].uuid, 0x00, sizeof(numapps[k].uuid));
+ memset(&numapps[k].address.addr, 0x00, sizeof(bluetooth_device_address_t));
+
+ /* Its a GATT Client Instance */
+ ret = gattc_deregister(client_if);
+ if (ret != OAL_STATUS_SUCCESS) {
+ BT_ERR("DeAllocate GATT Client instance with stack Fail ret: %d", ret);
+ return BLUETOOTH_ERROR_INTERNAL;
+ }
+ break;
+ }
+ }
+ return BLUETOOTH_ERROR_NONE;
+}
+
static int __bt_unregister_gatt_server_instance(int server_instance)
{
int ret = OAL_STATUS_SUCCESS;
return BLUETOOTH_ERROR_NONE;
}
-static void __bt_remove_all_service_handles(int instance_id)
+static void __bt_remove_all_service_handles(bt_service_app_info_t *app_info)
{
GSList *l;
int *handle = NULL;
int ret = OAL_STATUS_SUCCESS;
int count;
- count = g_slist_length(numapps[instance_id].service_handles);
+ if (app_info == NULL)
+ return;
+
+ count = g_slist_length(app_info->service_handles);
BT_INFO("Before handle removal: current count [%d]", count);
- for (l = numapps[instance_id].service_handles; l != NULL;) {
+ for (l = app_info->service_handles; l != NULL;) {
handle = l->data;
l = g_slist_next(l);
if (handle) {
- BT_INFO("Server Handle to be Removed [%d] Instance ID [%d]", *handle, instance_id);
- if (_bt_gatt_server_stop_service(numapps[instance_id].sender, *handle, instance_id) != BLUETOOTH_ERROR_NONE)
+ BT_INFO("Server Handle to be Removed [%d] Instance ID [%d]", *handle, app_info->instance_id);
+ if (_bt_gatt_server_stop_service(app_info->sender, *handle, app_info->instance_id) != BLUETOOTH_ERROR_NONE)
continue;
- ret = gatts_delete_service(instance_id, *handle);
+ ret = gatts_delete_service(app_info->instance_id, *handle);
if (ret != OAL_STATUS_SUCCESS) {
BT_ERR("ret: %d", ret);
continue;
} else {
- numapps[instance_id].service_handles = g_slist_remove(numapps[instance_id].service_handles, handle);
+ app_info->service_handles = g_slist_remove(app_info->service_handles, handle);
g_free(handle);
handle = NULL;
- count = g_slist_length(numapps[instance_id].service_handles);
+ count = g_slist_length(app_info->service_handles);
BT_INFO("After deleting current count [%d]", count);
}
}
if (!g_strcmp0(info->sender, sender)) {
BT_INFO("Unregister GATT server instance [%d]", info->instance_id);
/* Unregister all service handles with stack */
- __bt_remove_all_service_handles(info->instance_id);
+ __bt_remove_all_service_handles(info);
/* Disable adv if running */
BT_INFO("Disable Advertising Adv Handle [%d] sender [%s]",
int k;
oal_uuid_t uuid;
- BT_INFO("###Check on which instance Server instance can be initialized....");
+ BT_INFO("Check on which instance Server instance can be initialized....");
for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
if (numapps[k].is_initialized == 1) {
- BT_INFO("Instance ID [%d] is already in use..Check next slot", numapps[k].instance_id);
+ BT_DBG("Instance ID [%d] is already in use..Check next slot", numapps[k].instance_id);
} else {
slot = k;
- BT_INFO("Time to register GATT Server..UUID to be used is [%s] slot [%d]", uuid_list[slot-1], slot);
+ BT_DBG("Time to register GATT Server..UUID to be used is [%s] slot [%d]", uuid_list[slot-1], slot);
break;
}
}
g_free(uuid_string);
return BLUETOOTH_ERROR_INTERNAL;
}
- BT_INFO("GATT Server registration call successfully accepted by OAL..wait for Instance Initialized event from OAL..");
+ BT_DBG("GATT Server registration call successfully accepted by OAL..wait for Instance Initialized event from OAL..");
/* Return & wait for GATT Server Instance Initialization event */
memset(numapps[slot].sender, 0x00, sizeof(numapps[slot].sender));
memset(numapps[slot].uuid, 0x00, sizeof(numapps[slot].uuid));
#ifndef GATT_DIRECT
case BT_GATT_SERVER_REGISTER: {
bt_service_app_info_t *param = (bt_service_app_info_t*)data;
- BT_INFO("Sender [%s] Request Sender [%s]", param->sender, req_info->sender);
+
if (!g_strcmp0(req_info->sender, param->sender)) {
BT_DBG("GATT Server app found [%s]", req_info->sender);
case BT_GATT_SERVER_START_SERVICE:
case BT_GATT_SERVER_DELETE_SERVICE: {
bt_service_app_info_t *param = (bt_service_app_info_t*)data;
- BT_INFO("Sender [%s] Request Sender [%s]", param->sender, req_info->sender);
int *saved_instance_id = (int*)req_info->user_data;
if (!g_strcmp0(req_info->sender, param->sender) && param->instance_id == *saved_instance_id) {
case BT_GATT_SERVER_ADD_DESCRIPTOR:
case BT_GATT_SERVER_ADD_CHARACTERISTIC: {
int *handle = (int*)data;
- BT_INFO("Characteristic added: Handle [%d]", *handle);
+ BT_DBG("Characteristic added: Handle [%d]", *handle);
out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
g_array_append_vals(out_param, handle, sizeof(int));
#ifdef TIZEN_GATT_CLIENT
case BT_GATT_CLIENT_REGISTER: {
bt_service_app_info_t *param = (bt_service_app_info_t*)data;
- BT_INFO("Sender [%s] Request Sender [%s]", param->sender, req_info->sender);
+
if (!g_strcmp0(req_info->sender, param->sender)) {
BT_DBG("GATT Client app found [%s] created client ID [%d]",
req_info->sender, param->client_id);
_bt_convert_addr_type_to_string(address,
(unsigned char *)(¶m->device_addr.addr));
- BT_INFO("Request Sender [%s] address [%s]", req_info->sender, address);
-
/* Match address to determine same request */
if (!g_strcmp0((char*)req_info->user_data, address)) {
BT_DBG("GATT Client app found [%s] Remote address [%s]",
bt_char_browse_info_t param;
memcpy((void*)¶m, data, sizeof(bt_char_browse_info_t));
//bt_char_browse_info_t *param = (bt_char_browse_info_t*)data;
- BT_INFO("Request Sender [%s]", req_info->sender);
+
bluetooth_gatt_client_svc_prop_info_t *prop = (bluetooth_gatt_client_svc_prop_info_t*)req_info->user_data;
/* Match both address and service properties to determine same request */
sizeof(bluetooth_device_address_t)) &&
!memcmp(param.svc_uuid, prop->svc.uuid, BLUETOOTH_UUID_HEX_MAX_LEN) &&
param.svc_inst_id == prop->svc.instance_id) {
- BT_INFO("Returning Service properties");
+ BT_DBG("Returning Service properties");
out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
g_array_append_vals(out_param, ¶m, sizeof(bt_char_browse_info_t));
case BT_GATT_GET_CHARACTERISTIC_PROPERTIES: {
bt_descriptor_browse_info_t *param = (bt_descriptor_browse_info_t*)data;
- BT_INFO("Request Sender [%s]", req_info->sender);
bluetooth_gatt_client_char_prop_info_t *prop = (bluetooth_gatt_client_char_prop_info_t*)req_info->user_data;
/* Match both address, service properties &char properties to determine same request */
param->svc_inst_id == prop->svc.instance_id &&
!memcmp(param->char_uuid, prop->characteristic.uuid, BLUETOOTH_UUID_HEX_MAX_LEN) &&
param->char_inst_id == prop->characteristic.instance_id) {
- BT_INFO("Returning Characteristic properties");
+ BT_DBG("Returning Characteristic properties");
out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
g_array_append_vals(out_param, param, sizeof(bt_descriptor_browse_info_t));
_bt_service_method_return(req_info->context, out_param, result);
case BT_GATT_WATCH_CHARACTERISTIC: {
bt_gatt_notif_reg_info_t *param = (bt_gatt_notif_reg_info_t*)data;
bluetooth_gatt_client_char_prop_info_t *prop = (bluetooth_gatt_client_char_prop_info_t*)req_info->user_data;
- BT_INFO("Request Sender [%s]", req_info->sender);
+
/* Match both address, service properties &char properties to determine same request */
if (!memcmp(param->addr.addr,
prop->device_address.addr,
case BT_GATT_READ_CHARACTERISTIC:
case BT_GATT_WRITE_CHARACTERISTIC_VALUE_BY_TYPE: {
bluetooth_gatt_client_char_prop_info_t *param = (bluetooth_gatt_client_char_prop_info_t*)data;
- BT_INFO("Request Sender [%s]", req_info->sender);
char *addr = g_malloc0(sizeof(char) * BT_ADDRESS_STRING_SIZE);
bluetooth_gatt_client_char_prop_info_t *prop = (bluetooth_gatt_client_char_prop_info_t*)req_info->user_data;
_bt_convert_addr_type_to_string(addr, prop->device_address.addr);
if (!memcmp(param, prop, sizeof(bluetooth_gatt_client_char_prop_info_t))) {
- BT_INFO("Gatt Char read or write request matched for address [%s]", addr);
+ BT_DBG("Gatt Char read or write request matched for address [%s]", addr);
out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
g_array_append_vals(out_param, param, sizeof(bluetooth_gatt_client_char_prop_info_t));
_bt_service_method_return(req_info->context, out_param, result);
case BT_GATT_READ_DESCRIPTOR_VALUE:
case BT_GATT_WRITE_DESCRIPTOR_VALUE: {
bluetooth_gatt_client_desc_prop_info_t *param = (bluetooth_gatt_client_desc_prop_info_t*)data;
- BT_INFO("Request Sender [%s]", req_info->sender);
char *addr = g_malloc0(sizeof(char) * BT_ADDRESS_STRING_SIZE);
bluetooth_gatt_client_desc_prop_info_t *prop = (bluetooth_gatt_client_desc_prop_info_t*)req_info->user_data;
_bt_convert_addr_type_to_string(addr, prop->device_address.addr);
if (!memcmp(param, prop, sizeof(bluetooth_gatt_client_desc_prop_info_t))) {
- BT_INFO("Descriptor read or write request matched for address [%s]", addr);
+ BT_DBG("Descriptor read or write request matched for address [%s]", addr);
out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
g_array_append_vals(out_param, param, sizeof(bluetooth_gatt_client_desc_prop_info_t));
_bt_service_method_return(req_info->context, out_param, result);
bluetooth_device_address_t address;
if (!g_strcmp0(addr, (char*)data)) {
- BT_INFO("GATT Client BT_REQ_ATT_MTU call pending for app [%s] addr [%s]",
+ BT_DBG("GATT Client BT_REQ_ATT_MTU call pending for app [%s] addr [%s]",
req_info->sender, addr);
out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
_bt_convert_addr_string_to_type(address.addr, addr);
break;
}
}
- BT_DBG("-");
}
static void __bt_handle_server_instance_registered(event_gatts_register_t *data)
info = &numapps[k];
if (info->instance_id == event->gatt_srvc_stat.server_inst) {
- BT_INFO("Found GATT Server.. UUID [%s], sender [%s]", info->uuid, info->sender);
+ BT_INFO("numapps[%d] Found GATT Server.. UUID [%s], sender [%s]", k, info->uuid, info->sender);
__bt_gatt_handle_pending_request_info(result, BT_GATT_SERVER_ADD_SERVICE,
(int*)&svc_handle, sizeof(int));
if (svc_handle > 0) {
handle = g_malloc0(sizeof(int));
*handle = svc_handle;
- numapps[event->gatt_srvc_stat.server_inst].service_handles = g_slist_append(numapps[event->gatt_srvc_stat.server_inst].service_handles, handle);
- count = g_slist_length(numapps[event->gatt_srvc_stat.server_inst].service_handles);
+ numapps[k].service_handles = g_slist_append(numapps[k].service_handles, handle);
+ count = g_slist_length(numapps[k].service_handles);
BT_INFO("Added Service handle [%d] to list..current count [%d]", svc_handle, count);
}
break;
}
return NULL;
}
-
-static struct gatt_server_info_t *__bt_find_remote_gatt_server_info_from_client_if(int client_if)
-{
- GSList *l;
- struct gatt_server_info_t *info = NULL;
-
- for (l = gatt_server_info_list; l != NULL; l = g_slist_next(l)) {
- info = (struct gatt_server_info_t*)l->data;
- if (info == NULL)
- continue;
-
- if (info->client_id == client_if) {
- BT_INFO("Remote GATT server found addr[%s]", info->addr);
- return info;
- }
- }
- return NULL;
-}
#endif
-
-
-
#ifdef TIZEN_GATT_CLIENT
static void __bt_handle_gatt_server_connection_state(event_gatts_conn_t *event)
{
int result = BLUETOOTH_ERROR_NONE;
struct gatt_client_info_t *client_info = NULL;
+#ifndef __INTEGRATE_GATT_INFO__
struct gatt_server_info_t *server_info = NULL;
+#endif
bluetooth_device_address_t dev_addr;
GVariant *param = NULL;
int ret;
client_info->addr = g_strdup(address);
BT_INFO("Added GATT client addr[%s]", client_info->addr);
client_info->connection_id = event->conn_id;
+#ifdef __INTEGRATE_GATT_INFO__
+ client_info->client_id = -1;
+#endif
client_info->instance_id = event->server_inst;
gatt_client_info_list = g_slist_append(gatt_client_info_list, client_info);
BT_INFO("Total num of connected Remote GATT Clients [%d]", g_slist_length(gatt_client_info_list));
+#ifndef __INTEGRATE_GATT_INFO__
/* Save server connection info */
server_info = g_new0(struct gatt_server_info_t, 1);
server_info->addr = g_strdup(address);
server_info->connection_id = event->conn_id;
gatt_server_info_list = g_slist_append(gatt_server_info_list, server_info);
BT_INFO("Total num of connected Remote GATT Servers [%d]", g_slist_length(gatt_server_info_list));
+#endif
ret = gattc_add_connection_info((bt_address_t *)&dev_addr, event->conn_id, event->server_inst);
if (ret != OAL_STATUS_SUCCESS) {
{
int result = BLUETOOTH_ERROR_NONE;
struct gatt_client_info_t *client_info = NULL;
+#ifndef __INTEGRATE_GATT_INFO__
struct gatt_server_info_t *server_info = NULL;
+#endif
bluetooth_device_address_t dev_addr;
GVariant *param = NULL;
char address[BT_ADDRESS_STRING_SIZE];
BLUETOOTH_EVENT_GATT_SERVER_DISCONNECTED, /* Local device is GATT server */
param);
+#ifndef __INTEGRATE_GATT_INFO__
/* Remove server info from list */
server_info = _bt_find_remote_gatt_server_info(address);
if (server_info)
else
BT_INFO("Can not find conn info, already removed!");
+ /* Remove all services from info list_gatt_info */
+ __bt_cleanup_remote_services(server_info);
+#else
+ /* Remove all services from info list_gatt_info */
+ __bt_cleanup_remote_services(client_info);
+#endif
+
/* Remove client info from List */
gatt_client_info_list = g_slist_remove(gatt_client_info_list, client_info);
BT_INFO("Total num of connected GATT clients [%d]", g_slist_length(gatt_client_info_list));
struct gatt_client_info_t *conn_info = NULL;
GVariant *param = NULL;
guint8 status = 0;
- BT_INFO("GATT Server MTU changed event");
conn_info = __bt_find_remote_gatt_client_info_from_conn_id(event->conn_id);
if (conn_info == NULL) {
break;
}
case OAL_EVENT_GATTC_SERVICE_SEARCH_RESULT: {
- BT_INFO("OAL Event: GATT Client Service Search Result");
+ BT_DBG("OAL Event: GATT Client Service Search Result");
__bt_handle_client_service_search_result((event_gattc_service_result_t *) event_data);
break;
}
break;
}
case OAL_EVENT_GATTC_CHARAC_SERACH_RESULT: {
- BT_INFO("OAL Event: GATT Client Characteristic Search Result");
+ BT_DBG("OAL Event: GATT Client Characteristic Search Result");
__bt_handle_client_characteristic_search_result((event_gattc_characteristic_result_t *) event_data);
break;
}
case OAL_EVENT_GATTC_DESC_SERACH_RESULT: {
- BT_INFO("OAL Event: GATT Client Descriptor Search Result");
+ BT_DBG("OAL Event: GATT Client Descriptor Search Result");
__bt_handle_client_descriptor_search_result((event_gattc_descriptor_result_t *) event_data);
break;
}
case OAL_EVENT_GATTC_READ_CHARAC: {
- BT_INFO("OAL Event: GATT Client Characteristic Read Data");
+ BT_DBG("OAL Event: GATT Client Characteristic Read Data");
__bt_handle_client_characteristic_read_data((event_gattc_read_data *) event_data);
break;
}
case OAL_EVENT_GATTC_READ_DESCR: {
- BT_INFO("OAL Event: GATT Client Descriptor Read Data");
+ BT_DBG("OAL Event: GATT Client Descriptor Read Data");
__bt_handle_client_descriptor_read_data((event_gattc_read_data *) event_data);
break;
}
case OAL_EVENT_GATTC_WRITE_CHARAC: {
- BT_INFO("OAL Event: GATT Client Characteristic Write Data");
+ BT_DBG("OAL Event: GATT Client Characteristic Write Data");
__bt_handle_client_characteristic_write_data((event_gattc_write_data *) event_data);
break;
}
case OAL_EVENT_GATTC_WRITE_DESCR: {
- BT_INFO("OAL Event: GATT Client Descriptor Write Data");
+ BT_DBG("OAL Event: GATT Client Descriptor Write Data");
__bt_handle_client_descriptor_write_data((event_gattc_write_data *) event_data);
break;
}
break;
}
case OAL_EVENT_GATTC_NOTIFY_DATA: {
- BT_INFO("OAL Event: GATT Client Notification Data");
+ BT_DBG("OAL Event: GATT Client Notification Data");
__bt_handle_client_notification_data((event_gattc_notify_data *) event_data);
break;
}
oal_uuid_t uuid;
/* App should ensure that it should not send */
- BT_INFO("### Check on which instance GATT Client instance can be initialized....");
+ BT_INFO("Check on which instance GATT Client instance can be initialized....");
for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
if (numapps[k].is_initialized == 1) {
BT_INFO("Instance ID [%d] is already in use..Check next slot",
conn_info = g_new0(struct gatt_server_info_t, 1);
conn_info->addr = g_strdup(address);
conn_info->client_id = event_data->client_if;
- BT_INFO("Added GATT server addr[%s]", conn_info->addr);
+#ifdef __INTEGRATE_GATT_INFO__
+ conn_info->instance_id = -1;
+#endif
conn_info->connection_id = event_data->conn_id;
gatt_server_info_list = g_slist_append(gatt_server_info_list, conn_info);
- BT_INFO("Total num of connected Remote GATT server devices [%d]",
+ BT_DBG("Total num of connected Remote GATT server devices [%d]",
g_slist_length(gatt_server_info_list));
#if 0
bt_gatt_descriptor_info_t *desc_info;
bt_descriptor_browse_info_t browse_info;
- BT_INFO("descriptor search result status [%d]", event_data->conn_status.status);
+ BT_DBG("descriptor search result status [%d]", event_data->conn_status.status);
memset(&browse_info, 0x00, sizeof(bt_descriptor_browse_info_t));
memset(¬if_info, 0x00, sizeof(bt_gatt_notif_reg_info_t));
BT_INFO("Client Interface [%d] status [%d]",
- event_data->client_if,
+ event_data->conn_id,
event_data->status);
/* Extract Address from conn_id of event data */
- conn_info = __bt_find_remote_gatt_server_info_from_client_if(
- event_data->client_if);
-
+ conn_info = __bt_find_remote_gatt_server_info_from_conn_id(event_data->conn_id);
if (!conn_info) {
BT_INFO("Connection Info is not present, return");
return;
}
- BT_INFO("Notification Registered for addr [%s]",
- conn_info->addr);
-
+ BT_INFO("Notification Registered for addr [%s]", conn_info->addr);
/* Fill svc informations in buffer */
memcpy(¬if_info.svc_uuid,
char *address_str = NULL;
char *uuid_str = NULL;
- if (event_data->change_type == 0) {
- svc_info_list = __bt_get_service_info_list(event_data->conn_id);
- if (svc_info_list == NULL) {
- BT_ERR("svc_info_list is NULL");
- return;
- }
+ svc_info_list = __bt_get_service_info_list(event_data->conn_id);
+ if (svc_info_list == NULL) {
+ BT_ERR("svc_info_list is NULL");
+ return;
+ }
+ if (event_data->change_type) {
+ /* Add service UUID in list */
+ svc_info = g_malloc0(sizeof(bt_gatt_service_info_t));
+ memcpy(svc_info->uuid, event_data->uuid.uuid, BLUETOOTH_UUID_HEX_MAX_LEN);
+ svc_info->inst_id = event_data->inst_id;
+ svc_info->is_primary = 1; // TODO: Need to check is_primary is required or not
+ svc_info_list->services = g_slist_append(svc_info_list->services, svc_info);
+ BT_DBG("Service created and added in Svc info list or connection ID %d", event_data->conn_id);
+ } else {
/* Remove service UUID in list */
for (l = svc_info_list->services; l != NULL; l = g_slist_next(l)) {
svc_info = (bt_gatt_service_info_t *)l->data;
_bt_convert_addr_type_to_string(address_str, event_data->address.addr);
_bt_uuid_to_string(&event_data->uuid, uuid_str);
- param = g_variant_new("(iss)", event_data->change_type, address_str, uuid_str);
+ param = g_variant_new("(iiss)", event_data->inst_id, event_data->change_type, address_str, uuid_str);
_bt_send_event(BT_GATT_CLIENT_EVENT,
BLUETOOTH_EVENT_GATT_CLIENT_SERVICE_CHANGED,
return connected;
}
+void _bt_handle_invocation_context(int function_name, void *data)
+{
+ switch (function_name) {
+ case BT_CONNECT_LE:
+ __bt_gatt_handle_pending_request_info(BLUETOOTH_ERROR_NONE, BT_CONNECT_LE,
+ (char *)data, BT_ADDRESS_STRING_SIZE);
+ break;
+ default:
+ break;
+ }
+}
int _bt_connect_le_device(bluetooth_device_address_t *address,
int auto_connect, int client_id)
addr = g_malloc0(sizeof(char) * BT_ADDRESS_STRING_SIZE);
_bt_convert_addr_type_to_string(addr, address->addr);
- BT_INFO("GATT Client connect request for address [%s] client instance [%d]",
+ BT_DBG("GATT Client connect request for address [%s] client instance [%d]",
addr, client_id);
if (req_info) {
remote_address = (char*)req_info->user_data;
if (remote_address && !strcasecmp(remote_address, addr)) {/* Address matched */
- BT_INFO("Already Connection ongoing for same remote GATT Server address [%s]", remote_address);
+ BT_DBG("Already Connection ongoing for same remote GATT Server address [%s]", remote_address);
/* Return and wait for events to be sent to all apps */
g_free(addr);
return BLUETOOTH_ERROR_IN_PROGRESS;
/* Check if app sent 0 client id for connection, in such case, use default gatt client ID */
if (client_id == 0) {
- BT_INFO("GATT CLient connect request sent by an app without any client instance [%d]",
- client_id);
- BT_INFO("Assign default GATT client id [%d]", gatt_default_client);
+ /* GATT CLient connect request sent by an app without any client instance [0] */
+ BT_DBG("Assign default GATT client id [%d]", gatt_default_client);
client_id = gatt_default_client;
}
ret = gattc_connect(client_id, (bt_address_t*)(address), auto_connect);
if (ret != OAL_STATUS_SUCCESS) {
- BT_ERR("ret: %d", ret);
+ BT_ERR("gattc_connect is failed. ret: %d", ret);
g_free(addr);
return BLUETOOTH_ERROR_INTERNAL;
}
struct gatt_server_info_t *conn_info = NULL;
invocation_info_t *req_info = NULL;
int ret = OAL_STATUS_SUCCESS;
- BT_INFO("+");
+ BT_DBG("+");
/* Check if any app is already browsing primary services on the same remote GATT Server */
req_info = _bt_get_request_info_data(BT_GATT_GET_PRIMARY_SERVICES, address);
return BLUETOOTH_ERROR_NOT_CONNECTED;
}
- BT_INFO("Remove GATT server info from List..");
- /* Remove all services from info list_gatt_info */
- __bt_cleanup_remote_services(conn_info);
-
/* Send Primary Service Browsing request to stack */
ret = gattc_search_service(conn_info->connection_id, NULL);
if (ret != OAL_STATUS_SUCCESS) {
if (req_info) {
prop = (bluetooth_gatt_client_svc_prop_info_t*)req_info->user_data;
if (prop && !memcmp(svc->device_address.addr, prop->device_address.addr, sizeof(bluetooth_device_address_t))
- && memcmp(prop->svc.uuid, svc->svc.uuid, BLUETOOTH_UUID_HEX_MAX_LEN)
+ && !memcmp(prop->svc.uuid, svc->svc.uuid, BLUETOOTH_UUID_HEX_MAX_LEN)
&& prop->svc.instance_id == svc->svc.instance_id) {
BT_INFO("Already Properties browsing for Primary Service ongoing for same remote GATT Server");
/* Return and wait for events to be sent to all apps */
if (req_info) {
prop = (bluetooth_gatt_client_char_prop_info_t*)req_info->user_data;
if (prop && !memcmp(chr->device_address.addr, prop->device_address.addr, sizeof(bluetooth_device_address_t)) /* Address matched */
- && memcmp(chr->svc.uuid, prop->svc.uuid, BLUETOOTH_UUID_HEX_MAX_LEN) /* Service UUID matched */
+ && !memcmp(chr->svc.uuid, prop->svc.uuid, BLUETOOTH_UUID_HEX_MAX_LEN) /* Service UUID matched */
&& chr->svc.instance_id == prop->svc.instance_id /* Service Instance ID matched */
- && memcmp(chr->characteristic.uuid, prop->characteristic.uuid, BLUETOOTH_UUID_HEX_MAX_LEN) /* Characteristic UUID matched */
+ && !memcmp(chr->characteristic.uuid, prop->characteristic.uuid, BLUETOOTH_UUID_HEX_MAX_LEN) /* Characteristic UUID matched */
&& chr->characteristic.instance_id == prop->characteristic.instance_id) { /* Characteristic Instance ID matched */
BT_INFO("Already Properties browsing for Characteristic ongoing for same remote GATT Server");
/* Return and wait for events to be sent to all apps */
/* Register or unregister Notification characteristic */
if (is_notify)
- ret = gattc_register_for_notification(conn_info->client_id,
+ ret = gattc_register_for_notification(conn_info->connection_id,
(bt_address_t*)&(chr->device_address),
&srvc_id, &char_id);
else
- ret = gattc_deregister_for_notification(conn_info->client_id,
+ ret = gattc_deregister_for_notification(conn_info->connection_id,
(bt_address_t*)&(chr->device_address),
&srvc_id, &char_id);
BT_CHECK_PARAMETER(address, return);
- BT_INFO("+");
-
addr = g_malloc0(sizeof(char) * BT_ADDRESS_STRING_SIZE);
_bt_convert_addr_type_to_string(addr, address->addr);
BT_INFO("GATT Client Disconnect request for address [%s]", addr);
if (req_info) {
remote_address = (char*)req_info->user_data;
if (remote_address && !strcasecmp(remote_address, addr)) {/* Address matched */
- BT_INFO("Already DisConnection ongoing for same remote GATT Server address [%s]", remote_address);
+ BT_DBG("Already DisConnection ongoing for same remote GATT Server address [%s]", remote_address);
/* Return success and wait for events to be sent to all apps */
g_free(addr);
return BLUETOOTH_ERROR_IN_PROGRESS;
bt_service_app_info_t *info = NULL;
int k, ret;
- BT_INFO("Unregister Allocated GATT Client instance [%s] Client ID [%d]", sender, client_id);
+ BT_DBG("Unregister Allocated GATT Client instance [%s] Client ID [%d]", sender, client_id);
/* Unregister CLient instance associated with address X. It is possible that another app still
has client_id valid for same remote address */
/* Exact matching of sender */
if (!g_strcmp0(info->sender, sender) && info->client_id == client_id) { /* Check for only valid GATT client Instance */
- BT_INFO("Unregister GATT client instance [%d]", info->client_id);
numapps[k].client_id = -1;
numapps[k].is_initialized = FALSE;
memset(numapps[k].sender, 0x00, sizeof(numapps[k].sender));
}
}
+int _bt_gatt_get_data_batching_available_packets(
+ guint *available_packets)
+{
+ int ret = OAL_STATUS_SUCCESS;
+
+ BT_CHECK_PARAMETER(available_packets, return);
+
+ ret = gatt_get_data_batching_available_packets(available_packets);
+ if (ret != OAL_STATUS_SUCCESS) {
+ BT_ERR("ret: %d", ret);
+ if (ret == OAL_STATUS_NOT_SUPPORT)
+ return BLUETOOTH_ERROR_NOT_SUPPORT;
+ return BLUETOOTH_ERROR_INTERNAL;
+ }
+
+ return BLUETOOTH_ERROR_NONE;
+}
+
+int _bt_gatt_enable_data_batching(bluetooth_device_address_t *address,
+ int packet_threshold, int timeout)
+{
+ int ret = OAL_STATUS_SUCCESS;
+ char remote_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+
+ BT_CHECK_PARAMETER(address, return);
+
+ _bt_convert_addr_type_to_string(remote_address, address->addr);
+ BT_INFO("Enable GATT data batching. address[%s] packet_threshold[%d] timeout[%d]",
+ remote_address, packet_threshold, timeout);
+
+ ret = gatt_enable_data_batching((bt_address_t*)(address), packet_threshold, timeout);
+
+ if (ret != OAL_STATUS_SUCCESS) {
+ BT_ERR("ret: %d", ret);
+ if (ret == OAL_STATUS_INVALID_PARAM)
+ return BLUETOOTH_ERROR_INVALID_PARAM;
+ else if (ret == OAL_STATUS_NOT_SUPPORT)
+ return BLUETOOTH_ERROR_NOT_SUPPORT;
+ return BLUETOOTH_ERROR_INTERNAL;
+ }
+
+ return BLUETOOTH_ERROR_NONE;
+}
+
+int _bt_gatt_disable_data_batching(bluetooth_device_address_t *address)
+{
+ int ret = OAL_STATUS_SUCCESS;
+ char remote_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+
+ BT_CHECK_PARAMETER(address, return);
+
+ _bt_convert_addr_type_to_string(remote_address, address->addr);
+ BT_INFO("Disable GATT data batching. address[%s]", remote_address);
+
+ ret = gatt_disable_data_batching((bt_address_t*)(address));
+
+ if (ret != OAL_STATUS_SUCCESS) {
+ BT_ERR("ret: %d", ret);
+ if (ret == OAL_STATUS_NOT_SUPPORT)
+ return BLUETOOTH_ERROR_NOT_SUPPORT;
+ return BLUETOOTH_ERROR_INTERNAL;
+ }
+
+ return BLUETOOTH_ERROR_NONE;
+}
#endif
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff