Changeset 5806 for pjproject

Timestamp:

Jun 19, 2018 10:00:33 AM (6 years ago)

Author:

nanang

Message:

Fix #2120:

• Adjust local SE to comply to remote Min-SE when incoming request has Min-SE header but no SE header.
• Handle the case of receiving 422 response for subsequent INVITE or UPDATE.
• Add best effort to avoid INVITE/UPDATE req + 422 resp loop.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c (modified) (6 diffs)

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

@@ -69 +69 @@
     pj_timer_entry               expire_timer;  /**< Timer entry for expire 
                                                      refresher              */
+    pj_int32_t                   last_422_cseq; /**< Last 422 resp CSeq.    */
 };
 
@@ -786 +787 @@
         }
 
+        /* Avoid 422 retry loop. Ignore it and stop retrying if dialog is
+         * established, otherwise, just return error to disconnect the call.
+         */
+        if (rdata->msg_info.cseq->cseq == inv->timer->last_422_cseq + 1) {
+            if (inv->state == PJSIP_INV_STATE_CONFIRMED) {
+                inv->invite_tsx = NULL;
+                return PJ_SUCCESS;
+            } else {
+                return PJSIP_ERRNO_FROM_SIP_STATUS(
+                                            PJSIP_SC_SESSION_TIMER_TOO_SMALL);
+            }
+        }
+        inv->timer->last_422_cseq = rdata->msg_info.cseq->cseq;
+
         /* Session Timers should have been initialized here */
         pj_assert(inv->timer);
@@ -799 +814 @@
         /* Prepare to restart the request */
 
-        /* Get the original INVITE request. */
-        tdata = inv->invite_req;
+        /* Get the original INVITE/UPDATE request. */
+        tdata = pjsip_rdata_get_tsx((pjsip_rx_data*)rdata)->last_tx;
 
         /* Remove branch param in Via header. */
@@ -828 +843 @@
         add_timer_headers(inv, tdata, PJ_TRUE, PJ_TRUE);
 
-        /* Restart UAC */
-        pjsip_inv_uac_restart(inv, PJ_FALSE);
+        /* Restart UAC if this is initial INVITE, or simply reset tsx for
+         * subsequent INVITE.
+         */
+        if (inv->state < PJSIP_INV_STATE_CONFIRMED)
+            pjsip_inv_uac_restart(inv, PJ_FALSE);
+        else if (tdata->msg->line.req.method.id == PJSIP_INVITE_METHOD)
+            inv->invite_tsx = NULL;
+
+        /* Resend the updated request */
         pjsip_inv_send_msg(inv, tdata);
 
@@ -1042 +1064 @@
     }
 
+    /* Make sure Session Timers is initialized */
+    if (inv->timer == NULL)
+        pjsip_timer_init_session(inv, NULL);
+
     /* Find Session-Expires header */
     se_hdr = (pjsip_sess_expires_hdr*) pjsip_msg_find_hdr_by_names(
                                             msg, &STR_SE, &STR_SHORT_SE, NULL);
-    if (se_hdr == NULL) {
-        /* Remote doesn't support/want Session Timers, check if local 
-         * require or force to use Session Timers. Note that Supported and 
-         * Require headers negotiation should have been verified by invite 
-         * session.
-         */
-        if ((inv->options & 
-            (PJSIP_INV_REQUIRE_TIMER | PJSIP_INV_ALWAYS_USE_TIMER)) == 0)
-        {
-            /* Session Timers not forced/required */
-            pjsip_timer_end_session(inv);
-            return PJ_SUCCESS;
-        }
-    }
-
-    /* Make sure Session Timers is initialized */
-    if (inv->timer == NULL)
-        pjsip_timer_init_session(inv, NULL);
-
     /* Find Min-SE header */
     min_se_hdr = (pjsip_min_se_hdr*) pjsip_msg_find_hdr_by_name(msg, 
@@ -1094 +1101 @@
          */
         inv->timer->setting.sess_expires = min_se;
+    }
+
+    /* If incoming request has no SE header, it means remote doesn't
+     * support/want Session Timers. So let's check if local require or
+     * force to use Session Timers. Note that Supported and Require headers
+     * negotiation should have been verified by invite session.
+     */
+    if (se_hdr == NULL) {
+        if ((inv->options & 
+            (PJSIP_INV_REQUIRE_TIMER | PJSIP_INV_ALWAYS_USE_TIMER)) == 0)
+        {
+            /* Session Timers not forced/required */
+            pjsip_timer_end_session(inv);
+            return PJ_SUCCESS;
+        }
     }