mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol: Add system runtime directory for clients

Browse source 
Add /run/pipewire to the list of runtime directories so that clients can
connect to the system service without specifying runtime directory.

If the otherwise chosen directory (e.g. the user home directory) doesn't
contain any socket but /run/pipewire does, the latter will be used.
This commit is contained in:
Jonas Holmberg 2020-08-19 14:01:05 +02:00 • committed by Wim Taymans
parent 5c52670421
commit 3e7609dcaf
1 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/modules/module-protocol-native/local-socket.c
View file

@ -41,6 +41,8 @@
#include <pipewire/pipewire.h>
#define DEFAULT_SYSTEM_RUNTIME_DIR "/run/pipewire"
static const char *
get_remote(const struct spa_dict *props)
{
@ -55,11 +57,40 @@ get_remote(const struct spa_dict *props)
return name;
}
static bool
exists_in_dir(const char *name, const char *dir)
{
bool exists = false;
if (dir != NULL) {
int dirfd;
struct stat s;
dirfd = open(dir, O_RDONLY);
if (dirfd < 0)
pw_log_debug("open dir '%s' failed: %m", dir);
else {
if (fstatat(dirfd, name, &s, 0) < 0)
pw_log_debug("fstatat '%s', dir '%s' failed: %m", name, dir);
else
exists = true;
if (close(dirfd) < 0)
pw_log_warn("close dir failed: %m");
}
pw_log_debug("'%s' %s in dir '%s'", name, exists ? "exists" : "does not exist", dir);
}
return exists;
}
static const char *
get_runtime_dir(void)
get_runtime_dir(const char *name)
{
const char *runtime_dir;
if (name == NULL || strlen(name) == 0 || name[0] == '/')
return NULL;
runtime_dir = getenv("PIPEWIRE_RUNTIME_DIR");
if (runtime_dir == NULL)
runtime_dir = getenv("XDG_RUNTIME_DIR");
@ -73,6 +104,13 @@ get_runtime_dir(void)
if (getpwuid_r(getuid(), &pwd, buffer, sizeof(buffer), &result) == 0)
runtime_dir = result ? result->pw_dir : NULL;
}
if (runtime_dir == NULL || !exists_in_dir(name, runtime_dir)) {
if (exists_in_dir(name, DEFAULT_SYSTEM_RUNTIME_DIR))
runtime_dir = DEFAULT_SYSTEM_RUNTIME_DIR;
else
runtime_dir = NULL;
}
return runtime_dir;
}
@ -91,7 +129,7 @@ int pw_protocol_native_connect_local_socket(struct pw_protocol_client *client,
path_is_absolute = name[0] == '/';
runtime_dir = get_runtime_dir();
runtime_dir = get_runtime_dir(name);
pw_log_info("connecting to '%s' runtime_dir:%s", name, runtime_dir);