Changeset 2701

Timestamp:

May 17, 2009 3:34:26 PM (15 years ago)

Author:

nanang

Message:

Ticket #849: Updated conf switch to force destination port to be available for the new connection.

File:

• pjproject/branches/projects/sipit24/pjmedia/src/pjmedia/conf_switch.c (modified) (1 diff)

pjproject/branches/projects/sipit24/pjmedia/src/pjmedia/conf_switch.c

@@ -554 +554 @@
     }
     
-    /* Check if sink is listening to other ports */
+    /* If sink is currently listening to other ports, it needs to be released
+     * first before the new connection made.
+     */ 
     if (dst_port->transmitter_cnt > 0) {
-        pj_mutex_unlock(conf->mutex);
-        return PJ_ETOOMANYCONN;
+        unsigned j;
+        pj_bool_t transmitter_found = PJ_FALSE;
+
+        pj_assert(dst_port->transmitter_cnt == 1);
+        for (j=0; j<conf->max_ports && !transmitter_found; ++j) {
+            if (conf->ports[j]) {
+                unsigned k;
+
+                for (k=0; k < conf->ports[j]->listener_cnt; ++k) {
+                    if (conf->ports[j]->listener_slots[k] == sink_slot) {
+                        PJ_LOG(4,(THIS_FILE, "Connection [%d->%d] is "
+                                  "disconnected forcedly for the new "
+                                  "connection [%d->%d]",
+                                  j, sink_slot, src_slot, sink_slot));
+                        pjmedia_conf_disconnect_port(conf, j, sink_slot);
+                        transmitter_found = PJ_TRUE;
+                        break;
+                    }
+                }
+            }
+        }
+        pj_assert(dst_port->transmitter_cnt == 0);
     }