Changeset 5eeba76

Timestamp:

05/04/06 17:05:13 (14 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

bc4c11e

Parents:

48a20e3

Message:

Fixed memory leak in trace_event_trace
Wrote an example using the event framework
Removed old event examples
Updated format_pcapfile to use libtrace_direction_t
erf_read_packet now checks that malloc()ing a buffer actually succeeds

Files:

• examples/event/Makefile (modified) (2 diffs)
• examples/event/event_example.c (added)
• examples/event/rate-tracetime.c (deleted)
• examples/event/rate.c (deleted)
• lib/format_erf.c (modified) (1 diff)
• lib/format_helper.c (modified) (1 diff)
• lib/format_pcapfile.c (modified) (3 diffs)

examples/event/Makefile

@@ -1 +1 @@
 
-PREFIX=/usr/local
+PREFIX=/usr/local/
 CC=gcc
 
@@ -9 +9 @@
 LDLIBS  = -ltrace
 
-BINS = rate rate-tracetime
+BINS = event_example 
 .PHONY: all clean distclean install depend
 

lib/format_erf.c

@@ -530 +530 @@
                 packet->buffer = malloc(LIBTRACE_PACKET_BUFSIZE);
                 packet->buf_control = TRACE_CTRL_PACKET;
-        }
-
+                if (!packet->buffer) {
+                        trace_set_err(libtrace, errno, 
+                                        "Cannot allocate memory");
+                        return -1;
+                }
+        }
+
+        
+        
         packet->header = packet->buffer;
         packet->type = RT_DATA_ERF;

lib/format_helper.c

@@ -140 +140 @@
         /* TODO: finalise packet */
         *packet = *trace->event.packet;
-        trace->event.packet = NULL;
+        trace_destroy_packet(&trace->event.packet);
 
         event.type = TRACE_EVENT_PACKET;

lib/format_pcapfile.c

@@ -216 +216 @@
 }
 
-static int8_t pcapfile_get_direction(const libtrace_packet_t *packet) 
-{
-        int8_t direction  = -1;
+static libtrace_direction_t pcapfile_get_direction(const libtrace_packet_t *packet) 
+{
+        libtrace_direction_t direction  = -1;
         switch(pcapfile_get_link_type(packet)) {
                 case TRACE_TYPE_LINUX_SLL:
@@ -242 +242 @@
                          */
                         if (ntohs(sll->pkttype == 0)) {
-                                direction = 1;
+                                direction = TRACE_DIR_INCOMING;
                         } else {
-                                direction = 0;
+                                direction = TRACE_DIR_OUTGOING;
                         }
                         break;
@@ -262 +262 @@
                         if (ntohs(pflog->dir==0)) {
 
-                                direction = 1;
+                                direction = TRACE_DIR_INCOMING;
                         }
                         else {
-                                direction = 0;
+                                direction = TRACE_DIR_OUTGOING;
                         }
                         break;