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

Timestamp:

May 1, 2007 4:54:54 PM (16 years ago)

Author:

bennylp

Message:

PJSDP port to Symbian

File:

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

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

@@ -70 +70 @@
         return PJ_ENOMEM;
 
-    dlg = pj_pool_zalloc(pool, sizeof(pjsip_dialog));
+    dlg = PJ_POOL_ZALLOC_T(pool, pjsip_dialog);
     PJ_ASSERT_RETURN(dlg != NULL, PJ_ENOMEM);
 
@@ -155 +155 @@
             param->value.ptr[param->value.slen] = '\0';
 
-            hdr = pjsip_parse_hdr(dlg->pool, &param->name, param->value.ptr,
+            hdr = (pjsip_hdr*)
+                  pjsip_parse_hdr(dlg->pool, &param->name, param->value.ptr,
                                   param->value.slen, NULL);
 
@@ -223 +224 @@
         PJSIP_URI_SCHEME_IS_SIPS(dlg->remote.info->uri))
     {
-        pjsip_sip_uri *sip_uri = pjsip_uri_get_uri(dlg->remote.info->uri);
+        pjsip_sip_uri *sip_uri = (pjsip_sip_uri *) 
+                                 pjsip_uri_get_uri(dlg->remote.info->uri);
         if (!pj_list_empty(&sip_uri->header_param)) {
             pj_str_t tmp;
@@ -231 +233 @@
 
             /* Print URI */
-            tmp.ptr = pj_pool_alloc(dlg->pool, dlg->remote.info_str.slen);
+            tmp.ptr = (char*) pj_pool_alloc(dlg->pool, 
+                                            dlg->remote.info_str.slen);
             tmp.slen = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR,
                                        sip_uri, tmp.ptr, 
@@ -331 +334 @@
      * both local and remote URI.
      */
-    tmp.ptr = pj_pool_alloc(rdata->tp_info.pool, TMP_LEN);
+    tmp.ptr = (char*) 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);
+    dlg->local.info = (pjsip_fromto_hdr*)
+                      pjsip_hdr_clone(dlg->pool, rdata->msg_info.to);
     pjsip_fromto_hdr_set_from(dlg->local.info);
 
@@ -389 +393 @@
 
     /* Init remote info from the From header. */
-    dlg->remote.info = pjsip_hdr_clone(dlg->pool, rdata->msg_info.from);
+    dlg->remote.info = (pjsip_fromto_hdr*) 
+                       pjsip_hdr_clone(dlg->pool, rdata->msg_info.from);
     pjsip_fromto_hdr_set_to(dlg->remote.info);
 
@@ -406 +411 @@
 
     /* Init remote's contact from Contact header. */
-    contact_hdr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
+    contact_hdr = (pjsip_hdr*)
+                  pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
                                      NULL);
     if (!contact_hdr) {
@@ -412 +418 @@
         goto on_error;
     }
-    dlg->remote.contact = pjsip_hdr_clone(dlg->pool, contact_hdr);
+    dlg->remote.contact = (pjsip_contact_hdr*) 
+                          pjsip_hdr_clone(dlg->pool, contact_hdr);
 
     /* Init remote's CSeq from CSeq header */
@@ -432 +439 @@
 
     /* Call-ID */
-    dlg->call_id = pjsip_hdr_clone(dlg->pool, rdata->msg_info.cid);
+    dlg->call_id = (pjsip_cid_hdr*) 
+                   pjsip_hdr_clone(dlg->pool, rdata->msg_info.cid);
 
     /* Route set. 
@@ -447 +455 @@
 
         /* Clone the Record-Route, change the type to Route header. */
-        route = pjsip_hdr_clone(dlg->pool, rr);
+        route = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, rr);
         pjsip_routing_hdr_set_route(route);
 
@@ -457 +465 @@
         if (rr == (void*)&rdata->msg_info.msg->hdr)
             break;
-        rr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_RECORD_ROUTE, rr);
+        rr = (pjsip_route_hdr*) pjsip_msg_find_hdr(rdata->msg_info.msg, 
+                                                   PJSIP_H_RECORD_ROUTE, rr);
     }
 
@@ -570 +579 @@
 
     /* Clone remote target. */
-    dlg->target = pjsip_uri_clone(dlg->pool, first_dlg->target);
+    dlg->target = (pjsip_uri*) pjsip_uri_clone(dlg->pool, first_dlg->target);
 
     /* Clone local info. */
-    dlg->local.info = pjsip_hdr_clone(dlg->pool, first_dlg->local.info);
+    dlg->local.info = (pjsip_fromto_hdr*) 
+                      pjsip_hdr_clone(dlg->pool, first_dlg->local.info);
 
     /* Clone local tag. */
@@ -584 +594 @@
 
     /* Clone local Contact. */
-    dlg->local.contact = pjsip_hdr_clone(dlg->pool, first_dlg->local.contact);
+    dlg->local.contact = (pjsip_contact_hdr*) 
+                         pjsip_hdr_clone(dlg->pool, first_dlg->local.contact);
 
     /* Clone remote info. */
-    dlg->remote.info = pjsip_hdr_clone(dlg->pool, first_dlg->remote.info);
+    dlg->remote.info = (pjsip_fromto_hdr*) 
+                       pjsip_hdr_clone(dlg->pool, first_dlg->remote.info);
 
     /* Set remote tag from the response. */
@@ -611 +623 @@
 
     /* Clone Call-ID header. */
-    dlg->call_id = pjsip_hdr_clone(dlg->pool, first_dlg->call_id);
+    dlg->call_id = (pjsip_cid_hdr*) 
+                   pjsip_hdr_clone(dlg->pool, first_dlg->call_id);
 
     /* Duplicate Route-Set. */
@@ -619 +632 @@
         pjsip_route_hdr *h;
 
-        h = pjsip_hdr_clone(dlg->pool, r);
+        h = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, r);
         pj_list_push_back(&dlg->route_set, h);
 
@@ -721 +734 @@
         pjsip_route_hdr *new_r;
 
-        new_r = pjsip_hdr_clone(dlg->pool, r);
+        new_r = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, r);
         pj_list_push_back(&dlg->route_set, new_r);
 
@@ -980 +993 @@
     for (; route != end_list; route = route->next ) {
         pjsip_route_hdr *r;
-        r = pjsip_hdr_shallow_clone( tdata->pool, route );
+        r = (pjsip_route_hdr*) pjsip_hdr_shallow_clone( tdata->pool, route );
         pjsip_routing_hdr_set_route(r);
         pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)r);
@@ -1177 +1190 @@
                 pjsip_msg_find_hdr_by_name(tdata->msg, &hcontact, NULL) == 0) 
             {
-                hdr = pjsip_hdr_clone(tdata->pool, dlg->local.contact);
+                hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, 
+                                                   dlg->local.contact);
                 pjsip_msg_add_hdr(tdata->msg, hdr);
             }
@@ -1189 +1203 @@
                                                PJSIP_H_ALLOW, NULL);
             if (c_hdr) {
-                hdr = pjsip_hdr_clone(tdata->pool, c_hdr);
+                hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, c_hdr);
                 pjsip_msg_add_hdr(tdata->msg, hdr);
             }
@@ -1201 +1215 @@
                                                PJSIP_H_SUPPORTED, NULL);
             if (c_hdr) {
-                hdr = pjsip_hdr_clone(tdata->pool, c_hdr);
+                hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, c_hdr);
                 pjsip_msg_add_hdr(tdata->msg, hdr);
             }
@@ -1286 +1300 @@
      * 180 and then 302, the Contact in 302 will not get updated).
      */
-    hdr = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTACT, NULL);
+    hdr = (pjsip_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTACT, NULL);
     if (hdr)
         pj_list_erase(hdr);
@@ -1399 +1413 @@
         while (hdr != hdr_list) {
             pjsip_msg_add_hdr(tdata->msg,
-                              pjsip_hdr_clone(tdata->pool, hdr));
+                              (pjsip_hdr*)pjsip_hdr_clone(tdata->pool, hdr));
             hdr = hdr->next;
         }
@@ -1527 +1541 @@
         if (hdr->type == PJSIP_H_RECORD_ROUTE) {
             pjsip_route_hdr *r;
-            r = pjsip_hdr_clone(dlg->pool, hdr);
+            r = (pjsip_route_hdr*) pjsip_hdr_clone(dlg->pool, hdr);
             pjsip_routing_hdr_set_route(r);
             pj_list_push_back(&dlg->route_set, r);
@@ -1599 +1613 @@
          * field of the response.
          */
-        contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
+        contact = (pjsip_contact_hdr*)
+                  pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
                                      NULL);
         if (contact) {
-            dlg->remote.contact = pjsip_hdr_clone(dlg->pool, contact);
+            dlg->remote.contact = (pjsip_contact_hdr*) 
+                                  pjsip_hdr_clone(dlg->pool, contact);
             dlg->target = dlg->remote.contact->uri;
         }
@@ -1643 +1659 @@
         pjsip_contact_hdr *contact;
 
-        contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
-                                     NULL);
+        contact = (pjsip_contact_hdr*) pjsip_msg_find_hdr(rdata->msg_info.msg,
+                                                          PJSIP_H_CONTACT, 
+                                                          NULL);
         if (contact) {
-            dlg->remote.contact = pjsip_hdr_clone(dlg->pool, contact);
+            dlg->remote.contact = (pjsip_contact_hdr*) 
+                                  pjsip_hdr_clone(dlg->pool, contact);
             dlg->target = dlg->remote.contact->uri;
         }