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

module-rtp: Minor robustness improvement to PTP socket reading

Browse source 
Mark socket as CLOEXEC like we do everything else, log when we flush
stale data, and check for errors in the while loop.
This commit is contained in:
Arun Raghavan 2024-07-05 09:07:32 -04:00 • committed by Wim Taymans
parent 858f534436
commit 9b33cea0f7
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -376,7 +376,7 @@ static bool is_multicast(struct sockaddr *sa, socklen_t salen)
static int make_unix_socket(const char *path) { static int make_unix_socket(const char *path) {
struct sockaddr_un addr; struct sockaddr_un addr;
spa_autoclose int fd = socket(AF_UNIX, SOCK_DGRAM, 0); spa_autoclose int fd = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (fd < 0) { if (fd < 0) {
pw_log_warn("Failed to create PTP management socket"); pw_log_warn("Failed to create PTP management socket");
return -1; return -1;
@ -529,9 +529,11 @@ static void update_ts_refclk(struct impl *impl)
// Read if something is left in the socket // Read if something is left in the socket
int avail; int avail;
ioctl(impl->ptp_fd, FIONREAD, &avail);
uint8_t tmp; uint8_t tmp;
while (avail--) read(impl->ptp_fd, &tmp, 1);
ioctl(impl->ptp_fd, FIONREAD, &avail);
pw_log_debug("Flushing stale data: %u bytes", avail);
while (avail-- && read(impl->ptp_fd, &tmp, 1));
struct ptp_management_msg req; struct ptp_management_msg req;
spa_zero(req); spa_zero(req);