Merge pull request #698 from appneta/Bug_#695_macOS_tests_fail

Bug #695 mac os tests fail
appneta · Jan 28, 2022 · 22cecbb · 22cecbb
2 parents 54fe0bb + 2500a21
commit 22cecbb
Show file tree

Hide file tree

Showing 198 changed files with 151 additions and 335 deletions.
diff --git a/configure.ac b/configure.ac
@@ -4,7 +4,7 @@ dnl $Id$
 AC_PREREQ([2.69])
 
 dnl Set version info here!
-AC_INIT([tcpreplay],[4.4.0-beta1],[https:/appneta/tcpreplay/issues],[tcpreplay],[http://tcpreplay.sourceforge.net/])
+AC_INIT([tcpreplay],[4.4.0-beta2],[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)
@@ -1699,71 +1699,6 @@ fi
 
 fi # checking pcapnav version
 
-
-dnl (shamelessly ripped off from libpcap)
-dnl Checks to see if unaligned memory accesses fail
-dnl
-dnl FORCE_ALIGN (DEFINED)
-dnl
-AC_MSG_CHECKING(for requires strict byte alignment)
-AC_CACHE_VAL(unaligned_cv_fail,
- [case "$host_cpu" in
-
- # XXX: should also check that they don't do weird things (like on arm)
- alpha*|arm*|hp*|mips*|sparc*|ia64)
- unaligned_cv_fail=yes
- ;;
-
- *)
- cat >conftest.c <<EOF
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <stdio.h>
- unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
- main() {
- unsigned int i;
- pid_t pid;
- int status;
- /* avoid "core dumped" message */
- pid = fork();
- if (pid < 0)
- exit(2);
- if (pid > 0) {
- /* parent */
- pid = waitpid(pid, &status, 0);
- if (pid < 0)
- exit(3);
- exit(!WIFEXITED(status));
- }
- /* child */
- i = *(unsigned int *)&a[[1]];
- printf("%d\n", i);
- exit(0);
- }
-EOF
- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \
- conftest.c $LIBS >/dev/null 2>&1
- if test ! -x conftest ; then
- dnl failed to compile for some reason
- unaligned_cv_fail=yes
- else
- ./conftest >conftest.out
- if test ! -s conftest.out ; then
- unaligned_cv_fail=yes
- else
- unaligned_cv_fail=no
- fi
- fi
- rm -f conftest* core core.conftest
- ;;
-
- esac
- ])
-AC_MSG_RESULT($unaligned_cv_fail)
-if test $unaligned_cv_fail = yes ; then
- AC_DEFINE([FORCE_ALIGN], [1], [Are we strictly aligned?])
-fi
-
 dnl ##################################################
 dnl # Check for tcpdump.
 dnl ##################################################

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,4 +1,5 @@
 06/19/2021 Version 4.4.0-beta2
+ - remove obsolete FORCE_ALIGN support to fix macOS 11 compile (#695)
  - add a security policy document (#689)
  - ability to specify directory of pcap files (#682)
  - incorrect PPS rate for long-running sessions (#679)

diff --git a/lib/strlcpy.h b/lib/strlcpy.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/bridge.c b/src/bridge.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/bridge.h b/src/bridge.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common.h b/src/common.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/cache.c b/src/common/cache.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/cache.h b/src/common/cache.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/cidr.c b/src/common/cidr.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/cidr.h b/src/common/cidr.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/err.c b/src/common/err.c
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 2001-2010 Aaron Turner.
  *
- * Copyright (c) 2013-2018 Fred Klassen - AppNeta
+ * Copyright (c) 2013-2022 Fred Klassen - AppNeta
  *
  * Copyright (c) 2000 Dug Song <[email protected]>
  *

diff --git a/src/common/err.h b/src/common/err.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 2001-2010 Aaron Turner.
  *
- * Copyright (c) 2013-2018 Fred Klassen - AppNeta
+ * Copyright (c) 2013-2022 Fred Klassen - AppNeta
  *
  * Copyright (c) 2000 Dug Song <[email protected]>
  *

diff --git a/src/common/fakepcap.c b/src/common/fakepcap.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/fakepcap.h b/src/common/fakepcap.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/fakepcapnav.c b/src/common/fakepcapnav.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/fakepcapnav.h b/src/common/fakepcapnav.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/flows.c b/src/common/flows.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/flows.h b/src/common/flows.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/get.c b/src/common/get.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 
@@ -460,29 +460,11 @@ get_ipv4(const u_char *pktdata, int datalen, int datalink, u_char **newbuff)
  l2len -= l2offset;
  pkt_len -= l2offset;
 
-#ifdef FORCE_ALIGN
- /*
- * copy layer 3 and up to our temp packet buffer
- * for now on, we have to edit the packetbuff because
- * just before we send the packet, we copy the packetbuff 
- * back onto the pkt.data + l2len buffer
- * we do all this work to prevent byte alignment issues
- */
- if (l2len % sizeof(long)) {
- memcpy(*newbuff, (packet + l2len), (pkt_len - l2len));
- ip_hdr = *newbuff;
- } else {
-
- /* we don't have to do a memcpy if l2len lands on a boundary */
- ip_hdr = (packet + l2len);
- }
-#else
  /*
  * on non-strict byte align systems, don't need to memcpy(), 
  * just point to l2len bytes into the existing buffer
  */
  ip_hdr = (packet + l2len);
-#endif
 
  return ip_hdr;
 }
@@ -535,29 +517,11 @@ get_ipv6(const u_char *pktdata, int datalen, int datalink, u_char **newbuff)
  l2len -= l2offset;
  pkt_len -= l2offset;
 
-#ifdef FORCE_ALIGN
- /*
- * copy layer 3 and up to our temp packet buffer
- * for now on, we have to edit the packetbuff because
- * just before we send the packet, we copy the packetbuff
- * back onto the pkt.data + l2len buffer
- * we do all this work to prevent byte alignment issues
- */
- if (l2len % sizeof(long)) {
- memcpy(*newbuff, (packet + l2len), (pkt_len - l2len));
- ip6_hdr = *newbuff;
- } else {
-
- /* we don't have to do a memcpy if l2len lands on a boundary */
- ip6_hdr = (packet + l2len);
- }
-#else
  /*
  * on non-strict byte align systems, don't need to memcpy(),
  * just point to l2len bytes into the existing buffer
  */
  ip6_hdr = (packet + l2len);
-#endif
 
  return ip6_hdr;
 }

diff --git a/src/common/get.h b/src/common/get.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/interface.c b/src/common/interface.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/interface.h b/src/common/interface.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/list.c b/src/common/list.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/list.h b/src/common/list.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/mac.c b/src/common/mac.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/mac.h b/src/common/mac.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/pcap_dlt.h b/src/common/pcap_dlt.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/sendpacket.c b/src/common/sendpacket.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/sendpacket.h b/src/common/sendpacket.h
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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 

diff --git a/src/common/services.c b/src/common/services.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
- * Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - AppNeta
+ * Copyright (c) 2013-2022 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