Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve handling of connect cancellation #18

Merged
merged 1 commit into from
Apr 19, 2024
Merged

improve handling of connect cancellation #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/nrf-sdc/src/bin/ble_l2cap_central.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use sdc::rng_pool::RngPool;
use static_cell::StaticCell;
use trouble_host::{
adapter::{Adapter, HostResources},
connection::{ConnectConfig, Connection},
connection::ConnectConfig,
l2cap::L2capChannel,
scan::ScanConfig,
Address, PacketQos,
Expand Down Expand Up @@ -138,7 +138,7 @@ async fn main(spawner: Spawner) {
info!("Scanning for peripheral...");
let _ = join(adapter.run(), async {
loop {
let conn = unwrap!(Connection::connect(&adapter, &config).await);
let conn = unwrap!(adapter.connect(&config).await);
info!("Connected, creating l2cap channel");
const PAYLOAD_LEN: usize = 27;
let mut ch1: L2capChannel<'_, '_, _, PAYLOAD_LEN> =
Expand Down
125 changes: 65 additions & 60 deletions host/src/adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,9 @@ where
where
T: ControllerCmdSync<LeClearFilterAcceptList> + ControllerCmdSync<LeAddDeviceToFilterAcceptList>,
{
LeClearFilterAcceptList::new().exec(&self.controller).await?;
self.command(LeClearFilterAcceptList::new()).await?;
for entry in filter_accept_list {
LeAddDeviceToFilterAcceptList::new(entry.0, *entry.1)
.exec(&self.controller)
self.command(LeAddDeviceToFilterAcceptList::new(entry.0, *entry.1))
.await?;
}
Ok(())
Expand All @@ -151,7 +150,8 @@ where
Ok(())
}

pub(crate) async fn connect(&self, config: &ConnectConfig<'_>) -> Result<Connection, AdapterError<T::Error>>
/// Attempt to create a connection with the provided config.
pub async fn connect(&self, config: &ConnectConfig<'_>) -> Result<Connection, AdapterError<T::Error>>
where
T: ControllerCmdSync<LeClearFilterAcceptList>
+ ControllerCmdSync<LeAddDeviceToFilterAcceptList>
Expand All @@ -164,11 +164,15 @@ where
+ ControllerCmdSync<LeSetScanEnable>,
{
// Cancel any ongoing connection process
let _ = LeCreateConnCancel::new().exec(&self.controller).await;
let r = self.command(LeCreateConnCancel::new()).await;
if let Ok(()) = r {
self.connections.wait_canceled().await;
}

if config.scan_config.filter_accept_list.is_empty() {
return Err(Error::InvalidValue.into());
}

self.set_accept_filter(config.scan_config.filter_accept_list).await?;

if config.scan_config.extended {
Expand All @@ -183,19 +187,18 @@ where
max_ce_len: config.connect_params.event_length.into(),
};
let phy_params = Self::create_phy_params(initiating, config.scan_config.phys);
LeExtCreateConn::new(
self.async_command(LeExtCreateConn::new(
true,
self.address.map(|a| a.kind).unwrap_or(AddrKind::RANDOM),
AddrKind::RANDOM,
BdAddr::default(),
phy_params,
)
.exec(&self.controller)
))
.await?;
let info = self.connections.accept(config.scan_config.filter_accept_list).await;
Ok(Connection { info })
} else {
LeCreateConn::new(
self.async_command(LeCreateConn::new(
config.scan_config.interval.into(),
config.scan_config.window.into(),
true,
Expand All @@ -208,8 +211,7 @@ where
config.connect_params.supervision_timeout.into(),
config.connect_params.event_length.into(),
config.connect_params.event_length.into(),
)
.exec(&self.controller)
))
.await?;
let info = self.connections.accept(config.scan_config.filter_accept_list).await;
Ok(Connection { info })
Expand Down Expand Up @@ -252,24 +254,22 @@ where
scan_window: config.window.into(),
};
let phy_params = Self::create_phy_params(scanning, config.phys);
LeSetExtScanParams::new(
self.command(LeSetExtScanParams::new(
self.address.map(|s| s.kind).unwrap_or(AddrKind::RANDOM),
if config.filter_accept_list.is_empty() {
bt_hci::param::ScanningFilterPolicy::BasicUnfiltered
} else {
bt_hci::param::ScanningFilterPolicy::BasicFiltered
},
phy_params,
)
.exec(&self.controller)
))
.await?;
LeSetExtScanEnable::new(
self.command(LeSetExtScanEnable::new(
true,
FilterDuplicates::Disabled,
config.timeout.into(),
bt_hci::param::Duration::from_secs(0),
)
.exec(&self.controller)
))
.await?;
} else {
let params = LeSetScanParams::new(
Expand All @@ -287,9 +287,8 @@ where
bt_hci::param::ScanningFilterPolicy::BasicFiltered
},
);
params.exec(&self.controller).await?;

LeSetScanEnable::new(true, true).exec(&self.controller).await?;
self.command(params).await?;
self.command(LeSetScanEnable::new(true, true)).await?;
}
Ok(())
}
Expand All @@ -299,16 +298,15 @@ where
T: ControllerCmdSync<LeSetExtScanEnable> + ControllerCmdSync<LeSetScanEnable>,
{
if config.extended {
LeSetExtScanEnable::new(
self.command(LeSetExtScanEnable::new(
false,
FilterDuplicates::Disabled,
bt_hci::param::Duration::from_secs(0),
bt_hci::param::Duration::from_secs(0),
)
.exec(&self.controller)
))
.await?;
} else {
LeSetScanEnable::new(false, false).exec(&self.controller).await?;
self.command(LeSetScanEnable::new(false, false)).await?;
}
Ok(())
}
Expand Down Expand Up @@ -346,7 +344,7 @@ where
+ for<'t> ControllerCmdSync<LeSetScanResponseData>,
{
// May fail if already disabled
let _ = LeSetAdvEnable::new(false).exec(&self.controller).await;
let _ = self.command(LeSetAdvEnable::new(false)).await;

let mut params: RawAdvertisement = params.into();
let timeout = config
Expand All @@ -373,7 +371,7 @@ where
addr: BdAddr::default(),
});

LeSetAdvParams::new(
self.command(LeSetAdvParams::new(
config.interval_min.into(),
config.interval_max.into(),
kind,
Expand All @@ -382,29 +380,26 @@ where
peer.addr,
config.channel_map.unwrap_or(AdvChannelMap::ALL),
config.filter_policy,
)
.exec(&self.controller)
))
.await?;

if !params.adv_data.is_empty() {
let mut data = [0; 31];
let to_copy = params.adv_data.len().min(data.len());
data[..to_copy].copy_from_slice(&params.adv_data[..to_copy]);
LeSetAdvData::new(to_copy as u8, data).exec(&self.controller).await?;
self.command(LeSetAdvData::new(to_copy as u8, data)).await?;
}

if !params.scan_data.is_empty() {
let mut data = [0; 31];
let to_copy = params.scan_data.len().min(data.len());
data[..to_copy].copy_from_slice(&params.scan_data[..to_copy]);
LeSetScanResponseData::new(to_copy as u8, data)
.exec(&self.controller)
.await?;
self.command(LeSetScanResponseData::new(to_copy as u8, data)).await?;
}

LeSetAdvEnable::new(true).exec(&self.controller).await?;
self.command(LeSetAdvEnable::new(true)).await?;
let conn = Connection::accept(self).await;
LeSetAdvEnable::new(false).exec(&self.controller).await?;
self.command(LeSetAdvEnable::new(false)).await?;
Ok(conn)
}

Expand All @@ -426,8 +421,8 @@ where
+ for<'t> ControllerCmdSync<LeSetExtScanResponseData<'t>>,
{
// May fail if already disabled
let _ = LeSetExtAdvEnable::new(false, &[]).exec(&self.controller).await;
let _ = LeClearAdvSets::new().exec(&self.controller).await;
let _ = self.command(LeSetExtAdvEnable::new(false, &[])).await;
let _ = self.command(LeClearAdvSets::new()).await;
let handle = AdvHandle::new(0); // TODO: Configurable?

let mut params: RawAdvertisement = params.into();
Expand All @@ -444,7 +439,7 @@ where
kind: AddrKind::RANDOM,
addr: BdAddr::default(),
});
LeSetExtAdvParams::new(
self.command(LeSetExtAdvParams::new(
handle,
params.props,
config.interval_min.into(),
Expand All @@ -460,33 +455,36 @@ where
config.secondary_phy,
0,
false,
)
.exec(&self.controller)
))
.await?;

if let Some(address) = self.address {
LeSetAdvSetRandomAddr::new(handle, address.addr)
.exec(&self.controller)
.await?;
self.command(LeSetAdvSetRandomAddr::new(handle, address.addr)).await?;
}

if !params.adv_data.is_empty() {
LeSetExtAdvData::new(handle, Operation::Complete, false, params.adv_data)
.exec(&self.controller)
.await?;
self.command(LeSetExtAdvData::new(
handle,
Operation::Complete,
false,
params.adv_data,
))
.await?;
}

if !params.scan_data.is_empty() {
LeSetExtScanResponseData::new(handle, Operation::Complete, false, params.scan_data)
.exec(&self.controller)
.await?;
self.command(LeSetExtScanResponseData::new(
handle,
Operation::Complete,
false,
params.scan_data,
))
.await?;
}

LeSetExtAdvEnable::new(true, &[params.set])
.exec(&self.controller)
.await?;
self.command(LeSetExtAdvEnable::new(true, &[params.set])).await?;
let conn = Connection::accept(self).await;
LeSetExtAdvEnable::new(false, &[]).exec(&self.controller).await?;
self.command(LeSetExtAdvEnable::new(false, &[])).await?;
Ok(conn)
}

Expand Down Expand Up @@ -674,8 +672,8 @@ where
},
Ok(ControllerToHostPacket::Event(event)) => match event {
Event::Le(event) => match event {
LeEvent::LeConnectionComplete(e) => {
if e.status.into_inner() == 0 {
LeEvent::LeConnectionComplete(e) => match e.status.to_result() {
Ok(_) => {
info!("Connection complete {:?}: {:?}", e.handle, e.peer_addr);
if let Err(err) = self.connections.connect(
e.handle,
Expand All @@ -692,17 +690,20 @@ where
},
) {
warn!("Error establishing connection: {:?}", err);
Disconnect::new(
self.command(Disconnect::new(
e.handle,
DisconnectReason::RemoteDeviceTerminatedConnLowResources,
)
.exec(&self.controller)
))
.await?;
}
} else {
warn!("Error connection complete event: {:?}", e.status);
}
}
Err(bt_hci::param::Error::UNKNOWN_CONN_IDENTIFIER) => {
self.connections.canceled();
}
Err(e) => {
warn!("Error connection complete event: {:?}", e);
}
},
LeEvent::LeScanTimeout(_) => {
self.scanner.send(None).await;
}
Expand Down Expand Up @@ -848,6 +849,10 @@ impl<'d, T: Controller> HciController<'d, T> {
C: SyncCmd,
T: ControllerCmdSync<C>,
{
let permit = self
.permits
.try_acquire(1)
.ok_or::<AdapterError<T::Error>>(Error::NoPermits.into())?;
let fut = cmd.exec(self.controller);
match embassy_futures::poll_once(fut) {
Poll::Ready(result) => match result {
Expand Down
34 changes: 1 addition & 33 deletions host/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
use bt_hci::{
cmd::{
le::{
LeAddDeviceToFilterAcceptList, LeClearFilterAcceptList, LeConnUpdate, LeCreateConn, LeCreateConnCancel,
LeExtCreateConn, LeSetExtScanEnable, LeSetExtScanParams, LeSetScanEnable, LeSetScanParams,
},
link_control::Disconnect,
status::ReadRssi,
},
cmd::{le::LeConnUpdate, link_control::Disconnect, status::ReadRssi},
controller::{ControllerCmdAsync, ControllerCmdSync},
param::{BdAddr, ConnHandle, DisconnectReason, LeConnRole},
};
Expand Down Expand Up @@ -145,29 +138,4 @@ impl Connection {
.await?;
Ok(())
}

pub async fn connect<
M: RawMutex,
T,
const CONNS: usize,
const CHANNELS: usize,
const L2CAP_TXQ: usize,
const L2CAP_RXQ: usize,
>(
adapter: &Adapter<'_, M, T, CONNS, CHANNELS, L2CAP_TXQ, L2CAP_RXQ>,
config: &ConnectConfig<'_>,
) -> Result<Self, AdapterError<T::Error>>
where
T: ControllerCmdSync<LeClearFilterAcceptList>
+ ControllerCmdSync<LeAddDeviceToFilterAcceptList>
+ ControllerCmdAsync<LeCreateConn>
+ ControllerCmdAsync<LeExtCreateConn>
+ ControllerCmdSync<LeSetExtScanEnable>
+ ControllerCmdSync<LeSetExtScanParams>
+ ControllerCmdSync<LeSetScanParams>
+ ControllerCmdSync<LeCreateConnCancel>
+ ControllerCmdSync<LeSetScanEnable>,
{
adapter.connect(config).await
}
}
Loading