Changeset 2855 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.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_dialog.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -44 +44 @@
 pj_bool_t pjsip_include_allow_hdr_in_dlg = PJSIP_INCLUDE_ALLOW_HDR_IN_DLG;
 
+/* Contact header string */
+static const pj_str_t HCONTACT = { "Contact", 7 };
 
 PJ_DEF(pj_bool_t) pjsip_method_creates_dialog(const pjsip_method *m)
@@ -211 +213 @@
 
     /* Init local contact. */
-    dlg->local.contact = pjsip_contact_hdr_create(dlg->pool);
     pj_strdup_with_null(dlg->pool, &tmp, 
                         local_contact ? local_contact : local_uri);
-    dlg->local.contact->uri = pjsip_parse_uri(dlg->pool, tmp.ptr, tmp.slen,
-                                              PJSIP_PARSE_URI_AS_NAMEADDR);
-    if (!dlg->local.contact->uri) {
+    dlg->local.contact = pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp.ptr, 
+                                         tmp.slen, NULL);
+    if (!dlg->local.contact) {
         status = PJSIP_EINVALIDURI;
         goto on_error;
@@ -391 +392 @@
         pj_str_t tmp;
 
-        dlg->local.contact = pjsip_contact_hdr_create(dlg->pool);
         pj_strdup_with_null(dlg->pool, &tmp, contact);
-        dlg->local.contact->uri = pjsip_parse_uri(dlg->pool, tmp.ptr, tmp.slen,
-                                                  PJSIP_PARSE_URI_AS_NAMEADDR);
-        if (!dlg->local.contact->uri) {
+        dlg->local.contact = pjsip_parse_hdr(dlg->pool, &HCONTACT, tmp.ptr, 
+                                             tmp.slen, NULL);
+        if (!dlg->local.contact) {
             status = PJSIP_EINVALIDURI;
             goto on_error;
@@ -1226 +1226 @@
             st_code==485) 
         {
-            pj_str_t hcontact = { "Contact", 7 };
-
             /* Add contact header only if one is not present. */
             if (pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTACT, NULL) == 0 &&
-                pjsip_msg_find_hdr_by_name(tdata->msg, &hcontact, NULL) == 0) 
+                pjsip_msg_find_hdr_by_name(tdata->msg, &HCONTACT, NULL) == 0) 
             {
                 hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool,