Merge pull request #886 from appneta/4.5.0-beta3

4.5.0 beta3

configure.ac

@@ -4,7 +4,7 @@ dnl $Id$
 AC_PREREQ([2.69])
 
 dnl Set version info here!
-AC_INIT([tcpreplay],[4.5.0-beta1],[https:/appneta/tcpreplay/issues],[tcpreplay],[http://tcpreplay.sourceforge.net/])
+AC_INIT([tcpreplay],[4.5.0-beta3],[https:/appneta/tcpreplay/issues],[tcpreplay],[http://tcpreplay.sourceforge.net/])
 AC_CONFIG_SRCDIR([src/tcpreplay.c])
 AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_AUX_DIR(config)

docs/CHANGELOG

@@ -1,20 +1,25 @@
-06/08/2024 Version 4.5.0-beta1
+06/29/2024 Version 4.5.0-beta3
+ - tcpreplay --include / --exclude to control which packets are replayed (#884)
+ - add -W (--suppress-warnings) option to suppress warning messages (#878)
+ - AF_XDP compile issue due to merge issue (#876)
  - memory leak in tcpprep when using include/exclude (#869)
  - memory leak in tcpprep when using RegEx (#867)
  - fix nanosecond timestamp regression bug (#863)
  - autotools - AC_HELP_STRING is obsolete in 2.70 (#856)
+ - add -w output.pcap command line option to direct the output to a pcap (#853)
  - configure.ac: do not run conftest in case of cross compilation (#849)
  - Haiku support (#847)
  - --fixhdrlen option added to control action on packet length changes (#846)
  - incorrect checksum for certain IPv4 packets - fixed by #846 (#844)
  - add check for IPv6 extension header length (#827 #842)
  - GitHub template for pull requests (#839)
+ - improved 802.3 (Ethernet I) handling and warning messages (#835)
  - handle IPv6 fragment extension header (#832 #837)
  - Linux tap interfaces fail intermittently (#828)
  - Infinite loop in tcprewrite at get.c (#827 #842)
  - SLL incorrect size and protocol when converted to Ethernet (#826)
  - CVE-2023-43279 add check for empty CIDR (#824 #843)
- - AF_XDF socket extension (#822 #823)
+ - AF_XDP socket extension (#822 #823)
  - configure.ac: unify search dirs for pcap and add lib32 (#819)
  - tcpreplay-edit recomputes IPv4 checksums unnecessarily (#815 #846)
  - CVE-2023-4256 double free in tcprewrite DLT_JUNIPER_ETHER (#813 #851)

docs/INSTALL

@@ -138,6 +138,7 @@ written to directly.
 This feature requires `libxdp-dev` and `libbpf-dev` packages to be installed.
 For example:
 
+ $ sudo apt install -y libxdp-dev libbpf-dev
  $ ./configure | tail
  Linux/BSD netmap: no
  Tuntap device support: yes

lib/strlcpy.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it 
  * and/or modify it under the terms of the GNU General Public License as 

src/bridge.c

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/bridge.h

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common.h

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common/cache.c

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common/cache.h

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it 
  * and/or modify it under the terms of the GNU General Public License as 

src/common/cidr.c

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common/cidr.h

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common/err.c

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 2001-2010 Aaron Turner.
  *
- * Copyright (c) 2013-2022 Fred Klassen - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen - AppNeta
  *
  * Copyright (c) 2000 Dug Song <[email protected]>
  *
@@ -50,6 +50,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+int print_warnings = 1;
+
 /**
  * writes a notice message to stderr. Always forces a newline
  */

src/common/err.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 2001-2010 Aaron Turner.
  *
- * Copyright (c) 2013-2022 Fred Klassen - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen - AppNeta
  *
  * Copyright (c) 2000 Dug Song <[email protected]>
  *
@@ -50,6 +50,8 @@
 #include "defines.h"
 #include <stdlib.h>
 
+extern int print_warnings;
+
 #ifdef DEBUG
 extern int debug;
 #endif
@@ -84,12 +86,14 @@ void notice(const char *fmt, ...);
  fprintf(stderr, "DEBUG%d in %s:%s() line %d: " y "\n", x, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__); \
  } \
 } while(0)
-
-
-#define warn(x) fprintf(stderr, "Warning in %s:%s() line %d:\n%s\n", __FILE__, __FUNCTION__, __LINE__, x)
 
+#define warn(x) \
+ if (print_warnings) \
+ fprintf(stderr, "Warning in %s:%s() line %d:\n%s\n", __FILE__, __FUNCTION__, __LINE__, x)
 
-#define warnx(x, ...) fprintf(stderr, "Warning in %s:%s() line %d:\n" x "\n", __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
+#define warnx(x, ...) \
+ if (print_warnings) \
+ fprintf(stderr, "Warning in %s:%s() line %d:\n" x "\n", __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
 
 #define err(x, y) do { \
  fprintf(stderr, "\nFatal Error in %s:%s() line %d:\n%s\n", __FILE__, __FUNCTION__, __LINE__, y); \

src/common/fakepcap.c

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common/fakepcap.h

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it 
  * and/or modify it under the terms of the GNU General Public License as 

src/common/fakepcapnav.c

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common/fakepcapnav.h

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as

src/common/flows.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it 
  * and/or modify it under the terms of the GNU General Public License as 
@@ -157,8 +157,13 @@ static inline flow_entry_type_t hash_put_data(flow_hash_table_t *fht, const uint
 /*
  * Decode the packet, study it's flow status and report
  */
-flow_entry_type_t flow_decode(flow_hash_table_t *fht, const struct pcap_pkthdr *pkthdr,
- const u_char *pktdata, const int datalink, const int expiry)
+flow_entry_type_t
+flow_decode(flow_hash_table_t *fht,
+ const struct pcap_pkthdr *pkthdr,
+ const u_char *pktdata,
+ const int datalink,
+ const int expiry,
+ COUNTER packetnum)
 {
  uint32_t pkt_len = pkthdr->caplen;
  const u_char *packet = pktdata;
@@ -195,30 +200,52 @@ flow_entry_type_t flow_decode(flow_hash_table_t *fht, const struct pcap_pkthdr *
  &vlan_offset);
 
  if (res == -1) {
- warnx("Unable to process unsupported DLT type: %s (0x%x)",
- pcap_datalink_val_to_description(datalink), datalink);
+ warnx("flow_decode failed to determine %s header length for packet " COUNTER_SPEC "",
+ pcap_datalink_val_to_description(datalink),
+ packetnum);
  return FLOW_ENTRY_INVALID;
  }
 
  if (ether_type == ETHERTYPE_IP) {
- if (pkt_len < l2len + sizeof(ipv4_hdr_t))
- return FLOW_ENTRY_INVALID;
+ size_t required_len = sizeof(ipv4_hdr_t) + l2len;
+ if (pkt_len < required_len) {
+ warnx("flow_decode: packet " COUNTER_SPEC " needs at least %zd bytes for IPv4 header but only %d available",
+ packetnum,
+ required_len,
+ pkt_len);
+ return FLOW_ENTRY_INVALID;
+ }
 
  ip_hdr = (ipv4_hdr_t *)(packet + l2len);
 
- if (ip_hdr->ip_v != 4)
+ if (ip_hdr->ip_v != 4) {
+ warnx("flow_decode: packet " COUNTER_SPEC " IPv4 header version should be 4 but instead is %u",
+ packetnum,
+ ip_hdr->ip_v);
  return FLOW_ENTRY_NON_IP;
+ }
 
  ip_len = ip_hdr->ip_hl * 4;
  protocol = ip_hdr->ip_p;
  entry.src_ip.in = ip_hdr->ip_src;
  entry.dst_ip.in = ip_hdr->ip_dst;
  } else if (ether_type == ETHERTYPE_IP6) {
- if (pkt_len < l2len + sizeof(ipv6_hdr_t))
- return FLOW_ENTRY_INVALID;
+ size_t required_len = sizeof(ipv6_hdr_t) + l2len;
+ if (pkt_len < required_len) {
+ warnx("flow_decode: packet " COUNTER_SPEC " needs at least %zd bytes for IPv6 header but only %d available",
+ packetnum,
+ required_len,
+ pkt_len);
+ return FLOW_ENTRY_INVALID;
+ }
 
- if ((packet[0] >> 4) != 6)
+ uint8_t ip6_version = packet[0] >> 4;
+ if (ip6_version != 6) {
+ warnx("flow_decode: packet " COUNTER_SPEC " IPv6 header version should be 6 but instead is %u",
+ packetnum,
+ ip6_version);
  return FLOW_ENTRY_NON_IP;
+ }
 
  ip6_hdr = (ipv6_hdr_t *)(packet + l2len);
  ip_len = sizeof(*ip6_hdr);
@@ -238,30 +265,50 @@ flow_entry_type_t flow_decode(flow_hash_table_t *fht, const struct pcap_pkthdr *
  entry.protocol = protocol;
 
  switch (protocol) {
- case IPPROTO_UDP:
- if (pkt_len < (l2len + ip_len + sizeof(udp_hdr_t)))
+ case IPPROTO_UDP: {
+ size_t required_len = sizeof(udp_hdr_t) + l2len + ip_len;
+ if (pkt_len < required_len) {
+ warnx("flow_decode: packet " COUNTER_SPEC " needs at least %zd bytes for UDP header but only %d available",
+ packetnum,
+ required_len,
+ pkt_len);
  return FLOW_ENTRY_INVALID;
- udp_hdr = (udp_hdr_t*)(packet + ip_len + l2len);
+ }
+ udp_hdr = (udp_hdr_t *)(packet + ip_len + l2len);
  entry.src_port = udp_hdr->uh_sport;
  entry.dst_port = udp_hdr->uh_dport;
  break;
-
- case IPPROTO_TCP:
- if (pkt_len < (l2len + ip_len + sizeof(tcp_hdr_t)))
+ }
+ case IPPROTO_TCP: {
+ size_t required_len = sizeof(tcp_hdr_t) + l2len + ip_len;
+ if (pkt_len < required_len) {
+ warnx("flow_decode: packet " COUNTER_SPEC " needs at least %zd bytes for TCP header but only %d available",
+ packetnum,
+ required_len,
+ pkt_len);
  return FLOW_ENTRY_INVALID;
- tcp_hdr = (tcp_hdr_t*)(packet + ip_len + l2len);
+ }
+ tcp_hdr = (tcp_hdr_t *)(packet + ip_len + l2len);
  entry.src_port = tcp_hdr->th_sport;
  entry.dst_port = tcp_hdr->th_dport;
  break;
-
+ }
  case IPPROTO_ICMP:
- case IPPROTO_ICMPV6:
- if (pkt_len < (l2len + ip_len + sizeof(icmpv4_hdr_t)))
+ case IPPROTO_ICMPV6: {
+ size_t required_len = sizeof(icmpv4_hdr_t) + l2len + ip_len;
+ if (pkt_len < required_len) {
+ warnx("flow_decode: packet " COUNTER_SPEC " needs at least %zd bytes for %s header but only %d available",
+ packetnum,
+ required_len,
+ (protocol == IPPROTO_ICMP) ? "ICMP" : "ICMPv6",
+ pkt_len);
  return FLOW_ENTRY_INVALID;
- icmp_hdr = (icmpv4_hdr_t*)(packet + ip_len + l2len);
+ }
+ icmp_hdr = (icmpv4_hdr_t *)(packet + ip_len + l2len);
  entry.src_port = icmp_hdr->icmp_type;
  entry.dst_port = icmp_hdr->icmp_code;
  break;
+ }
  default:
  entry.src_port = 0;
  entry.dst_port = 0;

src/common/flows.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2022 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2024 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
  *
  * The Tcpreplay Suite of tools is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License as
@@ -38,4 +38,5 @@ flow_entry_type_t flow_decode(flow_hash_table_t *fht,
  const struct pcap_pkthdr *pkthdr,
  const u_char *pktdata,
  const int datalink,
- const int expiry);
+ const int expiry,
+ COUNTER packetnum);