From Greg Minshall:

	print the TTL for DNS entries with 3 or more "-v" flags;

	print the addresses in A, AAAA, and A6 entries numerically (the
	point of A, AAAA, and A6 entries being to give the address
	corresponding to a name).

Better late than never - do at least a little de-spamification of
addresses in the CREDITS file.  (Greg's address was despammed in his
sourceforge.net submission for this.)

Move the late Jun-ichiro itojun Hagino to a "Past maintainers" section.

Author: yuguy

CREDITS

@@ -1,163 +1,166 @@
 This file lists people who have contributed to tcpdump:
 
 The current maintainers:
-	Bill Fenner			<[email protected]>
-        David Young                     <[email protected]>
-	Fulvio Risso			<[email protected]>
-	Guy Harris	 		<[email protected]>
-	Hannes Gredler			<[email protected]>
-	Jun-ichiro itojun Hagino	<[email protected]>
-	Michael Richardson	 	<[email protected]>
+	Bill Fenner			<fenner at research dot att dot com>
+        David Young                     <dyoung at pobox dot com>
+	Fulvio Risso			<risso at polito dot it>
+	Guy Harris	 		<guy at alum dot mit dot edu>
+	Hannes Gredler			<hannes at juniper dot net>
+	Michael Richardson	 	<mcr at sandelman dot ottawa dot on dot ca>
 
 Additional people who have contributed patches:
 
-        Aaron Campbell                  <[email protected]>
-	Alfredo Andres			<[email protected]>
-	Albert Chin			<[email protected]>
-	Ananth Suryanarayana 		<[email protected]>
-        Andrea Bittau                   <[email protected]>
-	Andrew Brown			<[email protected]>
-	Andrew Church			<[email protected]>
-	Andrew Hintz			<[email protected]>
-	Andrew Tridgell			<[email protected]>
-        Andy Heffernan                  <[email protected]>
-	Arkadiusz Miskiewicz 		<[email protected]>
-	Armando L. Caro Jr.		<[email protected]>
-	Arnaldo Carvalho de Melo	<[email protected]>
-	Ben Byer			<[email protected]>
-	Atsushi Onoe			<[email protected]>
-	Ben Smithurst			<[email protected]>
-	Brent L. Bates			<[email protected]>
-	Brian Ginsbach			<[email protected]>
-	Bruce M. Simpson		<[email protected]>
-	Carles Kishimoto Bisbe          <[email protected]>
-	Charlie Lenahan			<[email protected]>
-	Charles M. Hannum		<[email protected]>
-	Chris Cogdon			<[email protected]>
-	Chris G. Demetriou		<[email protected]>
-	Christian Sievers		<[email protected]>
-	Chris Jepeway			<[email protected]>
-	Chris Larson			<[email protected]>
-	Craig Rodrigues			<[email protected]>
-	Crist J. Clark			<[email protected]>
-	Daniel Hagerty 			<[email protected]>
-	Darren Reed			<[email protected]>
-	David Binderman			<[email protected]>
-	David Smith			<[email protected]>
-	David Young			<[email protected]>
-	Don Ebright			<[email protected]>
-	Eddie Kohler			<[email protected]>
-	Florent Drouin			<[email protected]>
-	Francis Dupont			<[email protected]>
-	Francisco Matias Cuenca-Acuna	<[email protected]>
-	Francois-Xavier Le Bail		<[email protected]>
-	Frank Volf			<[email protected]>
-	Fulvio Risso			<[email protected]>
-	George Bakos			<[email protected]>
-	Gerald Combs			<[email protected]>
-        Gerrit Renker                   <[email protected]>
-	Gert Doering			<[email protected]>
-        Greg Stark                      <[email protected]>
-	Gilbert Ramirez Jr.		<[email protected]>
-	Gisle Vanem			<[email protected]>
-        Hannes Viertel                  <[email protected]>
-	Hank Leininger			<[email protected]>
-	Harry Raaymakers		<[email protected]>
-	Heinz-Ado Arnolds		<[email protected]>
-	Hendrik Scholz			<[email protected]>
-	Ian McDonald			<[email protected]>
-        Jacek Tobiasz                   <[email protected]>
-	Jakob Schlyter			<[email protected]>
-	Jan Oravec			<[email protected]>
-	Jason R. Thorpe			<[email protected]>
-	Jefferson Ogata 		<[email protected]>
-	Jeffrey Hutzelman		<[email protected]>
-	Jesper Peterson			<[email protected]>
-	Jim Hutchins			<[email protected]>
-        Jonathan Heusser                <[email protected]>
-	Tatuya Jinmei			<[email protected]>
-	J�rgen Thomsen			<[email protected]> 
-	Julian Cowley			<[email protected]>
-	Kaarthik Sivakumar		<[email protected]>
-	Kazushi Sugyo			<[email protected]>
-	Kelly Carmichael		<[email protected]>
-	Ken Hornstein			<[email protected]>
-	Kevin Steves			<[email protected]>
-	Klaus Klein			<[email protected]>
- 	Kris Kennaway			<[email protected]>
-	Krzysztof Halasa		<[email protected]>
-	Larry Lile			<[email protected]>
-	Lennert Buytenhek 		<[email protected]>
-	Loris Degioanni			<[email protected]>
-	Love H�rnquist-�strand		<[email protected]>
-	Luis Martin Garcia		<[email protected]>
-	Maciej W. Rozycki		<[email protected]>
-	Manu Pathak			<[email protected]>
-	Marc Binderberger		<[email protected]>
-	Marc A. Lehmann			<[email protected]>
-	Mark Ellzey Thomas		<[email protected]>
-	Marko Kiiskila			<[email protected]>
-	Markus Sch�pflin		<[email protected]>
-	Marshall Rose			<[email protected]>
-	Martin Husemann			<[email protected]>
-	Max Laier			<[email protected]>
-	Michael Madore			<[email protected]>
-	Michael Shalayeff		<[email protected]>
-	Michael Shields			<[email protected]>
-	Michael T. Stolarchuk		<[email protected]>
-	Michele "mydecay" Marchetto	<[email protected]>
-	Monroe Williams 		<[email protected]>
-	Motonori Shindo			<[email protected]>
-	Nathan J. Williams		<[email protected]>
-	Nathaniel Couper-Noles		<[email protected]>
-	Neil T. Spring			<[email protected]>
-	Niels Provos			<[email protected]>
-	Nickolai Zeldovich		<[email protected]>
-        Nicolas Ferrero                 <[email protected]>
-	Noritoshi Demizu		<[email protected]>
-	Olaf Kirch 			<[email protected]>
-	Onno van der Linden		<[email protected]>
-	Paolo Abeni			<[email protected]>
-	Pascal Hennequin 		<[email protected]>
-	Pasvorn Boonmark		<[email protected]>
-	Paul Mundt			<[email protected]>
-	Paul S. Traina			<[email protected]>
-	Pavlin Radoslavov		<[email protected]>
-	Pekka Savola 			<[email protected]>	
-	Peter Fales			<[email protected]>
-	Peter Jeremy			<[email protected]>
-					<[email protected]>
-	Phil Wood			<[email protected]>
-	Rafal Maszkowski		<[email protected]>
-	Raphael Raimbault		<[email protected]>
-	Rick Cheng                      <[email protected]>
-	Rick Jones			<[email protected]>
-	Rick Watson			<[email protected]>
-	Rob Braun			<[email protected]>
-	Roderick Schertler		<[email protected]>
-	Sami Farin			<[email protected]>
-	Scott Rose			<[email protected]>
-	Sebastian Krahmer		<[email protected]>
-	Sebastien Raveau		<[email protected]>
-	Sebastien Vincent		<[email protected]>
-	Sepherosa Ziehau		<[email protected]>
-	Seth Webster			<[email protected]>
-	Shinsuke Suzuki			<[email protected]>
-	Steinar Haug			<[email protected]>
-        Swaminathan Chandrasekaran      <[email protected]>
-	Takashi Yamamoto		<[email protected]>
-	Terry Kennedy			<[email protected]>
+        Aaron Campbell                  <aaron at arbor dot net>
+	Alfredo Andres			<aandres at s21sec dot com>
+	Albert Chin			<china at thewrittenword dot com>
+	Ananth Suryanarayana 		<anantha at juniper dot net>
+        Andrea Bittau                   <a dot bittau at cs dot ucl dot ac dot uk>
+	Andrew Brown			<atatat at atatdot dot net>
+	Andrew Church			<andrew at users dot sourceforge dot net>
+	Andrew Hintz			<adhintz at users dot sourceforge dot net>
+	Andrew Tridgell			<tridge at linuxcare dot com>
+        Andy Heffernan                  <ahh at juniper dot net>
+	Arkadiusz Miskiewicz 		<misiek at pld dot org dot pl>
+	Armando L. Caro Jr. 		<acaro at mail dot eecis dot udel dot edu>
+	Arnaldo Carvalho de Melo	<acme at ghostprotocols dot net>
+	Ben Byer			<bushing at sourceforge dot net>
+	Atsushi Onoe			<onoe at netbsd dot org>
+	Ben Smithurst			<ben at scientia dot demon dot co dot uk>
+	Brent L. Bates			<blbates at vigyan dot com>
+	Brian Ginsbach			<ginsbach at cray dot com>
+	Bruce M. Simpson		<bms at spc dot org>
+	Carles Kishimoto Bisbe          <ckishimo at ac dot upc dot es>
+	Charlie Lenahan			<clenahan at fortresstech dot com>
+	Charles M. Hannum		<mycroft at netbsd dot org>
+	Chris Cogdon			<chris at cogdon dot org>
+	Chris G. Demetriou		<cgd at netbsd dot org>
+	Christian Sievers		<c_s at users dot sourceforge dot net>
+	Chris Jepeway			<jepeway at blasted-heath dot com>
+	Chris Larson			<clarson at kergoth dot com>
+	Craig Rodrigues			<rodrigc at mediaone dot net>
+	Crist J. Clark			<cjclark at alum dot mit dot edu>
+	Daniel Hagerty 			<hag at ai dot mit dot edu>
+	Darren Reed			<darrenr at reed dot wattle dot id dot au>
+	David Binderman			<d dot binderman at virgin dot net>
+	David Smith			<dsmith at redhat dot com>
+	David Young			<dyoung at ojctech dot com>
+	Don Ebright			<Don dot Ebright at compuware dot com>
+	Eddie Kohler			<xexd at sourceforge dot net>
+	Florent Drouin			<Florent dot Drouin at alcatel-lucent dot fr>
+	Francis Dupont			<Francis dot Dupont at enst-bretagne dot fr>
+	Francisco Matias Cuenca-Acuna	<mcuenca at george dot rutgers dot edu>
+	Francois-Xavier Le Bail		<fx dot lebail at yahoo dot com>
+	Frank Volf			<volf at oasis dot IAEhv dot nl>
+	Fulvio Risso			<risso at polito dot it>
+	George Bakos			<gbakos at ists dot dartmouth dot edu>
+	Gerald Combs			<gerald at ethereal dot com>
+        Gerrit Renker                   <gerrit at erg dot abdn dot ac dot uk>
+	Gert Doering			<gert at greenie dot muc dot de>
+	Greg Minshall			<minshall at acm dot org>
+        Greg Stark                      <gsstark at mit dot edu>
+	Gilbert Ramirez Jr.		<gram at xiexie dot org>
+	Gisle Vanem			<giva at bgnett dot no>
+        Hannes Viertel                  <hviertel at juniper dot net>
+	Hank Leininger			<tcpdump-workers at progressive-comp dot com>
+	Harry Raaymakers		<harryr at connect dot com dot au>
+	Heinz-Ado Arnolds		<Ado dot Arnolds at dhm-systems dot de>
+	Hendrik Scholz			<hendrik at scholz dot net>
+	Ian McDonald			<imcdnzl at gmail dot com>
+        Jacek Tobiasz                   <Jacek dot Tobiasz at atm dot com dot pl>
+	Jakob Schlyter			<jakob at openbsd dot org>
+	Jan Oravec			<wsx at wsx6 dot net>
+	Jason R. Thorpe			<thorpej at netbsd dot org>
+	Jefferson Ogata 		<jogata at nodc dot noaa dot gov>
+	Jeffrey Hutzelman		<jhutz at cmu dot edu>
+	Jesper Peterson			<jesper at endace dot com>
+	Jim Hutchins			<jim at ca dot sandia dot gov>
+        Jonathan Heusser                <jonny at drugphish dot ch>
+	Tatuya Jinmei			<jinmei at kame dot net>
+	J�rgen Thomsen			<jth at jth dot net> 
+	Julian Cowley			<julian at lava dot net>
+	Kaarthik Sivakumar		<kaarthik at torrentnet dot com>
+	Kazushi Sugyo			<sugyo at pb dot jp dot nec dot com>
+	Kelly Carmichael		<kcarmich at ipapp dot com>
+	Ken Hornstein			<kenh at cmf dot nrl dot navy dot mil>
+	Kevin Steves			<stevesk at pobox dot com>
+	Klaus Klein			<kleink at reziprozitaet dot de>
+ 	Kris Kennaway			<kris at freebsd dot org>
+	Krzysztof Halasa		<khc at pm dot waw dot pl>
+	Larry Lile			<lile at stdio dot com>
+	Lennert Buytenhek 		<buytenh at gnu dot org>
+	Loris Degioanni			<loris at netgroup-serv dot polito dot it>
+	Love H�rnquist-�strand		<lha at stacken dot kth dot se>
+	Luis Martin Garcia		<luis dot mgarc at gmail dot com>
+	Maciej W. Rozycki		<macro at ds2 dot pg dot gda dot pl>
+	Manu Pathak			<mapathak at cisco dot com>
+	Marc Binderberger		<mbind at sourceforge dot net>
+	Marc A. Lehmann			<pcg at goof dot com>
+	Mark Ellzey Thomas		<mark at ackers dot net>
+	Marko Kiiskila			<carnil at cs dot tut dot fi>
+	Markus Sch�pflin		<schoepflin at sourceforge dot net>
+	Marshall Rose			<mrose at dbc dot mtview dot ca dot us>
+	Martin Husemann			<martin at netbsd dot org>
+	Max Laier			<max at love2party dot net>
+	Michael Madore			<mmadore at turbolinux dot com>
+	Michael Shalayeff		<mickey at openbsd dot org>
+	Michael Shields			<shields at msrl dot com>
+	Michael T. Stolarchuk		<mts at off dot to>
+	Michele "mydecay" Marchetto	<smarchetto1 at tin dot it>
+	Monroe Williams 		<monroe at pobox dot com>
+	Motonori Shindo			<mshindo at mshindo dot net>
+	Nathan J. Williams		<nathanw at MIT dot EDU>
+	Nathaniel Couper-Noles		<Nathaniel at isi1 dot tccisi dot com>
+	Neil T. Spring			<bluehal at users dot sourceforge dot net>
+	Niels Provos			<provos at openbsd dot org>
+	Nickolai Zeldovich		<kolya at MIT dot EDU>
+        Nicolas Ferrero                 <toorop at babylo dot net>
+	Noritoshi Demizu		<demizu at users dot sourceforge dot net>
+	Olaf Kirch 			<okir at caldera dot de>
+	Onno van der Linden		<onno at simplex dot nl>
+	Paolo Abeni			<paolo dot abeni at email dot it>
+	Pascal Hennequin 		<pascal dot hennequin at int-evry dot fr>
+	Pasvorn Boonmark		<boonmark at juniper dot net>
+	Paul Mundt			<lethal at linux-sh dot org>
+	Paul S. Traina			<pst at freebsd dot org>
+	Pavlin Radoslavov		<pavlin at icir dot org>
+	Pekka Savola 			<pekkas at netcore dot fi>	
+	Peter Fales			<peter at fales-lorenz dot net>
+	Peter Jeremy			<peter dot jeremy at alcatel dot com dot au>
+					<pfhunt at users dot sourceforge dot net>
+	Phil Wood			<cpw at lanl dot gov>
+	Rafal Maszkowski		<rzm at icm dot edu dot pl>
+	Raphael Raimbault		<raphael dot raimbault at netasq dot com>
+	Rick Cheng                      <rcheng at juniper dot net>
+	Rick Jones			<rick dot jones2 at hp dot com>
+	Rick Watson			<watsonrick at users dot sourceforge dot net>
+	Rob Braun			<bbraun at synack dot net>
+	Roderick Schertler		<roderick at argon dot org>
+	Sami Farin			<safari at iki dot fi>
+	Scott Rose			<syberpunk at users dot sourceforge dot net>
+	Sebastian Krahmer		<krahmer at cs dot uni-potsdam dot de>
+	Sebastien Raveau		<sebastien dot raveau at epita dot fr>
+	Sebastien Vincent		<svincent at idems dot fr>
+	Sepherosa Ziehau		<sepherosa at gmail dot com>
+	Seth Webster			<swebster at sst dot ll dot mit dot edu>
+	Shinsuke Suzuki			<suz at kame dot net>
+	Steinar Haug			<sthaug at nethelp dot no>
+        Swaminathan Chandrasekaran      <chander at juniper dot net>
+	Takashi Yamamoto		<yamt at mwd dot biglobe dot ne dot jp>
+	Terry Kennedy			<terry at tmk dot com>
 	Timo Koskiahde
-	Tony Li				<tli@procket.com>
-	Uns Lider			<unslider@miranda.org>
-	Victor Oppleman			<oppleman@users.sourceforge.net>
-	Wesley Griffin			<wgriffin@users.sourceforge.net>
-	Wilbert de Graaf		<wilbertdg@hetnet.nl>
-        Will Drewry                     <will@alum.bu.edu>
+	Tony Li				<tli at procket dot com>
+	Uns Lider			<unslider at miranda dot org>
+	Victor Oppleman			<oppleman at users dot sourceforge dot net>
+	Wesley Griffin			<wgriffin at users dot sourceforge dot net>
+	Wilbert de Graaf		<wilbertdg at hetnet dot nl>
+        Will Drewry                     <will at alum dot bu dot edu>
 	Yen Yen Lim
 	Yoshifumi Nishida
 
 The original LBL crew:
 	Steve McCanne
 	Craig Leres
 	Van Jacobson
+
+Past maintainers:
+	Jun-ichiro itojun Hagino	<itojun at iijlab dot net>

print-domain.c

@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.97 2007-02-13 19:19:00 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.98 2007-12-09 01:40:32 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -387,13 +387,22 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 			printf(" (Cache flush)");
 	}
 
-	/* ignore ttl */
-	cp += 2;
-	/* if T_OPT, save opt_flags */
-	if (typ == T_OPT)
+	if (typ == T_OPT) {
+		/* get opt flags */
+		cp += 2;
 		opt_flags = EXTRACT_16BITS(cp);
-	/* ignore rest of ttl */
-	cp += 2;
+		/* ignore rest of ttl field */
+		cp += 2;
+	} else if (vflag > 2) {
+		/* print ttl */
+		printf(" [");
+		relts_print(EXTRACT_32BITS(cp));
+		printf("]");
+		cp += 4;
+	} else {
+		/* ignore ttl */
+		cp += 4;
+	}
 
 	len = EXTRACT_16BITS(cp);
 	cp += 2;
@@ -408,7 +417,7 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 	case T_A:
 		if (!TTEST2(*cp, sizeof(struct in_addr)))
 			return(NULL);
-		printf(" %s", ipaddr_string(cp));
+		printf(" %s", intoa(htonl(EXTRACT_32BITS(cp))));
 		break;
 
 	case T_NS:
@@ -475,15 +484,24 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 
 #ifdef INET6
 	case T_AAAA:
+	    {
+		struct in6_addr addr;
+		char ntop_buf[INET6_ADDRSTRLEN];
+
 		if (!TTEST2(*cp, sizeof(struct in6_addr)))
 			return(NULL);
-		printf(" %s", ip6addr_string(cp));
+		memcpy(&addr, cp, sizeof(struct in6_addr));
+		printf(" %s",
+		    inet_ntop(AF_INET6, &addr, ntop_buf, sizeof(ntop_buf)));
+
 		break;
+	    }
 
 	case T_A6:
 	    {
 		struct in6_addr a;
 		int pbit, pbyte;
+		char ntop_buf[INET6_ADDRSTRLEN];
 
 		if (!TTEST2(*cp, 1))
 			return(NULL);
@@ -497,7 +515,8 @@ ns_rprint(register const u_char *cp, register const u_char *bp, int is_mdns)
 				return(NULL);
 			memset(&a, 0, sizeof(a));
 			memcpy(&a.s6_addr[pbyte], cp + 1, sizeof(a) - pbyte);
-			printf(" %u %s", pbit, ip6addr_string(&a));
+			printf(" %u %s", pbit,
+			    inet_ntop(AF_INET6, &a, ntop_buf, sizeof(ntop_buf)));
 		}
 		if (pbit > 0) {
 			putchar(' ');