From e32d6746dfb6ca95218422616dcd8522898c920b Mon Sep 17 00:00:00 2001
From: Val Packett <val@invisiblethingslab.com>
Date: Thu, 17 Jul 2025 19:47:50 -0300
Subject: [PATCH] Update busd git dep to include control over whether channel
 conns skip hello

---
 Cargo.lock                 | 19 +++++++++----------
 flake.nix                  |  4 ++++
 sidebus-broker/src/bus.rs  |  4 ++--
 sidebus-broker/src/main.rs |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 42d4646..bf7ac78 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -137,7 +137,7 @@ checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 [[package]]
 name = "busd"
 version = "0.4.0"
-source = "git+https://github.com/valpackett/busd?branch=val%2Fmsksqvsqqrxm#7b57cb53731ee4610e407f8c560316f22b01be22"
+source = "git+https://github.com/valpackett/busd?branch=val%2Fmsksqvsqqrxm#6a937cc7af971d5725f102343a08d3344082f225"
 dependencies = [
  "anyhow",
  "clap",
@@ -148,7 +148,6 @@ dependencies = [
  "nix 0.30.1",
  "quick-xml",
  "serde",
- "serde_repr",
  "tokio",
  "tracing",
  "xdg-home",
@@ -1324,8 +1323,8 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.8.0"
-source = "git+https://github.com/dbus2/zbus#b7c16006f3b79090c86f04b7934611e7796a6af1"
+version = "5.9.0"
+source = "git+https://github.com/dbus2/zbus#30487b8fdb09d1519f66941be35a599e290549e7"
 dependencies = [
  "async-broadcast",
  "async-recursion",
@@ -1353,8 +1352,8 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.8.0"
-source = "git+https://github.com/dbus2/zbus#b7c16006f3b79090c86f04b7934611e7796a6af1"
+version = "5.9.0"
+source = "git+https://github.com/dbus2/zbus#30487b8fdb09d1519f66941be35a599e290549e7"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1368,7 +1367,7 @@ dependencies = [
 [[package]]
 name = "zbus_names"
 version = "4.2.0"
-source = "git+https://github.com/dbus2/zbus#b7c16006f3b79090c86f04b7934611e7796a6af1"
+source = "git+https://github.com/dbus2/zbus#30487b8fdb09d1519f66941be35a599e290549e7"
 dependencies = [
  "serde",
  "winnow",
@@ -1398,7 +1397,7 @@ dependencies = [
 [[package]]
 name = "zvariant"
 version = "5.6.0"
-source = "git+https://github.com/dbus2/zbus#b7c16006f3b79090c86f04b7934611e7796a6af1"
+source = "git+https://github.com/dbus2/zbus#30487b8fdb09d1519f66941be35a599e290549e7"
 dependencies = [
  "endi",
  "enumflags2",
@@ -1411,7 +1410,7 @@ dependencies = [
 [[package]]
 name = "zvariant_derive"
 version = "5.6.0"
-source = "git+https://github.com/dbus2/zbus#b7c16006f3b79090c86f04b7934611e7796a6af1"
+source = "git+https://github.com/dbus2/zbus#30487b8fdb09d1519f66941be35a599e290549e7"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1423,7 +1422,7 @@ dependencies = [
 [[package]]
 name = "zvariant_utils"
 version = "3.2.0"
-source = "git+https://github.com/dbus2/zbus#b7c16006f3b79090c86f04b7934611e7796a6af1"
+source = "git+https://github.com/dbus2/zbus#30487b8fdb09d1519f66941be35a599e290549e7"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/flake.nix b/flake.nix
index 6cf313a..8fd62a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,10 @@
             inherit (cargoToml.package) name version;
             src = ./.;
             cargoLock.lockFile = ./Cargo.lock;
+            cargoLock.outputHashes = {
+              "zbus-5.9.0" = "sha256-3xaKbf+JmO5yVwPbvA3z9dHvqICh7yCeKk1SIX8zhJA=";
+              "busd-0.4.0" = "sha256-UzTclEJ8lRMmiuLJJi+gsm7vkx+MLfnDdi5s9OVT1HE=";
+            };
             buildAndTestSubdir = crate;
           };
       in
diff --git a/sidebus-broker/src/bus.rs b/sidebus-broker/src/bus.rs
index df0b30d..4740789 100644
--- a/sidebus-broker/src/bus.rs
+++ b/sidebus-broker/src/bus.rs
@@ -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!
     }
diff --git a/sidebus-broker/src/main.rs b/sidebus-broker/src/main.rs
index c381cfe..b918c2e 100644
--- a/sidebus-broker/src/main.rs
+++ b/sidebus-broker/src/main.rs
@@ -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(())
             } }