Changeset 81f9b6e for lib

Timestamp:

05/03/06 00:38:02 (16 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:

e5f1431

Parents:

ef69a05

Message:

Commit experimental direction tagging for pcap, such that it is.

Location:

lib

Files:

• format_pcap.c (modified) (3 diffs)
• libtrace_int.h (modified) (1 diff)
• linktypes.c (modified) (6 diffs)

lib/format_pcap.c

@@ -366 +366 @@
         linktype = rt_to_pcap_dlt(packet->type);
         return pcap_dlt_to_libtrace(linktype);
+}
+
+static int8_t pcap_set_direction(libtrace_packet_t *packet,int8_t dir) {
+        libtrace_sll_header_t *sll;
+        promote_packet(packet);
+        sll=packet->payload;
+        if(dir==0)
+                sll->pkttype=0;
+        else
+                sll->pkttype=1;
+        return sll->pkttype;
 }
 
@@ -518 +529 @@
         pcap_get_link_type,             /* get_link_type */
         pcap_get_direction,             /* get_direction */
-        NULL,                           /* set_direction */
+        pcap_set_direction,             /* set_direction */
         NULL,                           /* get_erf_timestamp */
         pcap_get_timeval,               /* get_timeval */
@@ -553 +564 @@
         pcap_get_link_type,             /* get_link_type */
         pcap_get_direction,             /* get_direction */
-        NULL,                           /* set_direction */
+        pcap_set_direction,             /* set_direction */
         NULL,                           /* get_erf_timestamp */
         pcap_get_timeval,               /* get_timeval */

lib/libtrace_int.h

@@ -346 +346 @@
 void register_format(struct libtrace_format_t *format);
 
-libtrace_linktype_t pcap_dlt_to_libtrace(int dlt);
-char libtrace_to_pcap_dlt(libtrace_linktype_t type);
-enum rt_field_t pcap_dlt_to_rt(int dlt);
-int rt_to_pcap_dlt(enum rt_field_t rt_type);
+libtrace_linktype_t pcap_dlt_to_libtrace(libtrace_dlt_t dlt);
+libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type);
+enum rt_field_t pcap_dlt_to_rt(libtrace_dlt_t dlt);
+libtrace_dlt_t rt_to_pcap_dlt(enum rt_field_t rt_type);
 libtrace_linktype_t erf_type_to_libtrace(char erf);
 char libtrace_to_erf_type(libtrace_linktype_t linktype);
+
+void promote_packet(libtrace_packet_t *packet);
 
 #if HAVE_BPF

lib/linktypes.c

@@ -7 +7 @@
 #include "rt_protocol.h"
 #include <assert.h>
+#include "libtrace_int.h"
+#include <stdlib.h>
+#include <net/if_arp.h>
+#include <string.h>
 
 /* This file maps libtrace types to/from pcap DLT and erf types
@@ -25 +29 @@
                 case TRACE_DLT_PFLOG: return TRACE_TYPE_PFLOG;
         }
-        return -1;
+        return ~0;
 }
 
-int libtrace_to_pcap_dlt(libtrace_linktype_t type)
+libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type)
 {
         switch(type) {
@@ -38 +42 @@
                 case TRACE_TYPE_PFLOG: return TRACE_DLT_PFLOG;
         }
-        return -1;
+        return ~0;
 }
 
-enum rt_field_t pcap_dlt_to_rt(int dlt) 
+enum rt_field_t pcap_dlt_to_rt(libtrace_dlt_t dlt) 
 {
         /* For pcap the rt type is just the dlt + a fixed value */
@@ -47 +51 @@
 }
 
-int rt_to_pcap_dlt(enum rt_field_t rt_type)
+libtrace_dlt_t rt_to_pcap_dlt(enum rt_field_t rt_type)
 {
         assert(rt_type >= RT_DATA_PCAP);
@@ -61 +65 @@
                 case TYPE_AAL5:         return TRACE_TYPE_AAL5;
         }
-        return -1;
+        return ~0;
 }
 
@@ -74 +78 @@
         return -1;
 }
+
+/** Tinker with a packet
+ * packets that don't support direction tagging are annoying, especially
+ * when we have direction tagging information!  So this converts the packet
+ * to TRACE_TYPE_LINUX_SLL which does support direction tagging.  This is a
+ * pcap style packet for the reason that it means it works with bpf filters.
+ *
+ * @note this will copy the packet, so use sparingly if possible.
+ */
+void promote_packet(libtrace_packet_t *packet)
+{
+        if (packet->trace->format->type == TRACE_FORMAT_PCAP) {
+                char *tmpbuffer;
+                libtrace_sll_header_t *hdr;
+
+                switch(pcap_dlt_to_libtrace(rt_to_pcap_dlt(packet->type))) {
+                        case TRACE_TYPE_LINUX_SLL:
+                                return; /* Unnecessary */
+
+                        case TRACE_TYPE_ETH:
+                                /* This should be easy, just prepend the header */
+                                tmpbuffer= malloc(sizeof(libtrace_sll_header_t)
+                                                +trace_get_capture_length(packet)
+                                                +trace_get_framing_length(packet)
+                                                );
+
+                                hdr=(void*)((char*)tmpbuffer
+                                        +trace_get_framing_length(packet));
+
+                                hdr->pkttype=0; /* "outgoing" */
+                                hdr->hatype = ARPHRD_ETHER;
+                                break;
+                        default:
+                                /* failed */
+                                return;
+                }
+                memcpy(tmpbuffer,packet->header,
+                                trace_get_framing_length(packet));
+                memcpy(tmpbuffer
+                                +sizeof(libtrace_sll_header_t)
+                                +trace_get_framing_length(packet),
+                                packet->payload,
+                                trace_get_capture_length(packet));
+                if (packet->buf_control == TRACE_CTRL_EXTERNAL) {
+                        packet->buf_control=TRACE_CTRL_PACKET;
+                }
+                else {
+                        free(packet->buffer);
+                }
+                packet->buffer=tmpbuffer;
+                packet->header=tmpbuffer;
+                packet->payload=tmpbuffer+trace_get_framing_length(packet);
+                packet->type=TRACE_TYPE_LINUX_SLL;
+                return;
+        }
+}