From 963ea1f57c04d09122d2d1b96317cfbbf15a8ece Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Thu, 19 Oct 2023 23:36:27 +0300 Subject: [PATCH] tools: make pw-dump/mon/top try to connect to the default manager socket These tools are used for debugging, and should default to connecting to the manager socket if present. --- src/tools/pw-dump.c | 3 ++- src/tools/pw-mon.c | 3 ++- src/tools/pw-top.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tools/pw-dump.c b/src/tools/pw-dump.c index 3adfddf09..f2b7b3ba5 100644 --- a/src/tools/pw-dump.c +++ b/src/tools/pw-dump.c @@ -1608,7 +1608,8 @@ int main(int argc, char *argv[]) data.core = pw_context_connect(data.context, pw_properties_new( - PW_KEY_REMOTE_NAME, opt_remote, + PW_KEY_REMOTE_NAME, opt_remote ? opt_remote : + ("[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]"), NULL), 0); if (data.core == NULL) { diff --git a/src/tools/pw-mon.c b/src/tools/pw-mon.c index 64a8642c9..9fa9e6c13 100644 --- a/src/tools/pw-mon.c +++ b/src/tools/pw-mon.c @@ -860,7 +860,8 @@ int main(int argc, char *argv[]) data.core = pw_context_connect(data.context, pw_properties_new( - PW_KEY_REMOTE_NAME, opt_remote, + PW_KEY_REMOTE_NAME, opt_remote ? opt_remote : + ("[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]"), NULL), 0); if (data.core == NULL) { diff --git a/src/tools/pw-top.c b/src/tools/pw-top.c index 6b83dcf36..50a0a5a98 100644 --- a/src/tools/pw-top.c +++ b/src/tools/pw-top.c @@ -836,7 +836,8 @@ int main(int argc, char *argv[]) data.core = pw_context_connect(data.context, pw_properties_new( - PW_KEY_REMOTE_NAME, opt_remote, + PW_KEY_REMOTE_NAME, opt_remote ? opt_remote : + ("[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]"), NULL), 0); if (data.core == NULL) {