Changeset 114b8d6

Timestamp:

04/22/06 00:43:32 (15 years ago)

Author:

Perry Lorier <perry@…>

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:

2d96bf2

Parents:

a4bfbf0

Message:

Remove reliance on pcap.h for DLT_'s (and while we're here, make them a pretty
enum, so we get warnings if we forget one somewhere)

Location:

lib

Files:

• format_pcap.c (modified) (1 diff)
• format_pcapfile.c (modified) (1 diff)
• libtrace.h (modified) (1 diff)
• linktypes.c (modified) (2 diffs)
• rt_protocol.h (modified) (2 diffs)
• trace.c (modified) (1 diff)

lib/format_pcap.c

@@ -408 +408 @@
         struct pcap_pkthdr *pcapptr = 0;
         pcapptr = (struct pcap_pkthdr *)packet->header;
-        if (packet->type==pcap_dlt_to_rt(DLT_EN10MB))
+        if (packet->type==pcap_dlt_to_rt(TRACE_DLT_EN10MB))
                 return pcapptr->len+4; /* Include the missing FCS */
         else

lib/format_pcapfile.c

@@ -288 +288 @@
         struct pcapfile_pkt_hdr_t *pcapptr 
                 = (struct pcapfile_pkt_hdr_t *)packet->header;
-        if (packet->type==pcap_dlt_to_rt(DLT_EN10MB))
+        if (packet->type==pcap_dlt_to_rt(TRACE_DLT_EN10MB))
                 /* Include the missing FCS */
                 return swapl(packet->trace,pcapptr->wirelen)+4; 

lib/libtrace.h

@@ -180 +180 @@
         TRACE_ERR_RECV_FAILED   = -11
 };
+
+typedef enum {
+        TRACE_DLT_NULL = 0,
+        TRACE_DLT_EN10MB = 1,
+        TRACE_DLT_ATM_RFC1483 = 11,
+        TRACE_DLT_IEEE802_11 = 105,
+        TRACE_DLT_LINUX_SLL = 113,
+        TRACE_DLT_PFLOG = 117
+} libtrace_dlt_t ;
+
 
 /** @name Protocol structures

lib/linktypes.c

@@ -15 +15 @@
  */
 
-libtrace_linktype_t pcap_dlt_to_libtrace(int dlt)
+libtrace_linktype_t pcap_dlt_to_libtrace(libtrace_dlt_t dlt)
 {
         switch(dlt) {
-#if HAVE_PCAP
-                case DLT_NULL: return TRACE_TYPE_NONE;
-                case DLT_EN10MB: return TRACE_TYPE_ETH;
-                case DLT_ATM_RFC1483: return TRACE_TYPE_ATM;
-                case DLT_IEEE802_11: return TRACE_TYPE_80211;
-#ifdef DLT_LINUX_SLL
-                case DLT_LINUX_SLL: return TRACE_TYPE_LINUX_SLL;
-#endif
-#ifdef DLT_PFLOG
-                case DLT_PFLOG: return TRACE_TYPE_PFLOG;
-#endif
-#else
+                case TRACE_DLT_NULL: return TRACE_TYPE_NONE;
+                case TRACE_DLT_EN10MB: return TRACE_TYPE_ETH;
+                case TRACE_DLT_ATM_RFC1483: return TRACE_TYPE_ATM;
+                case TRACE_DLT_IEEE802_11: return TRACE_TYPE_80211;
+                case TRACE_DLT_LINUX_SLL: return TRACE_TYPE_LINUX_SLL;
+                case TRACE_DLT_PFLOG: return TRACE_TYPE_PFLOG;
                 default:
                                 assert(!"No pcap support");
-#endif
         }
         return -1;
@@ -40 +33 @@
 {
         switch(type) {
-#ifdef HAVE_PCAP
-                case TRACE_TYPE_NONE: return DLT_NULL;
-                case TRACE_TYPE_ETH: return DLT_EN10MB;
-                case TRACE_TYPE_ATM: return DLT_ATM_RFC1483;
-                case TRACE_TYPE_80211: return DLT_IEEE802_11;
-#ifdef DLT_LINUX_SLL
-                case TRACE_TYPE_LINUX_SLL: return DLT_LINUX_SLL;
-#endif
-#ifdef DLT_PFLOG
-                case TRACE_TYPE_PFLOG: return DLT_PFLOG;
-#endif
-#endif
+                case TRACE_TYPE_NONE: return TRACE_DLT_NULL;
+                case TRACE_TYPE_ETH: return TRACE_DLT_EN10MB;
+                case TRACE_TYPE_ATM: return TRACE_DLT_ATM_RFC1483;
+                case TRACE_TYPE_80211: return TRACE_DLT_IEEE802_11;
+                case TRACE_TYPE_LINUX_SLL: return TRACE_DLT_LINUX_SLL;
+                case TRACE_TYPE_PFLOG: return TRACE_DLT_PFLOG;
         }
         return -1;

lib/rt_protocol.h

@@ -3 +3 @@
 
 #include "libtrace.h"
-#ifdef HAVE_PCAP
-#include <pcap.h>
-#endif
 
 #define CAPTURE_PORT 3434
@@ -62 +59 @@
  RT_DATA_LINUX_NATIVE   =RT_DATA_SIMPLE + TRACE_FORMAT_LINUX_NATIVE,
 
-#ifdef HAVE_PCAP
- RT_DATA_PCAP_NULL              =RT_DATA_PCAP + DLT_NULL,
- RT_DATA_PCAP_EN10MB            =RT_DATA_PCAP + DLT_EN10MB,
- RT_DATA_PCAP_ATM_RFC1483       =RT_DATA_PCAP + DLT_ATM_RFC1483,
- RT_DATA_PCAP_IEEE802_11        =RT_DATA_PCAP + DLT_IEEE802_11,
-#ifdef DLT_LINUX_SLL
- RT_DATA_PCAP_LINUX_SLL         =RT_DATA_PCAP + DLT_LINUX_SLL,
-#endif
-#ifdef DLT_PFLOG
- RT_DATA_PCAP_PFLOG             =RT_DATA_PCAP + DLT_PFLOG,
-#endif
-#endif
+ RT_DATA_PCAP_NULL              =RT_DATA_PCAP + TRACE_DLT_NULL,
+ RT_DATA_PCAP_EN10MB            =RT_DATA_PCAP + TRACE_DLT_EN10MB,
+ RT_DATA_PCAP_ATM_RFC1483       =RT_DATA_PCAP + TRACE_DLT_ATM_RFC1483,
+ RT_DATA_PCAP_IEEE802_11        =RT_DATA_PCAP + TRACE_DLT_IEEE802_11,
+ RT_DATA_PCAP_LINUX_SLL         =RT_DATA_PCAP + TRACE_DLT_LINUX_SLL,
+ RT_DATA_PCAP_PFLOG             =RT_DATA_PCAP + TRACE_DLT_PFLOG,
  RT_LAST = 3000
 };

lib/trace.c

@@ -1232 +1232 @@
                                 buf,trace->uridata);
         }
+        trace->err.err_num = 0; /* "OK" */
+        trace->err.problem[0]='\0';
 }