Merge branch 'the-tcpdump-group:master' into master

Author: sikarash

.ci-coverity-scan-build.sh

@@ -46,7 +46,7 @@ if [ ! -d $TOOL_BASE ]; then
 fi
 
 TOOL_DIR=$(find $TOOL_BASE -type d -name 'cov-analysis*')
-export PATH=$TOOL_DIR/bin:$PATH
+export PATH="$TOOL_DIR/bin:$PATH"
 
 # Build
 printf "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m\n"

.cirrus.yml

@@ -9,10 +9,10 @@ freebsd_task:
     # FreeBSD fails to start with 1 GB. 8 CPUs max concurrency.
     # The number of CPU cores must be either 1 or a multiple of 2.
     matrix:
-      - image_family: freebsd-12-4
+      - image_family: freebsd-13-2
         cpu: 2
         memory: 2G
-      - image_family: freebsd-13-2
+      - image_family: freebsd-14-0
         cpu: 2
         memory: 2G
   env:

CHANGES

@@ -21,12 +21,13 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
     User interface:
       Add optional unit suffix on -C file size.
       Add --print-sampling to print every Nth packet instead of all.
+      Add --lengths option to print the captured and original packet lengths.
     Source code:
       Use %zu when printing a sizeof to squelch compiler warnings
       Remove unused missing/snprintf.c.
       Remove unused missing/strdup.c.
       (FIXME: somebody please wrap the line below just before the release)
-      AODV, AppleTalk, BOOTP, CHDLC, DCCP, EAP, EGP, EIGRP, ForCES, Geneve, GRE, Juniper, L2TP, mobile, NetFlow, NTP, OLSR, PGM, RADIUS, RIP, RSVP, SCTP, SNMP, TCP, UDP, vsock: Modernize packet parsing style
+      AODV, AppleTalk, BOOTP, CHDLC, DCCP, EAP, EGP, EIGRP, ForCES, Geneve, GRE, ICMP, Juniper, L2TP, mobile, NetFlow, NTP, OLSR, PGM, RADIUS, RIP, RSVP, SCTP, SNMP, TCP, UDP, vsock: Modernize packet parsing style
       DCCP, EGP: Replace custom code with tok2str()
       UDP: Clean up address and port printing.
       AppleTalk: Declutter appletalk.h.
@@ -80,6 +81,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
     User interface:
       Print the supported time stamp types (-J) to stdout instead of stderr.
       Print the list of data link types (-L) to stdout instead of stderr.
+      Use symmetrical quotation characters in error messages.
     Source code:
       tcpdump: Fix a memory leak.
       child_cleanup: reap as many child processes as possible.
@@ -93,6 +95,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       Make nd_trunc_longjmp() not static inline.
       Include <time.h> from netdissect.h.
       Remove init_crc10_table() and the entourage.
+      Initialize tzcode early.
     Building and testing:
       Add a configure option to help debugging (--enable-instrument-functions)
       At build time require a proof of suitable snprintf(3) implementation in
@@ -1794,7 +1797,7 @@ v2.0.1 Sun Jan 26 21:10:10 PDT
 - Ultrix 4.0 is supported (also thanks to Jeff Mogul).
 
 - IBM RT and Stanford Enetfilter support has been added by
-  Rayan Zachariassen <rayan@canet.ca>.  Tcpdump has been tested under
+  Rayan Zachariassen <rayan@canet.ca>.  tcpdump has been tested under
   both the vanilla Enetfilter interface, and the extended interface
   (#ifdef'd by IBMRTPC) present in the MERIT version of the Enetfilter.
 

CMakeLists.txt

@@ -6,18 +6,22 @@ if(WIN32)
     cmake_minimum_required(VERSION 3.12)
 else(WIN32)
     #
-    # For now, require only 2.8.12, just in case somebody is
-    # configuring with CMake on a "long-term support" version
-    # of some OS and that version supplies an older version of
-    # CMake.
+    # For now:
     #
-    # If this is ever updated to CMake 3.1 or later, remove the
-    # stuff in cmake/Modules/FindPCAP.cmake that appends subdirectories
-    # of directories from CMAKE_PREFIX_PATH to the PKG_CONFIG_PATH
-    # environment variable when running pkg-config, to make sure
-    # it finds any .pc file from there.
+    #  if this is a version of CMake less than 3.5, require only
+    #  2.8.12, just in case somebody is configuring with CMake
+    #  on a "long-term support" version # of some OS and that
+    #  version supplies an older version of CMake;
     #
-    cmake_minimum_required(VERSION 2.8.12)
+    #  otherwise, require 3.5, so we don't get messages warning
+    #  that support for versions of CMake lower than 3.5 is
+    #  deprecated.
+    #
+    if(CMAKE_VERSION VERSION_LESS "3.5")
+        cmake_minimum_required(VERSION 2.8.12)
+    else()
+        cmake_minimum_required(VERSION 3.5)
+    endif()
 endif(WIN32)
 
 #
@@ -1393,7 +1397,7 @@ add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
 #
-# Tcpdump tests
+# tcpdump tests
 # We try to find the Perl interpreter and, if we do, we have the check
 # rule run tests/TESTrun with it, because just trying to run the TESTrun
 # script as a command won't work on Windows.

CONTRIBUTING.md

@@ -39,7 +39,7 @@ and ask!
 1) Check that there isn't a pull request already opened for the changes you
    intend to make.
 
-2) [Fork](https://help.github.com/articles/fork-a-repo/) the Tcpdump
+2) [Fork](https://help.github.com/articles/fork-a-repo/) the tcpdump
    [repository](https://github.com/the-tcpdump-group/tcpdump).
 
 3) The easiest way to test your changes on multiple operating systems and

Makefile.in

@@ -569,4 +569,4 @@ depend:
 	@$(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" -s "$(srcdir)" $(DEFS) $(INCLS) $(SRC) $(LIBNETDISSECT_SRC)
 
 shellcheck:
-	shellcheck -f gcc -e SC2006 build.sh build_matrix.sh build_common.sh
+	shellcheck -f gcc -e SC2006 build.sh build_matrix.sh build_common.sh .ci-coverity-scan-build.sh

README.md

@@ -35,12 +35,23 @@ tcpdump compiles and works on at least the following platforms:
 * {Mac} OS X / macOS
 * NetBSD
 * OpenBSD
-* OpenWrt
 * Solaris
 * Windows (requires WinPcap or Npcap, and Visual Studio with CMake)
 
+In the past tcpdump certainly or likely worked on the following platforms:
+
+* 4.3BSD
+* BSD/386, later BSD/OS
+* DEC OSF/1, later Digital UNIX, later Tru64 UNIX
+* DOS
+* IRIX
+* SINIX
+* SunOS
+* Ultrix
+* UnixWare
+
 ### Dependency on libpcap
-Tcpdump uses libpcap, a system-independent interface for user-level
+tcpdump uses libpcap, a system-independent interface for user-level
 packet capture.  Before building tcpdump, you must first retrieve and
 build libpcap.
 

build_matrix.sh

@@ -49,8 +49,8 @@ build_tcpdump() {
             export CRYPTO
             for SMB in $MATRIX_SMB; do
                 export SMB
-                COUNT=`increment $COUNT`
-                echo_magenta "===== SETUP $COUNT: BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CC=$CC CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2
+                COUNT=`increment "$COUNT"`
+                echo_magenta "===== SETUP $COUNT: CC=$CC BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2
                 # Run one build with setup environment variables:
                 # BUILD_LIBPCAP, REMOTE, CC, CMAKE, CRYPTO and SMB
                 run_after_echo ./build.sh

diag-control.h

@@ -132,6 +132,22 @@
   #define DIAG_ON_CAST_QUAL \
     DIAG_DO_PRAGMA(GCC diagnostic pop)
 
+  #if ND_IS_AT_LEAST_GNUC_VERSION(4,5)
+    /*
+     * GCC warns about unused return values if a function is marked as
+     * "warn about ignoring this function's return value".
+     *
+     * Clang appears to let you ignore a result without a warning by
+     * casting the function result to void, so we don't appear to
+     * need this for Clang.
+     */
+    #define DIAG_OFF_WARN_UNUSED_RESULT \
+      DIAG_DO_PRAGMA(GCC diagnostic push) \
+      DIAG_DO_PRAGMA(GCC diagnostic ignored "-Wunused-result")
+    #define DIAG_ON_WARN_UNUSED_RESULT \
+      DIAG_DO_PRAGMA(GCC diagnostic pop)
+  #endif
+
   /*
    * Suppress deprecation warnings.
    */
@@ -172,6 +188,12 @@
 #ifndef DIAG_ON_CAST_QUAL
 #define DIAG_ON_CAST_QUAL
 #endif
+#ifndef DIAG_OFF_WARN_UNUSED_RESULT
+#define DIAG_OFF_WARN_UNUSED_RESULT
+#endif
+#ifndef DIAG_ON_WARN_UNUSED_RESULT
+#define DIAG_ON_WARN_UNUSED_RESULT
+#endif
 #ifndef DIAG_OFF_DEPRECATION
 #define DIAG_OFF_DEPRECATION
 #endif

doc/README.haiku.md

@@ -4,8 +4,8 @@
 
 * Both system and local libpcap are suitable.
 * Autoconf 2.71 works.
-* CMake 3.24.2 works.
-* GCC 11.2.0 works.
+* CMake 3.27.7 works.
+* GCC 13.2.0 works.
 * Clang 12.0.1 works with the latest llvm12_clang-12.0.1-5 version.
 
 The following command will install respective non-default packages: