Changeset 9cecdb2 for lib

Timestamp:

11/24/05 12:00:55 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

79dbcef

Parents:

f66a4933

Message:

updated Changelog
fixed anonymous definition of packet status struct, to improve use.
updated format_erf paths to use sizeof(libtrace_packet_status_t)

Location:

lib

Files:

• format_erf.c (modified) (2 diffs)
• libtrace.h (modified) (2 diffs)

lib/format_erf.c

@@ -674 +674 @@
                         // Need to skip this packet as it is a message packet
                         tracefifo_out_update(libtrace->fifo, packet->size);
-                        tracefifo_ack_update(libtrace->fifo, packet->size + (sizeof(uint32_t) * 2));
+                        tracefifo_ack_update(libtrace->fifo, packet->size + 
+                                        sizeof(uint32_t) + 
+                                        sizeof(libtrace_packet_status_t));
                         continue;
                 }
@@ -691 +693 @@
                 tracefifo_out_update(libtrace->fifo,packet->size);
 
-                tracefifo_ack_update(libtrace->fifo,packet->size + (sizeof(uint32_t) * 2));
+                tracefifo_ack_update(libtrace->fifo,packet->size + 
+                                sizeof(uint32_t) + 
+                                sizeof(libtrace_packet_status_t));
 
                 //packet->size = numbytes;

lib/libtrace.h

@@ -87 +87 @@
 typedef struct libtrace_filter_t libtrace_filter_t;
 
+/** Structure holding status information for a packet */
+typedef struct libtrace_packet_status {
+        uint8_t type;
+        uint8_t reserved;
+        uint16_t message;
+
+} libtrace_packet_status_t;
+
 /** Structure holding information about a packet */
 #define LIBTRACE_PACKET_BUFSIZE 65536
@@ -94 +102 @@
         char buffer[LIBTRACE_PACKET_BUFSIZE];
         size_t size;
-        struct {
-                uint8_t type;
-                uint8_t reserved;
-                uint16_t message;
-        } status;
+        libtrace_packet_status_t status;
 } __attribute__ ((packed)) libtrace_packet_t;