Changeset 1241 for pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

Timestamp:

May 2, 2007 5:14:29 AM (17 years ago)

Author:

bennylp

Message:

Ported PJSIP and PJSIP-SIMPLE to Symbian

File:

• pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c (modified) (13 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_ua_layer.c

@@ -166 +166 @@
 
     /* Get the dialog where this transaction belongs. */
-    dlg = tsx->mod_data[mod_ua.mod.id];
+    dlg = (pjsip_dialog*) tsx->mod_data[mod_ua.mod.id];
     
     /* If dialog instance has gone, it could mean that the dialog
@@ -245 +245 @@
 
     set_key->slen = call_id->slen + local_tag->slen + 1;
-    set_key->ptr = pj_pool_alloc(pool, set_key->slen);
+    set_key->ptr = (char*) pj_pool_alloc(pool, set_key->slen);
     pj_assert(set_key->ptr != NULL);
 
@@ -268 +268 @@
         return set;
     } else {
-        set = pj_pool_alloc(mod_ua.pool, sizeof(struct dlg_set));
+        set = PJ_POOL_ALLOC_T(mod_ua.pool, struct dlg_set);
         return set;
     }
@@ -299 +299 @@
         struct dlg_set *dlg_set;
 
-        dlg_set = pj_hash_get( mod_ua.dlg_table, dlg->local.info->tag.ptr, 
+        dlg_set = (struct dlg_set*)
+                  pj_hash_get( mod_ua.dlg_table, dlg->local.info->tag.ptr, 
                                dlg->local.info->tag.slen,
                                &dlg->local.tag_hval);
@@ -367 +368 @@
 
     /* Find this dialog from the dialog set. */
-    dlg_set = dlg->dlg_set;
+    dlg_set = (struct dlg_set*) dlg->dlg_set;
     d = dlg_set->dlg_list.next;
     while (d != (pjsip_dialog*)&dlg_set->dlg_list && d != dlg) {
@@ -401 +402 @@
 PJ_DEF(pjsip_dialog*) pjsip_rdata_get_dlg( pjsip_rx_data *rdata )
 {
-    return rdata->endpt_info.mod_data[mod_ua.mod.id];
+    return (pjsip_dialog*) rdata->endpt_info.mod_data[mod_ua.mod.id];
 }
 
 PJ_DEF(pjsip_dialog*) pjsip_tsx_get_dlg( pjsip_transaction *tsx )
 {
-    return tsx->mod_data[mod_ua.mod.id];
+    return (pjsip_dialog*) tsx->mod_data[mod_ua.mod.id];
 }
 
@@ -427 +428 @@
 
     /* Lookup the dialog set. */
-    dlg_set = pj_hash_get(mod_ua.dlg_table, local_tag->ptr, local_tag->slen,
+    dlg_set = (struct dlg_set*)
+              pj_hash_get(mod_ua.dlg_table, local_tag->ptr, local_tag->slen,
                           NULL);
     if (dlg_set == NULL) {
@@ -517 +519 @@
         /* We should find the dialog attached to the INVITE transaction */
         if (tsx) {
-            dlg = tsx->mod_data[mod_ua.mod.id];
+            dlg = (pjsip_dialog*) tsx->mod_data[mod_ua.mod.id];
             pj_mutex_unlock(tsx->mutex);
 
@@ -523 +525 @@
              * (e.g. during debugging where initially there is a dialog)
              */
-            return dlg ? dlg->dlg_set : NULL;
+            return dlg ? (struct dlg_set*) dlg->dlg_set : NULL;
 
         } else {
@@ -540 +542 @@
 
         /* Lookup the dialog set. */
-        dlg_set = pj_hash_get(mod_ua.dlg_table, tag->ptr, tag->slen, NULL);
+        dlg_set = (struct dlg_set*)
+                  pj_hash_get(mod_ua.dlg_table, tag->ptr, tag->slen, NULL);
         return dlg_set;
     }
@@ -705 +708 @@
 
         /* Get the dialog set. */
-        dlg_set = dlg->dlg_set;
+        dlg_set = (struct dlg_set*) dlg->dlg_set;
 
         /* Even if transaction is found and (candidate) dialog has been 
@@ -733 +736 @@
 
         /* Get the dialog set. */
-        dlg_set = pj_hash_get(mod_ua.dlg_table, 
+        dlg_set = (struct dlg_set*)
+                  pj_hash_get(mod_ua.dlg_table, 
                               rdata->msg_info.from->tag.ptr,
                               rdata->msg_info.from->tag.slen,
@@ -918 +922 @@
             const char *title;
 
-            dlg_set = pj_hash_this(mod_ua.dlg_table, it);
+            dlg_set = (struct dlg_set*) pj_hash_this(mod_ua.dlg_table, it);
             if (!dlg_set || pj_list_empty(&dlg_set->dlg_list)) continue;