Changeset 2933 for pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

Timestamp:

Oct 9, 2009 12:19:35 PM (15 years ago)

Author:

nanang

Message:

Ticket #954: Updated session timer to tolerate 'bad' SE (less than Min-SE specified in request) in 2xx response.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c (modified) (1 diff)

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

@@ -792 +792 @@
             se_hdr->sess_expires < inv->timer->setting.min_se)
         {
-            if (st_code)
-                *st_code = PJSIP_SC_SESSION_TIMER_TOO_SMALL;
-            pjsip_timer_end_session(inv);
-            return PJSIP_ERRNO_FROM_SIP_STATUS(
-                                            PJSIP_SC_SESSION_TIMER_TOO_SMALL);
+            /* See ticket #954, instead of returning non-PJ_SUCCESS (which
+             * may cause disconnecting call/dialog), let's just accept the
+             * SE and update our local SE, as long as it isn't less than 90s.
+             */
+            if (se_hdr->sess_expires >= ABS_MIN_SE) {
+                PJ_LOG(3, (inv->pool->obj_name, 
+                           "Peer responds with bad Session-Expires, %ds, "
+                           "which is less than Min-SE specified in request, "
+                           "%ds. Well, let's just accept and use it.",
+                           se_hdr->sess_expires, inv->timer->setting.min_se));
+
+                inv->timer->setting.sess_expires = se_hdr->sess_expires;
+            }
+
+            //if (st_code)
+            //  *st_code = PJSIP_SC_SESSION_TIMER_TOO_SMALL;
+            //pjsip_timer_end_session(inv);
+            //return PJSIP_ERRNO_FROM_SIP_STATUS(
+            //                              PJSIP_SC_SESSION_TIMER_TOO_SMALL);
         }