Changeset 3598 for pjproject

Timestamp:

Jun 24, 2011 7:35:28 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1318: Prevent PJSIP_INV_STATE_CALLING from being reported more than once (thanks Sam Yasin for the report)

Location:

pjproject/branches/1.x/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (1 diff)
• src/pjsip-ua/sip_inv.c (modified) (2 diffs)

pjproject/branches/1.x/pjsip/include/pjsip-ua/sip_inv.h

@@ -368 +368 @@
     pj_str_t             cause_text;                /**< Cause text.        */
     pj_bool_t            notify;                    /**< Internal.          */
+    unsigned             cb_called;                 /**< Cb has been called */
     pjsip_dialog        *dlg;                       /**< Underlying dialog. */
     pjsip_role_e         role;                      /**< Invite role.       */

pjproject/branches/1.x/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);