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

Timestamp:

Oct 7, 2016 7:42:22 AM (8 years ago)

Author:

ming

Message:

Fixed #1965: Add support to specify Contact params specific to REGISTER requests

File:

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

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

@@ -88 +88 @@
     pj_strdup_with_null(pool, &dst->reg_uri, &src->reg_uri);
     pj_strdup_with_null(pool, &dst->force_contact, &src->force_contact);
+    pj_strdup_with_null(pool, &dst->reg_contact_params,
+                        &src->reg_contact_params);
     pj_strdup_with_null(pool, &dst->contact_params, &src->contact_params);
     pj_strdup_with_null(pool, &dst->contact_uri_params,
@@ -993 +995 @@
         update_reg = PJ_TRUE;
         unreg_first = PJ_TRUE;
+    }
+
+    /* Register contact params */
+    if (pj_strcmp(&acc->cfg.reg_contact_params, &cfg->reg_contact_params)) {
+        pj_strdup_with_null(acc->pool, &acc->cfg.reg_contact_params,
+                            &cfg->reg_contact_params);
+        update_reg = PJ_TRUE;
     }
 
@@ -1478 +1487 @@
 
 done:
-    if (!need_outbound) {
-        /* Outbound is not needed/wanted for the account. acc->reg_contact
-         * is set to the same as acc->contact.
-         */
-        acc->reg_contact = acc->contact;
-        acc->rfc5626_status = OUTBOUND_NA;
-    } else {
-        /* Need to use outbound, append the contact with +sip.instance and
-         * reg-id parameters.
-         */
+    {
         pj_ssize_t len;
         pj_str_t reg_contact;
 
         acc->rfc5626_status = OUTBOUND_WANTED;
-        len = acc->contact.slen + acc->rfc5626_instprm.slen +
-              acc->rfc5626_regprm.slen;
-        reg_contact.ptr = (char*) pj_pool_alloc(acc->pool, len);
-
-        pj_strcpy(&reg_contact, &acc->contact);
-        pj_strcat(&reg_contact, &acc->rfc5626_regprm);
-        pj_strcat(&reg_contact, &acc->rfc5626_instprm);
-
-        acc->reg_contact = reg_contact;
-
-        PJ_LOG(4,(THIS_FILE,
-                  "Contact for acc %d updated for SIP outbound: %.*s",
-                  acc->index,
-                  (int)acc->reg_contact.slen,
-                  acc->reg_contact.ptr));
+        len = acc->contact.slen + acc->cfg.reg_contact_params.slen +
+              (need_outbound?
+               (acc->rfc5626_instprm.slen + acc->rfc5626_regprm.slen): 0);
+        if (len > acc->contact.slen) {
+            reg_contact.ptr = (char*) pj_pool_alloc(acc->pool, len);
+
+            pj_strcpy(&reg_contact, &acc->contact);
+        
+            if (need_outbound) {
+                acc->rfc5626_status = OUTBOUND_WANTED;
+
+                /* Need to use outbound, append the contact with
+                 * +sip.instance and reg-id parameters.
+                 */
+                pj_strcat(&reg_contact, &acc->rfc5626_regprm);
+                pj_strcat(&reg_contact, &acc->rfc5626_instprm);
+            } else {
+                acc->rfc5626_status = OUTBOUND_NA;
+            }
+
+            pj_strcat(&reg_contact, &acc->cfg.reg_contact_params);
+            
+            acc->reg_contact = reg_contact;
+
+            PJ_LOG(4,(THIS_FILE,
+                      "Contact for acc %d updated: %.*s",
+                      acc->index,
+                      (int)acc->reg_contact.slen,
+                      acc->reg_contact.ptr));
+
+        } else {
+             /* Outbound is not needed/wanted for the account and there's
+              * no custom registration Contact params. acc->reg_contact
+              * is set to the same as acc->contact.
+              */
+             acc->reg_contact = acc->contact;
+             acc->rfc5626_status = OUTBOUND_NA;
+        }
     }
 }