Changeset 3841 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -196 +196 @@
 {
     pjsip_inv_state prev_state = inv->state;
+    pj_bool_t dont_notify = PJ_FALSE;
     pj_status_t status;
 
+    /* Prevent STATE_CALLING from being reported more than once because
+     * of authentication
+     * https://trac.pjsip.org/repos/ticket/1318
+     */
+    if (state==PJSIP_INV_STATE_CALLING && 
+        (inv->cb_called & (1 << PJSIP_INV_STATE_CALLING)) != 0)
+    {
+        dont_notify = PJ_TRUE;
+    }
 
     /* If state is confirmed, check that SDP negotiation is done,
@@ -225 +235 @@
               inv->cause != 0);
 
+    /* Mark the callback as called for this state */
+    inv->cb_called |= (1 << state);
+
     /* Call on_state_changed() callback. */
-    if (mod_inv.cb.on_state_changed && inv->notify)
+    if (mod_inv.cb.on_state_changed && inv->notify && !dont_notify)
         (*mod_inv.cb.on_state_changed)(inv, e);
 
@@ -4117 +4130 @@
                 const pjsip_hdr *accept;
 
+                /* The incoming SDP is unacceptable. If the SDP negotiator
+                 * state has just been changed, i.e: DONE -> REMOTE_OFFER,
+                 * revert it back.
+                 */
+                if (pjmedia_sdp_neg_get_state(inv->neg) ==
+                    PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER)
+                {
+                    pjmedia_sdp_neg_cancel_offer(inv->neg);
+                }
+
                 status = pjsip_dlg_create_response(inv->dlg, rdata, 
                                                    488, NULL, &tdata);