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-raop: handle 0 timing_port

Browse source 
When the timing_port is 0, just don't send out an initial timing packet.

When we receive a timing packet, reply to the same address/port that the
timing packet was sent from.

Fixes #3133
This commit is contained in:
Wim Taymans 2023-04-04 17:55:02 +02:00
parent e0a09ccf31
commit 7f7821c3f2
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-raop-sink.c
View file

@ -995,7 +995,7 @@ static int rtsp_setup_reply(void *data, int status, const struct spa_dict *heade
break; break;
case PROTO_UDP: case PROTO_UDP:
if (control_port == 0 || timing_port == 0) { if (control_port == 0) {
pw_log_error("missing UDP ports in Transport"); pw_log_error("missing UDP ports in Transport");
return 0; return 0;
} }
@ -1005,11 +1005,17 @@ static int rtsp_setup_reply(void *data, int status, const struct spa_dict *heade
return impl->server_fd; return impl->server_fd;
if ((impl->control_fd = connect_socket(impl, SOCK_DGRAM, impl->control_fd, control_port)) < 0) if ((impl->control_fd = connect_socket(impl, SOCK_DGRAM, impl->control_fd, control_port)) < 0)
return impl->control_fd; return impl->control_fd;
if (timing_port != 0) {
/* it is possible that there is no timing_port. We simply don't
* connect then and don't send an initial timing packet.
* We will reply to received timing packets on the same address we
* received the packet from so we don't really need this. */
if ((impl->timing_fd = connect_socket(impl, SOCK_DGRAM, impl->timing_fd, timing_port)) < 0) if ((impl->timing_fd = connect_socket(impl, SOCK_DGRAM, impl->timing_fd, timing_port)) < 0)
return impl->timing_fd; return impl->timing_fd;
ntp = ntp_now(CLOCK_MONOTONIC); ntp = ntp_now(CLOCK_MONOTONIC);
send_udp_timing_packet(impl, ntp, ntp, NULL, 0); send_udp_timing_packet(impl, ntp, ntp, NULL, 0);
}
impl->control_source = pw_loop_add_io(impl->loop, impl->control_fd, impl->control_source = pw_loop_add_io(impl->loop, impl->control_fd,
SPA_IO_IN, false, on_control_source_io, impl); SPA_IO_IN, false, on_control_source_io, impl);