wip

cgwalters · cgwalters · commit a3cb12147bba · 2022-11-14T15:28:17.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -95,6 +95,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tokio = { version = "1.16.1", features = ["time", "process", "rt", "net"] }
 xmlrpc = "0.15.1"
 termcolor = "1.1.3"
+tokio-unix-ipc = { version = "0.2.0", features = ["serde"] }
 
 [build-dependencies]
 anyhow = "1.0"
diff --git a/rpmostree-cxxrs.cxx b/rpmostree-cxxrs.cxx
@@ -2954,10 +2954,7 @@ extern "C"
           daemon_init_inner$ (debug);
           throw$.ptr = nullptr;
         },
-        [&] (const char *catch$) noexcept {
-          throw$.len = ::std::strlen (catch$);
-          throw$.ptr = const_cast<char *> (::cxxbridge1$exception (catch$, throw$.len));
-        });
+        ::rust::detail::Fail (throw$));
     return throw$;
   }
 
@@ -2971,10 +2968,7 @@ extern "C"
           daemon_main_inner$ ();
           throw$.ptr = nullptr;
         },
-        [&] (const char *catch$) noexcept {
-          throw$.len = ::std::strlen (catch$);
-          throw$.ptr = const_cast<char *> (::cxxbridge1$exception (catch$, throw$.len));
-        });
+        ::rust::detail::Fail (throw$));
     return throw$;
   }
 
diff --git a/rust/src/client.rs b/rust/src/client.rs
@@ -164,6 +164,8 @@ pub(crate) fn client_handle_fd_argument(
 fn start_daemon_via_socket() -> Result<()> {
     use cap_std::io_lifetimes::IntoSocketlike;
 
+    let conn = tokio::net::UnixStream::connect("/run/rpm-ostree/client.sock")?;
+
     let address = sockaddr()?;
     let socket = rustix::net::socket(
         rustix::net::AddressFamily::UNIX,
diff --git a/src/daemon/rpm-ostreed.socket b/src/daemon/rpm-ostreed.socket
@@ -2,7 +2,7 @@
 ConditionKernelCommandLine=ostree
 
 [Socket]
-ListenSequentialPacket=/run/rpm-ostree/client.sock
+ListenStream=/run/rpm-ostree/client.sock
 SocketMode=0600
 
 [Install]
