Changeset 7ac9705 for lib/rt_protocol.h

Timestamp:

03/06/06 15:31:15 (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:

e4e1635

Parents:

eeab9832

Message:

Changed rt types so that every pcap dlt has a matching rt type
Added functions for conversion between rt type and pcap dlt
format_rt now uses trace_set_err appropriately if rt_connect fails
format_pcap will check if a trace is dead before trying to look at

format data

Dead traces now have their format_data set to NULL
packet->type is now 32 bits, not 8

File:

• lib/rt_protocol.h (modified) (3 diffs)

lib/rt_protocol.h

@@ -3 +3 @@
 
 #include "libtrace.h"
+#include <pcap.h>
 
 #define CAPTURE_PORT 3434
@@ -9 +10 @@
 #define RT_MAX_HDR_SIZE 256
 #define MAX_SEQUENCE 2147483647 
+
+#define RT_DATA_SIMPLE 1000
+#define RT_DATA_PCAP 2000
 
 /* Type field definitions */
@@ -24 +28 @@
  RT_OPTION      =11,    /* Option request */
  
- RT_DATA_ERF            =12,    /* Erf data packet */
- RT_DATA_PCAP           =13,    /* Pcap data packet */
- RT_DATA_WAG            =14,    /* Wag data packet */
- RT_DATA_LEGACY_ATM     =15,    /* Legacy ATM packet */
- RT_DATA_LEGACY_POS     =16,    /* Legacy POS packet */
- RT_DATA_LEGACY_ETH     =17     /* Legacy ETH packet */
+ RT_DATA_ERF            =RT_DATA_SIMPLE + TRACE_FORMAT_ERF, 
+ RT_DATA_WAG            =RT_DATA_SIMPLE + TRACE_FORMAT_WAG, 
+ RT_DATA_LEGACY_ATM     =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_ATM, 
+ RT_DATA_LEGACY_POS     =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_POS, 
+ RT_DATA_LEGACY_ETH     =RT_DATA_SIMPLE + TRACE_FORMAT_LEGACY_ETH, 
+
+ 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
+
 };