Add_remote_publisher and room destroy

spscream · January 17, 2025, 12:04pm

We got the situation then ports are not freed by janus if remote publishers were added to room but remove_remote_publisher were not called if room is already destroyed.
Is it a bug or we should call remove_remote_publisher even if room already doesn’t exist?

udp               UNCONN                 0                   0                                                                                                *:20002
                  *:*
udp               UNCONN                 0                   0                                                                                                *:20003
                  *:*
udp               UNCONN                 0                   0                                                                                                *:20005
                  *:*
udp               UNCONN                 0                   0                                                                                                *:20006

udp ports are listening, but no rooms in janus exist.

lorenzo · January 17, 2025, 1:51pm

I guess it’s because of this check here in the remote publisher thread:

github.com/meetecho/janus-gateway

src/plugins/janus_videoroom.c

master


      
          		string_ids ? (gpointer)g_strdup(publisher->user_id_str) : (gpointer)janus_uint64_dup(publisher->user_id),
          		publisher);
          	/* Let's also notify all other participants that the publisher is here */
          	janus_mutex_lock(&publisher->streams_mutex);
          	janus_videoroom_notify_about_publisher(publisher, FALSE);
          	janus_mutex_unlock(&publisher->streams_mutex);
          	janus_mutex_unlock(&videoroom->mutex);
          
          	/* Loop */
          	int num = 0, i = 0;
          	while(!g_atomic_int_get(&publisher->remote_leaving) && !g_atomic_int_get(&publisher->destroyed)) {
          		/* Prepare poll */
          		num = 0;
          		if(publisher->remote_fd != -1) {
          			fds[num].fd = publisher->remote_fd;
          			fds[num].events = POLLIN;
          			fds[num].revents = 0;
          			num++;
          		}
          		if(publisher->remote_rtcp_fd != -1) {
          			fds[num].fd = publisher->remote_rtcp_fd;

Since you never called remove_remote_publisher, the remote_leaving property is never set to 1. The publisher is not set to destroyed either because they didn’t hangup (which regular participant do when notified about the room destruction).

I guess the easiest (and cleanest) approach is sending the remove_remote_publisher before destroying the room. You can also try adding a check on videoroom->destroyed in the line I mentioned, which should cause a cleanup when a room is destroyed too, but I’m not 100% sure that wouldn’t cause a leak. It’s worth a try, though: in case that works for you we can push it upstream.

spscream · January 18, 2025, 1:38pm

added check for videoroom->destroyed and it fixes problem - ports cleaned. I’ll monitor janus with this fix and build it with asan and check if it causes any leaks.

Topic		Replies	Views
Attendees and remote publishers General	3	31	November 18, 2024
No SDP offer from Janus when participant leaves General	3	94	December 12, 2023
Publisher with only data channel not announced in video room plugin General	2	86	March 20, 2024
Remote publishers and recording General	3	30	January 21, 2025
Does janus-gateway automatically destroy dynamically created rooms? General	2	133	April 26, 2023

Add_remote_publisher and room destroy

Related topics