Changeset 9075d49 for lib/trace.c

Timestamp:

03/23/05 22:34:39 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

23c13e8

Parents:

783825a

Message:

added in pcap ppp support (DLT_LINUX_SLL). This includes direction tagging
support, so get_direction will work on a PPP interface in linux

File:

• lib/trace.c (modified) (4 diffs)

lib/trace.c

@@ -1530 +1530 @@
                                 pcap = pcap_open_dead(DLT_EN10MB, 1500);
                                 break;
+                        case TRACE_TYPE_LINUX_SLL:
+                                pcap = pcap_open_dead(DLT_LINUX_SLL, 1500);
+                                break;
                         default:
-                                printf("only works for ETH at the moment\n");
+                                printf("only works for ETH and LINUX_SLL (ppp) at the moment\n");
                                 assert(0);
                 }               
@@ -1583 +1586 @@
  * @param packet a pointer to a libtrace_packet structure
  * @returns a signed value containing the direction flag, or -1 if this is not supported
+ * The direction is defined as 0 for packets originating locally (ie, outbound)
+ * and 1 for packets originating remotely (ie, inbound).
+ * Other values are possible, which might be overloaded to mean special things
+ * for a special trace.
  * @author Daniel Lawson
  */
@@ -1600 +1607 @@
                         break;
                 case PCAP:
+                case PCAPINT:
                         switch (trace_get_link_type(packet)) {
                                 case TRACE_TYPE_LINUX_SLL:
@@ -1606 +1614 @@
                                                 sll = trace_get_link(packet);
                                                 /* 0 == LINUX_SLL_HOST */
-                                                if (sll->pkttype==0) {
-                                                        direction = 0;
+                                                /* the Waikato Capture point defines "packets
+                                                 * originating locally" (ie, outbound), with a
+                                                 * direction of 0, and "packets destined locally"
+                                                 * (ie, inbound), with a direction of 1.
+                                                 * This is kind-of-opposite to LINUX_SLL.
+                                                 * We return consistent values here, however
+                                                 *
+                                                 * Note that in recent versions of pcap, you can
+                                                 * use "inbound" and "outbound" on ppp in linux
+                                                 */
+                                                if (ntohs(sll->pkttype==0)) {
+
+                                                        direction = 1;
                                                 }
                                                 else {
-                                                        direction = 1;
+                                                        direction = 0;
                                                 }
                                                 break;