Changeset 528eb6e for libpacketdump

Timestamp:

12/04/12 15:24:34 (9 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:

b4c3f61

Parents:

fd87898

Message:

• A very cut-down version of int: and ring: is now built on non-Linux systems, enabling them to be able to decode packets captured using those formats and exported via RT
• Replaced arphrd.h with a new header file (libtrace_arphrd.h) that provides our own #defines for the various ARPHRD types. The inconsistency between what is available on different OS's was becoming problematic.
• Increased RT buffer size so we can always fit a complete libtrace buffer into it - int: over RT tends to result in very large "packets".
• Fixed copy-paste error in the failure case when creating a dummy linux trace in format_rt.c
• Updated various bits of code to use the new LIBTRACE_ARPHRD types where sensible
• Removed unneeded #include in protocols_pktmeta.c
• Replaced u32 and u16 types in format_linux with more portable uint32_t and uint16_t types
• Removed unneeded calls to linuxnative_init_input in the prepare_packet functions in format_linux.c
• Don't call the fin_input function on a trace if the format does not provide one

File:

• libpacketdump/link_6.c (modified) (3 diffs)

libpacketdump/link_6.c

@@ -12 +12 @@
 #include "libtrace.h"
 
-#include "arphrd.h"
+#include "libtrace_arphrd.h"
 
 /* Copied this here because this isn't currently part of our external API -
@@ -18 +18 @@
 static libtrace_linktype_t arphrd_type_to_libtrace(unsigned int arphrd) {
         switch(arphrd) {
-                case ARPHRD_ETHER: return TRACE_TYPE_ETH;
-                case ARPHRD_EETHER: return TRACE_TYPE_ETH;
-                case ARPHRD_IEEE80211: return TRACE_TYPE_80211;
-                case ARPHRD_80211_RADIOTAP: return TRACE_TYPE_80211_RADIO;
-                case ARPHRD_PPP: return TRACE_TYPE_NONE;
-                case ARPHRD_LOOPBACK: return TRACE_TYPE_NONE;
-                case ARPHRD_NONE: return TRACE_TYPE_NONE;
+                case LIBTRACE_ARPHRD_ETHER: return TRACE_TYPE_ETH;
+                case LIBTRACE_ARPHRD_EETHER: return TRACE_TYPE_ETH;
+                case LIBTRACE_ARPHRD_IEEE80211: return TRACE_TYPE_80211;
+                case LIBTRACE_ARPHRD_IEEE80211_RADIOTAP: return TRACE_TYPE_80211_RADIO;
+                case LIBTRACE_ARPHRD_PPP: return TRACE_TYPE_NONE;
+                case LIBTRACE_ARPHRD_LOOPBACK: return TRACE_TYPE_NONE;
+                case LIBTRACE_ARPHRD_NONE: return TRACE_TYPE_NONE;
         }
         printf("Unknown ARPHRD: %u\n", arphrd);
@@ -62 +62 @@
         ret=trace_get_payload_from_meta(pkt, &linktype, &len);
         
-        if (ntohs(sll->hatype) == ARPHRD_ETHER || 
-                                ntohs(sll->hatype) == ARPHRD_LOOPBACK) { 
+        if (ntohs(sll->hatype) == LIBTRACE_ARPHRD_ETHER || 
+                                ntohs(sll->hatype) == LIBTRACE_ARPHRD_LOOPBACK) { 
                 
                 if (ntohs(sll->protocol) == 0x0060) {