[ Automated import by raw2svndump ]

ChangeLog

@@ -1,3 +1,31 @@
+Version 1.5beta6 (2005-01-03)
+
+    New --dnat, --no-dnat (default), and --no-dnat-strict command line
+    arguments.  --dnat enabled Destination NAT detection, which works by
+    comparing the quoted IP address in an ICMP payload with the
+    destination a probe packet was addressed to.
+
+    Numeric IP address in parenthesis is now only displayed if the content
+    in the parenthesis is different than the non-parenthesized content,
+    making the output less busy.
+
+    The SYN ISN (Initial Sequence Number) now set to a random 32bit value;
+    previously had always been zero.
+
+    Added missing htons() call around the arguments to getservbyport(),
+    which resulted in the destination port service name not being correctly
+    reported on some architectures, by Dmitry Karasik <dimakar@yahoo.com>
+
+    Improved the configure.ac so that it is less likely to link against
+    unnecessary libraries by "Dmitry V. Levin" <ldv@altlinux.org>
+
+    --no-select is now the default under NetBSD, based on a report and data
+    collected by Ed Ravin <eravin@panix.com>.
+
+    Split the tcptraceroute.c file into main.c, datalink.c, probe.c,
+    capture.c, util.c, and a number of include files, which should make
+    things much more manageable.
+
 Version 1.5beta5 (2003-07-02)
 
     Now functions properly with libpcap when using an interface without a
@@ -7,7 +35,7 @@ Version 1.5beta5 (2003-07-02)
     Improved autoconf handling of the --with-libpcap= command line argument,
     by Richard van den Berg <richard@vdberg.org>.
 
-    Moved the tcptraceroute man page from section 1 to section 8 now that
+    Moved the tcptraceroute man page to section 1 from section 8 now that
     tcptraceroute is installed in /usr/bin by default, as suggested by
     James Ralston <ralston@pobox.com>.
 

Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = tcptraceroute
-tcptraceroute_SOURCES = tcptraceroute.c
+tcptraceroute_SOURCES = main.c datalink.c util.c probe.c capture.c
 man_MANS = tcptraceroute.1
 
 docdir = $(datadir)/doc/tcptraceroute

Makefile.in

@@ -64,15 +64,12 @@ host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
 CC = @CC@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
-LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 bin_PROGRAMS = tcptraceroute
-tcptraceroute_SOURCES = tcptraceroute.c
+tcptraceroute_SOURCES = main.c datalink.c util.c probe.c capture.c
 man_MANS = tcptraceroute.1
 
 docdir = $(datadir)/doc/tcptraceroute
@@ -91,7 +88,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-tcptraceroute_OBJECTS =  tcptraceroute.o
+tcptraceroute_OBJECTS =  main.o datalink.o util.o probe.o capture.o
 tcptraceroute_LDADD = $(LDADD)
 tcptraceroute_DEPENDENCIES = 
 tcptraceroute_LDFLAGS = 
@@ -114,16 +111,18 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/capture.P .deps/datalink.P .deps/main.P .deps/probe.P \
+.deps/util.P
 SOURCES = $(tcptraceroute_SOURCES)
 OBJECTS = $(tcptraceroute_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -188,9 +187,6 @@ uninstall-binPROGRAMS:
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -336,6 +332,11 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -346,6 +347,38 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -387,25 +420,27 @@ distclean-generic:
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-		clean-generic mostlyclean-am
+		clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 	-rm -f config.status
 
 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -418,10 +453,12 @@ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile install-man1 uninstall-man1 install-man \
 uninstall-man uninstall-docDATA install-docDATA tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck all-recursive-am install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 

README

@@ -1,5 +1,5 @@
 tcptraceroute -- A traceroute implementation using TCP packets
-Copyright (c) 2001, 2002, 2003 Michael C. Toren <mct@toren.net>
+Copyright (c) 2001-2005  Michael C. Toren <mct@toren.net>
 
 Updates are available from <http://michael.toren.net/code/tcptraceroute/>
 

VERSION

@@ -1 +1 @@
-1.5beta5
+1.5beta6