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

Commit 57a38ae7 authored Aug 24, 2020 by Hansong Zhang

AG: Fold sec mask

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieb632fc424d4f0d2a70495c40876fc23e6b6674f

parent a6ce41a1

system/bta/ag/bta_ag_act.cc

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -102,7 +102,6 @@ static void bta_ag_cback_open(tBTA_AG_SCB* p_scb, const RawAddress& bd_addr,
	void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {		void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	/* initialize control block */		/* initialize control block */
	p_scb->reg_services = data.api_register.services;		p_scb->reg_services = data.api_register.services;
	p_scb->serv_sec_mask = BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT;
	p_scb->features = data.api_register.features;		p_scb->features = data.api_register.features;
	p_scb->app_id = data.api_register.app_id;		p_scb->app_id = data.api_register.app_id;

	@@ -175,7 +174,6 @@ void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	******************************************************************************/		******************************************************************************/
	void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {		void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	p_scb->peer_addr = data.api_open.bd_addr;		p_scb->peer_addr = data.api_open.bd_addr;
	p_scb->cli_sec_mask = BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT;
	p_scb->open_services = p_scb->reg_services;		p_scb->open_services = p_scb->reg_services;

	/* Check if RFCOMM has any incoming connection to avoid collision. */		/* Check if RFCOMM has any incoming connection to avoid collision. */

system/bta/ag/bta_ag_int.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -197,8 +197,6 @@ struct tBTA_AG_SCB {
	tBTA_SERVICE_MASK reg_services; /* services specified in register API */		tBTA_SERVICE_MASK reg_services; /* services specified in register API */
	tBTA_SERVICE_MASK open_services; /* services specified in open API */		tBTA_SERVICE_MASK open_services; /* services specified in open API */
	uint16_t conn_handle; /* RFCOMM handle of connected service */		uint16_t conn_handle; /* RFCOMM handle of connected service */
	tBTA_SEC serv_sec_mask; /* server security mask */
	tBTA_SEC cli_sec_mask; /* client security mask */
	tBTA_AG_FEAT features; /* features registered by application */		tBTA_AG_FEAT features; /* features registered by application */
	tBTA_AG_PEER_FEAT peer_features; /* peer device features */		tBTA_AG_PEER_FEAT peer_features; /* peer device features */
	uint16_t peer_sdp_features; /* peer device SDP features */		uint16_t peer_sdp_features; /* peer device SDP features */

system/bta/ag/bta_ag_rfc.cc

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -261,7 +261,7 @@ void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services) {
	bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU,		bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU,
	RawAddress::kAny, &(p_scb->serv_handle[i]),		RawAddress::kAny, &(p_scb->serv_handle[i]),
	bta_ag_mgmt_cback_tbl[management_callback_index], bta_ag_sec_id[i],		bta_ag_mgmt_cback_tbl[management_callback_index], bta_ag_sec_id[i],
	p_scb->serv_sec_mask);		BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT);
	if (status == PORT_SUCCESS) {		if (status == PORT_SUCCESS) {
	bta_ag_setup_port(p_scb, p_scb->serv_handle[i]);		bta_ag_setup_port(p_scb, p_scb->serv_handle[i]);
	} else {		} else {
	@@ -335,7 +335,8 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
	bta_ag_uuid[p_scb->conn_service], p_scb->peer_scn, false, BTA_AG_MTU,		bta_ag_uuid[p_scb->conn_service], p_scb->peer_scn, false, BTA_AG_MTU,
	p_scb->peer_addr, &(p_scb->conn_handle),		p_scb->peer_addr, &(p_scb->conn_handle),
	bta_ag_mgmt_cback_tbl[management_callback_index],		bta_ag_mgmt_cback_tbl[management_callback_index],
	bta_ag_sec_id[p_scb->conn_service], p_scb->cli_sec_mask);		bta_ag_sec_id[p_scb->conn_service],
			BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT);
	APPL_TRACE_DEBUG(		APPL_TRACE_DEBUG(
	"%s: p_scb=0x%08x, conn_handle=%d, mgmt_cback_index=%d,"		"%s: p_scb=0x%08x, conn_handle=%d, mgmt_cback_index=%d,"
	" status=%d",		" status=%d",