Changeset 4947 for pjproject/trunk

Timestamp:

Oct 16, 2014 10:39:35 AM (10 years ago)

Author:

riza

Message:

Misc (re #1782): Fixed unregistration sent twice when calling pjsua_acc_modify with reg_uri is blank.

File:

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

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

@@ -1250 +1250 @@
             if (reg_sip_uri)
                 acc->srv_port = reg_sip_uri->port;
-        } else {
-            /* Unregister if registration was set */
-            if (acc->cfg.reg_uri.slen)
-                pjsua_acc_set_registration(acc->index, PJ_FALSE);
-            pj_bzero(&acc->cfg.reg_uri, sizeof(acc->cfg.reg_uri));
-        }
+        } 
         update_reg = PJ_TRUE;
         unreg_first = PJ_TRUE;
@@ -1339 +1334 @@
     /* Unregister first */
     if (unreg_first) {
-        if (acc->cfg.reg_uri.slen)
-            pjsua_acc_set_registration(acc->index, PJ_FALSE);
+        pjsua_acc_set_registration(acc->index, PJ_FALSE);
         if (acc->regc != NULL) {
             pjsip_regc_destroy(acc->regc);
@@ -1346 +1340 @@
             acc->contact.slen = 0;
             acc->reg_mapped_addr.slen = 0;
+        }
+        
+        if (!cfg->reg_uri.slen) {
+            /* Reg URI still needed, delay unset after sending unregister. */
+            pj_bzero(&acc->cfg.reg_uri, sizeof(acc->cfg.reg_uri));
         }
     }