Merge pull request #175 from jokeyrhyme/implement-unix-dir-and-tmpdir…

…-sockets

✨ Implement unix:dir and unix:tmpdir for `--address`

Cargo.toml

@@ -47,6 +47,7 @@ enumflags2 = "0.7.9"
 console-subscriber = { version = "0.4.0", optional = true }
 xdg-home = "1.1.0"
 event-listener = "5.3.0"
+fastrand = "2.2.0"
 
 [target.'cfg(unix)'.dependencies]
 nix = { version = "0.29.0", features = ["user"] }

src/bus/mod.rs

@@ -164,8 +164,16 @@ impl Bus {
 
                 addr
             }
-            UnixSocket::Dir(_) => bail!("`dir` transport is not supported (yet)."),
-            UnixSocket::TmpDir(_) => bail!("`tmpdir` transport is not supported (yet)."),
+            UnixSocket::Dir(dir) | UnixSocket::TmpDir(dir) => {
+                let path = dir.join(format!("dbus-{}", fastrand::u32(1_000_000..u32::MAX)));
+                let addr = SocketAddr::from_pathname(&path)?;
+                info!(
+                    "Listening on UNIX socket file `{}`.",
+                    path.to_string_lossy()
+                );
+
+                addr
+            }
             _ => bail!("Unsupported address."),
         };
         let std_listener =
@@ -250,9 +258,8 @@ fn default_address() -> String {
                 .join("user")
                 .join(format!("{}", nix::unistd::Uid::current()))
         });
-    let path = runtime_dir.join("busd-session");
 
-    format!("unix:path={}", path.display())
+    format!("unix:dir={}", runtime_dir.display())
 }
 
 #[cfg(not(unix))]