Changeset 212 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Feb 21, 2006 11:47:00 PM (18 years ago)

Author:

bennylp

Message:

Implemented major feature: call hold and transfer

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (8 diffs)

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

@@ -79 +79 @@
     dlg->state = PJSIP_DIALOG_STATE_NULL;
 
+    pj_list_init(&dlg->inv_hdr);
+
     status = pj_mutex_create_recursive(pool, "dlg%p", &dlg->mutex);
     if (status != PJ_SUCCESS)
@@ -132 +134 @@
     }
 
+    /* Put any header param in the target URI into INVITE header list. */
+    if (PJSIP_URI_SCHEME_IS_SIP(dlg->target) ||
+        PJSIP_URI_SCHEME_IS_SIPS(dlg->target))
+    {
+        pjsip_param *param;
+        pjsip_sip_uri *uri = (pjsip_sip_uri*)pjsip_uri_get_uri(dlg->target);
+
+        param = uri->header_param.next;
+        while (param != &uri->header_param) {
+            pjsip_generic_string_hdr *req_hdr;
+
+            req_hdr = pjsip_generic_string_hdr_create(dlg->pool, &param->name,
+                                                      &param->value);
+            pj_list_push_back(&dlg->inv_hdr, req_hdr);
+
+            param = param->next;
+        }
+    }
+
     /* Init local info. */
     dlg->local.info = pjsip_from_hdr_create(dlg->pool);
-    pj_strdup_with_null(dlg->pool, &tmp, local_uri);
-    dlg->local.info->uri = pjsip_parse_uri(dlg->pool, tmp.ptr, tmp.slen, 0);
+    pj_strdup_with_null(dlg->pool, &dlg->local.info_str, local_uri);
+    dlg->local.info->uri = pjsip_parse_uri(dlg->pool, 
+                                           dlg->local.info_str.ptr, 
+                                           dlg->local.info_str.slen, 0);
     if (!dlg->local.info->uri) {
         status = PJSIP_EINVALIDURI;
@@ -165 +188 @@
     /* Init remote info. */
     dlg->remote.info = pjsip_to_hdr_create(dlg->pool);
-    pj_strdup_with_null(dlg->pool, &tmp, remote_uri);
-    dlg->remote.info->uri = pjsip_parse_uri(dlg->pool, tmp.ptr, tmp.slen, 0);
+    pj_strdup_with_null(dlg->pool, &dlg->remote.info_str, remote_uri);
+    dlg->remote.info->uri = pjsip_parse_uri(dlg->pool, 
+                                            dlg->remote.info_str.ptr, 
+                                            dlg->remote.info_str.slen, 0);
     if (!dlg->remote.info->uri) {
         status = PJSIP_EINVALIDURI;
@@ -226 +251 @@
     pjsip_rr_hdr *rr;
     pjsip_transaction *tsx = NULL;
+    pj_str_t tmp;
+    enum { TMP_LEN=128};
+    pj_ssize_t len;
     pjsip_dialog *dlg;
 
@@ -250 +278 @@
         return status;
 
+    /* Temprary string for getting the string representation of
+     * both local and remote URI.
+     */
+    tmp.ptr = pj_pool_alloc(rdata->tp_info.pool, TMP_LEN);
+
     /* Init local info from the To header. */
     dlg->local.info = pjsip_hdr_clone(dlg->pool, rdata->msg_info.to);
@@ -257 +290 @@
     pj_create_unique_string(dlg->pool, &dlg->local.info->tag);
 
+
+    /* Print the local info. */
+    len = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
+                          dlg->local.info->uri, tmp.ptr, TMP_LEN);
+    if (len < 1) {
+        pj_ansi_strcpy(tmp.ptr, "<-error: uri too long->");
+        tmp.slen = pj_ansi_strlen(tmp.ptr);
+    } else
+        tmp.slen = len;
+
+    /* Save the local info. */
+    pj_strdup(dlg->pool, &dlg->local.info_str, &tmp);
+
     /* Calculate hash value of local tag. */
     dlg->local.tag_hval = pj_hash_calc(0, dlg->local.info->tag.ptr,
                                        dlg->local.info->tag.slen);
+
+    /* Print the local info. */
+    len = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
+                          dlg->local.info->uri, tmp.ptr, TMP_LEN);
+    if (len < 1) {
+        pj_ansi_strcpy(tmp.ptr, "<-error: uri too long->");
+        tmp.slen = pj_ansi_strlen(tmp.ptr);
+    } else
+        tmp.slen = len;
+
+    /* Save the local info. */
+    pj_strdup(dlg->pool, &dlg->remote.info_str, &tmp);
+
 
     /* Randomize local cseq */
@@ -1086 +1145 @@
                                              pjsip_tx_data *tdata)
 {
+    pj_status_t status;
+
     /* Sanity check. */
     PJ_ASSERT_RETURN(dlg && tsx && tdata && tdata->msg, PJ_EINVAL);
@@ -1108 +1169 @@
 #endif
 
-    return pjsip_tsx_send_msg(tsx, tdata);
+    /* Must acquire dialog first, to prevent deadlock */
+    pjsip_dlg_inc_lock(dlg);
+
+    status = pjsip_tsx_send_msg(tsx, tdata);
+
+    pjsip_dlg_dec_lock(dlg);
+
+    return status;
 }