Skip to content

Fixed bug in audio conference disconnection #4198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sauwming merged 1 commit into from
Dec 6, 2024
Merged

Fixed bug in audio conference disconnection #4198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pjmedia/src/pjmedia/conference.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ static void op_disconnect_ports(pjmedia_conf *conf,
{
unsigned src_slot, sink_slot;
struct conf_port *src_port = NULL, *dst_port = NULL;
unsigned i;
int i;

/* Ports must be valid. */
src_slot = prm->disconnect_ports.src;
Expand Down Expand Up @@ -1440,13 +1440,16 @@ static void op_disconnect_ports(pjmedia_conf *conf,
dst_port->name.ptr));

for (i=0; i<conf->max_ports; ++i) {
unsigned j;
int j;

src_port = conf->ports[i];
if (!src_port || src_port->listener_cnt == 0)
continue;

for (j=0; j<src_port->listener_cnt; ++j) {
/* We need to iterate backwards since the listener count
* can potentially decrease.
*/
for (j=src_port->listener_cnt-1; j>=0; --j) {
if (src_port->listener_slots[j] == sink_slot) {
op_param op_prm = {0};
op_prm.disconnect_ports.src = i;
Expand All @@ -1465,7 +1468,10 @@ static void op_disconnect_ports(pjmedia_conf *conf,
(int)src_port->name.slen,
src_port->name.ptr));

for (i=0; i<src_port->listener_cnt; ++i) {
/* We need to iterate backwards since the listener count
* will keep decreasing.
*/
for (i=src_port->listener_cnt-1; i>=0; --i) {
op_param op_prm = {0};
op_prm.disconnect_ports.src = src_slot;
op_prm.disconnect_ports.sink = src_port->listener_slots[i];
Expand Down