Changeset 252

Timestamp:

Mar 1, 2006 7:28:08 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug where rdata is not reset properly causing memory to grow indefinitely

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (1 diff)
• src/pjsip/sip_transport_udp.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -164 +164 @@
         /** The transport object which received this packet. */
         pjsip_transport         *transport;
+
+        /** Other transport specific data to be attached to this buffer. */
+        void                    *tp_data;
 
         /** Ioqueue key. */

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -42 +42 @@
 
 /*
+ * Initialize transport's receive buffer from the specified pool.
+ */
+static void init_rdata(struct udp_transport *tp, unsigned rdata_index,
+                       pj_pool_t *pool, pjsip_rx_data **p_rdata)
+{
+    pjsip_rx_data *rdata;
+
+    /* Reset pool. */
+    pj_pool_reset(pool);
+
+    rdata = pj_pool_zalloc(pool, sizeof(pjsip_rx_data));
+
+    /* Init tp_info part. */
+    rdata->tp_info.pool = pool;
+    rdata->tp_info.transport = &tp->base;
+    rdata->tp_info.tp_data = (void*) rdata_index;
+    rdata->tp_info.op_key.rdata = rdata;
+    pj_ioqueue_op_key_init(&rdata->tp_info.op_key.op_key, 
+                           sizeof(pj_ioqueue_op_key_t));
+
+    tp->rdata[rdata_index] = rdata;
+
+    if (p_rdata)
+        *p_rdata = rdata;
+}
+
+
+/*
  * udp_on_read_complete()
  *
@@ -116 +144 @@
             flags = 0;
         }
+
+        /* Reset pool. */
+        pj_pool_reset(rdata->tp_info.pool);
+        init_rdata((struct udp_transport*)rdata->tp_info.transport,
+                   (unsigned)rdata->tp_info.tp_data,
+                   rdata->tp_info.pool,
+                   &rdata);
 
         /* Read next packet. */
@@ -413 +448 @@
         }
 
-        tp->rdata[i] = pj_pool_zalloc(rdata_pool, sizeof(pjsip_rx_data));
-
-        /* Init tp_info part. */
-        tp->rdata[i]->tp_info.pool = rdata_pool;
-        tp->rdata[i]->tp_info.transport = &tp->base;
-        tp->rdata[i]->tp_info.op_key.rdata = tp->rdata[i];
-        pj_ioqueue_op_key_init(&tp->rdata[i]->tp_info.op_key.op_key, 
-                               sizeof(pj_ioqueue_op_key_t));
-
+        init_rdata(tp, i, rdata_pool, NULL);
         tp->rdata_cnt++;
     }