Changeset 4754 for pjproject/trunk

Timestamp:

Feb 21, 2014 7:24:18 AM (11 years ago)

Author:

bennylp

Message:

More #1712: Handle case when 200/OK is not ACKed and inv needs to send BYE. In this case, ACK will never be received so don't wait for it. Similar treatment for transport error

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

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

@@ -2954 +2954 @@
         if (tdata->msg->line.req.method.id == PJSIP_BYE_METHOD &&
             inv->role == PJSIP_ROLE_UAS &&
-            inv->state == PJSIP_INV_STATE_CONNECTING)
+            inv->state == PJSIP_INV_STATE_CONNECTING &&
+            inv->cause != PJSIP_SC_REQUEST_TIMEOUT &&
+            inv->cause != PJSIP_SC_TSX_TRANSPORT_ERROR)
         {
             if (inv->pending_bye)
@@ -4214 +4216 @@
                     pj_status_t status;
 
+                    inv_set_cause(inv, tsx->status_code, &tsx->status_text);
+
                     /* Send BYE */
                     status = pjsip_dlg_create_request(inv->dlg,