Changeset 2852 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Aug 4, 2009 2:36:17 PM (15 years ago)

Author:

nanang

Message:

Ticket #930:

• Changed semantic of pjsua_acc_config.contact_params, it is now used for specifying Contact header parameters (it was used for specifying Contact URI parameters).
• Added a new field pjsua_acc_config.contact_uri_params, for specifying Contact URI parameters.
• Added fields pjsua_acc_config.contact_params and pjsua_acc_config.contact_uri_params into python pjsua.
• Updated/added option in pjsua app to specify Contact header parameters and Contact URI parameters.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -181 +181 @@
     puts  ("  --id=url            Set the URL of local ID (used in From header)");
     puts  ("  --contact=url       Optionally override the Contact information");
-    puts  ("  --contact-params=S  Append the specified parameters S in Contact URI");
+    puts  ("  --contact-params=S  Append the specified parameters S in Contact header");
+    puts  ("  --contact-uri-params=S  Append the specified parameters S in Contact URI");
     puts  ("  --proxy=url         Optional URL of proxy server to visit");
     puts  ("                      May be specified multiple times");
@@ -472 +473 @@
            OPT_LOCAL_PORT, OPT_IP_ADDR, OPT_PROXY, OPT_OUTBOUND_PROXY, 
            OPT_REGISTRAR, OPT_REG_TIMEOUT, OPT_PUBLISH, OPT_ID, OPT_CONTACT,
-           OPT_BOUND_ADDR, OPT_CONTACT_PARAMS,
+           OPT_BOUND_ADDR, OPT_CONTACT_PARAMS, OPT_CONTACT_URI_PARAMS,
            OPT_100REL, OPT_USE_IMS, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
            OPT_NAMESERVER, OPT_STUN_DOMAIN, OPT_STUN_SRV,
@@ -530 +531 @@
         { "contact",    1, 0, OPT_CONTACT},
         { "contact-params",1,0, OPT_CONTACT_PARAMS},
+        { "contact-uri-params",1,0, OPT_CONTACT_URI_PARAMS},
         { "auto-update-nat",    1, 0, OPT_AUTO_UPDATE_NAT},
         { "use-compact-form",   0, 0, OPT_USE_COMPACT_FORM},
@@ -852 +854 @@
             break;
 
+        case OPT_CONTACT_URI_PARAMS:
+            cur_acc->contact_uri_params = pj_str(pj_optarg);
+            break;
+
         case OPT_AUTO_UPDATE_NAT:   /* OPT_AUTO_UPDATE_NAT */
             cur_acc->allow_contact_rewrite  = pj_strtoul(pj_cstr(&tmp, pj_optarg));
@@ -1406 +1412 @@
     }
 
-    /* Contact parameters */
+    /* Contact header parameters */
     if (acc_cfg->contact_params.slen) {
         pj_ansi_sprintf(line, "--contact-params %.*s\n", 
                         (int)acc_cfg->contact_params.slen, 
                         acc_cfg->contact_params.ptr);
+        pj_strcat2(result, line);
+    }
+
+    /* Contact URI parameters */
+    if (acc_cfg->contact_uri_params.slen) {
+        pj_ansi_sprintf(line, "--contact-uri-params %.*s\n", 
+                        (int)acc_cfg->contact_uri_params.slen, 
+                        acc_cfg->contact_uri_params.ptr);
         pj_strcat2(result, line);
     }