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

Timestamp:

Jun 20, 2010 8:58:26 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1086 (New option to update the Contact URI in a single REGISTER request): added contact_rewrite_method account config to control this. Default is to use the new mechanism, i.e. the single REGISTER method.

File:

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

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

@@ -1099 +1099 @@
 
     PJ_LOG(3,(THIS_FILE, "IP address change detected for account %d "
-                         "(%.*s:%d --> %.*s:%d). Updating registration..",
+                         "(%.*s:%d --> %.*s:%d). Updating registration "
+                         "(using method %d)",
                          acc->index,
                          (int)uri->host.slen,
@@ -1106 +1107 @@
                          (int)via_addr->slen,
                          via_addr->ptr,
-                         rport));
-
-    /* Unregister current contact */
-    pjsua_acc_set_registration(acc->index, PJ_FALSE);
-    if (acc->regc != NULL) {
-        pjsip_regc_destroy(acc->regc);
-        acc->regc = NULL;
-        acc->contact.slen = 0;
-    }
-
-    /* Update account's Contact header */
+                         rport,
+                         acc->cfg.contact_rewrite_method));
+
+    pj_assert(acc->cfg.contact_rewrite_method == 1 ||
+              acc->cfg.contact_rewrite_method == 2);
+
+    if (acc->cfg.contact_rewrite_method == 1) {
+        /* Unregister current contact */
+        pjsua_acc_set_registration(acc->index, PJ_FALSE);
+        if (acc->regc != NULL) {
+            pjsip_regc_destroy(acc->regc);
+            acc->regc = NULL;
+            acc->contact.slen = 0;
+        }
+    }
+
+    /*
+     * Build new Contact header
+     */
     {
         char *tmp;
@@ -1152 +1161 @@
         }
         pj_strdup2_with_null(acc->pool, &acc->contact, tmp);
-    }
-
-    /* Always update, by http://trac.pjsip.org/repos/ticket/864. */
-    pj_strdup_with_null(tp->pool, &tp->local_name.host, via_addr);
-    tp->local_name.port = rport;
+
+        /* Always update, by http://trac.pjsip.org/repos/ticket/864. */
+        pj_strdup_with_null(tp->pool, &tp->local_name.host, via_addr);
+        tp->local_name.port = rport;
+
+    }
+
+    if (acc->cfg.contact_rewrite_method == 2 && acc->regc != NULL) {
+        pjsip_regc_update_contact(acc->regc, 1, &acc->contact);
+    }
 
     /* Perform new registration */