else/clan-sidebus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update busd git dep to include control over whether channel conns skip hello

Browse source
This commit is contained in:
Val Packett 2025-07-17 19:47:50 -03:00
parent 6428695a6b
commit e32d6746df
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sidebus-broker/src/bus.rs
View file

@ -48,10 +48,10 @@ impl HostedBus {
self.guid.inner()
}
pub async fn connect_channel(&mut self) -> eyre::Result<zbus::Connection> {
pub async fn connect_channel(&mut self, skip_hello: bool) -> eyre::Result<zbus::Connection> {
let id = self.next_id();
self.peers
.add_channel(&self.guid, id)
.add_channel(&self.guid, id, skip_hello)
.await
.map_err(|err| eyre::eyre!(Box::new(err))) // https://github.com/eyre-rs/eyre/issues/31 XXX: busd should not use anyhow!
}

2
sidebus-broker/src/main.rs
View file

@ -44,7 +44,7 @@ async fn main() -> eyre::Result<()> {
enclose! { (vm_bus, vm_bus_guid) async move {
// TODO: Not necessary to go through the channel, add vsock support to the Peer too
let client_conn = client.build((&vm_bus_guid).into()).await?;
let vmbus_conn = vm_bus.lock().await.connect_channel().await?;
let vmbus_conn = vm_bus.lock().await.connect_channel(true).await?;
sidebus_common::raw::splice_conns(client_conn, vmbus_conn).await;
Ok(())
} }