Changeset 431548c5

Timestamp:

05/04/06 14:54:59 (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:

48a20e3

Parents:

e5f1431

Message:

Updated various format modules to use libtrace_direction_t rather than int8_t
Changed MIN in fifo.c to be FIFO_MIN as this was very prone to conflict

Location:

lib

Files:

• fifo.c (modified) (3 diffs)
• format_erf.c (modified) (2 diffs)
• format_linux.c (modified) (1 diff)
• format_pcap.c (modified) (3 diffs)
• format_wag.c (modified) (1 diff)
• libtrace_int.h (modified) (1 diff)

lib/fifo.c

@@ -51 +51 @@
  * #define MIN(a,b) ({ int _a = a; int _b = b; (_a < _b) ? _a : _b; })
  */
-#define MIN(a,b) ((a)<(b)?(a):(b))
+#define FIFO_MIN(a,b) ((a)<(b)?(a):(b))
 
 static char *tracefifo_stat_buffer = 0;
@@ -201 +201 @@
         lenleft = len;
         while (lenleft > 0) {
-                size = MIN( ( fifo->length - fifo->datamap[which]), lenleft);
+                size = FIFO_MIN( ( fifo->length - fifo->datamap[which]), lenleft);
                 memcpy(buffer, 
                                 (char *)((ptrdiff_t)fifo->base + fifo->datamap[which]), 
@@ -228 +228 @@
         lenleft = len;
         while (lenleft > 0) {
-                size = MIN((fifo->length - fifo->datamap[FIFO_PTR_IN]), lenleft );
+                size = FIFO_MIN((fifo->length - fifo->datamap[FIFO_PTR_IN]), lenleft );
                 memcpy((char *)((ptrdiff_t)fifo->base + fifo->datamap[FIFO_PTR_IN]), 
                                 buffer, 

lib/format_erf.c

@@ -775 +775 @@
 }
 
-static int8_t erf_get_direction(const libtrace_packet_t *packet) {
+static libtrace_direction_t erf_get_direction(const libtrace_packet_t *packet) {
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;
@@ -781 +781 @@
 }
 
-static int8_t erf_set_direction(libtrace_packet_t *packet, int8_t direction) {
+static libtrace_direction_t erf_set_direction(libtrace_packet_t *packet, libtrace_direction_t direction) {
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->header;

lib/format_linux.c

@@ -273 +273 @@
 }
 
-static int8_t linuxnative_get_direction(const struct libtrace_packet_t *packet) {
+static libtrace_direction_t linuxnative_get_direction(const struct libtrace_packet_t *packet) {
         switch (((struct libtrace_linuxnative_header*)(packet->buffer))->hdr.sll_pkttype) {
                 case PACKET_OUTGOING:
-                        return 0;
+                        return TRACE_DIR_OUTGOING;
                 default:
-                        return 1;
+                        return TRACE_DIR_INCOMING;
         }
 }

lib/format_pcap.c

@@ -368 +368 @@
 }
 
-static int8_t pcap_set_direction(libtrace_packet_t *packet,int8_t dir) {
+static libtrace_direction_t pcap_set_direction(libtrace_packet_t *packet,
+                libtrace_direction_t dir) {
         libtrace_sll_header_t *sll;
         promote_packet(packet);
         sll=packet->payload;
-        if(dir==0)
-                sll->pkttype=0;
+        if(dir==TRACE_DIR_OUTGOING)
+                sll->pkttype=TRACE_DIR_OUTGOING;
         else
-                sll->pkttype=1;
+                sll->pkttype=TRACE_DIR_INCOMING;
         return sll->pkttype;
 }
 
-static int8_t pcap_get_direction(const libtrace_packet_t *packet) {
+static libtrace_direction_t pcap_get_direction(const libtrace_packet_t *packet) {
         libtrace_direction_t direction  = -1;
         switch(pcap_get_link_type(packet)) {
@@ -404 +405 @@
                          */
                         if (ntohs(sll->pkttype == 0)) {
-                                direction = 1;
+                                direction = TRACE_DIR_INCOMING;
                         } else {
-                                direction = 0;
+                                direction = TRACE_DIR_OUTGOING;
                         }
                         break;
@@ -424 +425 @@
                         if (ntohs(pflog->dir==0)) {
 
-                                direction = 1;
+                                direction = TRACE_DIR_INCOMING;
                         }
                         else {
-                                direction = 0;
+                                direction = TRACE_DIR_OUTGOING;
                         }
                         break;

lib/format_wag.c

@@ -417 +417 @@
 }
 
-static int8_t wag_get_direction(const libtrace_packet_t *packet) {
+static libtrace_direction_t wag_get_direction(const libtrace_packet_t *packet) {
         struct frame_data_rx_t *wagptr = (struct frame_data_rx_t *)packet->buffer;
         if (wagptr->hdr.type == 0) {

lib/libtrace_int.h

@@ -240 +240 @@
          * @note This callback may be NULL if not supported.
          */ 
-        int8_t (*get_direction)(const libtrace_packet_t *packet);
+        libtrace_direction_t (*get_direction)(const libtrace_packet_t *packet);
         /** set the direction of this packet 
          * @note This callback may be NULL if not supported.
          */ 
-        int8_t (*set_direction)(libtrace_packet_t *packet, int8_t direction);
+        libtrace_direction_t (*set_direction)(libtrace_packet_t *packet, libtrace_direction_t direction);
         /** return the erf timestamp of the packet.
          * @return the 64bit erf timestamp