Changeset 2870

Timestamp:

Aug 12, 2009 7:04:02 PM (15 years ago)

Author:

nanang

Message:

Ticket #833: Updated Session Timer to keep the refresher role unchanged on any refreshes, by timer or manual.

File:

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

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

@@ -606 +606 @@
         pjsip_timer_init_session(inv, NULL);
 
+    /* If refresher role (i.e: ours or peer) has been set/negotiated, 
+     * better to keep it.
+     */
+    if (inv->timer->refresher != TR_UNKNOWN) {
+        pj_bool_t as_refresher;
+
+        /* Check our refresher role */
+        as_refresher = 
+            (inv->timer->refresher==TR_UAC && inv->timer->role==PJSIP_ROLE_UAC) ||
+            (inv->timer->refresher==TR_UAS && inv->timer->role==PJSIP_ROLE_UAS);
+
+        /* Update transaction role */
+        inv->timer->role = PJSIP_ROLE_UAC;
+
+        /* Update refresher role */
+        inv->timer->refresher = as_refresher? TR_UAC : TR_UAS;
+    }
+
     /* Add Session Timers headers */
     add_timer_headers(inv, tdata, PJ_TRUE, PJ_TRUE);
@@ -879 +897 @@
     else if (se_hdr && pj_stricmp(&se_hdr->refresher, &STR_UAS) == 0)
         inv->timer->refresher = TR_UAS;
-    else
-        /* If UAC support timer (currently check the existance of 
-         * Session-Expires header in the request), set UAC as refresher.
+    else {
+        /* If refresher role (i.e: ours or peer) has been set/negotiated, 
+         * better to keep it.
          */
-        inv->timer->refresher = se_hdr? TR_UAC : TR_UAS;
+        if (inv->timer->refresher != TR_UNKNOWN) {
+            pj_bool_t as_refresher;
+
+            /* Check our refresher role */
+            as_refresher = 
+                (inv->timer->refresher==TR_UAC && inv->timer->role==PJSIP_ROLE_UAC) ||
+                (inv->timer->refresher==TR_UAS && inv->timer->role==PJSIP_ROLE_UAS);
+
+            /* Update refresher role */
+            inv->timer->refresher = as_refresher? TR_UAS : TR_UAC;
+        } else {
+            /* If UAC support timer (currently check the existance of 
+             * Session-Expires header in the request), set UAC as refresher.
+             */
+            inv->timer->refresher = se_hdr? TR_UAC : TR_UAS;
+        }
+    }
+
+    /* Remember our role in this transaction */
+    inv->timer->role = PJSIP_ROLE_UAS;
 
     /* Set active flag */
@@ -911 +948 @@
     {
         if (inv->timer && inv->timer->active) {
-            /* Remember our role in this transaction */
-            inv->timer->role = PJSIP_ROLE_UAS;
-
             /* Add Session-Expires header and start the timer */
             add_timer_headers(inv, tdata, PJ_TRUE, PJ_FALSE);