Changeset 97e39a7

Timestamp:

04/14/06 14:13:07 (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:

566e404

Parents:

6b0560b

Message:

Port new linux native capture type from libtrace 2.
Fail if we try and decode a pcap link type and we don't have pcap installed.

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• format_linux.c (added)
• format_pcap.c (modified) (1 diff)
• libtrace.h (modified) (1 diff)
• libtrace_int.h (modified) (1 diff)
• linktypes.c (modified) (2 diffs)
• protocols.c (modified) (1 diff)

lib/Makefile.am

@@ -5 +5 @@
 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h \
                 format_erf.c format_pcap.c format_wag.c format_legacy.c format_rt.c\
-                format_helper.c format_helper.h \
+                format_helper.c format_helper.h format_linux.c \
                 parse_cmd.c parse_cmd.h libtrace_int.h lt_inttypes.h \
                 linktypes.c protocols.c

lib/format_pcap.c

@@ -326 +326 @@
          */
         linktype = rt_to_pcap_dlt(packet->type);
-        /*
-        if (packet->trace->format_data == NULL) 
-                linktype = rt_to_pcap_dlt(packet->type);
-        else 
-                linktype = pcap_datalink(DATA(packet->trace)->input.pcap);
-        */
         return pcap_dlt_to_libtrace(linktype);
 }

lib/libtrace.h

@@ -1190 +1190 @@
         TRACE_FORMAT_LEGACY_ATM   =5,
         TRACE_FORMAT_LEGACY_POS   =6,
-        TRACE_FORMAT_LEGACY_ETH   =7
+        TRACE_FORMAT_LEGACY_ETH   =7,
+        TRACE_FORMAT_LINUX_NATIVE =8
 };
 

lib/libtrace_int.h

@@ -208 +208 @@
          * if this function is not supported, this field may be NULL.
          */
-        int (*read_packet)(libtrace_t *libtrace, struct libtrace_packet_t *packet);
+        int (*read_packet)(libtrace_t *libtrace, libtrace_packet_t *packet);
         /** finalise a packet
          * cleanup any resources used by a packet that can't be reused for

lib/linktypes.c

@@ -1 +1 @@
 #include "libtrace.h"
+#include "config.h"
 #ifdef HAVE_PCAP
 #include <pcap.h>
@@ -28 +29 @@
                 case DLT_PFLOG: return TRACE_TYPE_PFLOG;
 #endif
+#else
+                default:
+                                assert(!"No pcap support");
 #endif
         }

lib/protocols.c

@@ -185 +185 @@
                         return trace_get_payload_from_atm(link,type,remaining);
         }
-        fprintf(stderr,"Don't understand link layer type %i in trace_get_ip6()\n",
+        fprintf(stderr,"Don't understand link layer type %i in trace_get_payload_from_link()\n",
                 linktype);
         return NULL;