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

Timestamp:

Nov 4, 2014 8:00:15 AM (9 years ago)

Author:

nanang

Message:

Close #1802: Configurable randomized value range for auto re-registration interval.

File:

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

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

@@ -1205 +1205 @@
     acc->cfg.reg_retry_interval = cfg->reg_retry_interval;
     acc->cfg.reg_first_retry_interval = cfg->reg_first_retry_interval;
+    acc->cfg.reg_retry_random_interval = cfg->reg_retry_random_interval;    
     acc->cfg.drop_calls_on_reg_fail = cfg->drop_calls_on_reg_fail;
     acc->cfg.register_on_acc_add = cfg->register_on_acc_add;
@@ -3540 +3541 @@
     delay.msec = 0;
 
-    /* Randomize interval by +/- 10 secs */
-    if (delay.sec >= 10) {
-        delay.msec = -10000 + (pj_rand() % 20000);
-    } else {
-        delay.sec = 0;
-        delay.msec = (pj_rand() % 10000);
+    /* Randomize interval by +/- reg_retry_random_interval, if configured */
+    if (acc->cfg.reg_retry_random_interval) {
+        long rand_ms = acc->cfg.reg_retry_random_interval * 1000;
+        if (delay.sec >= (long)acc->cfg.reg_retry_random_interval) {
+            delay.msec = -rand_ms + (pj_rand() % (rand_ms * 2));
+        } else {
+            delay.sec = 0;
+            delay.msec = (pj_rand() % (delay.sec * 1000 + rand_ms));
+        }
     }
     pj_time_val_normalize(&delay);