Changeset c4be35b for lib

Timestamp:

03/23/05 18:11:01 (17 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:

783825a

Parents:

ea161ea

Message:

Added support for pcap NULL link layer and linux SLL link layer (with
direction handling!)

This should make ppp work under Linux

Location:

lib

Files:

• libtrace.h (modified) (1 diff)
• trace.c (modified) (7 diffs)

lib/libtrace.h

@@ -375 +375 @@
        TRACE_TYPE_ETH,
        TRACE_TYPE_ATM,
-       TRACE_TYPE_80211
+       TRACE_TYPE_80211,
+       TRACE_TYPE_NONE,
+       TRACE_TYPE_LINUX_SLL
      } libtrace_linktype_t;
 

lib/trace.c

@@ -169 +169 @@
         double last_ts;
         double start_ts;
+};
+
+struct trace_sll_header_t {
+        uint16_t pkttype;               /* packet type */
+        uint16_t hatype;                /* link-layer address type */
+        uint16_t halen;                 /* link-layer address length */
+        char addr[8];                   /* link-layer address */
+        uint16_t protocol;              /* protocol */
 };
 
@@ -801 +809 @@
  */
 void *trace_get_link(const struct libtrace_packet_t *packet) {
-        void *ethptr = 0;
+        const void *ethptr = 0;
         dag_record_t *erfptr = 0;
         struct wag_event_t *event = (struct wag_event_t *)packet->buffer;
@@ -825 +833 @@
                 case PCAPINT:
                 case PCAP:
-                        ethptr = (struct ether_header *)(packet->buffer + sizeof(struct pcap_pkthdr));
+                        ethptr = (packet->buffer + sizeof(struct pcap_pkthdr));
                         break;
 #endif
@@ -886 +894 @@
                                 break;
                         }
+                case TRACE_TYPE_NONE:
+                        ipptr = trace_get_link(packet);
+                        break;
+                case TRACE_TYPE_LINUX_SLL:
+                        {
+                                struct trace_sll_header_t *sll;
+
+                                sll = trace_get_link(packet);
+                                if (ntohs(sll->protocol)!=0x0800) {
+                                        ipptr = NULL;
+                                }
+                                else {
+                                        ipptr = ((void*)sll)+sizeof(*sll);
+                                }
+                        }
+                        break;
                 case TRACE_TYPE_ATM:
                         {
@@ -1296 +1320 @@
                         linktype = pcap_datalink(packet->trace->input.pcap);
                         switch (linktype) {
-                                case 1:
+                                case DLT_NULL:
+                                        return TRACE_TYPE_NONE;
+                                case DLT_EN10MB:
                                         return TRACE_TYPE_ETH; 
-                                case 11:
+                                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
                         }
                         break;
@@ -1560 +1590 @@
         dag_record_t *erfptr = 0;
         assert(packet);
+        direction = -1;
 
         switch(packet->trace->format) {
@@ -1568 +1599 @@
                         direction = erfptr->flags.iface;
                         break;
+                case PCAP:
+                        switch (trace_get_link_type(packet)) {
+                                case TRACE_TYPE_LINUX_SLL:
+                                        {
+                                                struct trace_sll_header_t *sll;
+                                                sll = trace_get_link(packet);
+                                                /* 0 == LINUX_SLL_HOST */
+                                                if (sll->pkttype==0) {
+                                                        direction = 0;
+                                                }
+                                                else {
+                                                        direction = 1;
+                                                }
+                                                break;
+                                        }
+                                default:
+                                        /* pass */
+                        }
                 default:
-                        direction = -1;
+                        /* pass */
         }