Changeset 4653 for pjproject

Timestamp:

Nov 19, 2013 10:18:17 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1712: Must not send BYE before ACK is received

Location:

pjproject/trunk/pjsip

Files:

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

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -394 +394 @@
     pj_bool_t            cancelling;                /**< CANCEL requested   */
     pj_bool_t            pending_cancel;            /**< Wait to send CANCEL*/
+    pjsip_tx_data       *pending_bye;               /**< BYE to send later  */
     pjsip_status_code    cause;                     /**< Disconnect cause.  */
     pj_str_t             cause_text;                /**< Cause text.        */

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

@@ -264 +264 @@
             inv->invite_req = NULL;
         }
+        if (inv->pending_bye) {
+            pjsip_tx_data_dec_ref(inv->pending_bye);
+            inv->pending_bye = NULL;
+        }
         pjsip_100rel_end_session(inv);
         pjsip_timer_end_session(inv);
@@ -356 +360 @@
 }
 
+/* Process pending disconnection
+ *  http://trac.pjsip.org/repos/ticket/1712
+ */
+static void inv_perform_pending_bye(pjsip_inv_session *inv)
+{
+    if (inv->pending_bye) {
+        pjsip_tx_data *bye = inv->pending_bye;
+        pj_status_t status;
+
+        PJ_LOG(4,(inv->dlg->obj_name, "Sending pending BYE"));
+
+        inv->pending_bye = NULL;
+        status = pjsip_inv_send_msg(inv, bye);
+
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(1,(inv->dlg->obj_name, status,
+                         "Failed sending pending BYE"));
+        }
+    }
+}
 
 /*
@@ -529 +553 @@
             PJSIP_EVENT_INIT_RX_MSG(event, rdata);
             inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, &event);
+
+            /* Send pending BYE if any:
+             *   http://trac.pjsip.org/repos/ticket/1712
+             * Do this after setting the state to CONFIRMED, so that we
+             * have consistent CONFIRMED state between caller and callee.
+             */
+            if (inv->pending_bye)
+                inv_perform_pending_bye(inv);
         }
     }
@@ -2890 +2922 @@
         }
 
+        /* Don't send BYE before ACK is received
+         * http://trac.pjsip.org/repos/ticket/1712
+         */
+        if (tdata->msg->line.req.method.id == PJSIP_BYE_METHOD &&
+            inv->role == PJSIP_ROLE_UAS &&
+            inv->state == PJSIP_INV_STATE_CONNECTING)
+        {
+            if (inv->pending_bye)
+                pjsip_tx_data_dec_ref(inv->pending_bye);
+
+            inv->pending_bye = tdata;
+            PJ_LOG(4, (inv->obj_name, "Delaying BYE request until "
+                       "ACK is received"));
+            pjsip_dlg_dec_lock(inv->dlg);
+            goto on_return;
+        }
+
         /* Associate our data in outgoing invite transaction */
         tsx_inv_data = PJ_POOL_ZALLOC_T(inv->pool, struct tsx_inv_data);
@@ -2925 +2974 @@
 
     /* Done */
+on_return:
     pj_log_pop_indent();
     return PJ_SUCCESS;
@@ -4092 +4142 @@
 
                 inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, e);
+
+                /* Send pending BYE if any:
+                 *   http://trac.pjsip.org/repos/ticket/1712
+                 * Do this after setting the state to CONFIRMED, so that we
+                 * have consistent CONFIRMED state between caller and callee.
+                 */
+                if (inv->pending_bye)
+                    inv_perform_pending_bye(inv);
+
             }
             break;