Changeset 17c5749

Timestamp:

07/22/14 12:57:50 (7 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:

41148f2

Parents:

54834a1 (diff), a6c77b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upsteam/develop' into FixingDPDK

Conflicts:

README
lib/format_linux.c
test/Makefile

Files:

• README (modified) (1 diff)
• configure.in (modified) (4 diffs)
• lib/format_linux.c (modified) (2 diffs)
• lib/format_pcap.c (modified) (1 diff)
• lib/libtrace.h.in (modified) (3 diffs)
• lib/protocols_l3.c (modified) (1 diff)
• lib/protocols_transport.c (modified) (4 diffs)
• libpacketdump/eth_2048.c (modified) (4 diffs)
• libpacketdump/ip_1.c (modified) (1 diff)
• libpacketdump/ip_17.c (modified) (4 diffs)
• libpacketdump/ip_33.c (modified) (4 diffs)
• libpacketdump/ip_6.c (modified) (5 diffs)
• libpacketdump/ip_89.c (modified) (2 diffs)
• libpacketdump/libpacketdump.h (modified) (1 diff)
• libwandio/Makefile.am (modified) (1 diff)
• libwandio/ior-lzma.c (added)
• libwandio/iow-lzma.c (added)
• libwandio/iow-lzo.c (modified) (2 diffs)
• libwandio/wandio.c (modified) (7 diffs)
• libwandio/wandio.h (modified) (6 diffs)
• libwandio/wcat.c (added)
• test/Makefile (modified) (1 diff)
• test/do-live-tests.sh (added)
• test/do-tests.sh (modified) (2 diffs)
• test/netns-env.sh (added)
• test/test-fragment.c (added)
• test/test-live-snaplen.c (added)
• test/test-live.c (added)
• test/test-ports.c (added)
• test/traces/5_packets.erf.xz (added)
• test/traces/fragtest.erf.gz (added)
• tools/traceanon/traceanon.1 (modified) (1 diff)
• tools/traceanon/traceanon.c (modified) (1 diff)
• tools/tracemerge/tracemerge.1 (modified) (1 diff)
• tools/tracemerge/tracemerge.c (modified) (1 diff)
• tools/tracesplit/tracesplit.1 (modified) (1 diff)
• tools/tracesplit/tracesplit.c (modified) (1 diff)

README

@@ -4 +4 @@
 Libtrace functions might not function correctly breaking the supplied tools.
 
-libtrace 3.0.19
+libtrace 3.0.20
 
 ---------------------------------------------------------------------------

configure.in

@@ -4 +4 @@
 # and in the README
 
-AC_INIT([libtrace],[3.0.19],[contact@wand.net.nz],[libtrace])
+AC_INIT([libtrace],[3.0.20],[contact@wand.net.nz],[libtrace])
 
 LIBTRACE_MAJOR=3
 LIBTRACE_MID=0
-LIBTRACE_MINOR=19
+LIBTRACE_MINOR=20
 
 # OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not
@@ -580 +580 @@
 )
 
+AC_ARG_WITH([lzma],
+        AC_HELP_STRING([--with-lzma], [build with support for lzma compressed files]))
+
+AS_IF([test "x$with_lzma" != "xno"],
+        [
+        AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
+        ], [have_lzma=no])
+
+AS_IF([test "x$have_lzma" = "xyes"], [
+        if test "$ac_cv_lib_lzma_code" != "none required"; then
+                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzma"
+        fi
+        AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support")
+        with_lzma=yes],
+
+        
+        [AS_IF([test "x$with_lzma" = "xyes"],
+                [AC_MSG_ERROR([lzma requested but not found])])
+        AC_DEFINE(HAVE_LIBLZMA, 0, "Compiled with lzma support")
+        with_lzma=no]
+)
 
 # Define automake conditionals for use in our Makefile.am files
@@ -594 +615 @@
 AM_CONDITIONAL([HAVE_ZLIB], [test "x$with_zlib" != "xno"])
 AM_CONDITIONAL([HAVE_LZO], [ test "x$with_lzo" != "xno"])
+AM_CONDITIONAL([HAVE_LZMA], [ test "x$with_lzma" != "xno"])
 
 # Check for miscellaneous programs
@@ -648 +670 @@
 reportopt "Compiled with compressed trace (bz2) support" $with_bzip2
 reportopt "Compiled with compressed trace (lzo write only) support" $with_lzo
+reportopt "Compiled with compressed trace (lzma) support" $with_lzma
 if test x"$libtrace_dag" = xtrue; then
         if test "$libtrace_dag_version" = 24; then

lib/format_linux.c

@@ -1109 +1109 @@
         if (check_queue) {
                 // Check for a packet - TODO only Linux has MSG_DONTWAIT should use fctl O_NONBLOCK
-                hdr->wirelen = recvmsg(fd, &msghdr, MSG_DONTWAIT);
+                hdr->wirelen = recvmsg(fd, &msghdr, MSG_DONTWAIT | MSG_TRUNC);
                 if ((int) hdr->wirelen == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
                         // Do message queue check or select
@@ -1136 +1136 @@
                 }
         } else {
-                hdr->wirelen = recvmsg(fd, &msghdr, 0);
+                hdr->wirelen = recvmsg(fd, &msghdr, MSG_TRUNC);
         }
         

lib/format_pcap.c

@@ -578 +578 @@
 static libtrace_direction_t pcap_set_direction(libtrace_packet_t *packet,
                 libtrace_direction_t dir) {
-        
+
+        /* We only support tagging with IN or OUT return error for any others */
+        if(!(dir == TRACE_DIR_OUTGOING || dir == TRACE_DIR_INCOMING))
+                return -1;
+
         /* PCAP doesn't have a direction field in the header, so we need to
          * promote to Linux SLL to tag it properly */

lib/libtrace.h.in

@@ -883 +883 @@
         uint8_t ospf_v;         /**< OSPF Version, should be 2 */
         uint8_t type;           /**< OSPF Packet Type */
-        uint16_t len;           /**< Packet length, including OSPF header */
+        uint16_t ospf_len;      /**< Packet length, including OSPF header */
         struct in_addr router;  /**< Router ID of the packet source */
         struct in_addr area;    /**< Area the packet belongs to */
@@ -1255 +1255 @@
         TRACE_OPTION_COMPRESSTYPE_BZ2  = 2, /**< BZip2 Compression */
         TRACE_OPTION_COMPRESSTYPE_LZO  = 3,  /**< LZO Compression */
+        TRACE_OPTION_COMPRESSTYPE_LZMA  = 4,  /**< LZO Compression */
         TRACE_OPTION_COMPRESSTYPE_LAST
 } trace_option_compresstype_t;
@@ -1795 +1796 @@
 DLLEXPORT uint16_t *trace_checksum_transport(libtrace_packet_t *packet,
                 uint16_t *csum);
+
+/** Calculates the fragment offset in bytes for an IP packet
+ * @param packet        The libtrace packet to calculate the offset for
+ * @param[out] more     A boolean flag to indicate whether there are more
+ *                      fragments after the current packet.
+ * @return The fragment offset for the packet in bytes. If the packet is not
+ * an IP packet or the fragment offset is not present in packet, the return
+ * value will be 0.
+ *
+ * @note The value returned is in bytes, not 8-octet units as it is stored
+ * in the fragment offset field in the headers. In other words, libtrace
+ * automatically does the multiplication for you.
+ *
+ * The value passed in for 'more' does not matter; it will be overwritten
+ * with the value of the More Fragments flag from the IP header.
+ *
+ * New in libtrace 3.0.20
+ */
+DLLEXPORT uint16_t trace_get_fragment_offset(const libtrace_packet_t *packet,
+                uint8_t *more); 
 
 /** Gets a pointer to the transport layer header (if any)

lib/protocols_l3.c

@@ -724 +724 @@
 }
 
+DLLEXPORT uint16_t trace_get_fragment_offset(const libtrace_packet_t *packet, 
+                uint8_t *more) {
+
+        void *l3;
+        uint16_t ethertype;
+        uint32_t remaining;
+
+        *more = 0;
+
+        l3 = trace_get_layer3(packet, &ethertype, &remaining);
+        if (l3 == NULL)
+                return 0;
+
+        if (ethertype == TRACE_ETHERTYPE_IP) {
+                libtrace_ip_t *ip = (libtrace_ip_t *)l3;
+                uint16_t offset = 0;
+
+                /* Fragment offset appears in 7th and 8th bytes */
+                if (remaining < 8)
+                        return 0;
+                 
+                offset = ntohs(ip->ip_off);
+
+                if ((offset & 0x2000) != 0)
+                        *more = 1;
+                return (offset & 0x1FFF) * 8;
+        }
+
+        if (ethertype == TRACE_ETHERTYPE_IPV6) {
+                libtrace_ip6_t *ip6 = (libtrace_ip6_t *)l3;
+                void *payload = ip6++;
+                uint8_t nxt = ip6->nxt;
+                uint16_t len;
+                
+                /* First task, find a Fragment header if present */
+                if (remaining < sizeof(libtrace_ip6_t))
+                        return 0;
+                remaining -= sizeof(libtrace_ip6_t);
+
+                /* Adapted from trace_get_payload_from_ip6 */
+                while (1) {
+                        switch (nxt) {
+                        case 0:
+                        case TRACE_IPPROTO_ROUTING:
+                        case TRACE_IPPROTO_AH: 
+                        case TRACE_IPPROTO_DSTOPTS: 
+                        {
+
+                                /* Length does not include the first 8 bytes */
+                                len=((libtrace_ip6_ext_t*)payload)->len * 8;
+                                len += 8;
+
+                                if (remaining < len) {
+                                        /* Snap too short */
+                                        return 0;
+                                }
+                                remaining-=len;
+
+                                nxt=((libtrace_ip6_ext_t*)payload)->nxt;
+                                continue;
+                        }
+                        case TRACE_IPPROTO_FRAGMENT:
+                        {
+                                libtrace_ip6_frag_t *frag = (libtrace_ip6_frag_t *)payload;
+                                uint16_t offset;
+                                len = sizeof(libtrace_ip6_frag_t);
+                                if (remaining < len) {
+                                        /* Snap too short */
+                                        return 0;
+                                }
+                                remaining-=len;
+
+                                offset = ntohs(frag->frag_off);
+                                if ((offset & 0x0001) != 0) 
+                                        *more = 1;
+
+                                return ((offset & 0xFFF8) >> 3) * 8;
+                         }
+                         default:
+                                return 0;
+                         }
+                }
+
+        }
+        return 0;
+}

lib/protocols_transport.c

@@ -382 +382 @@
         uint32_t remaining;
         uint8_t proto;
-        const struct ports_t *port = 
-                (const struct ports_t*)trace_get_transport((libtrace_packet_t*)packet,
+        struct ports_t *port;
+        uint16_t fragoff;
+        uint8_t more;
+
+        fragoff = trace_get_fragment_offset(packet, &more);
+
+        /* If we're not the first fragment, we're unlikely to be able
+         * to get any useful port numbers from this packet.
+         */
+        if (fragoff != 0)
+                return 0;
+        
+        
+        port = (struct ports_t*)trace_get_transport(
+                        (libtrace_packet_t*)packet,
                         &proto, &remaining);
 
@@ -391 +404 @@
 
         /* ICMP *technically* doesn't have ports */
-        if (proto == TRACE_IPPROTO_ICMP)
+        if (proto == TRACE_IPPROTO_ICMP || proto == TRACE_IPPROTO_ICMPV6)
                 return 0;
 
@@ -405 +418 @@
         uint32_t remaining;
         uint8_t proto;
-        struct ports_t *port = 
-                (struct ports_t*)trace_get_transport((libtrace_packet_t*)packet,
+        struct ports_t *port;
+        uint16_t fragoff;
+        uint8_t more;
+
+        fragoff = trace_get_fragment_offset(packet, &more);
+
+        /* If we're not the first fragment, we're unlikely to be able
+         * to get any useful port numbers from this packet.
+         */
+        if (fragoff != 0)
+                return 0;
+        
+        
+        port = (struct ports_t*)trace_get_transport(
+                        (libtrace_packet_t*)packet,
                         &proto, &remaining);
         /* Snapped too early */
@@ -413 +439 @@
         
         /* ICMP *technically* doesn't have ports */
-        if (proto == TRACE_IPPROTO_ICMP)
+        if (proto == TRACE_IPPROTO_ICMP || proto == TRACE_IPPROTO_ICMPV6)
                 return 0;
 

libpacketdump/eth_2048.c

@@ -10 +10 @@
 #include <netdb.h>
 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if ((unsigned int)len>=((char*)&ip->x-(char*)ip+sizeof(ip->x))) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,ip->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(ip->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&ip->x))
-
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len)
 {
@@ -29 +18 @@
         }
         //DISPLAY(ip_tos," TOS %02x")
-        DISPLAY_EXP(ip_tos," DSCP %02x",ip->ip_tos >> 2)
-        DISPLAY_EXP(ip_tos," ECN %x",ip->ip_tos & 0x2)
-        DISPLAYS(ip_len," Total Length %i")
+        DISPLAY_EXP(ip, ip_tos," DSCP %02x",ip->ip_tos >> 2);
+        DISPLAY_EXP(ip, ip_tos," ECN %x",ip->ip_tos & 0x2);
+        DISPLAYS(ip, ip_len," Total Length %i");
         printf("\n IP:");
-        DISPLAYS(ip_id," Id %u");
+        DISPLAYS(ip, ip_id," Id %u");
         
         if ((unsigned int)len >= ((char *)&ip->ip_ttl - (char *)ip - 2)) {
@@ -42 +31 @@
         }
         //printf("\n IP:");
-        DISPLAY(ip_ttl,"\n IP: TTL %i");
+        DISPLAY(ip, ip_ttl,"\n IP: TTL %i");
         if ((unsigned int)len>=((char*)&ip->ip_p-(char*)ip+sizeof(ip->ip_p))) {
                 struct protoent *ent=getprotobynumber(ip->ip_p);
@@ -55 +44 @@
                 return;
         }
-        DISPLAYS(ip_sum," Checksum %i\n");
-        DISPLAYIP(ip_src," IP: Source %s ");
-        DISPLAYIP(ip_dst,"Destination %s\n");
+        DISPLAYS(ip, ip_sum," Checksum %i\n");
+        DISPLAYIP(ip, ip_src," IP: Source %s ");
+        DISPLAYIP(ip, ip_dst,"Destination %s\n");
         decode_next(packet+ip->ip_hl*4,len-ip->ip_hl*4,"ip",ip->ip_p);
         return;

libpacketdump/ip_1.c

@@ -3 +3 @@
 #include <dlfcn.h>
 #include "libpacketdump.h"
-
-#define STRUCT icmp
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&STRUCT->x-(char*)STRUCT+sizeof(STRUCT->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,STRUCT->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(STRUCT->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(STRUCT->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&STRUCT->x))
 
 static char *unreach_types[]={

libpacketdump/ip_17.c

@@ -8 +8 @@
 #include <netdb.h>
 
-#define STRUCT udp
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&STRUCT->x-(char*)STRUCT+sizeof(STRUCT->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,STRUCT->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(STRUCT->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(STRUCT->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&STRUCT->x))
-
 
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len)
@@ -29 +13 @@
         struct libtrace_udp *udp = (struct libtrace_udp*)packet;
         printf(" UDP:");
-        if (SAFE(source)) {
+        if (SAFE(udp, source)) {
                 struct servent *ent=getservbyport(udp->source,"udp");
                 if(ent) {
@@ -41 +25 @@
                 return;
         }
-        if (SAFE(dest)) {
+        if (SAFE(udp, dest)) {
                 struct servent *ent=getservbyport(udp->dest,"udp");
                 if(ent) {
@@ -54 +38 @@
         }
         printf("\n UDP:");
-        DISPLAYS(len," Len %u");
-        DISPLAYS(check," Checksum %u");
+        DISPLAYS(udp, len," Len %u");
+        DISPLAYS(udp, check," Checksum %u");
         printf("\n");
         if (htons(udp->source) < htons(udp->dest)) 

libpacketdump/ip_33.c

@@ -6 +6 @@
 #include <netinet/tcp.h>
 #include <netinet/in.h>
-
-#define STRUCT dccp
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&STRUCT->x-(char*)STRUCT+sizeof(STRUCT->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,STRUCT->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(STRUCT->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(STRUCT->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&STRUCT->x))
 
 struct dccphdr {
@@ -50 +34 @@
 {
         struct dccphdr *dccp = (struct dccphdr*)packet;
-        DISPLAYS(source," DCCP: Source %i");
-        DISPLAYS(dest," Dest %i");
+        DISPLAYS(dccp, source," DCCP: Source %i");
+        DISPLAYS(dccp, dest," Dest %i");
         if (len>4) {
                 printf("\n DCCP: Type %i",dccp->type);
@@ -69 +53 @@
         else
                 return;
-        DISPLAY(doff," DCCP: Dataoff: %i\n");
+        DISPLAY(dccp, doff," DCCP: Dataoff: %i\n");
         if (len>9)
                 printf(" DCCP: NDP %i CsLen: %i\n",dccp->ndp,dccp->cslen);
@@ -75 +59 @@
                 return;
         }
-        DISPLAY(check," DCCP: Checksum: %i\n");
+        /* Should this be byteswapped??? */
+        DISPLAY(dccp, check," DCCP: Checksum: %i\n");
         if (htons(dccp->source) < htons(dccp->dest)) 
                 decode_next(packet+dccp->doff*4,len-dccp->doff*4,"dccp",htons(dccp->source));

libpacketdump/ip_6.c

@@ -5 +5 @@
 #include <assert.h>
 #include <netdb.h>
-
-#define SAFE(x) \
-        ((unsigned int)len>=((char*)&tcp->x-(char*)tcp+sizeof(tcp->x))) 
-#define DISPLAY_EXP(x,fmt,exp) \
-        if (SAFE(x)) \
-                printf(fmt,exp); \
-        else \
-                return; 
-
-#define DISPLAY(x,fmt) DISPLAY_EXP(x,fmt,tcp->x)
-
-#define DISPLAYS(x,fmt) DISPLAY_EXP(x,fmt,htons(tcp->x))
-#define DISPLAYL(x,fmt) DISPLAY_EXP(x,fmt,htonl(tcp->x))
-#define DISPLAYIP(x,fmt) DISPLAY_EXP(x,fmt,inet_ntoa(*(struct in_addr*)&tcp->x))
 
 DLLEXPORT void decode(int link_type UNUSED,const char *packet,unsigned len)
@@ -27 +13 @@
         libtrace_tcp_t *tcp = (libtrace_tcp_t *)packet;
         printf(" TCP:");
-        if (SAFE(source)) {
+        if (SAFE(tcp, source)) {
                 struct servent *ent=getservbyport(tcp->source,"tcp");
                 if(ent) {
@@ -39 +25 @@
                 return;
         }
-        if (SAFE(dest)) {
+        if (SAFE(tcp, dest)) {
                 struct servent *ent=getservbyport(tcp->dest,"tcp");
                 if(ent) {
@@ -52 +38 @@
         }
         printf("\n TCP:");
-        DISPLAYL(seq," Seq %u");
+        DISPLAYL(tcp, seq," Seq %u");
         printf("\n TCP:");
-        DISPLAYL(ack_seq," Ack %u");
+        DISPLAYL(tcp, ack_seq," Ack %u");
         if ((char*)&tcp->window-(char *)tcp>len) {
                 printf("\n");
@@ -71 +57 @@
         if (tcp->ack) printf(" ACK");
         if (tcp->urg) printf(" URG");
-        DISPLAYS(window," Window %i");
+        DISPLAYS(tcp, window," Window %i");
         printf("\n TCP:");
-        DISPLAYS(check," Checksum %i");
-        DISPLAYS(urg_ptr," Urgent %i");
+        DISPLAYS(tcp, check," Checksum %i");
+        DISPLAYS(tcp, urg_ptr," Urgent %i");
         pkt = (unsigned char*)packet+sizeof(*tcp);
         plen = (len-sizeof *tcp) < (tcp->doff*4-sizeof(*tcp))?(len-sizeof(*tcp)):(tcp->doff*4-sizeof *tcp);

libpacketdump/ip_89.c

@@ -10 +10 @@
 static void dump_ospf_v2_header(libtrace_ospf_v2_t *hdr, unsigned len) {
 
-        printf(" OSPF Header: Version %u Type %u ",
-                        hdr->ospf_v, hdr->type);
+        DISPLAY(hdr, ospf_v, " OSPF Header: Version %u");
+        DISPLAY(hdr, type, " Type %u ");
         switch(hdr->type) {
                 case TRACE_OSPF_HELLO:
@@ -29 +29 @@
                         break;
         }
+        printf("\n");
 
-        printf("\n OSPF Header: Length %u \n", ntohs(hdr->len));
-        printf(" OSPF Header: Router Id %s ", inet_ntoa(hdr->router));
-        printf("Area Id %s\n", inet_ntoa(hdr->area));
-        printf(" OSPF Header: Checksum %u Auth Type %u\n", ntohs(hdr->sum),
-                        ntohs(hdr->au_type));
-
-        printf(" OSPF Header: Auth Key ID %u Auth Data Len %u\n", 
-                        hdr->au_key_id, hdr->au_data_len);
-        printf(" OSPF Header: Auth Crypto Seq %u\n", ntohl(hdr->au_seq_num));
-
+        DISPLAYS(hdr, ospf_len, "OSPF Header: Length %u \n");
+        DISPLAYIP(hdr, router, " OSPF Header: Router Id %s ");
+        DISPLAYIP(hdr, area, "Area Id %s\n");
+        DISPLAYS(hdr, sum, " OSPF Header: Checksum %u ");
+        DISPLAYS(hdr, au_type, "Auth Type %u\n");
+        DISPLAY(hdr, au_key_id, " OSPF Header: Auth Key ID %u ");
+        DISPLAY(hdr, au_data_len, "Auth Data Len %u\n");
+        DISPLAYL(hdr, au_seq_num, " OSPF Header: Auth Crypto Seq %u\n");
 
 }

libpacketdump/libpacketdump.h

@@ -6 +6 @@
 extern "C" {
 #endif
+
+#define SAFE(hdr,x) \
+        ((unsigned int)len>=((char*)&hdr->x-(char*)hdr+sizeof(hdr->x))) 
+
+#define DISPLAY_EXP(hdr,x,fmt,exp) \
+        if (SAFE(hdr, x)) \
+                printf(fmt,exp); \
+        else {\
+                printf("(Truncated)\n"); \
+                return; \
+        }
+
+#define DISPLAY(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,hdr->x)
+
+#define DISPLAYS(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,htons(hdr->x))
+#define DISPLAYL(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,htonl(hdr->x))
+#define DISPLAYIP(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,inet_ntoa(*(struct in_addr*)&hdr->x))
+
 
 void trace_hexdump_packet(libtrace_packet_t *packet);

libwandio/Makefile.am

@@ -24 +24 @@
 endif
 
+if HAVE_LZMA
+LIBTRACEIO_LZMA=ior-lzma.c iow-lzma.c
+else
+LIBTRACEIO_LZMA=
+endif
+
 libwandio_la_SOURCES=wandio.c ior-peek.c ior-stdio.c ior-thread.c \
                 iow-stdio.c iow-thread.c wandio.h wandio_internal.h \
-                $(LIBTRACEIO_ZLIB) $(LIBTRACEIO_BZLIB) $(LIBTRACEIO_LZO)
+                $(LIBTRACEIO_ZLIB) $(LIBTRACEIO_BZLIB) $(LIBTRACEIO_LZO) \
+                $(LIBTRACEIO_LZMA)
 
 AM_CPPFLAGS = @ADD_INCLS@
 libwandio_la_LIBADD = @LIBWANDIO_LIBS@
-libwandio_la_LDFLAGS=-version-info 1:0:0 @ADD_LDFLAGS@
+libwandio_la_LDFLAGS=-version-info 1:1:0 @ADD_LDFLAGS@
 
+bin_PROGRAMS = wandiocat
+wandiocat_SOURCES = wcat.c
+wandiocat_CFLAGS = -I"$(top_srcdir)/libwandio"
+wandiocat_CXXFLAGS = -I"$(top_srcdir)/libwandio"
+wandiocat_LDFLAGS = -L"$(top_srcdir)/libwandio" -lwandio

libwandio/iow-lzo.c

@@ -274 +274 @@
 }
 
-iow_t *lzo_wopen(iow_t *child, int compress_level UNUSED)
+iow_t *lzo_wopen(iow_t *child, int compress_level)
 {
         const int opt_filter = 0;
@@ -290 +290 @@
                 return NULL;
         }
+
+        /* Compress level is useless for LZO, but getting UNUSED into here
+         * is more trouble than it is worth so this check will at least
+         * stop us from getting warnings about it.
+         */
+        if (compress_level < 0)
+                return NULL;
 
         iow = malloc(sizeof(iow_t));

libwandio/wandio.c

@@ -46 +46 @@
  */
 
-struct compression_type compression_type[]  = {
-        { "GZ",         "gz",   WANDIO_COMPRESS_ZLIB    },
-        { "BZ2",        "bz2",  WANDIO_COMPRESS_BZ2     },
-        { "LZO",        "lzo",  WANDIO_COMPRESS_LZO     },
+struct wandio_compression_type compression_type[]  = {
+        { "gzip",       "gz",   WANDIO_COMPRESS_ZLIB    },
+        { "bzip2",      "bz2",  WANDIO_COMPRESS_BZ2     },
+        { "lzo",        "lzo",  WANDIO_COMPRESS_LZO     },
+        { "lzma",       "xz",  WANDIO_COMPRESS_LZMA     },
         { "NONE",       "",     WANDIO_COMPRESS_NONE    }
 };
@@ -141 +142 @@
         DEBUG_PIPELINE("peek");
         io_t *io = peek_open(stdio_open(filename));
-        char buffer[1024];
+        unsigned char buffer[1024];
         int len;
         if (!io)
@@ -151 +152 @@
 
         if (autodetect) {
-                if (len>=3 && buffer[0] == '\037' && buffer[1] == '\213' &&
+                if (len>=3 && buffer[0] == 0x1f && buffer[1] == 0x8b &&
                                 buffer[2] == 0x08) { 
 #if HAVE_LIBZ
@@ -162 +163 @@
                 }
                 /* Auto detect compress(1) compressed data (gzip can read this) */
-                if (len>=2 && buffer[0] == '\037' && buffer[1] == '\235') {
+                if (len>=2 && buffer[0] == 0x1f && buffer[1] == 0x9d) {
 #if HAVE_LIBZ
                         DEBUG_PIPELINE("zlib");
@@ -182 +183 @@
 #endif
                 }
+
+                if (len >=5 && buffer[0] == 0xfd && buffer[1] == '7' && 
+                                buffer[2] == 'z' && buffer[3] == 'X' &&
+                                buffer[4] == 'Z') {
+#if HAVE_LIBLZMA
+                        DEBUG_PIPELINE("lzma");
+                        io = lzma_open(io);
+#else
+                        fprintf(stderr, "File %s is lzma compressed but libtrace has not been built with lzma support!\n", filename);
+                        return NULL;
+#endif
+                }
         }       
         /* Now open a threaded, peekable reader using the appropriate module
@@ -193 +206 @@
         DEBUG_PIPELINE("peek");
         return peek_open(io);
+}
+
+DLLEXPORT struct wandio_compression_type *wandio_lookup_compression_type(
+        const char *name) {
+
+        struct wandio_compression_type *wct = compression_type;
+
+        while (strcmp(wct->name, "NONE") != 0) {
+                if (strcmp(wct->name, name) == 0)
+                        return wct;
+                wct++;
+        }
+
+        return NULL;
 }
 
@@ -291 +318 @@
         }
 #endif
+#if HAVE_LIBLZMA
+        else if (compression_level != 0 && 
+            compress_type == WANDIO_COMPRESS_LZMA) {
+                iow = lzma_wopen(iow,compression_level);
+        }
+#endif
         /* Open a threaded writer */
         if (use_threads)

libwandio/wandio.h

@@ -66 +66 @@
 
 /** Structure defining a supported compression method */
-struct compression_type {
+struct wandio_compression_type {
         /** Name of the compression method */
         const char *name;
@@ -77 +77 @@
 
 /** The list of supported compression methods */
-extern struct compression_type compression_type[];
+extern struct wandio_compression_type compression_type[];
 
 /** Structure defining a libtrace IO reader module */
@@ -178 +178 @@
         /** LZO compression */
         WANDIO_COMPRESS_LZO     = 3,
+        /** LZMA compression */
+        WANDIO_COMPRESS_LZMA    = 4,
         /** All supported methods - used as a bitmask */
         WANDIO_COMPRESS_MASK    = 7
@@ -193 +195 @@
 io_t *zlib_open(io_t *parent);
 io_t *thread_open(io_t *parent);
+io_t *lzma_open(io_t *parent);
 io_t *peek_open(io_t *parent);
 io_t *stdio_open(const char *filename);
@@ -199 +202 @@
 iow_t *bz_wopen(iow_t *child, int compress_level);
 iow_t *lzo_wopen(iow_t *child, int compress_level);
+iow_t *lzma_wopen(iow_t *child, int compress_level);
 iow_t *thread_wopen(iow_t *child);
 iow_t *stdio_wopen(const char *filename, int fileflags);
@@ -211 +215 @@
  *
  * @{ */
+
+/** Given a string describing the compression method, finds the internal
+  * data structure representing that method. This is mostly useful for
+  * nicely mapping a method name to the internal libwandio compression
+  * method enum when configuring an output file.
+  *
+  * @param name          The compression method name as a string, e.g. "gzip",
+  *                      "bzip2", "lzo" or "lzma".
+  * @return A pointer to the compression_type structure representing the
+  * compression method or NULL if no match can be found.
+  *
+  */
+struct wandio_compression_type *wandio_lookup_compression_type(const char *name);
 
 /** Creates a new libtrace IO reader and opens the provided file for reading.

test/Makefile

@@ -18 +18 @@
 
 BINS = test-pcap-bpf test-event test-time test-dir test-wireless test-errors \
-        test-plen test-autodetect $(BINS_DATASTRUCT) $(BINS_PARALLEL)
+        test-plen test-autodetect test-ports test-fragment test-live test-live-snaplen \
+        $(BINS_DATASTRUCT) $(BINS_PARALLEL)
 
 .PHONY: all clean distclean install depend test

test/do-tests.sh

@@ -72 +72 @@
 echo \* Testing payload length
 do_test ./test-plen
+
+echo \* Testing port numbers
+do_test ./test-ports
+
+echo \* Testing fragment parsing
+do_test ./test-fragment
 
 echo \* Testing event framework
@@ -221 +227 @@
 echo " * format autodetection - bzip2"
 do_test ./test-autodetect traces/5_packets.erf.bz2
+echo " * format autodetection - lzma"
+do_test ./test-autodetect traces/5_packets.erf.xz
 
 echo

tools/traceanon/traceanon.1

@@ -86 +86 @@
 .BI \-\^\-compress-type=method
 compress the output trace using the compression algorithm "method". Possible
-algorithms are "gzip", "bzip2", "lzo" and "none". Default is "none".
+algorithms are "gzip", "bzip2", "lzo", "xz" and "none". Default is "none".
 
 .SH EXAMPLES

tools/traceanon/traceanon.c

@@ -219 +219 @@
         } else if (strncmp(compress_type_str, "lzo", 3) == 0) {
                 compress_type = TRACE_OPTION_COMPRESSTYPE_LZO;
+        } else if (strncmp(compress_type_str, "xz", 2) == 0) {
+                compress_type = TRACE_OPTION_COMPRESSTYPE_LZMA;
         } else if (strncmp(compress_type_str, "no", 2) == 0) {
                 compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;

tools/tracemerge/tracemerge.1

@@ -53 +53 @@
 .BI \-\^\-compress-type method 
 Describes the compression algorithm to be used when writing the output trace.
-Possible methods are "gzip", "bzip2", "lzo" and "none". Defaults to "none".
+Possible methods are "gzip", "bzip2", "lzo", "xz" and "none". Defaults to 
+"none".
 
 

tools/tracemerge/tracemerge.c

@@ -120 +120 @@
         } else if (strncmp(compress_type_str, "lzo", 3) == 0) {
                 compress_type = TRACE_OPTION_COMPRESSTYPE_LZO;
+        } else if (strncmp(compress_type_str, "xz", 2) == 0) {
+                compress_type = TRACE_OPTION_COMPRESSTYPE_LZMA;
         } else if (strncmp(compress_type_str, "no", 2) == 0) {
                 compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;

tools/tracesplit/tracesplit.1

@@ -61 +61 @@
 \fB-Z\fR compression-method
 Compress the data using the specified compression algorithm. Accepted methods
-are "gzip", "bzip2", "lzo" or "none". Default value is none unless a 
+are "gzip", "bzip2", "lzo", "xz" or "none". Default value is none unless a 
 compression level is specified, in which case gzip will be used.
 

tools/tracesplit/tracesplit.c

@@ -316 +316 @@
         } else if (strncmp(compress_type_str, "lzo", 3) == 0) {
                 compress_type = TRACE_OPTION_COMPRESSTYPE_LZO;
+        } else if (strncmp(compress_type_str, "xz", 2) == 0) {
+                compress_type = TRACE_OPTION_COMPRESSTYPE_LZMA;
         } else if (strncmp(compress_type_str, "no", 2) == 0) {
                 compress_type = TRACE_OPTION_COMPRESSTYPE_NONE;