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

Timestamp:

May 17, 2012 8:35:51 AM (12 years ago)

Author:

nanang

Message:

Re #1509: backported r4122-r4129.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (5 diffs)

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

@@ -676 +676 @@
     pj_str_t acc_proxy[PJSUA_ACC_MAX_PROXIES];
     pj_bool_t update_reg = PJ_FALSE;
+    pj_bool_t unreg_first = PJ_FALSE;
     pj_status_t status = PJ_SUCCESS;
 
@@ -803 +804 @@
         acc->srv_port = 0;
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -857 +859 @@
                             &cfg->force_contact);
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -1101 +1104 @@
         }
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -1109 +1113 @@
     {
         update_reg = PJ_TRUE;
+    }
+
+    /* Unregister first */
+    if (unreg_first) {
+        pjsua_acc_set_registration(acc->index, PJ_FALSE);
+        if (acc->regc != NULL) {
+            pjsip_regc_destroy(acc->regc);
+            acc->regc = NULL;
+            acc->contact.slen = 0;
+        }
     }