Changeset d5e1796

Timestamp:

10/25/06 15:42:38 (14 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:

c9f6ee5

Parents:

16da8f3

Message:

Add support to convert from Endance-ATM to PCAP-LLCSnap

Location:

lib

Files:

• format_pcap.c (modified) (1 diff)
• libtrace.h.in (modified) (3 diffs)
• linktypes.c (modified) (2 diffs)
• protocols.c (modified) (1 diff)

lib/format_pcap.c

@@ -310 +310 @@
 {
         struct pcap_pkthdr pcap_pkt_hdr;
+
+        /* If this packet cannot be converted to a pcap linktype then
+         * pop off the top header until it can be converted
+         */
+        while (libtrace_to_pcap_dlt(trace_get_link_type(packet))==~0) {
+                if (!demote_packet(packet)) {
+                        trace_set_err_out(libtrace, 
+                                TRACE_ERR_NO_CONVERSION,
+                                "pcap does not support this format");
+                        return -1;
+                }
+        }
 
         if (!OUTPUT.trace.pcap) {

lib/libtrace.h.in

@@ -170 +170 @@
 #define LIBTRACE_PACKET_BUFSIZE 65536
 
-/** The libtrace packet structure, applications shouldn't be 
- * meddling around in here 
- */
-typedef struct libtrace_packet_t {
-        struct libtrace_t *trace; /**< pointer to the trace */
-        void *header;           /**< pointer to the framing header */
-        void *payload;          /**< pointer to the link layer */
-        void *buffer;           /**< allocated buffer */
-        uint32_t type;          /**< rt protocol type for the packet */
-        buf_control_t buf_control; /**< who owns the memory */
-} libtrace_packet_t;
-
 /** libtrace error information */
 typedef struct trace_err_t{
@@ -216 +204 @@
         TRACE_DLT_LINUX_SLL = 113,
         TRACE_DLT_PFLOG = 117,
-    TRACE_DLT_IEEE802_11_RADIO = 127 /**< Radiotap */
+        TRACE_DLT_IEEE802_11_RADIO = 127 /**< Radiotap */
 } libtrace_dlt_t ;
 
@@ -235 +223 @@
        TRACE_TYPE_80211_PRISM = 12,
        TRACE_TYPE_AAL5 = 13,
-       TRACE_TYPE_DUCK = 14,            /**< Pseudo link layer for DUCK packets */
-       TRACE_TYPE_80211_RADIO = 15 /**< Radiotap + 802.11 */
-     } libtrace_linktype_t;
+       TRACE_TYPE_DUCK = 14,         /**< Pseudo link layer for DUCK packets */
+       TRACE_TYPE_80211_RADIO = 15,  /**< Radiotap + 802.11 */
+       TRACE_TYPE_LLCSNAP = 16,      /**< Raw LLC/SNAP */
+        
+} libtrace_linktype_t;
+
+typedef enum {
+        TRACE_RT_DLT_ATM_RFC1483 = 2000+TRACE_DLT_ATM_RFC1483,
+        TRACE_RT_LAST   = (2<<31)
+} libtrace_rt_types_t;
+
+/** The libtrace packet structure, applications shouldn't be 
+ * meddling around in here 
+ */
+typedef struct libtrace_packet_t {
+        struct libtrace_t *trace;       /**< pointer to the trace */
+        void *header;                   /**< pointer to the framing header */
+        void *payload;                  /**< pointer to the link layer */
+        void *buffer;                   /**< allocated buffer */
+        libtrace_rt_types_t  type;      /**< rt protocol type for the packet */
+        buf_control_t buf_control;      /**< who owns the memory */
+} libtrace_packet_t;
+
 
 /** Trace directions 

lib/linktypes.c

@@ -37 +37 @@
                 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;
-                case TRACE_DLT_IEEE802_11_RADIO:
-                                        return TRACE_TYPE_80211_RADIO;
-        }
-        return ~0;
-}
+                case TRACE_DLT_PFLOG: return TRACE_TYPE_PFLOG;
+                case TRACE_DLT_IEEE802_11_RADIO: return TRACE_TYPE_80211_RADIO;
+                case TRACE_DLT_ATM_RFC1483: return TRACE_TYPE_LLCSNAP;
+                                         
+        }
+        return ~0;
+}
+
 
 libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type)
 {
+        /* If pcap doesn't have a DLT, you can either ask pcap to register
+         * you a DLT, (and perhaps write a tcpdump decoder for it), or you
+         * can add it to demote_packet
+         */
         switch(type) {
                 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;
-        case TRACE_TYPE_80211_RADIO: return TRACE_DLT_IEEE802_11_RADIO;
+                case TRACE_TYPE_80211_RADIO: return TRACE_DLT_IEEE802_11_RADIO;
+                case TRACE_TYPE_ATM: 
+                        /* Dispite hints to the contrary, there is no DLT
+                         * for 'raw atm packets that happen to be missing
+                         * the HEC' or even 'raw atm packets that have a hec'.
+                         *
+                         * The closest are DLT_ATM_RFC1483 but that doesn't
+                         * include the ATM header, only the LLCSNAP header.
+                         */
+                        return ~0;
+                case TRACE_TYPE_LLCSNAP: return TRACE_DLT_ATM_RFC1483;
         }
         return ~0;
@@ -196 +209 @@
 bool demote_packet(libtrace_packet_t *packet)
 {
+        uint8_t type;
+        uint32_t remaining;
+        char *tmp;
+        struct timeval tv;
+        static libtrace_t *trace = NULL;
         switch(trace_get_link_type(packet)) {
+                case TRACE_TYPE_ATM:
+                        remaining=trace_get_capture_length(packet);
+                        packet->payload=trace_get_payload_from_atm(
+                                packet->payload,&type,&remaining);
+
+                        tmp=malloc(
+                                trace_get_capture_length(packet)
+                                +sizeof(libtrace_pcapfile_pkt_hdr_t)
+                                );
+
+                        tv=trace_get_timeval(packet);
+                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->ts_sec=tv.tv_sec;
+                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->ts_usec=tv.tv_usec;
+                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->caplen
+                                = remaining;
+                        ((libtrace_pcapfile_pkt_hdr_t*)tmp)->wirelen
+                                = trace_get_capture_length(packet)-remaining;
+
+                        memcpy(tmp+sizeof(libtrace_pcapfile_pkt_hdr_t),
+                                        packet->payload,
+                                        remaining);
+                        if (packet->buf_control == TRACE_CTRL_EXTERNAL) {
+                                packet->buf_control=TRACE_CTRL_PACKET;
+                        }
+                        else {
+                                free(packet->buffer);
+                        }
+                        packet->buffer=tmp;
+                        packet->header=tmp;
+                        packet->payload=tmp+sizeof(libtrace_pcapfile_pkt_hdr_t);
+                        packet->type=pcap_dlt_to_rt(TRACE_DLT_ATM_RFC1483);
+                        
+                        if (trace == NULL) {
+                                trace = trace_create_dead("pcap:-");
+                        }
+
+                        packet->trace=trace;
+
+                        return true;
+
                 case TRACE_TYPE_LINUX_SLL:
                         switch(ntohs(((libtrace_sll_header_t*)packet->payload)

lib/protocols.c

@@ -174 +174 @@
 }
 
-static void *trace_get_payload_from_atm(void *link,
+DLLEXPORT
+void *trace_get_payload_from_atm(void *link,
                 uint8_t *type, uint32_t *remaining)
 {