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

Timestamp:

Aug 11, 2009 4:26:20 PM (15 years ago)

Author:

nanang

Message:

Ticket #833:

• Renamed pjsip_timer_default_setting() to pjsip_timer_setting_default().
• Updated session timer settings in pjsua-lib as whole session timer setting struct (pyhton version remains using se & min_se).
• Added output param SIP status code in pjsip_timer_process_resp() and pjsip_timer_process_req() to specify the corresponding SIP status code when function returning non-PJ_SUCCESS.
• Fixed print header functions in sip_timer.c to have buffer check.
• Added PJSIP_SESS_TIMER_DEF_SE setting to specify the default value of session timer interval.
• Fixed role reference of the refresher, it is transaction role, not dialog role.

File:

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

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

@@ -28 +28 @@
 
 
-/* Constant values of Session Timers */
+/* Constant of Session Timers */
 #define ABS_MIN_SE              90      /* Absolute Min-SE, in seconds      */
-#define DEF_SE                  1800    /* Default SE, in seconds           */
 
 
@@ -61 +60 @@
     pj_bool_t                    use_update;    /**< Use UPDATE method to
                                                      refresh the session    */
+    pjsip_role_e                 role;          /**< Role in last INVITE/
+                                                     UPDATE transaction.    */
 
 } pjsip_timer;
@@ -121 +122 @@
     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name;
 
+    /* Print header name and value */
+    if ((endbuf - p) < (hname->slen + 16))
+        return -1;
+
     copy_advance(p, (*hname));
     *p++ = ':';
@@ -128 +133 @@
     p += printed;
 
-    if (hdr->refresher.slen && (endbuf-p) > (hdr->refresher.slen + 2))
+    /* Print 'refresher' param */
+    if (hdr->refresher.slen)
     {
+        if  ((endbuf - p) < (STR_REFRESHER.slen + 2 + hdr->refresher.slen))
+            return -1;
+
         *p++ = ';';
         copy_advance(p, STR_REFRESHER);
@@ -136 +145 @@
     }
 
+    /* Print generic params */
     printed = pjsip_param_print_on(&hdr->other_param, p, endbuf-p,
                                    &pc->pjsip_TOKEN_SPEC, 
@@ -177 +187 @@
     const pjsip_parser_const_t *pc = pjsip_parser_const();
 
+    /* Print header name and value */
+    if ((endbuf - p) < (hdr->name.slen + 16))
+        return -1;
+
     copy_advance(p, hdr->name);
     *p++ = ':';
@@ -184 +198 @@
     p += printed;
 
+    /* Print generic params */
     printed = pjsip_param_print_on(&hdr->other_param, p, endbuf-p,
                                    &pc->pjsip_TOKEN_SPEC, 
@@ -324 +339 @@
     /* Check our role */
     as_refresher = 
-        (inv->timer->refresher == TR_UAC && inv->role == PJSIP_ROLE_UAC) ||
-        (inv->timer->refresher == TR_UAS && inv->role == PJSIP_ROLE_UAS);
+        (inv->timer->refresher == TR_UAC && inv->timer->role == PJSIP_ROLE_UAC) ||
+        (inv->timer->refresher == TR_UAS && inv->timer->role == PJSIP_ROLE_UAS);
 
     /* Do action based on role, refresher or refreshee */
@@ -418 +433 @@
     
     /* Set delay based on role, refresher or refreshee */
-    if ((timer->refresher == TR_UAC && inv->role == PJSIP_ROLE_UAC) ||
-        (timer->refresher == TR_UAS && inv->role == PJSIP_ROLE_UAS))
+    if ((timer->refresher == TR_UAC && inv->timer->role == PJSIP_ROLE_UAC) ||
+        (timer->refresher == TR_UAS && inv->timer->role == PJSIP_ROLE_UAS))
     {
         /* Next refresh, the delay is half of session expire */
@@ -488 +503 @@
  * Initialize Session Timers setting with default values.
  */
-PJ_DEF(pj_status_t) pjsip_timer_default_setting(pjsip_timer_setting *setting)
+PJ_DEF(pj_status_t) pjsip_timer_setting_default(pjsip_timer_setting *setting)
 {
     pj_bzero(setting, sizeof(pjsip_timer_setting));
 
-    setting->sess_expires = DEF_SE;
+    setting->sess_expires = PJSIP_SESS_TIMER_DEF_SE;
     setting->min_se = ABS_MIN_SE;
 
@@ -527 +542 @@
         pj_memcpy(s, setting, sizeof(*s));
     } else {
-        pjsip_timer_default_setting(s);
+        pjsip_timer_setting_default(s);
     }
 
@@ -605 +620 @@
  */
 PJ_DEF(pj_status_t) pjsip_timer_process_resp(pjsip_inv_session *inv,
-                                             const pjsip_rx_data *rdata)
+                                             const pjsip_rx_data *rdata,
+                                             pjsip_status_code *st_code)
 {
     const pjsip_msg *msg;
 
-    PJ_ASSERT_RETURN(inv && rdata, PJ_EINVAL);
+    PJ_ASSERT_ON_FAIL(inv && rdata,
+        {if(st_code)*st_code=PJSIP_SC_INTERNAL_SERVER_ERROR;return PJ_EINVAL;});
 
     /* Check if Session Timers is supported */
@@ -705 +722 @@
              */
             if (inv->options & PJSIP_INV_REQUIRE_TIMER) {
+                if (st_code)
+                    *st_code = PJSIP_SC_EXTENSION_REQUIRED;
                 pjsip_timer_end_session(inv);
                 return PJSIP_ERRNO_FROM_SIP_STATUS(
@@ -727 +746 @@
             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(
@@ -758 +779 @@
         PJ_TODO(CHECK_IF_REMOTE_SUPPORT_UPDATE);
 
+        /* Remember our role in this transaction */
+        inv->timer->role = PJSIP_ROLE_UAC;
+
         /* Finally, set active flag and start the Session Timers */
         inv->timer->active = PJ_TRUE;
@@ -770 +794 @@
  */
 PJ_DEF(pj_status_t) pjsip_timer_process_req(pjsip_inv_session *inv,
-                                            const pjsip_rx_data *rdata)
+                                            const pjsip_rx_data *rdata,
+                                            pjsip_status_code *st_code)
 {
     pjsip_min_se_hdr *min_se_hdr;
@@ -777 +802 @@
     unsigned min_se;
 
-    PJ_ASSERT_RETURN(inv && rdata, PJ_EINVAL);
+    PJ_ASSERT_ON_FAIL(inv && rdata,
+        {if(st_code)*st_code=PJSIP_SC_INTERNAL_SERVER_ERROR;return PJ_EINVAL;});
 
     /* Check if Session Timers is supported */
@@ -828 +854 @@
      * (or 90 seconds if Min-SE is not set).
      */
-    if (se_hdr && se_hdr->sess_expires < min_se)
+    if (se_hdr && se_hdr->sess_expires < min_se) {
+        if (st_code)
+            *st_code = PJSIP_SC_SESSION_TIMER_TOO_SMALL;
         return PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_SESSION_TIMER_TOO_SMALL);
+    }
 
     /* Update SE. Note that there is a case that SE is not available in the
@@ -882 +911 @@
     if (msg->line.status.code/100 == 2)
     {
-        /* Add Session-Expires header and start the timer */
         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);
             start_timer(inv);