Merge branch 'master' of github.com:the-tcpdump-group/tcpdump

diff --git a/aclocal.m4 b/aclocal.m4
index a00314128f4de696522debae9fa3f434c1c6f13c..30d01f5f9e5d6330faadd956b50fac7efa26597c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -996,6 +996,7 @@ AC_DEFUN(AC_LBL_DEVEL,
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wold-style-definition)
                    AC_LBL_CHECK_COMPILER_OPT($1, -Wused-but-marked-unused)
                    AC_LBL_CHECK_COMPILER_OPT($1, -W)
+                   AC_LBL_CHECK_COMPILER_OPT($1, -Wassign-enum)
            fi
            AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT()
            #

diff --git a/configure b/configure
index 9a261d528a0e47c5d2ea8d28760620e8953464d4..434c87cff682683de76fe7866ef85f4a9a8a700f 100755 (executable)
--- a/configure
+++ b/configure
@@ -7232,6 +7232,49 @@ else
 $as_echo "no" >&6; }
                CFLAGS="$save_CFLAGS"
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wassign-enum option" >&5
+$as_echo_n "checking whether the compiler supports the -Wassign-enum option... " >&6; }
+       save_CFLAGS="$CFLAGS"
+       if expr "x-Wassign-enum" : "x-W.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS $ac_lbl_unknown_warning_option_error -Wassign-enum"
+       elif expr "x-Wassign-enum" : "x-f.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wassign-enum"
+       elif expr "x-Wassign-enum" : "x-m.*" >/dev/null
+       then
+           CFLAGS="$CFLAGS -Werror -Wassign-enum"
+       else
+           CFLAGS="$CFLAGS -Wassign-enum"
+       fi
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               CFLAGS="$save_CFLAGS"
+               V_CCOPT="$V_CCOPT -Wassign-enum"
+
+else
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               CFLAGS="$save_CFLAGS"
+
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 

diff --git a/netdissect.h b/netdissect.h
index 9060d1500ead9c017cd27d0afb96f1966ead0de1..e8d1f3c21e0a4b624891a18df926f888ebd8604b 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -143,7 +143,7 @@ struct netdissect_options {
   int ndo_bflag;               /* print 4 byte ASes in ASDOT notation */
   int ndo_eflag;               /* print ethernet header */
   int ndo_fflag;               /* don't translate "foreign" IP address */
-  int ndo_Kflag;               /* don't check TCP checksums */
+  int ndo_Kflag;               /* don't check IP, TCP or UDP checksums */
   int ndo_nflag;               /* leave addresses as numbers */
   int ndo_Nflag;               /* remove domains from printed host names */
   int ndo_qflag;               /* quick (shorter) output */