Changeset 789 for pjproject/branches/symbian/pjsip/src/pjsip/sip_transport_udp.c

Timestamp:

Oct 29, 2006 6:13:13 PM (17 years ago)

Author:

bennylp

Message:

Another Symbian commit, ported all PJSIP libraries and sipstateless runs without crashes (still no SIP message though)

File:

• pjproject/branches/symbian/pjsip/src/pjsip/sip_transport_udp.c (modified) (8 diffs)

pjproject/branches/symbian/pjsip/src/pjsip/sip_transport_udp.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjsip/sip_transport.h>
+#include <pjsip/sip_transport_udp.h>
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_errno.h>
@@ -82 +82 @@
     pj_pool_reset(pool);
 
-    rdata = pj_pool_zalloc(pool, sizeof(pjsip_rx_data));
+    rdata = (pjsip_rx_data*) pj_pool_zalloc(pool, sizeof(pjsip_rx_data));
 
     /* Init tp_info part. */
@@ -261 +261 @@
                                    pj_ssize_t bytes_sent)
 {
-    struct udp_transport *tp = pj_ioqueue_get_user_data(key);
+    struct udp_transport *tp = (struct udp_transport *) pj_ioqueue_get_user_data(key);
     pjsip_tx_data_op_key *tdata_op_key = (pjsip_tx_data_op_key*)op_key;
 
@@ -337 +337 @@
 
     /* Unregister from ioqueue. */
-    if (tp->key)
+    if (tp->key) {
         pj_ioqueue_unregister(tp->key);
+        tp->sock = PJ_INVALID_SOCKET;
+    }
 
     /* Close socket. */
@@ -425 +427 @@
 
     /* Create the UDP transport object. */
-    tp = pj_pool_zalloc(pool, sizeof(struct udp_transport));
+    tp = (struct udp_transport*) 
+         pj_pool_zalloc(pool, sizeof(struct udp_transport));
 
     /* Save pool. */
@@ -474 +477 @@
 
     /* Transport info. */
-    tp->base.info = pj_pool_alloc(pool, 80);
+    tp->base.info = (char*) pj_pool_alloc(pool, 80);
     pj_ansi_sprintf( 
         tp->base.info, "udp %s:%d [published as %s:%d]",
@@ -519 +522 @@
     /* Create rdata and put it in the array. */
     tp->rdata_cnt = 0;
-    tp->rdata = pj_pool_calloc(tp->base.pool, async_cnt, 
+    tp->rdata = (pjsip_rx_data**)
+                pj_pool_calloc(tp->base.pool, async_cnt, 
                                sizeof(pjsip_rx_data*));
     for (i=0; i<async_cnt; ++i) {
@@ -553 +557 @@
         } else if (status != PJ_EPENDING) {
             /* Error! */
+            pj_atomic_dec(tp->base.ref_cnt);
             pjsip_transport_unregister(tp->base.tpmgr, &tp->base);
             return status;