Changeset 5288

Timestamp:

May 10, 2016 2:58:41 PM (9 years ago)

Author:

riza

Message:

Fixed #1914: onCreateMediaTransport() callback might not be called on PJSUA2.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (3 diffs)
• src/pjsua2/endpoint.cpp (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -190 +190 @@
     pj_bool_t            reinv_pending;/**< Pending until CONFIRMED state.  */
     pj_bool_t            reinv_ice_sent;/**< Has reinvite for ICE upd sent? */
+    pjsip_rx_data       *incoming_data;/**< Cloned incoming call rdata.
+                                            On pjsua2, when handling incoming 
+                                            call, onCreateMediaTransport() will
+                                            not be called since the call isn't
+                                            created yet. This temporary 
+                                            variable is used to handle such 
+                                            case, see ticket #1916.         */
 };
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1101 +1101 @@
     pjsip_inv_session *inv = NULL;
     int acc_id;
-    pjsua_call *call;
+    pjsua_call *call = NULL;
     int call_id = -1;
     int sip_err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
@@ -1222 +1222 @@
             goto on_return;
         }
+    }
+
+    if (!replaced_dlg) {
+        /* Clone rdata. */
+        pjsip_rx_data_clone(rdata, 0, &call->incoming_data);
     }
 
@@ -1637 +1642 @@
     if (dlg) {
         pjsip_dlg_dec_lock(dlg);
+    }
+
+    if (call && call->incoming_data) {
+        pjsip_rx_data_free_cloned(call->incoming_data);
+        call->incoming_data = NULL;
     }
     

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -603 +603 @@
     }
 
+    pjsua_call *call = &pjsua_var.calls[call_id];
+    if (!call->incoming_data) {
+        /* This happens when the incoming call callback has been called from 
+         * inside the on_create_media_transport() callback. So we simply 
+         * return here to avoid calling the callback twice. 
+         */
+        return;
+    }
+
     /* call callback */
     OnIncomingCallParam prm;
@@ -609 +618 @@
 
     acc->onIncomingCall(prm);
+
+    /* Free cloned rdata. */
+    pjsip_rx_data_free_cloned(call->incoming_data);
+    call->incoming_data = NULL;
 
     /* disconnect if callback doesn't handle the call */
@@ -1226 +1239 @@
     Call *call = Call::lookup(call_id);
     if (!call) {
-        return base_tp;
+        pjsua_call *in_call = &pjsua_var.calls[call_id];
+        if (in_call->incoming_data) {
+            /* This can happen when there is an incoming call but the
+             * on_incoming_call() callback hasn't been called. So we need to 
+             * call the callback here.
+             */
+            on_incoming_call(in_call->acc_id, call_id, in_call->incoming_data);
+
+            /* New call should already be created by app. */
+            call = Call::lookup(call_id);
+            if (!call) {
+                return base_tp;
+            }
+        } else {
+            return base_tp;
+        }
     }