Changeset 3441 for pjproject

Timestamp:

Mar 15, 2011 3:20:37 AM (14 years ago)

Author:

ming

Message:

Fixed #1205: Configurable delay before registration refresh setting in pjsua_acc_config

Location:

pjproject/trunk

Files:

• pjsip-apps/src/python/_pjsua.h (modified) (4 diffs)
• pjsip/include/pjsip-ua/sip_regc.h (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (5 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (5 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/python/_pjsua.h

@@ -1659 +1659 @@
     PyListObject    *proxy;
     unsigned         reg_timeout;
+    unsigned         reg_delay_before_refresh;
     PyListObject    *cred_info;
     int              transport_id;
@@ -1721 +1722 @@
 
     obj->reg_timeout = cfg->reg_timeout;
+    obj->reg_delay_before_refresh = cfg->reg_delay_before_refresh;
 
     Py_XDECREF(obj->cred_info);
@@ -1777 +1779 @@
 
     cfg->reg_timeout = obj->reg_timeout;
+    cfg->reg_delay_before_refresh = obj->reg_delay_before_refresh;
 
     cfg->cred_count = PyList_Size((PyObject*)obj->cred_info);
@@ -1898 +1901 @@
         "If the value is zero, default interval will be used "
         "(PJSUA_REG_INTERVAL, 55 seconds). "
+    },
+    {
+        "reg_delay_before_refresh", T_INT, 
+        offsetof(PyObj_pjsua_acc_config, reg_delay_before_refresh), 0,
+        "Specify the number of seconds to refresh the client registration"
+        "before the registration expires."
+        "(PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH, 5 seconds). "
     },
     {

pjproject/trunk/pjsip/include/pjsip-ua/sip_regc.h

@@ -191 +191 @@
                                      pj_uint32_t expires);
 
+/**
+ * Set the number of seconds to refresh the client registration before
+ * the registration expires.
+ *
+ * @param regc      The registration structure.
+ * @param delay     The number of seconds to refresh the client
+ *                  registration before the registration expires.
+ *
+ * @return          PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t)
+pjsip_regc_set_delay_before_refresh( pjsip_regc *regc,
+                                     pj_uint32_t delay );
+
 
 /**

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2270 +2270 @@
 
     /**
+     * Specify the number of seconds to refresh the client registration
+     * before the registration expires.
+     *
+     * Default: PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH, 5 seconds
+     */
+    unsigned        reg_delay_before_refresh;
+
+    /**
      * Specify the maximum time to wait for unregistration requests to
      * complete during library shutdown sequence.

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

@@ -38 +38 @@
 
 #define REFRESH_TIMER           1
-#define DELAY_BEFORE_REFRESH    PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH
+#define DELAY_BEFORE_REFRESH    PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH
 #define THIS_FILE               "sip_reg.c"
 
@@ -88 +88 @@
     pjsip_expires_hdr           *expires_hdr;
     pj_uint32_t                  expires;
+    pj_uint32_t                  delay_before_refresh;
     pjsip_route_hdr              route_set;
     pjsip_hdr                    hdr_list;
@@ -376 +377 @@
     /* Set "Expires" header, if required. */
     set_expires( regc, expires);
+    regc->delay_before_refresh = DELAY_BEFORE_REFRESH;
 
     /* Set "Call-ID" header. */
@@ -387 +389 @@
 
     /* Done. */
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t)
+pjsip_regc_set_delay_before_refresh( pjsip_regc *regc,
+                                     pj_uint32_t delay )
+{
+    PJ_ASSERT_RETURN(regc, PJ_EINVAL);
+    regc->delay_before_refresh = delay;
     return PJ_SUCCESS;
 }
@@ -1120 +1131 @@
                 pj_time_val delay = { 0, 0};
 
-                delay.sec = expiration - DELAY_BEFORE_REFRESH;
+                delay.sec = expiration - regc->delay_before_refresh;
                 if (regc->expires != PJSIP_REGC_EXPIRATION_NOT_SPECIFIED && 
                     delay.sec > (pj_int32_t)regc->expires) 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -100 +100 @@
 
     dst->reg_timeout = src->reg_timeout;
+    dst->reg_delay_before_refresh = src->reg_delay_before_refresh;
     dst->cred_count = src->cred_count;
 
@@ -393 +394 @@
     pjsua_acc_config_dup(acc->pool, &pjsua_var.acc[id].cfg, cfg);
     
-    /* Normalize registration timeout */
-    if (pjsua_var.acc[id].cfg.reg_uri.slen &&
-        pjsua_var.acc[id].cfg.reg_timeout == 0)
-    {
-        pjsua_var.acc[id].cfg.reg_timeout = PJSUA_REG_INTERVAL;
+    /* Normalize registration timeout and refresh delay */
+    if (pjsua_var.acc[id].cfg.reg_uri.slen) {
+        if (pjsua_var.acc[id].cfg.reg_timeout == 0) {
+            pjsua_var.acc[id].cfg.reg_timeout = PJSUA_REG_INTERVAL;
+        }
+        if (pjsua_var.acc[id].cfg.reg_delay_before_refresh == 0) {
+            pjsua_var.acc[id].cfg.reg_delay_before_refresh =
+                PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH;
+        }
     }
 
@@ -941 +946 @@
     /* Registration */
     acc->cfg.reg_timeout = cfg->reg_timeout;
+    acc->cfg.reg_delay_before_refresh = cfg->reg_delay_before_refresh;
     acc->cfg.unreg_timeout = cfg->unreg_timeout;
     acc->cfg.allow_contact_rewrite = cfg->allow_contact_rewrite;
@@ -946 +952 @@
     acc->cfg.drop_calls_on_reg_fail = cfg->drop_calls_on_reg_fail;
 
-    /* Normalize registration timeout */
-    if (acc->cfg.reg_uri.slen && acc->cfg.reg_timeout == 0)
-        acc->cfg.reg_timeout = PJSUA_REG_INTERVAL;
+    /* Normalize registration timeout and refresh delay */
+    if (acc->cfg.reg_uri.slen ) {
+        if (acc->cfg.reg_timeout == 0) {
+            acc->cfg.reg_timeout = PJSUA_REG_INTERVAL;
+        }
+        if (acc->cfg.reg_delay_before_refresh == 0) {
+            acc->cfg.reg_delay_before_refresh =
+                PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH;
+        }
+    }
 
     /* Registrar URI */
@@ -1816 +1829 @@
         pjsip_regc_set_credentials( acc->regc, acc->cred_cnt, acc->cred);
     }
+
+    /* Set delay before registration refresh */
+    pjsip_regc_set_delay_before_refresh(acc->regc,
+                                        acc->cfg.reg_delay_before_refresh);
 
     /* Set authentication preference */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -167 +167 @@
 
     cfg->reg_timeout = PJSUA_REG_INTERVAL;
+    cfg->reg_delay_before_refresh = PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH;
     cfg->unreg_timeout = PJSUA_UNREG_TIMEOUT;
     pjsip_publishc_opt_default(&cfg->publish_opt);