Changeset 756 for pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

Timestamp:

Oct 8, 2006 4:59:38 PM (18 years ago)

Author:

bennylp

Message:

Modify sip_transaction.c to send ACK first before notifying upper layer about the failure (so that ACK is transmitted first before next INVITE is sent).

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -2393 +2393 @@
         pjsip_endpt_cancel_timer( tsx->endpt, &tsx->timeout_timer );
 
-        /* Generate ACK now (for INVITE) but send it later because
-         * dialog need to use last_tx.
-         */
+        /* Generate and send ACK (for INVITE) */
         if (tsx->method.id == PJSIP_INVITE_METHOD) {
             pj_status_t status;
@@ -2404 +2402 @@
             if (status != PJ_SUCCESS)
                 return status;
+
+            status = tsx_send_msg( tsx, ack_tdata);
+            if (status != PJ_SUCCESS)
+                return status;
         }
 
@@ -2412 +2414 @@
         /* Generate and send ACK for INVITE. */
         if (tsx->method.id == PJSIP_INVITE_METHOD) {
-            pj_status_t status;
-
-            status = tsx_send_msg( tsx, ack_tdata);
-
             if (ack_tdata != tsx->last_tx) {
                 pjsip_tx_data_dec_ref(tsx->last_tx);
@@ -2426 +2424 @@
                 pjsip_tx_data_add_ref(ack_tdata);
                 */
-            }
-
-            if (status != PJ_SUCCESS) {
-                return status;
             }
         }