Fix conn_id conflict issue between client and server hal

Change-Id: I73ee4b3675a0a4c4215c3247f3ebdd0a43fab0b9

diff --git a/bt-oal/bluez_hal/src/bt-hal-gatt-client.c b/bt-oal/bluez_hal/src/bt-hal-gatt-client.c
index f0c82ec..2d1232c 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-gatt-client.c
+++ b/bt-oal/bluez_hal/src/bt-hal-gatt-client.c
@@ -145,7 +145,7 @@ static GSList * hal_gattc_client_info_list = NULL;
 
 static bt_pending_le_conn_info_s *pending_le_conn_info = NULL;
 static guint pending_le_conn_timer_id = 0;
-static int bt_conn_id = 0;
+int hal_gatt_conn_id = 0;
 static int bt_inst_id = 0;
 
 /* Should match the range with bt-service-gatt.c's MAX_APPS_SUPPORTED */
@@ -3485,7 +3485,7 @@ static gboolean __bt_connect_le_timer_cb(gpointer user_data)
 
 static int __hal_generate_conn_id()
 {
-        return ++bt_conn_id;
+        return ++hal_gatt_conn_id;
 }
 
 static int __hal_generate_server_instance_id()

diff --git a/bt-oal/bluez_hal/src/bt-hal-gatt-server.c b/bt-oal/bluez_hal/src/bt-hal-gatt-server.c
index f905a1f..899010f 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-gatt-server.c
+++ b/bt-oal/bluez_hal/src/bt-hal-gatt-server.c
@@ -135,7 +135,7 @@ static GSList *gatt_server_apps = NULL;
 
 static GSList *gatt_services = NULL;
 
-static int conn_id = 0;
+extern int hal_gatt_conn_id;
 
 /* Linked List of connected Remote GATT clients */
 static GSList *gatt_client_info_list = NULL;
@@ -575,7 +575,7 @@ void _bt_hal_gatt_connected_state_event(gboolean is_connected, char *address)
                        conn_info = g_new0(struct gatt_client_info_t, 1);
                        conn_info->addr = g_strdup(address);
                        INFO("Added GATT client addr[%s]", conn_info->addr);
-                       conn_info->connection_id = ++conn_id;
+                       conn_info->connection_id = ++hal_gatt_conn_id;
                        conn_info->instance_id = instance;
                        gatt_client_info_list = g_slist_append(gatt_client_info_list, conn_info);
                        INFO("Total num of connected GATT clients [%d]", g_slist_length(gatt_client_info_list));