Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a13b34f3 authored May 07, 2024 by Chris Manton

stack::sdp [1/12] service.SDP_InitDiscoveryDb

Bug: 339311914
Test: m .
Flag: EXEMPT, Logging Change

Change-Id: I40991b63d6241760d18a3dd64fc15bacf622d33a

parent 1b4c9972

system/bta/dm/bta_dm_disc.cc

+5 −2

Original line number	Diff line number	Diff line
		@@ -716,8 +716,11 @@ static void bta_dm_find_services(const RawAddress& bd_addr) {
		(tSDP_DISCOVERY_DB*)osi_malloc(BTA_DM_SDP_DB_SIZE);

		log::info("search UUID = {}", uuid.ToString());
		get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		bta_dm_discovery_cb.p_sdp_db, BTA_DM_SDP_DB_SIZE, 1, &uuid, 0, NULL);
		if (!get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		bta_dm_discovery_cb.p_sdp_db, BTA_DM_SDP_DB_SIZE, 1, &uuid, 0,
		NULL)) {
		log::warn("Unable to initialize SDP service discovery db peer:{}", bd_addr);
		}

		memset(g_disc_raw_data_buf, 0, sizeof(g_disc_raw_data_buf));
		bta_dm_discovery_cb.p_sdp_db->raw_data = g_disc_raw_data_buf;

system/bta/dm/bta_dm_disc_legacy.cc

+6 −2

Original line number	Diff line number	Diff line
		@@ -1090,8 +1090,12 @@ static void bta_dm_find_services(const RawAddress& bd_addr) {
		}

		log::info("search UUID = {}", uuid.ToString());
		get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		bta_dm_search_cb.p_sdp_db, BTA_DM_SDP_DB_SIZE, 1, &uuid, 0, NULL);
		if (!get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		bta_dm_search_cb.p_sdp_db, BTA_DM_SDP_DB_SIZE, 1, &uuid, 0,
		NULL)) {
		log::warn("Unable to initialize SDP service discovery db peer:{}",
		bd_addr);
		}

		memset(g_disc_raw_data_buf, 0, sizeof(g_disc_raw_data_buf));
		bta_dm_search_cb.p_sdp_db->raw_data = g_disc_raw_data_buf;

system/bta/gatt/bta_gattc_cache.cc

+6 −2

Original line number	Diff line number	Diff line
		@@ -432,8 +432,12 @@ static tGATT_STATUS bta_gattc_sdp_service_disc(uint16_t conn_id,
		attr_list[1] = ATTR_ID_PROTOCOL_DESC_LIST;

		Uuid uuid = Uuid::From16Bit(UUID_PROTOCOL_ATT);
		get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		cb_data->p_sdp_db, BTA_GATT_SDP_DB_SIZE, 1, &uuid, num_attrs, attr_list);
		if (!get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		cb_data->p_sdp_db, BTA_GATT_SDP_DB_SIZE, 1, &uuid, num_attrs,
		attr_list)) {
		log::warn("Unable to initialize SDP service discovery db peer:{}",
		p_server_cb->server_bda);
		};

		if (!get_legacy_stack_sdp_api()->service.SDP_ServiceSearchAttributeRequest2(
		p_server_cb->server_bda, cb_data->p_sdp_db, &bta_gattc_sdp_callback,

system/bta/sdp/bta_sdp_act.cc

+5 −2

Original line number	Diff line number	Diff line
		@@ -691,8 +691,11 @@ void bta_sdp_search(const RawAddress bd_addr, const bluetooth::Uuid uuid) {

		/* initialize the search for the uuid */
		log::verbose("init discovery with UUID: {}", uuid.ToString());
		get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		p_bta_sdp_cfg->p_sdp_db, p_bta_sdp_cfg->sdp_db_size, 1, &uuid, 0, NULL);
		if (!get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		p_bta_sdp_cfg->p_sdp_db, p_bta_sdp_cfg->sdp_db_size, 1, &uuid, 0,
		NULL)) {
		log::warn("Unable to initialize SDP service search db peer:{}", bd_addr);
		}

		Uuid* bta_sdp_search_uuid = (Uuid*)osi_malloc(sizeof(Uuid));
		*bta_sdp_search_uuid = uuid;

system/stack/hid/hidh_api.cc

+4 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,10 @@ tHID_STATUS HID_HostGetSDPRecord(const RawAddress& addr,

		hh_cb.p_sdp_db = p_db;
		Uuid uuid_list = Uuid::From16Bit(UUID_SERVCLASS_HUMAN_INTERFACE);
		get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(p_db, db_len, 1,
		&uuid_list, 0, NULL);
		if (!get_legacy_stack_sdp_api()->service.SDP_InitDiscoveryDb(
		p_db, db_len, 1, &uuid_list, 0, NULL)) {
		log::warn("Unable to initialize SDP service discovery db peer:{}", addr);
		};

		if (get_legacy_stack_sdp_api()->service.SDP_ServiceSearchRequest(
		addr, p_db, hidh_search_callback)) {