Changeset 170

Timestamp:

Feb 9, 2006 2:14:21 PM (18 years ago)

Author:

bennylp

Message:

Fixed ACK receipt not processed by invite session

File:

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

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

@@ -199 +199 @@
      */
     if (method->id == PJSIP_ACK_METHOD && inv &&
-        inv->state == PJSIP_INV_STATE_CONFIRMED)
+        inv->state != PJSIP_INV_STATE_CONFIRMED)
     {
         pjsip_event event;
+
+        /* Terminate INVITE transaction, if it's still present. */
+        if (inv->invite_tsx && 
+            inv->invite_tsx->state <= PJSIP_TSX_STATE_COMPLETED)
+        {
+            pjsip_tsx_terminate(inv->invite_tsx, 
+                                inv->invite_tsx->status_code);
+            inv->invite_tsx = NULL;
+        }
 
         PJSIP_EVENT_INIT_RX_MSG(event, rdata);
@@ -1562 +1571 @@
 
                 inv_send_ack(inv, e->body.tsx_state.src.rdata);
+                inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, e);
 
 
@@ -1701 +1711 @@
 
                     inv_send_ack(inv, e->body.tsx_state.src.rdata);
-
                     inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, e);
                 }