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

Commit 7d817c1a authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

connection_manager: Add initial support for target announcements 

Extend connection manager to handle target announcement.
Goal:
1. if there are multiple user for single device and at least one of them
is expecting to use target annoucements, then only scan filtering for
targeted annoucements shall be used
2. When user requested targeted annoucement usage is removed, and there
are other users interested in background conneect, then device shall
be added back to the accept list

Bug: 248340126
Test: atest BluetoothInstrumentationTests
Test: atest --host  net_test_gatt_conn_multiplexing
Tag: #feature

Merged-In: I00f30dcccbdb3d8712d49f15c9d8d7bae60663f6
Change-Id: I00f30dcccbdb3d8712d49f15c9d8d7bae60663f6
(cherry picked from commit 99abc724)
parent 83103288

system/stack/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ cc_test { 
cc_test {

    name: "net_test_gatt_conn_multiplexing",

    defaults: ["fluoride_defaults"],

    host_supported: true,

    local_include_dirs: [

        "include",

        "btm",

system/stack/gatt/connection_manager.cc

+156 −17
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ namespace connection_manager { 
struct tAPPS_CONNECTING {

  // ids of clients doing background connection to given device

  std::set<tAPP_ID> doing_bg_conn;

  std::set<tAPP_ID> doing_targeted_announcements_conn;

  bool is_in_accept_list;



  // Apps trying to do direct connection.

  std::map<tAPP_ID, unique_alarm_ptr> doing_direct_conn;
@@ -75,12 +77,30 @@ namespace { 
// Maps address to apps trying to connect to it

std::map<RawAddress, tAPPS_CONNECTING> bgconn_dev;



bool anyone_connecting(

int num_of_targeted_announcements_users(void) {

  return std::count_if(

      bgconn_dev.begin(), bgconn_dev.end(), [](const auto& pair) {

        return (!pair.second.is_in_accept_list &&

                !pair.second.doing_targeted_announcements_conn.empty());

      });

}



bool is_anyone_interested_to_use_accept_list(

    const std::map<RawAddress, tAPPS_CONNECTING>::iterator it) {

  if (!it->second.doing_targeted_announcements_conn.empty()) {

    return (!it->second.doing_direct_conn.empty());

  }

  return (!it->second.doing_bg_conn.empty() ||

          !it->second.doing_direct_conn.empty());

}



bool is_anyone_connecting(

    const std::map<RawAddress, tAPPS_CONNECTING>::iterator it) {

  return (!it->second.doing_bg_conn.empty() ||

          !it->second.doing_direct_conn.empty() ||

          !it->second.doing_targeted_announcements_conn.empty());

}



}  // namespace



/** background connection device from the list. Returns pointer to the device
@@ -92,6 +112,65 @@ std::set<tAPP_ID> get_apps_connecting_to(const RawAddress& address) { 
                                  : std::set<tAPP_ID>();

}



void target_announcements_filtering_set(bool enable) {

  // TODO Implement

}



/** Add a device to the background connection list for targeted announcements.

 * Returns

 *   true if device added to the list, or already in list,

 *   false otherwise

 */

bool background_connect_targeted_announcement_add(tAPP_ID app_id,

                                                  const RawAddress& address) {

  LOG_INFO("app_id=%d, address=%s", static_cast<int>(app_id),

           address.ToString().c_str());



  bool disable_accept_list = false;



  auto it = bgconn_dev.find(address);

  if (it != bgconn_dev.end()) {

    // check if filtering already enabled

    if (it->second.doing_targeted_announcements_conn.count(app_id)) {

      LOG_INFO(

          "app_id=%d, already doing targeted announcement filtering to "

          "address=%s",

          static_cast<int>(app_id), address.ToString().c_str());

      return true;

    }



    bool targeted_filtering_enabled =

        !it->second.doing_targeted_announcements_conn.empty();



    // Check if connecting

    if (!it->second.doing_direct_conn.empty()) {

      LOG_INFO("app_id=%d, address=%s, already in direct connection",

               static_cast<int>(app_id), address.ToString().c_str());



    } else if (!targeted_filtering_enabled &&

               !it->second.doing_bg_conn.empty()) {

      // device is already in the acceptlist so we would have to remove it

      LOG_INFO(

          "already doing background connection to address=%s. Need to disable "

          "it.",

          address.ToString().c_str());

      disable_accept_list = true;

    }

  }



  if (disable_accept_list) {

    BTM_AcceptlistRemove(address);

    bgconn_dev[address].is_in_accept_list = false;

  }



  bgconn_dev[address].doing_targeted_announcements_conn.insert(app_id);

  if (num_of_targeted_announcements_users() == 1) {

    target_announcements_filtering_set(true);

  }



  return true;

}



/** Add a device from the background connection list.  Returns true if device

 * added to the list, or already in list, false otherwise */

bool background_connect_add(uint8_t app_id, const RawAddress& address) {
@@ -103,6 +182,7 @@ bool background_connect_add(uint8_t app_id, const RawAddress& address) { 


  auto it = bgconn_dev.find(address);

  bool in_acceptlist = false;

  bool is_targeted_announcement_enabled = false;

  if (it != bgconn_dev.end()) {

    // device already in the acceptlist, just add interested app to the list

    if (it->second.doing_bg_conn.count(app_id)) {
@@ -112,20 +192,28 @@ bool background_connect_add(uint8_t app_id, const RawAddress& address) { 
    }



    // Already in acceptlist ?

    if (anyone_connecting(it)) {

    if (it->second.is_in_accept_list) {

      LOG_DEBUG("app_id=%d, address=%s, already in accept list",

                static_cast<int>(app_id), address.ToString().c_str());

      in_acceptlist = true;

    } else {

      is_targeted_announcement_enabled =

          !it->second.doing_targeted_announcements_conn.empty();

    }

  }



  if (!in_acceptlist) {

    // the device is not in the acceptlist

    if (is_targeted_announcement_enabled) {

      LOG_DEBUG("Targeted announcement enabled, do not add to AcceptList");

    } else {

      if (!BTM_AcceptlistAdd(address)) {

        LOG_WARN("Failed to add device %s to accept list for app %d",

                 address.ToString().c_str(), static_cast<int>(app_id));

        return false;

      }

      bgconn_dev[address].is_in_accept_list = true;

    }

  }



  // create entry for address, and insert app_id.
@@ -161,21 +249,50 @@ bool background_connect_remove(uint8_t app_id, const RawAddress& address) { 
    return false;

  }



  if (!it->second.doing_bg_conn.erase(app_id)) {

  bool accept_list_enabled = it->second.is_in_accept_list;

  auto num_of_targeted_announcements_before_remove =

      it->second.doing_targeted_announcements_conn.size();



  if (!it->second.doing_bg_conn.erase(app_id) &&

      !it->second.doing_targeted_announcements_conn.erase(app_id)) {

    LOG_WARN("Failed to remove background connection app %d for address %s",

             static_cast<int>(app_id), address.ToString().c_str());

    return false;

  }



  if (anyone_connecting(it)) {

  if (is_anyone_connecting(it)) {

    LOG_DEBUG("some device is still connecting, app_id=%d, address=%s",

              static_cast<int>(app_id), address.ToString().c_str());

    /* Check which method should be used now.*/

    if (!accept_list_enabled) {

      /* Accept list was not used */

      if (!it->second.doing_targeted_announcements_conn.empty()) {

        /* Keep using filtering */

        LOG_DEBUG(" Keep using target announcement filtering");

      } else if (!it->second.doing_bg_conn.empty()) {

        if (!BTM_AcceptlistAdd(address)) {

          LOG_WARN("Could not re add device to accept list");

        } else {

          bgconn_dev[address].is_in_accept_list = true;

        }

      }

    }

    return true;

  }



  bgconn_dev.erase(it);



  // no more apps interested - remove from accept list and delete record

  if (accept_list_enabled) {

    BTM_AcceptlistRemove(address);

  bgconn_dev.erase(it);

    return true;

  }



  if ((num_of_targeted_announcements_before_remove > 0) &&

      num_of_targeted_announcements_users() == 0) {

    target_announcements_filtering_set(true);

  }



  return true;

}
@@ -190,7 +307,7 @@ void on_app_deregistered(uint8_t app_id) { 


    it->second.doing_direct_conn.erase(app_id);



    if (anyone_connecting(it)) {

    if (is_anyone_connecting(it)) {

      it++;

      continue;

    }
@@ -221,11 +338,14 @@ void on_connection_timed_out_from_shim(const RawAddress& address) { 
  on_connection_timed_out(0x00, address);

}



/** Reset bg device list. If called after controller reset, set |after_reset| to

 * true, as there is no need to wipe controller acceptlist in this case. */

/** Reset bg device list. If called after controller reset, set |after_reset|

 * to true, as there is no need to wipe controller acceptlist in this case. */

void reset(bool after_reset) {

  bgconn_dev.clear();

  if (!after_reset) BTM_AcceptlistClear();

  if (!after_reset) {

    target_announcements_filtering_set(false);

    BTM_AcceptlistClear();

  }

}



void wl_direct_connect_timeout_cb(uint8_t app_id, const RawAddress& address) {
@@ -258,7 +378,7 @@ bool direct_connect_add(uint8_t app_id, const RawAddress& address) { 
    }



    // are we already in the acceptlist ?

    if (anyone_connecting(it)) {

    if (it->second.is_in_accept_list) {

      LOG_WARN("Background connection attempt already in progress app_id=%x",

               app_id);

      in_acceptlist = true;
@@ -274,6 +394,7 @@ bool direct_connect_add(uint8_t app_id, const RawAddress& address) { 
      if (params_changed) BTM_SetLeConnectionModeToSlow();

      return false;

    }

    bgconn_dev[address].is_in_accept_list = true;

  }



  // Setup a timer
@@ -309,6 +430,10 @@ bool direct_connect_remove(uint8_t app_id, const RawAddress& address) { 
    return false;

  }



  /* Let see if the device was connected due to Target Announcements.*/

  bool is_targeted_announcement_enabled =

      !it->second.doing_targeted_announcements_conn.empty();



  // this will free the alarm

  it->second.doing_direct_conn.erase(app_it);
@@ -318,13 +443,19 @@ bool direct_connect_remove(uint8_t app_id, const RawAddress& address) { 
    BTM_SetLeConnectionModeToSlow();

  }



  if (anyone_connecting(it)) {

  if (is_anyone_interested_to_use_accept_list(it)) {

    return true;

  }



  // no more apps interested - remove from acceptlist

  BTM_AcceptlistRemove(address);



  if (!is_targeted_announcement_enabled) {

    bgconn_dev.erase(it);

  } else {

    it->second.is_in_accept_list = false;

  }



  return true;

}
@@ -352,6 +483,14 @@ void dump(int fd) { 
        dprintf(fd, "%d, ", id);

      }

    }

    if (!entry.second.doing_targeted_announcements_conn.empty()) {

      dprintf(fd, "\n\t\tapps doing cap announcement connect: ");

      for (const auto& id : entry.second.doing_targeted_announcements_conn) {

        dprintf(fd, "%d, ", id);

      }

    }

    dprintf(fd, "\n\t\t is in the allow list: %s",

            entry.second.is_in_accept_list ? "true" : "false");

  }

  dprintf(fd, "\n");

}

system/stack/gatt/connection_manager.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ namespace connection_manager { 
using tAPP_ID = uint8_t;



/* for background connection */

extern bool background_connect_targeted_announcement_add(

    tAPP_ID app_id, const RawAddress& address);

extern bool background_connect_add(tAPP_ID app_id, const RawAddress& address);

extern bool background_connect_remove(tAPP_ID app_id,

                                      const RawAddress& address);

system/stack/gatt/gatt_api.cc

+8 −2
Original line number Diff line number Diff line
@@ -1303,8 +1303,14 @@ bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, 
               bd_addr.ToString().c_str(), +gatt_if);

      ret = false;

    } else {

      LOG_DEBUG("Adding to accept list device:%s", PRIVATE_ADDRESS(bd_addr));

      LOG_DEBUG("Adding to background connect to device:%s",

                PRIVATE_ADDRESS(bd_addr));

      if (connection_type == BTM_BLE_BKG_CONNECT_ALLOW_LIST) {

        ret = connection_manager::background_connect_add(gatt_if, bd_addr);

      } else {

        ret = connection_manager::background_connect_targeted_announcement_add(

            gatt_if, bd_addr);

      }

    }

  }

system/stack/test/gatt_connection_manager_test.cc

+68 −2
Original line number Diff line number Diff line 
#include "stack/gatt/connection_manager.h"



#include <base/bind.h>

#include <base/callback.h>

#include <base/location.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include <memory>



#include "common/init_flags.h"

#include "osi/include/alarm.h"

#include "osi/test/alarm_mock.h"

#include "stack/gatt/connection_manager.h"



using testing::_;

using testing::DoAll;
@@ -17,6 +19,11 @@ using testing::SaveArg; 


using connection_manager::tAPP_ID;



const char* test_flags[] = {

    "INIT_logging_debug_enabled_for_all=true",

    nullptr,

};



namespace {

// convenience mock, for verifying acceptlist operations on lower layer are

// actually scheduled
@@ -73,6 +80,7 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& bd_addr) { 
namespace connection_manager {

class BleConnectionManager : public testing::Test {

  void SetUp() override {

    bluetooth::common::InitFlags::Load(test_flags);

    localAcceptlistMock = std::make_unique<AcceptlistMock>();

  }
@@ -283,4 +291,62 @@ TEST_F(BleConnectionManager, test_direct_and_background_connect) { 
  Mock::VerifyAndClearExpectations(localAcceptlistMock.get());

}



TEST_F(BleConnectionManager, test_target_announement_connect) {

  EXPECT_CALL(*localAcceptlistMock, AcceptlistRemove(_)).Times(0);

  EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT1, address1));

  EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT1, address1));

}



TEST_F(BleConnectionManager,

       test_add_targeted_announement_when_allow_list_used) {

  /* Accept adding to allow list */

  EXPECT_CALL(*localAcceptlistMock, AcceptlistAdd(address1))

      .WillOnce(Return(true));



  /* This shall be called when registering announcements */

  EXPECT_CALL(*localAcceptlistMock, AcceptlistRemove(_)).Times(1);

  EXPECT_TRUE(background_connect_add(CLIENT1, address1));

  EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT2, address1));



  Mock::VerifyAndClearExpectations(localAcceptlistMock.get());

}



TEST_F(BleConnectionManager,

       test_add_background_connect_when_targeted_announcement_are_enabled) {

  /* Accept adding to allow list */

  EXPECT_CALL(*localAcceptlistMock, AcceptlistAdd(address1)).Times(0);



  /* This shall be called when registering announcements */

  EXPECT_CALL(*localAcceptlistMock, AcceptlistRemove(_)).Times(0);



  EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT2, address1));



  EXPECT_TRUE(background_connect_add(CLIENT1, address1));

  Mock::VerifyAndClearExpectations(localAcceptlistMock.get());

}



TEST_F(BleConnectionManager, test_re_add_background_connect_to_allow_list) {

  EXPECT_CALL(*localAcceptlistMock, AcceptlistAdd(address1)).Times(0);

  EXPECT_CALL(*localAcceptlistMock, AcceptlistRemove(_)).Times(0);



  EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT2, address1));



  EXPECT_TRUE(background_connect_add(CLIENT1, address1));

  Mock::VerifyAndClearExpectations(localAcceptlistMock.get());



  /* Now remove app using targeted announcement and expect device

   * to be added to white list

   */



  /* Accept adding to allow list */

  EXPECT_CALL(*localAcceptlistMock, AcceptlistAdd(address1))

      .WillOnce(Return(true));



  EXPECT_TRUE(background_connect_remove(CLIENT2, address1));

  Mock::VerifyAndClearExpectations(localAcceptlistMock.get());



  EXPECT_CALL(*localAcceptlistMock, AcceptlistRemove(_)).Times(1);

  EXPECT_TRUE(background_connect_remove(CLIENT1, address1));

  Mock::VerifyAndClearExpectations(localAcceptlistMock.get());

}

}  // namespace connection_manager