Changeset 3834 for pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

Oct 21, 2011 9:39:40 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1391: Missing CSeq check for incoming ACK in an INVITE session (thanks Ilya Kalinin for the report)

File:

• pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/src/pjsip-ua/sip_inv.c

@@ -456 +456 @@
     if (method->id == PJSIP_ACK_METHOD && inv) {
 
+        /* Ignore if we don't have INVITE in progress */
+        if (!inv->invite_tsx) {
+            return PJ_TRUE;
+        }
+
         /* Ignore ACK if pending INVITE transaction has not finished. */
-        if (inv->invite_tsx && 
-            inv->invite_tsx->state < PJSIP_TSX_STATE_COMPLETED)
-        {
+        if (inv->invite_tsx->state < PJSIP_TSX_STATE_COMPLETED) {
             return PJ_TRUE;
         }
 
+        /* Ignore ACK with different CSeq
+         * https://trac.pjsip.org/repos/ticket/1391
+         */
+        if (rdata->msg_info.cseq->cseq != inv->invite_tsx->cseq) {
+            return PJ_TRUE;
+        }
+
         /* Terminate INVITE transaction, if it's still present. */
-        if (inv->invite_tsx && 
-            inv->invite_tsx->state <= PJSIP_TSX_STATE_COMPLETED)
-        {
+        if (inv->invite_tsx->state <= PJSIP_TSX_STATE_COMPLETED) {
             /* Before we terminate INVITE transaction, process the SDP
              * in the ACK request, if any.