Changeset 2855 for pjproject/trunk/pjsip/src/pjsip/sip_util.c

Timestamp:

Aug 5, 2009 6:41:23 PM (15 years ago)

Author:

nanang

Message:

Ticket #930:

• Updated semantic of contact param in functions pjsip_dlg_create_uac(), pjsip_dlg_create_uas(), pjsip_endpt_create_request() and also variable pjsua_acc.contact to be Contact header value (was Contact URI).
• Updated docs related to above modifications.
• Fixed pjsua_im_send() in generating contact header, it should use pjsua_acc.contact instead, if it is set.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_util.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -308 +308 @@
     pj_str_t tmp;
     pj_status_t status;
+    const pj_str_t STR_CONTACT = { "Contact", 7 };
     PJ_USE_EXCEPTION;
 
@@ -349 +350 @@
         /* Contact. */
         if (param_contact) {
-            contact = pjsip_contact_hdr_create(tdata->pool);
             pj_strdup_with_null(tdata->pool, &tmp, param_contact);
-            contact->uri = pjsip_parse_uri( tdata->pool, tmp.ptr, tmp.slen,
-                                            PJSIP_PARSE_URI_AS_NAMEADDR);
-            if (contact->uri == NULL) {
+            contact = (pjsip_contact_hdr*)
+                      pjsip_parse_hdr(tdata->pool, &STR_CONTACT, tmp.ptr, 
+                                      tmp.slen, NULL);
+            if (contact == NULL) {
                 status = PJSIP_EINVALIDHDR;
                 goto on_error;