Changeset 3441 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

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

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (5 diffs)

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 */