Changeset 4955 for pjproject/trunk

Timestamp:

Oct 27, 2014 7:36:08 AM (10 years ago)

Author:

nanang

Message:

Fix #1801:

• put error check in re-registration attempt in pjsua_acc_modify(),
• updated pjsua_acc_modify() docs about its behavior regarding unregistration and re-registration.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)

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

@@ -3645 +3645 @@
 
 /**
- * Modify account information.
- *
+ * Modify account configuration setting. This function may trigger
+ * unregistration (of old account setting) and re-registration (of the new
+ * account setting), e.g: changing account ID, credential, registar, or
+ * proxy setting.
+ *
+ * Note:
+ * - when the new config triggers unregistration, the pjsua callback
+ *   on_reg_state()/on_reg_state2() for the unregistration will not be called
+ *   and any failure in the unregistration will be ignored, so if application
+ *   needs to be sure about the unregistration status, it should unregister
+ *   manually and wait for the callback before calling this function
+ * - when the new config triggers re-registration and the re-registration
+ *   fails, the account setting will not be reverted back to the old setting
+ *   and the account will be in unregistered state.
+ * 
  * @param acc_id        Id of the account to be modified.
  * @param acc_cfg       New account configuration.

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

@@ -1334 +1334 @@
     /* Unregister first */
     if (unreg_first) {
-        pjsua_acc_set_registration(acc->index, PJ_FALSE);
+        status = pjsua_acc_set_registration(acc->index, PJ_FALSE);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Ignored failure in unregistering the "
+                         "old account setting in modifying account", status);
+            /* Not really sure if we should return error */
+            status = PJ_SUCCESS;
+        }
         if (acc->regc != NULL) {
             pjsip_regc_destroy(acc->regc);
@@ -1351 +1357 @@
     if (update_reg) {
         /* If accounts has registration enabled, start registration */
-        if (acc->cfg.reg_uri.slen)
-            pjsua_acc_set_registration(acc->index, PJ_TRUE);
+        if (acc->cfg.reg_uri.slen) {
+            status = pjsua_acc_set_registration(acc->index, PJ_TRUE);
+            if (status != PJ_SUCCESS) {
+                pjsua_perror(THIS_FILE, "Failed to register with new account "
+                             "setting in modifying account", status);
+                goto on_return;
+            }
+        }
     }
 
     /* Update MWI subscription */
     if (update_mwi) {
-        pjsua_start_mwi(acc_id, PJ_TRUE);
+        status = pjsua_start_mwi(acc_id, PJ_TRUE);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Failed in starting MWI subscription for "
+                         "new account setting in modifying account", status);
+        }
     }