mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rtp-sap: use autobind

Browse source
This commit is contained in:
Dmitry Sharshakov 2024-01-22 15:49:00 +03:00 • committed by Wim Taymans
parent 61db1f16e2
commit bd5af4e573
1 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/module-rtp-sap.c
View file

@ -276,7 +276,6 @@ struct impl {
char *extra_attrs_end; char *extra_attrs_end;
char *ptp_mgmt_socket; char *ptp_mgmt_socket;
char ptp_client_path[64];
int ptp_fd; int ptp_fd;
uint32_t ptp_seq; uint32_t ptp_seq;
uint8_t clock_id[8]; uint8_t clock_id[8];
@ -386,9 +385,8 @@ static bool is_multicast(struct sockaddr *sa, socklen_t salen)
return false; return false;
} }
static int make_unix_socket(const char *path, const char *client_path) static int make_unix_socket(const char *path) {
{ struct sockaddr_un addr;
struct sockaddr_un client_addr, server_addr;
spa_autoclose int fd = socket(AF_UNIX, SOCK_DGRAM, 0); spa_autoclose int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
if (fd < 0) { if (fd < 0) {
@ -396,20 +394,17 @@ static int make_unix_socket(const char *path, const char *client_path)
return -1; return -1;
} }
spa_zero(client_addr); int val = 1;
client_addr.sun_family = AF_UNIX; if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &val, sizeof(val)) < 0) {
strncpy(client_addr.sun_path, client_path, strlen(client_addr.sun_path));
if (bind(fd, (struct sockaddr *)&client_addr, sizeof(client_addr)) < 0) {
pw_log_warn("Failed to bind PTP management socket"); pw_log_warn("Failed to bind PTP management socket");
return -1; return -1;
} }
spa_zero(server_addr); spa_zero(addr);
server_addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strncpy(server_addr.sun_path, path, sizeof(server_addr.sun_path) - 1); strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
if (connect(fd, (struct sockaddr*)&server_addr, sizeof(server_addr)) < 0) { if (connect(fd, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
pw_log_warn("Failed to connect PTP management socket"); pw_log_warn("Failed to connect PTP management socket");
return -1; return -1;
} }
@ -1649,7 +1644,6 @@ static void impl_destroy(struct impl *impl)
free(impl->extra_attrs_end); free(impl->extra_attrs_end);
free(impl->ptp_mgmt_socket); free(impl->ptp_mgmt_socket);
unlink(impl->ptp_client_path);
free(impl->ifname); free(impl->ifname);
free(impl); free(impl);
} }
@ -1722,16 +1716,9 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
str = pw_properties_get(props, "ptp.management-socket"); str = pw_properties_get(props, "ptp.management-socket");
impl->ptp_mgmt_socket = str ? strdup(str) : NULL; impl->ptp_mgmt_socket = str ? strdup(str) : NULL;
if (impl->ptp_mgmt_socket) { // TODO: support UDP management access as well
char *client_dir = getenv("PIPEWIRE_RUNTIME_DIR"); if (impl->ptp_mgmt_socket)
if (!client_dir) client_dir = getenv("XDG_RUNTIME_DIR"); impl->ptp_fd = make_unix_socket(impl->ptp_mgmt_socket);
if (!client_dir) client_dir = "/tmp";
snprintf(impl->ptp_client_path, sizeof(impl->ptp_client_path), "%s/pipewire-ptp-mgmt.%d", client_dir, getpid());
// TODO: support UDP management access as well
impl->ptp_fd = make_unix_socket(impl->ptp_mgmt_socket, impl->ptp_client_path);
}
if ((str = pw_properties_get(props, "sap.ip")) == NULL) if ((str = pw_properties_get(props, "sap.ip")) == NULL)
str = DEFAULT_SAP_IP; str = DEFAULT_SAP_IP;