Changeset 1241 for pjproject/trunk/pjsip/src/pjsip/sip_transport.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_transport.c (modified) (13 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -315 +315 @@
         return PJ_ENOMEM;
 
-    tdata = pj_pool_zalloc(pool, sizeof(pjsip_tx_data));
+    tdata = PJ_POOL_ZALLOC_T(pool, pjsip_tx_data);
     tdata->pool = pool;
     tdata->mgr = mgr;
@@ -397 +397 @@
     int len;
 
-    cseq = pjsip_msg_find_hdr(msg, PJSIP_H_CSEQ, NULL);
+    cseq = (const pjsip_cseq_hdr*) pjsip_msg_find_hdr(msg, PJSIP_H_CSEQ, NULL);
     PJ_ASSERT_RETURN(cseq != NULL, "INVALID MSG");
 
@@ -419 +419 @@
     }
 
-    info = pj_pool_alloc(pool, len+1);
+    info = (char*) pj_pool_alloc(pool, len+1);
     pj_memcpy(info, info_buf, len+1);
 
@@ -493 +493 @@
                                     pj_ssize_t size)
 {
-    pjsip_tx_data *tdata = token;
+    pjsip_tx_data *tdata = (pjsip_tx_data*) token;
 
     PJ_UNUSED_ARG(transport);
@@ -518 +518 @@
     /* Allocate buffer if necessary. */
     if (tdata->buf.start == NULL) {
-        tdata->buf.start = pj_pool_alloc( tdata->pool, PJSIP_MAX_PKT_LEN);
+        tdata->buf.start = (char*) 
+                           pj_pool_alloc( tdata->pool, PJSIP_MAX_PKT_LEN);
         tdata->buf.cur = tdata->buf.start;
         tdata->buf.end = tdata->buf.start + PJSIP_MAX_PKT_LEN;
@@ -613 +614 @@
                                     struct pj_timer_entry *entry)
 {
-    pjsip_transport *tp = entry->user_data;
+    pjsip_transport *tp = (pjsip_transport*) entry->user_data;
     pj_assert(tp != NULL);
 
@@ -901 +902 @@
 
     /* Create and initialize transport manager. */
-    mgr = pj_pool_zalloc(pool, sizeof(*mgr));
+    mgr = PJ_POOL_ZALLOC_T(pool, pjsip_tpmgr);
     mgr->endpt = endpt;
     mgr->on_rx_msg = rx_cb;
@@ -1036 +1037 @@
         pjsip_transport *transport;
         
-        transport = pj_hash_this(mgr->table, itr);
+        transport = (pjsip_transport*) pj_hash_this(mgr->table, itr);
 
         next = pj_hash_next(mgr->table, itr);
@@ -1344 +1345 @@
         pj_memcpy(&key.addr, remote, addr_len);
 
-        transport = pj_hash_get(mgr->table, &key, key_len, NULL);
+        transport = (pjsip_transport*)
+                    pj_hash_get(mgr->table, &key, key_len, NULL);
         if (transport == NULL) {
             unsigned flag = pjsip_transport_get_flag_from_type(type);
@@ -1357 +1359 @@
                 pj_bzero(addr, sizeof(pj_sockaddr_in));
                 key_len = sizeof(key.type) + sizeof(pj_sockaddr_in);
-                transport = pj_hash_get(mgr->table, &key, key_len, NULL);
+                transport = (pjsip_transport*) 
+                            pj_hash_get(mgr->table, &key, key_len, NULL);
             }
             /* For datagram INET transports, try lookup with zero address.
@@ -1370 +1373 @@
 
                 key_len = sizeof(key.type) + sizeof(pj_sockaddr_in);
-                transport = pj_hash_get(mgr->table, &key, key_len, NULL);
+                transport = (pjsip_transport*)
+                            pj_hash_get(mgr->table, &key, key_len, NULL);
             }
         }
@@ -1411 +1415 @@
     /* Request factory to create transport. */
     status = factory->create_transport(factory, mgr, mgr->endpt,
-                                       remote, addr_len, tp);
+                                       (const pj_sockaddr*) remote, addr_len,
+                                       tp);
     if (status == PJ_SUCCESS) {
         PJ_ASSERT_ON_FAIL(tp!=NULL, 
@@ -1455 +1460 @@
 
         do {
-            pjsip_transport *t = pj_hash_this(mgr->table, itr);
+            pjsip_transport *t = (pjsip_transport*) 
+                                 pj_hash_this(mgr->table, itr);
 
             PJ_LOG(3, (THIS_FILE, "  %s %s (refcnt=%d%s)",