Changeset 2053 for pjproject/trunk

Timestamp:

Jun 25, 2008 6:35:31 PM (16 years ago)

Author:

bennylp

Message:

Fixed assertion error when resending re-INVITE after it is challenged with 401/407, and also fixed error when the invite session is not retrying the BYE request when it is challenged with 401/407

File:

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

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

@@ -2547 +2547 @@
      * but only the transaction.
      */
-    if ((tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST &&
+    if (inv->state != PJSIP_INV_STATE_DISCONNECTED &&
+        ((tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST &&
             tsx->method.id != PJSIP_CANCEL_METHOD) ||
-        tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
-        tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||
-        tsx->status_code == PJSIP_SC_TSX_TRANSPORT_ERROR)
+         tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
+         tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||
+         tsx->status_code == PJSIP_SC_TSX_TRANSPORT_ERROR))
     {
         pjsip_tx_data *bye;
@@ -3304 +3305 @@
              tsx->role == PJSIP_ROLE_UAC)
     {
-        /* Must not have other pending INVITE transaction */
-        pj_assert(inv->invite_tsx==NULL || tsx==inv->invite_tsx);
 
         /*
@@ -3311 +3310 @@
          */
         if (tsx->state == PJSIP_TSX_STATE_CALLING) {
+
+            /* Must not have other pending INVITE transaction */
+            pj_assert(inv->invite_tsx==NULL || tsx==inv->invite_tsx);
 
             /* Save pending invite transaction */
@@ -3419 +3421 @@
 
         }
-    }
-}
-
+
+    } else if (tsx->role == PJSIP_ROLE_UAC) {
+        /*
+         * Handle 401/407/408/481 response
+         */
+        handle_uac_tsx_response(inv, e);
+    }
+}
+