Changeset 4156 for pjproject/trunk

Timestamp:

Jun 6, 2012 7:24:08 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1530: Sending ACK is reported with wrong pjsip_event info

File:

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

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

@@ -363 +363 @@
 {
     pjsip_rx_data *rdata;
+    pjsip_event ack_e;
     pj_status_t status;
 
@@ -398 +399 @@
         status = pjsip_inv_create_ack(inv, rdata->msg_info.cseq->cseq,
                                       &inv->last_ack);
-    }
+        if (status != PJ_SUCCESS)
+            return status;
+    }
+
+    PJSIP_EVENT_INIT_TX_MSG(ack_e, inv->last_ack);
 
     /* Send ACK */
@@ -414 +419 @@
      */
     if (inv->state < PJSIP_INV_STATE_CONFIRMED) {
-        inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, e);
+        inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, &ack_e);
     }