mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-07 04:06:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rtp: handle state change errors better

Browse source 
Make a new function to set the rtp stream in the error state.

When we fail to start the stream, set the error state. Otherwise (like
when we try to use an invalid interface name) the socket create will
fail but the stream will still try to send data to the invalid socket.
This commit is contained in:
Wim Taymans 2024-03-25 12:22:11 +01:00
parent 6e7b893448
commit 4ffd74ef46
4 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/module-rtp-source.c
View file

@ -305,7 +305,7 @@ static int stream_start(struct impl *impl)
if ((fd = make_socket((const struct sockaddr *)&impl->src_addr,
impl->src_len, impl->ifname)) < 0) {
pw_log_error("failed to create socket: %m");
return fd;
return -errno;
}
impl->source = pw_loop_add_io(impl->data_loop, fd,
@ -338,13 +338,16 @@ static void stream_destroy(void *d)
static void stream_state_changed(void *data, bool started, const char *error)
{
struct impl *impl = data;
int res;
if (error) {
pw_log_error("stream error: %s", error);
pw_impl_module_schedule_destroy(impl->module);
} else if (started) {
if ((errno = -stream_start(impl)) < 0)
pw_log_error("failed to start RTP stream: %m");
if ((res = stream_start(impl)) < 0) {
pw_log_error("failed to start RTP stream: %s", spa_strerror(res));
rtp_stream_set_error(impl->stream, res, "Can't start RTP stream");
}
} else {
if (!impl->always_process)
stream_stop(impl);