Changeset 5455

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

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• include/pjsua2/account.hpp (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (3 diffs)
• src/pjsua2/account.cpp (modified) (4 diffs)

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

@@ -2954 +2954 @@
     pjsip_hdr       reg_hdr_list;
 
+    /**
+     * Additional parameters that will be appended in the Contact header
+     * for this account. This will only affect REGISTER requests and
+     * will be appended after \a contact_params;
+     *
+     * The parameters should be preceeded by semicolon, and all strings must
+     * be properly escaped. Example:
+     *   ";my-param=X;another-param=Hi%20there"
+     */
+    pj_str_t        reg_contact_params;
+
     /** 
      * The optional custom SIP headers to be put in the presence

pjproject/trunk/pjsip/include/pjsua2/account.hpp

@@ -71 +71 @@
 
     /**
+     * Additional parameters that will be appended in the Contact header
+     * of the registration requests. This will be appended after
+     * \a AccountSipConfig.contactParams;
+     *
+     * The parameters should be preceeded by semicolon, and all strings must
+     * be properly escaped. Example:
+     *   ";my-param=X;another-param=Hi%20there"
+     */
+    string              contactParams;
+
+    /**
      * Optional interval for registration, in seconds. If the value is zero,
      * default interval will be used (PJSUA_REG_INTERVAL, 300 seconds).

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;
+        }
     }
 }

pjproject/trunk/pjsip/src/pjsua2/account.cpp

@@ -44 +44 @@
     NODE_READ_UNSIGNED  (this_node, unregWaitMsec);
     NODE_READ_UNSIGNED  (this_node, proxyUse);
+    NODE_READ_STRING    (this_node, contactParams);
 
     readSipHeaders(this_node, "headers", headers);
@@ -62 +63 @@
     NODE_WRITE_UNSIGNED (this_node, unregWaitMsec);
     NODE_WRITE_UNSIGNED (this_node, proxyUse);
+    NODE_WRITE_STRING   (this_node, contactParams);
 
     writeSipHeaders(this_node, "headers", headers);
@@ -330 +332 @@
     ret.unreg_timeout           = regConfig.unregWaitMsec;
     ret.reg_use_proxy           = regConfig.proxyUse;
+    ret.reg_contact_params      = str2Pj(regConfig.contactParams);
     for (i=0; i<regConfig.headers.size(); ++i) {
         pj_list_push_back(&ret.reg_hdr_list, &regConfig.headers[i].toPj());
@@ -464 +467 @@
     regConfig.unregWaitMsec     = prm.unreg_timeout;
     regConfig.proxyUse          = prm.reg_use_proxy;
+    regConfig.contactParams     = pj2Str(prm.reg_contact_params);
     regConfig.headers.clear();
     hdr = prm.reg_hdr_list.next;