Changeset 1597 for pjproject/trunk

Timestamp:

Nov 23, 2007 12:04:40 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #426: Respond incoming CANCEL with no matching INVITE with 481 (thanks Sergey Bakulin)

File:

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

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

@@ -2045 +2045 @@
 
         /* Invite transaction not found! 
-         * Respond CANCEL with 491 (RFC 3261 Section 9.2 page 42)
-         */
-        status = pjsip_dlg_create_response( inv->dlg, rdata, 200, NULL, 
+         * Respond CANCEL with 481 (RFC 3261 Section 9.2 page 55)
+         */
+        status = pjsip_dlg_create_response( inv->dlg, rdata, 481, NULL, 
                                             &tdata);
 
@@ -2567 +2567 @@
          * Transaction Does Not Exist), 408, or when it's timed out. In these
          * cases, disconnect session (i.e. dialog usage only).
-         */
-        if (tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST ||
+         * Note that 481 response to CANCEL does not terminate dialog usage,
+         * but only the transaction.
+         */
+        if ((tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST &&
+                tsx->method.id != PJSIP_CANCEL_METHOD) ||
             tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
             tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||
@@ -2785 +2788 @@
          * Transaction Does Not Exist), 408, or when it's timed out. In these
          * cases, disconnect session (i.e. dialog usage only).
-         */
-        if (tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST ||
+         * Note that 481 response to CANCEL does not terminate dialog usage,
+         * but only the transaction.
+         */
+        if ((tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST &&
+                tsx->method.id != PJSIP_CANCEL_METHOD) ||
             tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
             tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||
@@ -2924 +2930 @@
          * Transaction Does Not Exist), 408, or when it's timed out. In these
          * cases, disconnect session (i.e. dialog usage only).
-         */
-        if (tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST ||
+         * Note that 481 response to CANCEL does not terminate dialog usage,
+         * but only the transaction.
+         */
+        if ((tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST &&
+                tsx->method.id != PJSIP_CANCEL_METHOD) ||
             tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
             tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||
@@ -3232 +3241 @@
          * Transaction Does Not Exist), 408, or when it's timed out. In these
          * cases, disconnect session (i.e. dialog usage only).
-         */
-        if (tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST ||
+         * Note that 481 response to CANCEL does not terminate dialog usage,
+         * but only the transaction.
+         */
+        if ((tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST &&
+                tsx->method.id != PJSIP_CANCEL_METHOD) ||
             tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
             tsx->status_code == PJSIP_SC_TSX_TIMEOUT ||