From 324fecbfb2c243ca446b61b6b8e7855402103703 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Tue, 28 Jul 2026 17:46:56 +0900
Subject: [PATCH] server/varlink_api: factor out default socket location

---
 src/bin/finger.rs         | 6 ++++--
 src/bin/ruptime.rs        | 6 ++++--
 src/bin/rwho.rs           | 6 ++++--
 src/server/config.rs      | 2 --
 src/server/varlink_api.rs | 2 ++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/bin/finger.rs b/src/bin/finger.rs
index dfc5ff4..a245b70 100644
--- a/src/bin/finger.rs
+++ b/src/bin/finger.rs
@@ -5,7 +5,9 @@ use roowho2_lib::{
     proto::finger_protocol::FingerResponseUserEntry,
     server::{
         fingerd::{FingerRequestInfo, FingerRequestNetworking},
-        varlink_api::{VarlinkFingerClientError, VarlinkFingerClientProxy},
+        varlink_api::{
+            DEFAULT_CLIENT_SERVER_SOCKET_PATH, VarlinkFingerClientError, VarlinkFingerClientProxy,
+        },
     },
 };
 
@@ -174,7 +176,7 @@ async fn main() -> anyhow::Result<()> {
         return Ok(());
     }
 
-    let mut conn = zlink::tokio::unix::connect("/run/roowho2/roowho2.varlink")
+    let mut conn = zlink::tokio::unix::connect(DEFAULT_CLIENT_SERVER_SOCKET_PATH)
         .await
         .expect("Failed to connect to fingerd server");
 
diff --git a/src/bin/ruptime.rs b/src/bin/ruptime.rs
index c6a4f23..de9645f 100644
--- a/src/bin/ruptime.rs
+++ b/src/bin/ruptime.rs
@@ -5,7 +5,9 @@ use clap_complete::{Shell, generate};
 
 use roowho2_lib::{
     proto::WhodStatusUpdate,
-    server::varlink_api::{VarlinkRwhodClientError, VarlinkRwhodClientProxy},
+    server::varlink_api::{
+        DEFAULT_CLIENT_SERVER_SOCKET_PATH, VarlinkRwhodClientError, VarlinkRwhodClientProxy,
+    },
 };
 
 /// Show host status of local machines.
@@ -87,7 +89,7 @@ async fn main() -> anyhow::Result<()> {
         Some(i64::from(args.idle_timeout) * 60)
     };
 
-    let mut conn = zlink::tokio::unix::connect("/run/roowho2/roowho2.varlink")
+    let mut conn = zlink::tokio::unix::connect(DEFAULT_CLIENT_SERVER_SOCKET_PATH)
         .await
         .expect("Failed to connect to rwhod server");
 
diff --git a/src/bin/rwho.rs b/src/bin/rwho.rs
index 38c6db4..8a7ec0d 100644
--- a/src/bin/rwho.rs
+++ b/src/bin/rwho.rs
@@ -5,7 +5,9 @@ use clap::{CommandFactory, Parser};
 use clap_complete::{Shell, generate};
 use roowho2_lib::{
     proto::WhodUserEntry,
-    server::varlink_api::{VarlinkRwhodClientError, VarlinkRwhodClientProxy},
+    server::varlink_api::{
+        DEFAULT_CLIENT_SERVER_SOCKET_PATH, VarlinkRwhodClientError, VarlinkRwhodClientProxy,
+    },
 };
 
 /// Check who is logged in on local machines.
@@ -61,7 +63,7 @@ async fn main() -> anyhow::Result<()> {
         Some(i64::from(args.idle_timeout) * 60)
     };
 
-    let mut conn = zlink::tokio::unix::connect("/run/roowho2/roowho2.varlink")
+    let mut conn = zlink::tokio::unix::connect(DEFAULT_CLIENT_SERVER_SOCKET_PATH)
         .await
         .expect("Failed to connect to rwhod server");
 
diff --git a/src/server/config.rs b/src/server/config.rs
index 06e4621..a9a97e3 100644
--- a/src/server/config.rs
+++ b/src/server/config.rs
@@ -4,8 +4,6 @@ use serde::{Deserialize, Serialize};
 
 pub const DEFAULT_CONFIG_PATH: &str = "/etc/roowho2/config.toml";
 
-pub const DEFAULT_CLIENT_SOCKET_PATH: &str = "/run/roowho2/server_client.sock";
-
 /// Default interval between rwhod status packet broadcasts.
 const DEFAULT_SEND_INTERVAL_SECONDS: u64 = 60;
 
diff --git a/src/server/varlink_api.rs b/src/server/varlink_api.rs
index 36239bc..d48cbcf 100644
--- a/src/server/varlink_api.rs
+++ b/src/server/varlink_api.rs
@@ -20,6 +20,8 @@ use crate::{
     },
 };
 
+pub const DEFAULT_CLIENT_SERVER_SOCKET_PATH: &str = "/run/roowho2/roowho2.varlink";
+
 // Types for 'no.ntnu.pvv.roowho2.rwhod'
 
 #[zlink::proxy("no.ntnu.pvv.roowho2.rwhod")]