Merge branch 'master' into macsec

1 files changed, 60 insertions, 44 deletions

diff --git a/Makefile.in b/Makefile.in
index 4bec2139..85854af8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,6 +32,7 @@ mandir = @mandir@
 
 # VPATH
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 #
@@ -70,7 +71,7 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
 	@rm -f $@
 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
 
-CSRC =	setsignal.c tcpdump.c
+CSRC =	fptype.c tcpdump.c
 
 LIBNETDISSECT_SRC=\
 	addrtoname.c \
@@ -80,12 +81,14 @@ LIBNETDISSECT_SRC=\
 	checksum.c \
 	cpack.c \
 	gmpls.c \
-	gmt2local.c \
 	in_cksum.c \
 	ipproto.c \
 	l2vpn.c \
 	machdep.c \
+	netdissect.c \
+	netdissect-alloc.c \
 	nlpid.c \
+	ntp.c \
 	oui.c \
 	parsenfsfh.c \
 	print.c \
@@ -97,15 +100,18 @@ LIBNETDISSECT_SRC=\
 	print-aoe.c \
 	print-ap1394.c \
 	print-arcnet.c \
+	print-arista.c \
 	print-arp.c \
 	print-ascii.c \
 	print-atalk.c \
 	print-atm.c \
 	print-babel.c \
+	print-bcm-li.c \
 	print-beep.c \
 	print-bfd.c \
 	print-bgp.c \
 	print-bootp.c \
+	print-brcmtag.c \
 	print-bt.c \
 	print-calm-fast.c \
 	print-carp.c \
@@ -118,6 +124,7 @@ LIBNETDISSECT_SRC=\
 	print-decnet.c \
 	print-dhcp6.c \
 	print-domain.c \
+	print-dsa.c \
 	print-dtp.c \
 	print-dvmrp.c \
 	print-eap.c \
@@ -141,12 +148,14 @@ LIBNETDISSECT_SRC=\
 	print-icmp6.c \
 	print-igmp.c \
 	print-igrp.c \
+	print-ip-demux.c \
 	print-ip.c \
 	print-ip6.c \
 	print-ip6opts.c \
 	print-ipcomp.c \
 	print-ipfc.c \
 	print-ipnet.c \
+	print-ipoib.c \
 	print-ipx.c \
 	print-isakmp.c \
 	print-isoclns.c \
@@ -165,7 +174,6 @@ LIBNETDISSECT_SRC=\
 	print-lwres.c \
 	print-m3ua.c \
 	print-macsec.c \
-	print-medsa.c \
 	print-mobile.c \
 	print-mobility.c \
 	print-mpcp.c \
@@ -191,6 +199,7 @@ LIBNETDISSECT_SRC=\
 	print-ppp.c \
 	print-pppoe.c \
 	print-pptp.c \
+	print-ptp.c \
 	print-radius.c \
 	print-raw.c \
 	print-resp.c \
@@ -210,6 +219,8 @@ LIBNETDISSECT_SRC=\
 	print-slow.c \
 	print-smtp.c \
 	print-snmp.c \
+	print-someip.c \
+	print-ssh.c \
 	print-stp.c \
 	print-sunatm.c \
 	print-sunrpc.c \
@@ -223,34 +234,35 @@ LIBNETDISSECT_SRC=\
 	print-token.c \
 	print-udld.c \
 	print-udp.c \
+	print-unsupported.c \
 	print-usb.c \
 	print-vjc.c \
 	print-vqp.c \
 	print-vrrp.c \
+	print-vsock.c \
 	print-vtp.c \
-	print-vxlan.c \
 	print-vxlan-gpe.c \
+	print-vxlan.c \
 	print-wb.c \
+	print-zep.c \
 	print-zephyr.c \
 	print-zeromq.c \
-	netdissect.c \
 	signature.c \
 	strtoaddr.c \
 	util-print.c
 
 LOCALSRC = @LOCALSRC@
-GENSRC = version.c
 LIBOBJS = @LIBOBJS@
 
 LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) ${LOCALSRC:.c=.o} ${LIBOBJS}
 LIBNETDISSECT=libnetdissect.a
 
 
-SRC =	$(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC)
+SRC =	$(CSRC) $(GENSRC) $(LOCALSRC)
 
 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
 # hack the extra indirection
-OBJ =	$(CSRC:.c=.o) $(GENSRC:.c=.o) $(LIBNETDISSECT_OBJ)
+OBJ =	$(CSRC:.c=.o) $(GENSRC:.c=.o)
 HDR = \
 	addrtoname.h \
 	addrtostr.h \
@@ -260,13 +272,14 @@ HDR = \
 	ascii_strcasecmp.h \
 	atm.h \
 	chdlc.h \
+	compiler-tests.h \
 	cpack.h \
-	ether.h \
 	ethertype.h \
 	extract.h \
-	getopt_long.h \
+	fptype.h \
+	funcattrs.h \
+	getservent.h \
 	gmpls.h \
-	gmt2local.h \
 	interface.h \
 	ip.h \
 	ip6.h \
@@ -278,9 +291,13 @@ HDR = \
 	mpls.h \
 	nameser.h \
 	netdissect.h \
+	netdissect-alloc.h \
+	netdissect-ctype.h \
+	netdissect-stdinc.h \
 	nfs.h \
 	nfsfh.h \
 	nlpid.h \
+	ntp.h \
 	openflow.h \
 	ospf.h \
 	oui.h \
@@ -289,16 +306,15 @@ HDR = \
 	print.h \
 	rpc_auth.h \
 	rpc_msg.h \
-	rpl.h \
-	setsignal.h \
 	signature.h \
 	slcompress.h \
 	smb.h \
+	status-exit-codes.h \
 	strtoaddr.h \
 	tcp.h \
-	netdissect-stdinc.h \
 	timeval-operations.h \
-	udp.h
+	udp.h \
+	varattrs.h
 
 TAGHDR = \
 	/usr/include/arpa/tftp.h \
@@ -310,14 +326,16 @@ TAGHDR = \
 	/usr/include/netinet/udp.h \
 	/usr/include/protocols/routed.h
 
-TAGFILES = $(SRC) $(HDR) $(TAGHDR)
+TAGFILES = $(SRC) $(HDR) $(TAGHDR) $(LIBNETDISSECT_SRC) \
+	print-pflog.c print-smb.c smbutil.c
 
-CLEANFILES = $(PROG) $(OBJ) $(GENSRC)
+CLEANFILES = $(PROG) $(OBJ) $(GENSRC) $(LIBNETDISSECT_OBJ)
 
 EXTRA_DIST = \
 	CHANGES \
 	CONTRIBUTING \
 	CREDITS \
+	CMakeLists.txt \
 	INSTALL.txt \
 	LICENSE \
 	Makefile.in \
@@ -330,11 +348,17 @@ EXTRA_DIST = \
 	aclocal.m4 \
 	atime.awk \
 	bpf_dump.c \
+	cmake_uninstall.cmake.in \
+	cmakeconfig.h.in \
+	cmake/Modules/FindCRYPTO.cmake \
+	cmake/Modules/FindPCAP.cmake \
+	cmake/Modules/FindSMI.cmake \
 	config.guess \
 	config.h.in \
 	config.sub \
 	configure \
-	configure.in \
+	configure.ac \
+	doc/README.Win32.md \
 	install-sh \
 	lbl/os-osf4.h \
 	lbl/os-solaris2.h \
@@ -343,36 +367,37 @@ EXTRA_DIST = \
 	makemib \
 	missing/dlnames.c \
 	missing/datalinks.c \
+	missing/getopt_long.h \
 	missing/getopt_long.c \
+	missing/getservent.c \
+	missing/pcap_dump_ftell.c \
 	missing/snprintf.c \
 	missing/strdup.c \
 	missing/strlcat.c \
 	missing/strlcpy.c \
 	missing/strsep.c \
+	missing/win_ether_ntohost.c \
+	missing/win_ether_ntohost.h \
 	mkdep \
 	packetdat.awk \
-	pcap_dump_ftell.c \
 	print-pflog.c \
 	print-smb.c \
 	send-ack.awk \
 	smbutil.c \
 	stime.awk \
 	tcpdump.1.in \
-	vfprintf.c \
-	win32/prj/GNUmakefile \
 	win32/prj/WinDump.dsp \
 	win32/prj/WinDump.dsw \
 	win32/prj/WinDump.sln \
-	win32/prj/WinDump.vcproj \
-	win32/src/ether_ntohost.c
+	win32/prj/WinDump.vcproj
 
-TEST_DIST= `find tests \( -name 'DIFF' -prune \) -o \( -name NEW -prune \) -o -type f \! -name '.*' \! -name '*~' -print`
+TEST_DIST= `git ls-files tests | grep -v 'tests/\..*'`
 
-all: $(PROG) $(LIBNETDISSECT)
+all: $(PROG)
 
-$(PROG): $(OBJ) @V_PCAPDEP@
+$(PROG): $(OBJ) @V_PCAPDEP@ $(LIBNETDISSECT)
 	@rm -f $@
-	$(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+	$(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBNETDISSECT) $(LIBS)
 
 $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
 	@rm -f $@
@@ -383,6 +408,8 @@ datalinks.o: $(srcdir)/missing/datalinks.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
 dlnames.o: $(srcdir)/missing/dlnames.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/dlnames.c
+getservent.o: $(srcdir)/missing/getservent.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getservent.c
 getopt_long.o: $(srcdir)/missing/getopt_long.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/getopt_long.c
 snprintf.o: $(srcdir)/missing/snprintf.c
@@ -395,19 +422,8 @@ strlcpy.o: $(srcdir)/missing/strlcpy.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c
 strsep.o: $(srcdir)/missing/strsep.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strsep.c
-
-version.o: version.c
-	$(CC) $(FULL_CFLAGS) -c version.c
-
-version.c: $(srcdir)/VERSION
-	@rm -f $@
-	if grep GIT ${srcdir}/VERSION >/dev/null; then \
-		read ver <${srcdir}/VERSION; \
-		echo $$ver | tr -d '\012'; \
-		date +_%Y_%m_%d; \
-	else \
-		cat ${srcdir}/VERSION; \
-	fi | sed -e 's/.*/const char version[] = "&";/' > $@
+pcap_dump_ftell.o: $(srcdir)/missing/pcap_dump_ftell.c
+	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/pcap_dump_ftell.c
 
 install: all
 	[ -d $(DESTDIR)$(sbindir) ] || \
@@ -423,7 +439,7 @@ uninstall:
 	rm -f $(DESTDIR)$(mandir)/man1/$(PROG).1
 
 lint: $(GENSRC)
-	lint -hbxn $(SRC) | \
+	lint -hbxn $(SRC) $(LIBNETDISSECT_SRC) | \
 	    grep -v 'struct/union .* never defined' | \
 	    grep -v 'possible pointer alignment problem'
 
@@ -438,7 +454,7 @@ distclean:
 	rm -rf autom4te.cache tests/DIFF tests/NEW
 
 check: tcpdump
-	(cd tests && ./TESTrun.sh)
+	$(srcdir)/tests/TESTrun
 
 extags: $(TAGFILES)
 	ctags $(TAGFILES)
@@ -450,7 +466,7 @@ TAGS: $(TAGFILES)
 	etags $(TAGFILES)
 
 releasetar:
-	@cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
+	@name=$(PROG)-`cat VERSION` ; \
 	   mkdir $$name; \
 	   tar cf - $(CSRC) $(HDR) $(LIBNETDISSECT_SRC) $(EXTRA_DIST) $(TEST_DIST) | (cd $$name; tar xf -); \
 	   tar -c -z -f $$name.tar.gz $$name; \
@@ -460,4 +476,4 @@ testlist:
 	echo $(TEST_DIST)
 
 depend: $(GENSRC)
-	$(MKDEP) -c $(CC) -m $(DEPENDENCY_CFLAG) $(DEFS) $(INCLS) $(SRC)
+	$(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" -s "$(srcdir)" $(DEFS) $(INCLS) $(SRC) $(LIBNETDISSECT_SRC)