Improve GATT Server database handling. am: e8de06e3f4 am: 6a968b1cee (f200deb8) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/gatt/gatt_api.cc

+119 −118

Original line number	Diff line number	Diff line
		@@ -60,6 +60,21 @@ uint8_t GATT_SetTraceLevel(uint8_t new_level) {
		return (gatt_cb.trace_level);
		}

		/**
		* Add an service handle range to the list in decending order of the start
		* handle. Return reference to the newly added element.
		**/
		tGATT_HDL_LIST_ELEM& gatt_add_an_item_to_list(uint16_t s_handle) {
		auto lst_ptr = gatt_cb.hdl_list_info;
		auto it = lst_ptr->begin();
		for (; it != lst_ptr->end(); it++) {
		if (s_handle > it->asgn_range.s_handle) break;
		}

		auto rit = lst_ptr->emplace(it);
		return *rit;
		}

		/*****************************************************************************
		*
		* GATT SERVER API
		@@ -75,20 +90,10 @@ uint8_t GATT_SetTraceLevel(uint8_t new_level) {
		*
		* Parameter p_hndl_range: pointer to allocated handles information
		*
		* Returns true if handle range is added sucessfully; otherwise false.
		*
		******************************************************************************/

		bool GATTS_AddHandleRange(tGATTS_HNDL_RANGE* p_hndl_range) {
		tGATT_HDL_LIST_ELEM* p_buf;
		bool status = false;
		**/

		p_buf = gatt_alloc_hdl_buffer();
		if (p_buf != NULL) {
		p_buf->asgn_range = *p_hndl_range;
		status = gatt_add_an_item_to_list(&gatt_cb.hdl_list_info, p_buf);
		}
		return status;
		void GATTS_AddHandleRange(tGATTS_HNDL_RANGE* p_hndl_range) {
		gatt_add_an_item_to_list(p_hndl_range->s_handle);
		}

		/*******************************************************************************
		@@ -190,6 +195,14 @@ static bool is_gatt_attr_type(const tBT_UUID& uuid) {
		return false;
		}

		/** Update the the last primary info for the service list info */
		static void gatt_update_last_pri_srv_info() {
		gatt_cb.last_primary_s_handle = 0;

		for (tGATT_SRV_LIST_ELEM& el : *gatt_cb.srv_list_info)
		if (el.is_primary) gatt_cb.last_primary_s_handle = el.s_hdl;
		}

		/*******************************************************************************
		*
		* Function GATTS_AddService
		@@ -207,8 +220,6 @@ static bool is_gatt_attr_type(const tBT_UUID& uuid) {
		******************************************************************************/
		uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service,
		int count) {
		tGATT_HDL_LIST_INFO* p_list_info = &gatt_cb.hdl_list_info;
		tGATT_HDL_LIST_ELEM* p_list = NULL;
		uint16_t s_hdl = 0;
		bool save_hdl = false;
		tGATT_REG* p_reg = gatt_get_regcb(gatt_if);
		@@ -236,9 +247,9 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service,
		(svc_uuid.uu.uuid16 == UUID_SERVCLASS_GAP_SERVER)) {
		s_hdl = gatt_cb.hdl_cfg.gap_start_hdl;
		} else {
		p_list = p_list_info->p_first;

		if (p_list) s_hdl = p_list->asgn_range.e_handle + 1;
		if (!gatt_cb.hdl_list_info->empty()) {
		s_hdl = gatt_cb.hdl_list_info->front().asgn_range.e_handle + 1;
		}

		if (s_hdl < gatt_cb.hdl_cfg.app_start_hdl)
		s_hdl = gatt_cb.hdl_cfg.app_start_hdl;
		@@ -253,42 +264,25 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service,
		return GATT_INTERNAL_ERROR;
		}

		p_list = gatt_alloc_hdl_buffer();
		if (p_list == NULL) {
		/* No free entry */
		GATT_TRACE_ERROR("GATTS_ReserveHandles: no free handle blocks");
		return GATT_INTERNAL_ERROR;
		}

		p_list->asgn_range.app_uuid128 = *p_app_uuid128;
		p_list->asgn_range.svc_uuid = svc_uuid;
		p_list->asgn_range.s_handle = s_hdl;
		p_list->asgn_range.e_handle = s_hdl + num_handles - 1;
		p_list->asgn_range.is_primary = is_pri;

		gatt_add_an_item_to_list(p_list_info, p_list);
		tGATT_HDL_LIST_ELEM& list = gatt_add_an_item_to_list(s_hdl);
		list.asgn_range.app_uuid128 = *p_app_uuid128;
		list.asgn_range.svc_uuid = svc_uuid;
		list.asgn_range.s_handle = s_hdl;
		list.asgn_range.e_handle = s_hdl + num_handles - 1;
		list.asgn_range.is_primary = is_pri;

		if (save_hdl) {
		if (gatt_cb.cb_info.p_nv_save_callback)
		(*gatt_cb.cb_info.p_nv_save_callback)(true, &p_list->asgn_range);
		(*gatt_cb.cb_info.p_nv_save_callback)(true, &list.asgn_range);
		}

		if (!gatts_init_service_db(&p_list->svc_db, &svc_uuid, is_pri, s_hdl,
		num_handles)) {
		GATT_TRACE_ERROR("GATTS_ReserveHandles: service DB initialization failed");
		if (p_list) {
		gatt_remove_an_item_from_list(p_list_info, p_list);
		gatt_free_hdl_buffer(p_list);
		}

		return GATT_INTERNAL_ERROR;
		}
		gatts_init_service_db(list.svc_db, &svc_uuid, is_pri, s_hdl, num_handles);

		GATT_TRACE_DEBUG(
		"%d: handles needed:%u s_hdl=%u e_hdl=%u %s[%x] is_primary=%d", __func__,
		num_handles, p_list->asgn_range.s_handle, p_list->asgn_range.e_handle,
		((p_list->asgn_range.svc_uuid.len == 2) ? "uuid16" : "uuid128"),
		p_list->asgn_range.svc_uuid.uu.uuid16, p_list->asgn_range.is_primary);
		num_handles, list.asgn_range.s_handle, list.asgn_range.e_handle,
		((list.asgn_range.svc_uuid.len == 2) ? "uuid16" : "uuid128"),
		list.asgn_range.svc_uuid.uu.uuid16, list.asgn_range.is_primary);

		service->attribute_handle = s_hdl;

		@@ -317,7 +311,7 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service,
		}

		el->attribute_handle = gatts_add_characteristic(
		&p_list->svc_db, el->permissions, el->properties, &uuid);
		list.svc_db, el->permissions, el->properties, uuid);
		} else if (el->type == BTGATT_DB_DESCRIPTOR) {
		if (is_gatt_attr_type(uuid)) {
		GATT_TRACE_ERROR(
		@@ -328,58 +322,79 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service,
		}

		el->attribute_handle =
		gatts_add_char_descr(&p_list->svc_db, el->permissions, &uuid);
		gatts_add_char_descr(list.svc_db, el->permissions, uuid);
		} else if (el->type == BTGATT_DB_INCLUDED_SERVICE) {
		tGATT_HDL_LIST_ELEM* p_incl_decl;
		p_incl_decl = gatt_find_hdl_buffer_by_handle(el->attribute_handle);
		if (p_incl_decl == NULL) {
		if (p_incl_decl == nullptr) {
		GATT_TRACE_DEBUG("Included Service not created");
		return GATT_INTERNAL_ERROR;
		}

		el->attribute_handle = gatts_add_included_service(
		&p_list->svc_db, p_incl_decl->asgn_range.s_handle,
		list.svc_db, p_incl_decl->asgn_range.s_handle,
		p_incl_decl->asgn_range.e_handle, p_incl_decl->asgn_range.svc_uuid);
		}
		}

		tGATT_SR_REG* p_sreg;
		uint8_t i_sreg;
		tBT_UUID* p_uuid;

		GATT_TRACE_API("%s: service parsed correctly, now starting", __func__);

		/this is a new application servoce start /
		i_sreg = gatt_sr_alloc_rcb(p_list);
		if (i_sreg == GATT_MAX_SR_PROFILES) {
		GATT_TRACE_ERROR("%s: no free server registration block", __func__);
		return GATT_NO_RESOURCES;
		/this is a new application service start /

		// find a place for this service in the list
		auto lst_ptr = gatt_cb.srv_list_info;
		auto it = lst_ptr->begin();
		for (; it != lst_ptr->end(); it++) {
		if (list.asgn_range.s_handle < it->s_hdl) break;
		}
		auto rit = lst_ptr->emplace(it);

		p_sreg = &gatt_cb.sr_reg[i_sreg];
		p_sreg->gatt_if = gatt_if;
		tGATT_SRV_LIST_ELEM& elem = *rit;
		elem.gatt_if = gatt_if;
		elem.s_hdl = list.asgn_range.s_handle;
		elem.e_hdl = list.asgn_range.e_handle;
		elem.p_db = &list.svc_db;
		elem.is_primary = list.asgn_range.is_primary;

		if (p_sreg->type == GATT_UUID_PRI_SERVICE) {
		p_uuid = gatts_get_service_uuid(p_sreg->p_db);
		p_sreg->sdp_handle =
		gatt_add_sdp_record(p_uuid, p_sreg->s_hdl, p_sreg->e_hdl);
		}
		memcpy(&elem.app_uuid, &list.asgn_range.app_uuid128, sizeof(tBT_UUID));
		elem.type = list.asgn_range.is_primary ? GATT_UUID_PRI_SERVICE
		: GATT_UUID_SEC_SERVICE;

		gatts_update_srv_list_elem(i_sreg, p_sreg->s_hdl,
		p_list->asgn_range.is_primary);
		if (elem.type == GATT_UUID_PRI_SERVICE) {
		tBT_UUID* p_uuid = gatts_get_service_uuid(elem.p_db);
		elem.sdp_handle = gatt_add_sdp_record(p_uuid, elem.s_hdl, elem.e_hdl);
		} else {
		elem.sdp_handle = 0;
		}

		gatt_add_a_srv_to_list(&gatt_cb.srv_list_info, &gatt_cb.srv_list[i_sreg]);
		gatt_update_last_pri_srv_info();

		GATT_TRACE_DEBUG("%s: allocated i_sreg=%d ", __func__, i_sreg);
		GATT_TRACE_DEBUG("%s: s_hdl=%d e_hdl=%d type=0x%x sdp_hdl=0x%x", __func__,
		p_sreg->s_hdl, p_sreg->e_hdl, p_sreg->type,
		p_sreg->sdp_handle);
		GATT_TRACE_DEBUG("%s: allocated el: s_hdl=%d e_hdl=%d type=0x%x sdp_hdl=0x%x",
		__func__, elem.s_hdl, elem.e_hdl, elem.type,
		elem.sdp_handle);

		gatt_proc_srv_chg();

		return GATT_SERVICE_STARTED;
		}

		bool is_active_service(tBT_UUID* p_app_uuid128, tBT_UUID* p_svc_uuid,
		uint16_t start_handle) {
		for (auto& info : *gatt_cb.srv_list_info) {
		tBT_UUID* p_this_uuid = gatts_get_service_uuid(info.p_db);

		if (p_this_uuid && gatt_uuid_compare(*p_app_uuid128, info.app_uuid) &&
		gatt_uuid_compare(p_svc_uuid, p_this_uuid) &&
		(start_handle == info.s_hdl)) {
		GATT_TRACE_ERROR("Active Service Found ");
		gatt_dbg_display_uuid(*p_svc_uuid);

		return true;
		}
		}
		return false;
		}

		/*******************************************************************************
		*
		* Function GATTS_DeleteService
		@@ -396,43 +411,35 @@ uint16_t GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service,
		******************************************************************************/
		bool GATTS_DeleteService(tGATT_IF gatt_if, tBT_UUID* p_svc_uuid,
		uint16_t svc_inst) {
		tGATT_HDL_LIST_INFO* p_list_info = &gatt_cb.hdl_list_info;
		tGATT_HDL_LIST_ELEM* p_list = NULL;
		uint8_t i_sreg;
		tGATT_REG* p_reg = gatt_get_regcb(gatt_if);
		tBT_UUID* p_app_uuid128;

		GATT_TRACE_DEBUG("GATTS_DeleteService");

		tGATT_REG* p_reg = gatt_get_regcb(gatt_if);
		if (p_reg == NULL) {
		GATT_TRACE_ERROR("Applicaiton not foud");
		return false;
		}
		p_app_uuid128 = &p_reg->app_uuid128;

		p_list = gatt_find_hdl_buffer_by_app_id(p_app_uuid128, p_svc_uuid, svc_inst);
		if (p_list == NULL) {
		tBT_UUID* p_app_uuid128 = &p_reg->app_uuid128;
		auto it = gatt_find_hdl_buffer_by_app_id(p_app_uuid128, p_svc_uuid, svc_inst);
		if (it == gatt_cb.hdl_list_info->end()) {
		GATT_TRACE_ERROR("No Service found");
		return false;
		}

		gatt_proc_srv_chg();

		i_sreg = gatt_sr_find_i_rcb_by_app_id(p_app_uuid128, p_svc_uuid, svc_inst);
		if (i_sreg != GATT_MAX_SR_PROFILES) {
		GATTS_StopService(gatt_cb.sr_reg[i_sreg].s_hdl);
		if (is_active_service(p_app_uuid128, p_svc_uuid, svc_inst)) {
		GATTS_StopService(it->asgn_range.s_handle);
		}

		GATT_TRACE_DEBUG("released handles s_hdl=%u e_hdl=%u",
		p_list->asgn_range.s_handle, p_list->asgn_range.e_handle);
		it->asgn_range.s_handle, it->asgn_range.e_handle);

		if ((p_list->asgn_range.s_handle >= gatt_cb.hdl_cfg.app_start_hdl) &&
		if ((it->asgn_range.s_handle >= gatt_cb.hdl_cfg.app_start_hdl) &&
		gatt_cb.cb_info.p_nv_save_callback)
		(*gatt_cb.cb_info.p_nv_save_callback)(false, &p_list->asgn_range);

		gatt_remove_an_item_from_list(p_list_info, p_list);
		gatt_free_hdl_buffer(p_list);
		(*gatt_cb.cb_info.p_nv_save_callback)(false, &it->asgn_range);

		gatt_cb.hdl_list_info->erase(it);
		return true;
		}

		@@ -448,22 +455,20 @@ bool GATTS_DeleteService(tGATT_IF gatt_if, tBT_UUID* p_svc_uuid,
		*
		******************************************************************************/
		void GATTS_StopService(uint16_t service_handle) {
		uint8_t ii = gatt_sr_find_i_rcb_by_handle(service_handle);

		GATT_TRACE_API("GATTS_StopService %u", service_handle);
		GATT_TRACE_API("%s: %u", __func__, service_handle);

		/* Index 0 is reserved for GATT, and is never stopped */
		if ((ii > 0) && (ii < GATT_MAX_SR_PROFILES) && (gatt_cb.sr_reg[ii].in_use)) {
		if (gatt_cb.sr_reg[ii].sdp_handle) {
		SDP_DeleteRecord(gatt_cb.sr_reg[ii].sdp_handle);
		}
		gatt_remove_a_srv_from_list(&gatt_cb.srv_list_info, &gatt_cb.srv_list[ii]);
		gatt_cb.srv_list[ii].in_use = false;
		memset(&gatt_cb.sr_reg[ii], 0, sizeof(tGATT_SR_REG));
		} else {
		GATT_TRACE_ERROR("GATTS_StopService service_handle: %u is not in use",
		auto it = gatt_sr_find_i_rcb_by_handle(service_handle);
		if (it == gatt_cb.srv_list_info->end()) {
		GATT_TRACE_ERROR("%s: service_handle: %u is not in use", __func__,
		service_handle);
		}

		if (it->sdp_handle) {
		SDP_DeleteRecord(it->sdp_handle);
		}

		gatt_cb.srv_list_info->erase(it);
		gatt_update_last_pri_srv_info();
		}
		/*******************************************************************************
		*
		@@ -1170,13 +1175,9 @@ tGATT_IF GATT_Register(tBT_UUID* p_app_uuid128, tGATT_CBACK* p_cb_info) {
		*
		******************************************************************************/
		void GATT_Deregister(tGATT_IF gatt_if) {
		tGATT_REG* p_reg = gatt_get_regcb(gatt_if);
		tGATT_TCB* p_tcb;
		tGATT_CLCB* p_clcb;
		uint8_t i, ii, j;
		tGATT_SR_REG* p_sreg;

		GATT_TRACE_API("GATT_Deregister gatt_if=%d", gatt_if);

		tGATT_REG* p_reg = gatt_get_regcb(gatt_if);
		/* Index 0 is GAP and is never deregistered */
		if ((gatt_if == 0) \|\| (p_reg == NULL)) {
		GATT_TRACE_ERROR("GATT_Deregister with invalid gatt_if: %u", gatt_if);
		@@ -1188,11 +1189,9 @@ void GATT_Deregister(tGATT_IF gatt_if) {
		other application
		deregisteration need to bed performed in an orderly fashion
		no check for now */

		for (ii = 0, p_sreg = gatt_cb.sr_reg; ii < GATT_MAX_SR_PROFILES;
		ii++, p_sreg++) {
		if (p_sreg->in_use && (p_sreg->gatt_if == gatt_if)) {
		GATTS_StopService(p_sreg->s_hdl);
		for (auto& el : *gatt_cb.srv_list_info) {
		if (el.gatt_if == gatt_if) {
		GATTS_StopService(el.s_hdl);
		}
		}

		@@ -1201,13 +1200,15 @@ void GATT_Deregister(tGATT_IF gatt_if) {

		/* When an application deregisters, check remove the link associated with the
		* app */

		tGATT_TCB* p_tcb;
		int i, j;
		for (i = 0, p_tcb = gatt_cb.tcb; i < GATT_MAX_PHY_CHANNEL; i++, p_tcb++) {
		if (p_tcb->in_use) {
		if (gatt_get_ch_state(p_tcb) != GATT_CH_CLOSE) {
		gatt_update_app_use_link_flag(gatt_if, p_tcb, false, true);
		}

		tGATT_CLCB* p_clcb;
		for (j = 0, p_clcb = &gatt_cb.clcb[j]; j < GATT_CL_MAX_LCB;
		j++, p_clcb++) {
		if (p_clcb->in_use && (p_clcb->p_reg->gatt_if == gatt_if) &&

system/stack/gatt/gatt_db.cc

+247 −546

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/gatt/gatt_int.h

+31 −81

Original line number	Diff line number	Diff line
		@@ -28,13 +28,14 @@
		#include "osi/include/fixed_queue.h"

		#include <string.h>
		#include <list>
		#include <vector>

		#define GATT_CREATE_CONN_ID(tcb_idx, gatt_if) \
		((uint16_t)((((uint8_t)(tcb_idx)) << 8) \| ((uint8_t)(gatt_if))))
		#define GATT_GET_TCB_IDX(conn_id) ((uint8_t)(((uint16_t)(conn_id)) >> 8))
		#define GATT_GET_GATT_IF(conn_id) ((tGATT_IF)((uint8_t)(conn_id)))

		#define GATT_GET_SR_REG_PTR(index) (&gatt_cb.sr_reg[(uint8_t)(index)]);
		#define GATT_TRANS_ID_MAX 0x0fffffff /* 4 MSB is reserved */

		/* security action for GATT write and read request */
		@@ -153,7 +154,6 @@ typedef union {
		tBT_UUID uuid; /* service declaration */
		tGATT_CHAR_DECL char_decl; /* characteristic declaration */
		tGATT_INCL_SRVC incl_handle; /* included service */

		} tGATT_ATTR_VALUE;

		/* Attribute UUID type
		@@ -166,9 +166,7 @@ typedef uint8_t tGATT_ATTR_UUID_TYPE;
		/* 16 bits UUID Attribute in server database
		*/
		typedef struct {
		void* p_next; /* pointer to the next attribute,
		either tGATT_ATTR16 or tGATT_ATTR128 */
		tGATT_ATTR_VALUE* p_value;
		std::unique_ptr<tGATT_ATTR_VALUE> p_value;
		tGATT_PERM permission;
		uint16_t handle;
		tBT_UUID uuid;
		@@ -178,30 +176,11 @@ typedef struct {
		/* Service Database definition
		*/
		typedef struct {
		void* p_attr_list; /* pointer to the first attribute,
		either tGATT_ATTR16 or tGATT_ATTR128 */
		uint8_t* p_free_mem; /* Pointer to free memory */
		fixed_queue_t* svc_buffer; /* buffer queue used for service database */
		uint32_t mem_free; /* Memory still available */
		std::vector<tGATT_ATTR> attr_list; /* pointer to the attributes */
		uint16_t end_handle; /* Last handle number */
		uint16_t next_handle; /* Next usable handle value */
		} tGATT_SVC_DB;

		/* Data Structure used for GATT server */
		/* A GATT registration record consists of a handle, and 1 or more attributes */
		/* A service registration information record consists of beginning and ending */
		/* attribute handle, service UUID and a set of GATT server callback. */
		typedef struct {
		tGATT_SVC_DB* p_db; /* pointer to the service database */
		tBT_UUID app_uuid; /* applicatino UUID */
		uint32_t sdp_handle; /* primamry service SDP handle */
		uint16_t type; /* service type UUID, primary or secondary */
		uint16_t s_hdl; /* service starting handle */
		uint16_t e_hdl; /* service ending handle */
		tGATT_IF gatt_if; /* this service is belong to which application */
		bool in_use;
		} tGATT_SR_REG;

		/* Data Structure used for GATT server */
		/* An GATT registration record consists of a handle, and 1 or more attributes */
		/* A service registration information record consists of beginning and ending */
		@@ -262,35 +241,25 @@ typedef struct hdl_cfg {
		} tGATT_HDL_CFG;

		typedef struct hdl_list_elem {
		struct hdl_list_elem* p_next;
		struct hdl_list_elem* p_prev;
		tGATTS_HNDL_RANGE asgn_range; /* assigned handle range */
		tGATT_SVC_DB svc_db;
		bool in_use;
		} tGATT_HDL_LIST_ELEM;

		/* Data Structure used for GATT server */
		/* A GATT registration record consists of a handle, and 1 or more attributes */
		/* A service registration information record consists of beginning and ending */
		/* attribute handle, service UUID and a set of GATT server callback. */
		typedef struct {
		tGATT_HDL_LIST_ELEM* p_first;
		tGATT_HDL_LIST_ELEM* p_last;
		uint16_t count;
		} tGATT_HDL_LIST_INFO;

		typedef struct srv_list_elem {
		struct srv_list_elem* p_next;
		struct srv_list_elem* p_prev;
		uint16_t s_hdl;
		uint8_t i_sreg;
		bool in_use;
		tGATT_SVC_DB* p_db; /* pointer to the service database */
		tBT_UUID app_uuid; /* applicatino UUID */
		uint32_t sdp_handle; /* primamry service SDP handle */
		uint16_t type; /* service type UUID, primary or secondary */
		uint16_t s_hdl; /* service starting handle */
		uint16_t e_hdl; /* service ending handle */
		tGATT_IF gatt_if; /* this service is belong to which application */
		bool is_primary;
		} tGATT_SRV_LIST_ELEM;

		typedef struct {
		tGATT_SRV_LIST_ELEM* p_last_primary;
		tGATT_SRV_LIST_ELEM* p_first;
		tGATT_SRV_LIST_ELEM* p_last;
		uint16_t count;
		} tGATT_SRV_LIST_INFO;

		typedef struct {
		fixed_queue_t* pending_enc_clcb; /* pending encryption channel q */
		tGATT_SEC_ACTION sec_act;
		@@ -400,14 +369,12 @@ typedef struct {
		tGATT_TCB tcb[GATT_MAX_PHY_CHANNEL];
		fixed_queue_t* sign_op_queue;

		tGATT_SR_REG sr_reg[GATT_MAX_SR_PROFILES];
		uint16_t next_handle; /* next available handle */
		uint16_t last_primary_s_handle; /* handle of last primary service */
		tGATT_SVC_CHG gattp_attr; /* GATT profile attribute service change */
		tGATT_IF gatt_if;
		tGATT_HDL_LIST_INFO hdl_list_info;
		tGATT_HDL_LIST_ELEM hdl_list[GATT_MAX_SR_PROFILES];
		tGATT_SRV_LIST_INFO srv_list_info;
		tGATT_SRV_LIST_ELEM srv_list[GATT_MAX_SR_PROFILES];
		std::list<tGATT_HDL_LIST_ELEM>* hdl_list_info;
		std::list<tGATT_SRV_LIST_ELEM>* srv_list_info;

		fixed_queue_t* srv_chg_clt_q; /* service change clients queue */
		tGATT_REG cl_rcb[GATT_MAX_APPS];
		@@ -514,23 +481,9 @@ extern void gatt_free_srvc_db_buffer_app_id(tBT_UUID* p_app_id);
		extern bool gatt_cl_send_next_cmd_inq(tGATT_TCB* p_tcb);

		/* reserved handle list */
		extern tGATT_HDL_LIST_ELEM* gatt_find_hdl_buffer_by_app_id(
		extern std::list<tGATT_HDL_LIST_ELEM>::iterator gatt_find_hdl_buffer_by_app_id(
		tBT_UUID* p_app_uuid128, tBT_UUID* p_svc_uuid, uint16_t svc_inst);
		extern tGATT_HDL_LIST_ELEM* gatt_find_hdl_buffer_by_handle(uint16_t handle);
		extern tGATT_HDL_LIST_ELEM* gatt_alloc_hdl_buffer(void);
		extern void gatt_free_hdl_buffer(tGATT_HDL_LIST_ELEM* p);
		extern bool gatt_is_last_attribute(tGATT_SRV_LIST_INFO* p_list,
		tGATT_SRV_LIST_ELEM* p_start,
		tBT_UUID value);
		extern void gatt_update_last_pri_srv_info(tGATT_SRV_LIST_INFO* p_list);
		extern bool gatt_add_a_srv_to_list(tGATT_SRV_LIST_INFO* p_list,
		tGATT_SRV_LIST_ELEM* p_new);
		extern bool gatt_remove_a_srv_from_list(tGATT_SRV_LIST_INFO* p_list,
		tGATT_SRV_LIST_ELEM* p_remove);
		extern bool gatt_add_an_item_to_list(tGATT_HDL_LIST_INFO* p_list,
		tGATT_HDL_LIST_ELEM* p_new);
		extern bool gatt_remove_an_item_from_list(tGATT_HDL_LIST_INFO* p_list,
		tGATT_HDL_LIST_ELEM* p_remove);
		extern tGATTS_SRV_CHG* gatt_add_srv_chg_clt(tGATTS_SRV_CHG* p_srv_chg);

		/* for background connection */
		@@ -544,11 +497,11 @@ extern tGATT_BG_CONN_DEV* gatt_find_bg_dev(BD_ADDR remote_bda);
		extern void gatt_deregister_bgdev_list(tGATT_IF gatt_if);

		/* server function */
		extern uint8_t gatt_sr_find_i_rcb_by_handle(uint16_t handle);
		extern uint8_t gatt_sr_find_i_rcb_by_app_id(tBT_UUID* p_app_uuid128,
		extern std::list<tGATT_SRV_LIST_ELEM>::iterator gatt_sr_find_i_rcb_by_handle(
		uint16_t handle);
		extern bool gatt_sr_find_i_rcb_by_app_id(tBT_UUID* p_app_uuid128,
		tBT_UUID* p_svc_uuid,
		uint16_t svc_inst);
		extern uint8_t gatt_sr_alloc_rcb(tGATT_HDL_LIST_ELEM* p_list);
		extern tGATT_STATUS gatt_sr_process_app_rsp(tGATT_TCB* p_tcb, tGATT_IF gatt_if,
		uint32_t trans_id, uint8_t op_code,
		tGATT_STATUS status,
		@@ -625,17 +578,16 @@ extern tGATT_SEC_ACTION gatt_get_sec_act(tGATT_TCB* p_tcb);
		extern void gatt_set_sec_act(tGATT_TCB* p_tcb, tGATT_SEC_ACTION sec_act);

		/* gatt_db.cc */
		extern bool gatts_init_service_db(tGATT_SVC_DB* p_db, tBT_UUID* p_service,
		extern void gatts_init_service_db(tGATT_SVC_DB& db, tBT_UUID* p_service,
		bool is_pri, uint16_t s_hdl,
		uint16_t num_handle);
		extern uint16_t gatts_add_included_service(tGATT_SVC_DB* p_db,
		uint16_t s_handle, uint16_t e_handle,
		tBT_UUID service);
		extern uint16_t gatts_add_characteristic(tGATT_SVC_DB* p_db, tGATT_PERM perm,
		extern uint16_t gatts_add_included_service(tGATT_SVC_DB& db, uint16_t s_handle,
		uint16_t e_handle, tBT_UUID service);
		extern uint16_t gatts_add_characteristic(tGATT_SVC_DB& db, tGATT_PERM perm,
		tGATT_CHAR_PROP property,
		tBT_UUID* p_char_uuid);
		extern uint16_t gatts_add_char_descr(tGATT_SVC_DB* p_db, tGATT_PERM perm,
		tBT_UUID* p_dscp_uuid);
		tBT_UUID& char_uuid);
		extern uint16_t gatts_add_char_descr(tGATT_SVC_DB& db, tGATT_PERM perm,
		tBT_UUID& dscp_uuid);
		extern tGATT_STATUS gatts_db_read_attr_value_by_type(
		tGATT_TCB* p_tcb, tGATT_SVC_DB* p_db, uint8_t op_code, BT_HDR* p_rsp,
		uint16_t s_handle, uint16_t e_handle, tBT_UUID type, uint16_t* p_len,
		@@ -652,8 +604,6 @@ extern tGATT_STATUS gatts_read_attr_perm_check(tGATT_SVC_DB* p_db, bool is_long,
		uint16_t handle,
		tGATT_SEC_FLAG sec_flag,
		uint8_t key_size);
		extern void gatts_update_srv_list_elem(uint8_t i_sreg, uint16_t handle,
		bool is_primary);
		extern tBT_UUID* gatts_get_service_uuid(tGATT_SVC_DB* p_db);

		#endif

system/stack/gatt/gatt_main.cc

+8 −3

Original line number	Diff line number	Diff line
		@@ -132,6 +132,9 @@ void gatt_init(void) {
		gatt_cb.hdl_cfg.gatt_start_hdl = GATT_GATT_START_HANDLE;
		gatt_cb.hdl_cfg.gap_start_hdl = GATT_GAP_START_HANDLE;
		gatt_cb.hdl_cfg.app_start_hdl = GATT_APP_START_HANDLE;

		gatt_cb.hdl_list_info = new std::list<tGATT_HDL_LIST_ELEM>();
		gatt_cb.srv_list_info = new std::list<tGATT_SRV_LIST_ELEM>();
		gatt_profile_db_init();
		}

		@@ -168,9 +171,11 @@ void gatt_free(void) {
		fixed_queue_free(gatt_cb.tcb[i].sr_cmd.multi_rsp_q, NULL);
		gatt_cb.tcb[i].sr_cmd.multi_rsp_q = NULL;
		}
		for (i = 0; i < GATT_MAX_SR_PROFILES; i++) {
		gatt_free_hdl_buffer(&gatt_cb.hdl_list[i]);
		}

		gatt_cb.hdl_list_info->clear();
		gatt_cb.hdl_list_info = nullptr;
		gatt_cb.srv_list_info->clear();
		gatt_cb.srv_list_info = nullptr;
		}

		/*******************************************************************************

system/stack/gatt/gatt_sr.cc

+76 −129

File changed.

Preview size limit exceeded, changes collapsed.