Changeset 1266 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

May 11, 2007 3:14:34 PM (17 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (24 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -230 +230 @@
         return PJ_FALSE;
 
-    inv = dlg->mod_data[mod_inv.mod.id];
+    inv = (pjsip_inv_session*) dlg->mod_data[mod_inv.mod.id];
 
     /* Report to dialog that we handle INVITE, CANCEL, BYE, ACK. 
@@ -412 +412 @@
 PJ_DEF(pjsip_inv_session*) pjsip_dlg_get_inv_session(pjsip_dialog *dlg)
 {
-    return dlg->mod_data[mod_inv.mod.id];
+    return (pjsip_inv_session*) dlg->mod_data[mod_inv.mod.id];
 }
 
@@ -453 +453 @@
 
     /* Create the session */
-    inv = pj_pool_zalloc(dlg->pool, sizeof(pjsip_inv_session));
+    inv = PJ_POOL_ZALLOC_T(dlg->pool, pjsip_inv_session);
     pj_assert(inv != NULL);
 
@@ -578 +578 @@
 
         /* Parse and validate SDP */
-        status = pjmedia_sdp_parse(rdata->tp_info.pool, body->data, body->len,
-                                   &sdp);
+        status = pjmedia_sdp_parse(rdata->tp_info.pool, 
+                                   (char*)body->data, body->len, &sdp);
         if (status == PJ_SUCCESS)
             status = pjmedia_sdp_validate(sdp);
@@ -651 +651 @@
      * implicitly by sending this INVITE.
      */
-    allow = pjsip_msg_find_hdr(msg, PJSIP_H_ALLOW, NULL);
+    allow = (pjsip_allow_hdr*) pjsip_msg_find_hdr(msg, PJSIP_H_ALLOW, NULL);
     if (allow) {
         unsigned i;
@@ -669 +669 @@
 
     /* Check Supported header */
-    sup_hdr = pjsip_msg_find_hdr(msg, PJSIP_H_SUPPORTED, NULL);
+    sup_hdr = (pjsip_supported_hdr*)
+              pjsip_msg_find_hdr(msg, PJSIP_H_SUPPORTED, NULL);
     if (sup_hdr) {
         unsigned i;
@@ -684 +685 @@
 
     /* Check Require header */
-    req_hdr = pjsip_msg_find_hdr(msg, PJSIP_H_REQUIRE, NULL);
+    req_hdr = (pjsip_require_hdr*)
+              pjsip_msg_find_hdr(msg, PJSIP_H_REQUIRE, NULL);
     if (req_hdr) {
         unsigned i;
@@ -743 +745 @@
                 pj_assert(h);
                 if (h) {
-                    sup_hdr = pjsip_hdr_clone(rdata->tp_info.pool, h);
+                    sup_hdr = (pjsip_supported_hdr*)
+                              pjsip_hdr_clone(rdata->tp_info.pool, h);
                     pj_list_push_back(&res_hdr_list, sup_hdr);
                 }
@@ -783 +786 @@
             pj_assert(h);
             if (h) {
-                sup_hdr = pjsip_hdr_clone(rdata->tp_info.pool, h);
+                sup_hdr = (pjsip_supported_hdr*)
+                          pjsip_hdr_clone(rdata->tp_info.pool, h);
                 pj_list_push_back(&res_hdr_list, sup_hdr);
             }
@@ -815 +819 @@
             pjsip_hdr *cloned;
 
-            cloned = pjsip_hdr_clone(tdata->pool, h);
+            cloned = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, h);
             PJ_ASSERT_RETURN(cloned, PJ_ENOMEM);
 
@@ -875 +879 @@
 
     /* Create the session */
-    inv = pj_pool_zalloc(dlg->pool, sizeof(pjsip_inv_session));
+    inv = PJ_POOL_ZALLOC_T(dlg->pool, pjsip_inv_session);
     pj_assert(inv != NULL);
 
@@ -894 +898 @@
 
         /* Parse and validate SDP */
-        status = pjmedia_sdp_parse(inv->pool, body->data, body->len,
+        status = pjmedia_sdp_parse(inv->pool, (char*)body->data, body->len,
                                    &rem_sdp);
         if (status == PJ_SUCCESS)
@@ -936 +940 @@
 
     /* Attach our data to the transaction. */
-    tsx_inv_data = pj_pool_zalloc(inv->invite_tsx->pool, 
-                                  sizeof(struct tsx_inv_data));
+    tsx_inv_data = PJ_POOL_ZALLOC_T(inv->invite_tsx->pool, struct tsx_inv_data);
     tsx_inv_data->inv = inv;
     inv->invite_tsx->mod_data[mod_inv.mod.id] = tsx_inv_data;
@@ -998 +1001 @@
 {
     PJ_UNUSED_ARG(len);
-    return pjmedia_sdp_session_clone(pool, data);
+    return pjmedia_sdp_session_clone(pool, (const pjmedia_sdp_session*)data);
 }
 
 static int print_sdp(pjsip_msg_body *body, char *buf, pj_size_t len)
 {
-    return pjmedia_sdp_print(body->data, buf, len);
+    return pjmedia_sdp_print((const pjmedia_sdp_session*)body->data, buf, len);
 }
 
@@ -1015 +1018 @@
     pjsip_msg_body *body;
 
-    body = pj_pool_zalloc(pool, sizeof(pjsip_msg_body));
+    body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body);
     PJ_ASSERT_RETURN(body != NULL, PJ_ENOMEM);
 
@@ -1083 +1086 @@
 
         while (hdr != &inv->dlg->inv_hdr) {
-            pjsip_msg_add_hdr(tdata->msg,
+            pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
                               pjsip_hdr_shallow_clone(tdata->pool, hdr));
             hdr = hdr->next;
@@ -1118 +1121 @@
     hdr = pjsip_endpt_get_capability(inv->dlg->endpt, PJSIP_H_ALLOW, NULL);
     if (hdr) {
-        pjsip_msg_add_hdr(tdata->msg,
+        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
                           pjsip_hdr_shallow_clone(tdata->pool, hdr));
     }
@@ -1125 +1128 @@
     hdr = pjsip_endpt_get_capability(inv->dlg->endpt, PJSIP_H_SUPPORTED, NULL);
     if (hdr) {
-        pjsip_msg_add_hdr(tdata->msg,
+        pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
                           pjsip_hdr_shallow_clone(tdata->pool, hdr));
     }
@@ -1178 +1181 @@
 
     /* Get/attach invite session's transaction data */
-    tsx_inv_data = tsx->mod_data[mod_inv.mod.id];
+    tsx_inv_data = (struct tsx_inv_data*) tsx->mod_data[mod_inv.mod.id];
     if (tsx_inv_data == NULL) {
-        tsx_inv_data = pj_pool_zalloc(tsx->pool, sizeof(struct tsx_inv_data));
+        tsx_inv_data = PJ_POOL_ZALLOC_T(tsx->pool, struct tsx_inv_data);
         tsx_inv_data->inv = inv;
         tsx->mod_data[mod_inv.mod.id] = tsx_inv_data;
@@ -1208 +1211 @@
     /* Parse the SDP body. */
 
-    status = pjmedia_sdp_parse(rdata->tp_info.pool, msg->body->data,
+    status = pjmedia_sdp_parse(rdata->tp_info.pool, 
+                               (char*)msg->body->data,
                                msg->body->len, &sdp);
     if (status != PJ_SUCCESS) {
@@ -1588 +1592 @@
 
         pj_strdup_with_null(inv->dlg->pool, &tmp, new_contact);
-        contact_hdr = pjsip_parse_hdr(inv->dlg->pool, &STR_CONTACT, 
+        contact_hdr = (pjsip_contact_hdr*)
+                      pjsip_parse_hdr(inv->dlg->pool, &STR_CONTACT, 
                                       tmp.ptr, tmp.slen, NULL);
         if (!contact_hdr) {
@@ -1685 +1690 @@
         pjsip_dlg_inc_lock(inv->dlg);
 
-        tsx_inv_data = pj_pool_zalloc(inv->pool, sizeof(struct tsx_inv_data));
+        tsx_inv_data = PJ_POOL_ZALLOC_T(inv->pool, struct tsx_inv_data);
         tsx_inv_data->inv = inv;
 
@@ -1701 +1706 @@
          * request.
          */
-        PJ_ASSERT_RETURN((cseq=pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CSEQ, NULL))!=NULL
+        PJ_ASSERT_RETURN((cseq=(pjsip_cseq_hdr*)pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CSEQ, NULL))!=NULL
                           && (cseq->cseq == inv->invite_tsx->cseq),
                          PJ_EINVALIDOP);
@@ -2416 +2421 @@
                                                     NULL);
                 if (accept) {
-                    pjsip_msg_add_hdr(tdata->msg,
+                    pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)
                                       pjsip_hdr_clone(tdata->pool, accept));
                 }