Changeset 431548c5 for lib/format_pcap.c

Timestamp:

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

File:

• lib/format_pcap.c (modified) (3 diffs)

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;