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 <[email protected]>.  Tcpdump has been tested under
+  Rayan Zachariassen <[email protected]>.  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:

doc/README.solaris.md

@@ -2,6 +2,12 @@
 
 * Autoconf works everywhere.
 
+## OmniOS r151046/AMD64
+
+* Both system and local libpcap are suitable.
+* CMake 3.26.4 works
+* GCC 12.2.0 and Clang 16.0.4 work.
+
 ## OmniOS r151044/AMD64
 
 * Both system and local libpcap are suitable.
@@ -52,6 +58,12 @@ ENDOFTEXT
 * CMake 3.14.3 works.
 * Sun C 5.13 and GCC 5.5.0 work.
 
+## Solaris 10/SPARC
+
+* Both system and local libpcap are suitable.
+* CMake 3.14.3 works.
+* Sun C 5.9 and GCC 5.5.0 work.
+
 ## Solaris 9
 
 This version of this OS is not supported because the snprintf(3) implementation

netdissect.h

@@ -228,6 +228,7 @@ struct netdissect_options {
   jmp_buf ndo_early_end;	/* jmp_buf for setjmp()/longjmp() */
   void *ndo_last_mem_p;		/* pointer to the last allocated memory chunk */
   int ndo_packet_number;	/* print a packet number in the beginning of line */
+  int ndo_lengths;		/* print packet header caplen and len */
   int ndo_print_sampling;	/* print every Nth packet */
   int ndo_suppress_default_print; /* don't use default_print() for unknown packet types */
   int ndo_tstamp_precision;	/* requested time stamp precision */
@@ -657,7 +658,7 @@ extern void hncp_print(netdissect_options *, const u_char *, u_int);
 extern void hsrp_print(netdissect_options *, const u_char *, u_int);
 extern void http_print(netdissect_options *, const u_char *, u_int);
 extern void icmp6_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
-extern void icmp_print(netdissect_options *, const u_char *, u_int, const u_char *, int);
+extern void icmp_print(netdissect_options *, const u_char *, u_int, int);
 extern u_int ieee802_11_radio_print(netdissect_options *, const u_char *, u_int, u_int);
 extern u_int ieee802_15_4_print(netdissect_options *, const u_char *, u_int);
 extern void igmp_print(netdissect_options *, const u_char *, u_int);

ospf.h

@@ -72,6 +72,7 @@
 #define LS_OPAQUE_TYPE_TE       1   /* rfc3630 */
 #define LS_OPAQUE_TYPE_GRACE    3   /* rfc3623 */
 #define LS_OPAQUE_TYPE_RI       4   /* draft-ietf-ospf-cap-03 */
+#define LS_OPAQUE_TYPE_EP       7   /* rfc7684 */
 
 #define LS_OPAQUE_TE_TLV_ROUTER 1   /* rfc3630 */
 #define LS_OPAQUE_TE_TLV_LINK   2   /* rfc3630 */
@@ -94,6 +95,12 @@
 #define LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_PTP        1  /* rfc3630 */
 #define LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE_MA         2  /* rfc3630 */
 
+#define LS_OPAQUE_RI_SUBTLV_SID_LABEL                 1  /* rfc8665 */
+
+#define LS_OPAQUE_EP_EXTD_PREFIX_TLV                  1  /* rfc7684 */
+#define LS_OPAQUE_EP_EXTD_PREFIX_RANGE_TLV            2  /* rfc8665 */
+#define LS_OPAQUE_EP_SUBTLV_PREFIX_SID                2  /* rfc8665 */
+
 #define LS_OPAQUE_GRACE_TLV_PERIOD       1 /* rfc3623 */
 #define LS_OPAQUE_GRACE_TLV_REASON       2 /* rfc3623 */
 #define LS_OPAQUE_GRACE_TLV_INT_ADDRESS  3 /* rfc3623 */
@@ -104,7 +111,8 @@
 #define LS_OPAQUE_GRACE_TLV_REASON_CP_SWITCH   3 /* rfc3623 */
 
 #define LS_OPAQUE_RI_TLV_CAP             1 /* draft-ietf-ospf-cap-03 */
-
+#define LS_OPAQUE_RI_TLV_HOSTNAME        7 /* rfc5642 */
+#define LS_OPAQUE_RI_TLV_SID_LABEL_RANGE 9 /* rfc8665 */
 
 /* rla_link.link_type	*/
 #define	RLA_TYPE_ROUTER		1   /* point-to-point to another router	*/
@@ -247,6 +255,13 @@ struct lsa {
 	    nd_byte     data[1]; /* may repeat   */
 	} un_ri_tlv[1]; /* may repeat */
 
+        /* Extended Prefix LSA */
+        struct {
+	    nd_uint16_t type;
+	    nd_uint16_t length;
+	    nd_byte     data[1]; /* may repeat   */
+	} un_ep_tlv[1]; /* may repeat */
+
         /* Unknown LSA */
         struct unknown {
 	    nd_byte data[1]; /* may repeat   */

print-brcmtag.c

@@ -29,7 +29,6 @@
 
 #define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
-#include "ethertype.h"
 #include "addrtoname.h"
 #include "extract.h"
 

print-dhcp6.c

@@ -299,7 +299,6 @@ dhcp6opt_print(netdissect_options *ndo,
 	uint8_t dh6_reconf_type;
 	uint8_t dh6_lq_query_type;
 	u_int first_list_value;
-	uint16_t remainder_len;
 
 	if (cp == ep)
 		return;
@@ -558,7 +557,9 @@ dhcp6opt_print(netdissect_options *ndo,
 			ND_PRINT(" ");
 			for (i = 0; i < optlen && i < 10; i++)
 				ND_PRINT("%02x", GET_U_1(tp + i));
-			ND_PRINT("...)");
+			if (i < optlen)
+				ND_PRINT("...");
+			ND_PRINT(")");
 			break;
 		case DH6OPT_RECONF_MSG:
 			if (optlen != 1) {
@@ -685,7 +686,9 @@ dhcp6opt_print(netdissect_options *ndo,
 			 */
 			for (i = 4; i < optlen && i < 14; i++)
 				ND_PRINT("%02x", GET_U_1(tp + i));
-			ND_PRINT("...)");
+			if (i < optlen)
+				ND_PRINT("...");
+			ND_PRINT(")");
 			break;
 		case DH6OPT_LQ_QUERY:
 			if (optlen < 17) {
@@ -732,7 +735,9 @@ dhcp6opt_print(netdissect_options *ndo,
 			 */
 			for (i = 16; i < optlen && i < 26; i++)
 				ND_PRINT("%02x", GET_U_1(tp + i));
-			ND_PRINT("...)");
+			if (i < optlen)
+				ND_PRINT("...");
+			ND_PRINT(")");
 			break;
 		case DH6OPT_NTP_SERVER:
 			if (optlen < 4) {
@@ -786,7 +791,7 @@ dhcp6opt_print(netdissect_options *ndo,
 					nd_printjnp(ndo, tp, label_len);
 					tp += label_len;
 					remain_len -= (label_len + 1);
-					if(GET_U_1(tp)) ND_PRINT(".");
+					if (GET_U_1(tp)) ND_PRINT(".");
 				} else {
 					ND_PRINT(" ?");
 					break;
@@ -819,24 +824,24 @@ dhcp6opt_print(netdissect_options *ndo,
 			ND_PRINT(" ");
 			tp = (const u_char *)(dh6o + 1);
 			first_list_value = TRUE;
-			remainder_len = optlen;
-			while (remainder_len >= 2) {
+			remain_len = optlen;
+			while (remain_len >= 2) {
 				if (first_list_value == FALSE) {
 					ND_PRINT(",");
 				}
 				first_list_value = FALSE;
 				subopt_len = GET_BE_U_2(tp);
-				if (subopt_len > remainder_len-2) {
+				if (subopt_len > remain_len - 2) {
+					ND_PRINT(" ?");
 					break;
 				}
 				tp += 2;
 				nd_printjn(ndo, tp, subopt_len);
 				tp += subopt_len;
-				remainder_len -= (subopt_len+2);
+				remain_len -= (subopt_len + 2);
 			}
-			if (remainder_len != 0 ) {
+			if (remain_len != 0)
 				ND_PRINT(" ?");
-			}
 			ND_PRINT(")");
 			break;