Changeset 4523

Timestamp:

May 23, 2013 7:41:17 AM (11 years ago)

Author:

nanang

Message:

Fix #1669: When (account/global) proxy setting is changed, unregister and reset registration internal state (acc->regc) before performing re-registration. The same mechanism is also applied for any account config changes on transport, credential info, or auth preference.

File:

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

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

@@ -925 +925 @@
         acc->cfg.transport_id = cfg->transport_id;
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -992 +993 @@
         acc->cfg.reg_use_proxy = cfg->reg_use_proxy;
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -1012 +1014 @@
 
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -1036 +1039 @@
 
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -1089 +1093 @@
             acc->cred[acc->cred_cnt++] = pjsua_var.ua_cfg.cred_info[i];
         }
+
+        update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
     /* Authentication preference */
     acc->cfg.auth_pref.initial_auth = cfg->auth_pref.initial_auth;
-    if (pj_strcmp(&acc->cfg.auth_pref.algorithm, &cfg->auth_pref.algorithm))
+    if (pj_strcmp(&acc->cfg.auth_pref.algorithm, &cfg->auth_pref.algorithm)) {
         pj_strdup_with_null(acc->pool, &acc->cfg.auth_pref.algorithm, 
                             &cfg->auth_pref.algorithm);
+        update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
+    }
 
     /* Registration */