Changeset 2852 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.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/src/pjsua-lib/pjsua_acc.c (modified) (6 diffs)

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

@@ -713 +713 @@
         tmp = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
         len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE,
-                               "<sip:%.*s%s%s%.*s%s:%d;transport=%s%.*s>",
+                               "<sip:%.*s%s%s%.*s%s:%d;transport=%s%.*s>%.*s",
                                (int)acc->user_part.slen,
                                acc->user_part.ptr,
@@ -723 +723 @@
                                rport,
                                tp->type_name,
+                               (int)acc->cfg.contact_uri_params.slen,
+                               acc->cfg.contact_uri_params.ptr,
                                (int)acc->cfg.contact_params.slen,
                                acc->cfg.contact_params.ptr);
@@ -1699 +1701 @@
     contact->ptr = (char*)pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
     contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
-                                     "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>",
+                                     "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s",
                                      (int)acc->display.slen,
                                      acc->display.ptr,
@@ -1713 +1715 @@
                                      local_port,
                                      transport_param,
+                                     (int)acc->cfg.contact_uri_params.slen,
+                                     acc->cfg.contact_uri_params.ptr,
                                      (int)acc->cfg.contact_params.slen,
                                      acc->cfg.contact_params.ptr);
@@ -1851 +1855 @@
     contact->ptr = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
     contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
-                                     "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>",
+                                     "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s",
                                      (int)acc->display.slen,
                                      acc->display.ptr,
@@ -1865 +1869 @@
                                      local_port,
                                      transport_param,
+                                     (int)acc->cfg.contact_uri_params.slen,
+                                     acc->cfg.contact_uri_params.ptr,
                                      (int)acc->cfg.contact_params.slen,
                                      acc->cfg.contact_params.ptr);