Changeset 9d89626

Timestamp:

03/26/15 11:44:45 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

f50515e

Parents:

e99c493

Message:

Various fixes to the linux format to support compiling on BSD

Location:

lib

Files:

• format_linux_common.c (modified) (1 diff)
• format_linux_common.h (modified) (1 diff)
• format_linux_ring.c (modified) (7 diffs)

lib/format_linux_common.c

@@ -681 +681 @@
 #endif /* HAVE_NETPACKET_PACKET_H */
 
-
-inline libtrace_direction_t linuxcommon_get_direction(uint8_t pkttype)
-{
-        switch (pkttype) {
-                case PACKET_OUTGOING:
-                case PACKET_LOOPBACK:
-                        return TRACE_DIR_OUTGOING;
-                case PACKET_OTHERHOST:
-                        return TRACE_DIR_OTHER;
-                default:
-                        return TRACE_DIR_INCOMING;
-        }
-}
-
-inline libtrace_direction_t
-linuxcommon_set_direction(struct sockaddr_ll * skadr,
-                          libtrace_direction_t direction)
-{
-        switch (direction) {
-                case TRACE_DIR_OUTGOING:
-                        skadr->sll_pkttype = PACKET_OUTGOING;
-                        return TRACE_DIR_OUTGOING;
-                case TRACE_DIR_INCOMING:
-                        skadr->sll_pkttype = PACKET_HOST;
-                        return TRACE_DIR_INCOMING;
-                case TRACE_DIR_OTHER:
-                        skadr->sll_pkttype = PACKET_OTHERHOST;
-                        return TRACE_DIR_OTHER;
-                default:
-                        return -1;
-        }
-}
-
-inline libtrace_linktype_t linuxcommon_get_link_type(uint16_t linktype)
-{
-        /* Convert the ARPHRD type into an appropriate libtrace link type */
-        switch (linktype) {
-                case LIBTRACE_ARPHRD_ETHER:
-                case LIBTRACE_ARPHRD_LOOPBACK:
-                        return TRACE_TYPE_ETH;
-                case LIBTRACE_ARPHRD_PPP:
-                        return TRACE_TYPE_NONE;
-                case LIBTRACE_ARPHRD_IEEE80211_RADIOTAP:
-                        return TRACE_TYPE_80211_RADIO;
-                case LIBTRACE_ARPHRD_IEEE80211:
-                        return TRACE_TYPE_80211;
-                case LIBTRACE_ARPHRD_SIT:
-                case LIBTRACE_ARPHRD_NONE:
-                        return TRACE_TYPE_NONE;
-                default: /* shrug, beyond me! */
-                        printf("unknown Linux ARPHRD type 0x%04x\n",linktype);
-                        return (libtrace_linktype_t)~0U;
-        }
-}

lib/format_linux_common.h

@@ -326 +326 @@
 
 void linuxcommon_get_statistics(libtrace_t *libtrace, libtrace_stat_t *stat);
-inline libtrace_direction_t linuxcommon_get_direction(uint8_t pkttype);
-inline libtrace_direction_t linuxcommon_set_direction(struct sockaddr_ll * skadr,
-                                                 libtrace_direction_t direction);
-inline libtrace_linktype_t linuxcommon_get_link_type(uint16_t linktype);
-
+
+static inline libtrace_direction_t linuxcommon_get_direction(uint8_t pkttype)
+{
+        switch (pkttype) {
+                case PACKET_OUTGOING:
+                case PACKET_LOOPBACK:
+                        return TRACE_DIR_OUTGOING;
+                case PACKET_OTHERHOST:
+                        return TRACE_DIR_OTHER;
+                default:
+                        return TRACE_DIR_INCOMING;
+        }
+}
+
+static inline libtrace_direction_t
+linuxcommon_set_direction(struct sockaddr_ll * skadr,
+                          libtrace_direction_t direction)
+{
+        switch (direction) {
+                case TRACE_DIR_OUTGOING:
+                        skadr->sll_pkttype = PACKET_OUTGOING;
+                        return TRACE_DIR_OUTGOING;
+                case TRACE_DIR_INCOMING:
+                        skadr->sll_pkttype = PACKET_HOST;
+                        return TRACE_DIR_INCOMING;
+                case TRACE_DIR_OTHER:
+                        skadr->sll_pkttype = PACKET_OTHERHOST;
+                        return TRACE_DIR_OTHER;
+                default:
+                        return -1;
+        }
+}
+
+static inline libtrace_linktype_t linuxcommon_get_link_type(uint16_t linktype)
+{
+        /* Convert the ARPHRD type into an appropriate libtrace link type */
+        switch (linktype) {
+                case LIBTRACE_ARPHRD_ETHER:
+                case LIBTRACE_ARPHRD_LOOPBACK:
+                        return TRACE_TYPE_ETH;
+                case LIBTRACE_ARPHRD_PPP:
+                        return TRACE_TYPE_NONE;
+                case LIBTRACE_ARPHRD_IEEE80211_RADIOTAP:
+                        return TRACE_TYPE_80211_RADIO;
+                case LIBTRACE_ARPHRD_IEEE80211:
+                        return TRACE_TYPE_80211;
+                case LIBTRACE_ARPHRD_SIT:
+                case LIBTRACE_ARPHRD_NONE:
+                        return TRACE_TYPE_NONE;
+                default: /* shrug, beyond me! */
+                        printf("unknown Linux ARPHRD type 0x%04x\n",linktype);
+                        return (libtrace_linktype_t)~0U;
+        }
+}
 
 #endif /* FORMAT_LINUX_COMMON_H */

lib/format_linux_ring.c

@@ -63 +63 @@
 #include "format_linux_common.h"
 
+/* Get the start of the captured data. I'm not sure if tp_mac (link layer) is
+ * always guaranteed. If it's not there then just use tp_net.
+ */
+#define TP_TRACE_START(mac, net, hdrend) \
+        ((mac) > (hdrend) && (mac) < (net) ? (mac) : (net))
+
 #ifdef HAVE_NETPACKET_PACKET_H
 /* Get current frame in the ring buffer*/
@@ -69 +75 @@
          (stream->rxring_offset *                               \
           stream->req.tp_frame_size))
-#endif
-
-/* Get the start of the captured data. I'm not sure if tp_mac (link layer) is
- * always guaranteed. If it's not there then just use tp_net.
- */
-#define TP_TRACE_START(mac, net, hdrend) \
-        ((mac) > (hdrend) && (mac) < (net) ? (mac) : (net))
+
 /* Cached page size, the page size shouldn't be changing */
 static int pagesize = 0;
@@ -351 +351 @@
         return 0;
 }
+#endif /* HAVE_NETPACKET_PACKET_H */
 
 static libtrace_linktype_t
@@ -454 +455 @@
         return 0;
 }
+
+#ifdef HAVE_NETPACKET_PACKET_H
 #define LIBTRACE_MIN(a,b) ((a)<(b) ? (a) : (b))
 inline static int linuxring_read_stream(libtrace_t *libtrace,
@@ -700 +703 @@
 
 }
-
-#ifdef HAVE_NETPACKET_PACKET_H
 
 static void linuxring_help(void)
@@ -765 +766 @@
         NULL                            /* get thread stats */
 };
-#else
+#else /* HAVE_NETPACKET_PACKET_H */
 
 static void linuxring_help(void)
@@ -816 +817 @@
         NON_PARALLEL(true)
 };
-#endif
+#endif /* HAVE_NETPACKET_PACKET_H */
 
 /* TODO: Figure out how to give this format preference over the linux native