Changeset 4716 for pjproject/trunk

Timestamp:

Jan 24, 2014 11:28:34 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1725: ACK is not sent upon receiving 200/OK retransmission if re-INVITE is sent

File:

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

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

@@ -399 +399 @@
     }
 
+    /* Note that with https://trac.pjsip.org/repos/ticket/1725, this
+     * function can be called to send ACK for previous INVITE 200/OK
+     * retransmission
+     */
+
     PJ_LOG(5,(inv->obj_name, "Received %s, sending ACK",
               pjsip_rx_data_get_info(rdata)));
@@ -619 +624 @@
      */
     if (msg->type == PJSIP_RESPONSE_MSG && msg->line.status.code/100==2 &&
-        rdata->msg_info.cseq->method.id == PJSIP_INVITE_METHOD &&
-        inv->invite_tsx == NULL) 
-    {
-        pjsip_event e;
-
-        PJSIP_EVENT_INIT_RX_MSG(e, rdata);
-        inv_send_ack(inv, &e);
-        return PJ_TRUE;
-
+        rdata->msg_info.cseq->method.id == PJSIP_INVITE_METHOD)
+    {
+        /* The code inside "if" is called the second time 200/OK
+         * retransmission is received. Also handle the situation
+         * when we have another re-INVITE on going and 200/OK
+         * retransmission is received. See:
+         * https://trac.pjsip.org/repos/ticket/1725
+         */
+        if (inv->invite_tsx == NULL ||
+            (inv->last_ack && inv->last_ack_cseq==rdata->msg_info.cseq->cseq))
+        {
+            pjsip_event e;
+
+            PJSIP_EVENT_INIT_RX_MSG(e, rdata);
+            inv_send_ack(inv, &e);
+            return PJ_TRUE;
+        }
     }