Changeset 1241 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.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_tcp.c (modified) (10 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -171 +171 @@
 {
     enum { M = 48 };
-    host_port->host.ptr = pj_pool_alloc(pool, M);
+    host_port->host.ptr = (char*) pj_pool_alloc(pool, M);
     host_port->host.slen = pj_ansi_snprintf( host_port->host.ptr, M, "%s", 
                                             pj_inet_ntoa(addr->sin_addr));
@@ -223 +223 @@
 
 
-    listener = pj_pool_zalloc(pool, sizeof(struct tcp_listener));
+    listener = PJ_POOL_ZALLOC_T(pool, struct tcp_listener);
     listener->factory.pool = pool;
     listener->factory.type = PJSIP_TRANSPORT_TCP;
@@ -346 +346 @@
         }
 
-        listener->accept_op[i] = pj_pool_zalloc(pool, 
-                                                sizeof(struct pending_accept));
+        listener->accept_op[i] = PJ_POOL_ZALLOC_T(pool, 
+                                                  struct pending_accept);
         pj_ioqueue_op_key_init(&listener->accept_op[i]->op_key, 
                                 sizeof(listener->accept_op[i]->op_key));
@@ -508 +508 @@
      * Create and initialize basic transport structure.
      */
-    tcp = pj_pool_zalloc(pool, sizeof(*tcp));
+    tcp = PJ_POOL_ZALLOC_T(pool, struct tcp_transport);
     tcp->sock = sock;
     tcp->is_server = is_server;
@@ -533 +533 @@
     tcp->base.flag = pjsip_transport_get_flag_from_type(PJSIP_TRANSPORT_TCP);
 
-    tcp->base.info = pj_pool_alloc(pool, 64);
+    tcp->base.info = (char*) pj_pool_alloc(pool, 64);
     pj_ansi_snprintf(tcp->base.info, 64, "TCP to %s:%d",
                      pj_inet_ntoa(remote->sin_addr), 
@@ -890 +890 @@
     int err_cnt = 0;
 
-    listener = pj_ioqueue_get_user_data(key);
+    listener = (struct tcp_listener*) pj_ioqueue_get_user_data(key);
     accept_op = (struct pending_accept*) op_key;
 
@@ -949 +949 @@
             pool = pjsip_endpt_create_pool(listener->endpt, "tcps%p", 
                                            POOL_TP_INIT, POOL_TP_INC);
-            new_op = pj_pool_zalloc(pool, sizeof(struct pending_accept));
+            new_op = PJ_POOL_ZALLOC_T(pool, struct pending_accept);
             new_op->pool = pool;
             new_op->listener = listener;
@@ -1003 +1003 @@
                               pj_ssize_t bytes_sent)
 {
-    struct tcp_transport *tcp = pj_ioqueue_get_user_data(key);
+    struct tcp_transport *tcp = (struct tcp_transport*) 
+                                pj_ioqueue_get_user_data(key);
     pjsip_tx_data_op_key *tdata_op_key = (pjsip_tx_data_op_key*)op_key;
 
@@ -1082 +1083 @@
              * the delayed list.
              */
-            delayed_tdata = pj_pool_alloc(tdata->pool, 
-                                          sizeof(*delayed_tdata));
+            delayed_tdata = PJ_POOL_ALLOC_T(tdata->pool, 
+                                            struct delayed_tdata);
             delayed_tdata->tdata_op_key = &tdata->op_key;
 
@@ -1293 +1294 @@
     int addrlen;
 
-    tcp = pj_ioqueue_get_user_data(key);
+    tcp = (struct tcp_transport*) pj_ioqueue_get_user_data(key);
 
     /* Mark that pending connect() operation has completed. */