Jun-ichiro's IPv6 patch is merged in with ethereal and now uses the new

proto*() functions. The configure script tries to use ipv6 name resolution if
it knows the type of ipv6 stack the user has (this can be avoided with the
--disable-ipv6 switch) Additionally, the configure script now deals with wiretap
better. If the user doesn't want to compile wiretap, the wiretap is never
visited. A few unnecessary #includes were removed from some wiretap files, and
a CPP macro was moved from bpf.c to wtap.h.

svn path=/trunk/; revision=229

Makefile.am

@@ -26,11 +26,13 @@ ethereal_SOURCES = \
 	packet-fddi.c  \
 	packet-giop.c  \
 	packet-http.c  \
-	packet-llc.c   \
-	packet-lpd.c   \
 	packet-ip.c    \
+	packet-icmpv6.c \
+	packet-ipsec.c \
 	packet-ipv6.c  \
 	packet-ipx.c   \
+	packet-llc.c   \
+	packet-lpd.c   \
 	packet-nbipx.c \
 	packet-nbns.c  \
 	packet-ncp.c   \
@@ -88,9 +90,10 @@ ps.c: print.ps rdps
 rdps: rdps.c
 	$(CC) -o rdps rdps.c
 
-DISTCLEANFILES = \
-	rdps \
-	ps.c
+DISTCLEANFILES =			\
+	rdps 					\
+	ps.c 					\
+	*~
 
 EXTRA_DIST =                \
 	doc/Makefile            \
@@ -103,4 +106,4 @@ EXTRA_DIST =                \
 	print.ps                \
 	rdps.c
 
-SUBDIRS= wiretap
+SUBDIRS = @SUBDIRS@

Makefile.in

@@ -71,7 +71,6 @@ RANLIB = @RANLIB@
 SNPRINTF_C = @SNPRINTF_C@
 SNPRINTF_O = @SNPRINTF_O@
 VERSION = @VERSION@
-WIRETAP_DIR = @WIRETAP_DIR@
 
 bin_PROGRAMS = ethereal
 
@@ -101,11 +100,13 @@ ethereal_SOURCES = \
 	packet-fddi.c  \
 	packet-giop.c  \
 	packet-http.c  \
-	packet-llc.c   \
-	packet-lpd.c   \
 	packet-ip.c    \
+	packet-icmpv6.c \
+	packet-ipsec.c \
 	packet-ipv6.c  \
 	packet-ipx.c   \
+	packet-llc.c   \
+	packet-lpd.c   \
 	packet-nbipx.c \
 	packet-nbns.c  \
 	packet-ncp.c   \
@@ -157,9 +158,10 @@ EXTRA_ethereal_SOURCES = \
 ethereal_DEPENDENCIES = @SNPRINTF_O@ @LIBWIRETAP_A@
 ethereal_LDADD = @SNPRINTF_O@ @LIBWIRETAP_A@
 
-DISTCLEANFILES = \
-	rdps \
-	ps.c
+DISTCLEANFILES =			\
+	rdps 					\
+	ps.c 					\
+	*~
 
 EXTRA_DIST =                \
 	doc/Makefile            \
@@ -172,7 +174,7 @@ EXTRA_DIST =                \
 	print.ps                \
 	rdps.c
 
-SUBDIRS= wiretap
+SUBDIRS = @SUBDIRS@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -188,11 +190,11 @@ ethereal_OBJECTS =  capture.o column.o ethereal.o ethertype.o file.o \
 filter.o follow.o gtkpacket.o menu.o packet.o packet-aarp.o \
 packet-arp.o packet-atalk.o packet-bootp.o packet-cdp.o packet-data.o \
 packet-dns.o packet-eth.o packet-fddi.o packet-giop.o packet-http.o \
-packet-llc.o packet-lpd.o packet-ip.o packet-ipv6.o packet-ipx.o \
-packet-nbipx.o packet-nbns.o packet-ncp.o packet-null.o packet-osi.o \
-packet-ospf.o packet-ppp.o packet-raw.o packet-rip.o packet-tcp.o \
-packet-tftp.o packet-tr.o packet-trmac.o packet-udp.o packet-vines.o \
-prefs.o print.o ps.o resolv.o util.o
+packet-ip.o packet-icmpv6.o packet-ipsec.o packet-ipv6.o packet-ipx.o \
+packet-llc.o packet-lpd.o packet-nbipx.o packet-nbns.o packet-ncp.o \
+packet-null.o packet-osi.o packet-ospf.o packet-ppp.o packet-raw.o \
+packet-rip.o packet-tcp.o packet-tftp.o packet-tr.o packet-trmac.o \
+packet-udp.o packet-vines.o prefs.o print.o ps.o resolv.o util.o
 ethereal_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -219,14 +221,15 @@ DEP_FILES =  .deps/capture.P .deps/column.P .deps/ethereal.P \
 .deps/packet-atalk.P .deps/packet-bootp.P .deps/packet-cdp.P \
 .deps/packet-data.P .deps/packet-dns.P .deps/packet-eth.P \
 .deps/packet-fddi.P .deps/packet-giop.P .deps/packet-http.P \
-.deps/packet-ip.P .deps/packet-ipv6.P .deps/packet-ipx.P \
-.deps/packet-llc.P .deps/packet-lpd.P .deps/packet-nbipx.P \
-.deps/packet-nbns.P .deps/packet-ncp.P .deps/packet-null.P \
-.deps/packet-osi.P .deps/packet-ospf.P .deps/packet-ppp.P \
-.deps/packet-raw.P .deps/packet-rip.P .deps/packet-tcp.P \
-.deps/packet-tftp.P .deps/packet-tr.P .deps/packet-trmac.P \
-.deps/packet-udp.P .deps/packet-vines.P .deps/packet.P .deps/prefs.P \
-.deps/print.P .deps/ps.P .deps/resolv.P .deps/snprintf.P .deps/util.P
+.deps/packet-icmpv6.P .deps/packet-ip.P .deps/packet-ipsec.P \
+.deps/packet-ipv6.P .deps/packet-ipx.P .deps/packet-llc.P \
+.deps/packet-lpd.P .deps/packet-nbipx.P .deps/packet-nbns.P \
+.deps/packet-ncp.P .deps/packet-null.P .deps/packet-osi.P \
+.deps/packet-ospf.P .deps/packet-ppp.P .deps/packet-raw.P \
+.deps/packet-rip.P .deps/packet-tcp.P .deps/packet-tftp.P \
+.deps/packet-tr.P .deps/packet-trmac.P .deps/packet-udp.P \
+.deps/packet-vines.P .deps/packet.P .deps/prefs.P .deps/print.P \
+.deps/ps.P .deps/resolv.P .deps/snprintf.P .deps/util.P
 SOURCES = $(ethereal_SOURCES) $(EXTRA_ethereal_SOURCES)
 OBJECTS = $(ethereal_OBJECTS)
 

README

@@ -13,13 +13,17 @@ The latest distribution can be found in the subdirectory
 
     http://ethereal.zing.org/distribution
 
+Interesting and exotic packet traces can be found at
+
+    http://ethereal.zing.org/~gram/sample.html
+
 
 Installation
 ------------
 
 Ethereal is known to compile and run on the following systems:
 
-  - Linux (2.0.x)
+  - Linux (2.0.x, 2.1.x, 2.2.x)
   - Solaris (2.5.1, 2.6)
   - FreeBSD (2.2.5, 2.2.6)
 
@@ -64,8 +68,22 @@ If you want to add support for other packet-capture file formats, please
 look at the wiretap source code in the wiretap directory.
 
 Please report any problems that are wiretap related to
-Gilbert Ramirez <gram@verdict.uthscsa.edu>. He uses token-ring at work, so he
-is especially interested in any non-token-ring trace files you can send him.
+Gilbert Ramirez <gram@verdict.uthscsa.edu>.
+
+
+IPv6
+----
+If your operating system includes IPv6 support, ethereal will attempt to
+use reverse name resolution capabilities when decoding IPv6 packets. If
+you want to turn off name resolution while using ethereal, start ethereal
+with the "-n" option. If you would like to compile ethereal without
+support for IPv6 name resolution, use the "--disable-ipv6" option with
+"./configure". If you compile ethereal without IPv6 name resolution,
+you will still be able to decode IPv6 packets, but you'll only see IPv6
+addresses, not host names.
+
+The "Follow TCP Stream" feature only supports TCP over IPv4. Support for TCP
+over IPv6 is planned.
 
 
 Disclaimer

acinclude.m4

@@ -48,6 +48,9 @@ dnl Written by David MacKenzie, with help from
 dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor,
 dnl Roland McGrath, Noah Friedman, david d zuhn, and many others.
 
+#
+# AC_ETHEREAL_STRUCT_SA_LEN
+#
 dnl AC_STRUCT_ST_BLKSIZE extracted from the file in qustion,
 dnl "acspecific.m4" in GNU Autoconf 2.12, and turned into
 dnl AC_ETHEREAL_STRUCT_SA_LEN, which checks if "struct sockaddr"
@@ -57,7 +60,6 @@ dnl Done by Guy Harris <guy@netapp.com> on 1998-11-14.
 
 dnl ### Checks for structure members
 
-
 AC_DEFUN(AC_ETHEREAL_STRUCT_SA_LEN,
 [AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_ethereal_struct_sa_len,
 [AC_TRY_COMPILE([#include <sys/types.h>
@@ -67,3 +69,93 @@ if test $ac_cv_ethereal_struct_sa_len = yes; then
   AC_DEFINE(HAVE_SA_LEN)
 fi
 ])
+
+
+#
+# AC_ETHEREAL_IPV6_STACK
+#
+# By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net>
+
+AC_DEFUN(AC_ETHEREAL_IPV6_STACK,
+[
+	v6type=unknown
+	v6lib=none
+
+	AC_MSG_CHECKING([ipv6 stack type])
+	for i in v6d toshiba kame inria zeta linux; do
+		case $i in
+		v6d)
+			AC_EGREP_CPP(yes, [dnl
+#include </usr/local/v6/include/sys/types.h>
+#ifdef __V6D__
+yes
+#endif],
+				[v6type=$i; v6lib=v6;
+				v6libdir=/usr/local/v6/lib;
+				CFLAGS="-I/usr/local/v6/include $CFLAGS"])
+			;;
+		toshiba)
+			AC_EGREP_CPP(yes, [dnl
+#include <sys/param.h>
+#ifdef _TOSHIBA_INET6
+yes
+#endif],
+				[v6type=$i; v6lib=inet6;
+				v6libdir=/usr/local/v6/lib;
+				CFLAGS="-DINET6 $CFLAGS"])
+			;;
+		kame)
+			AC_EGREP_CPP(yes, [dnl
+#include <netinet/in.h>
+#ifdef __KAME__
+yes
+#endif],
+				[v6type=$i; v6lib=inet6;
+				v6libdir=/usr/local/v6/lib;
+				CFLAGS="-DINET6 $CFLAGS"])
+			;;
+		inria)
+			AC_EGREP_CPP(yes, [dnl
+#include <netinet/in.h>
+#ifdef IPV6_INRIA_VERSION
+yes
+#endif],
+				[v6type=$i; CFLAGS="-DINET6 $CFLAGS"])
+			;;
+		zeta)
+			AC_EGREP_CPP(yes, [dnl
+#include <sys/param.h>
+#ifdef _ZETA_MINAMI_INET6
+yes
+#endif],
+				[v6type=$i; v6lib=inet6;
+				v6libdir=/usr/local/v6/lib;
+				CFLAGS="-DINET6 $CFLAGS"])
+			;;
+		linux)
+			if test -d /usr/inet6; then
+				v6type=$i
+				v6lib=inet6
+				v6libdir=/usr/inet6
+				CFLAGS="-DINET6 $CFLAGS"
+			fi
+			;;
+		esac
+		if test "$v6type" != "unknown"; then
+			break
+		fi
+	done
+
+	if test "$v6lib" != "none"; then
+		for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
+			if test -d $dir -a -f $dir/lib$v6lib.a; then
+				LIBS="-L$dir -l$v6lib $LIBS"
+				break
+			fi
+		done
+		enable_ipv6="yes"
+	else
+		enable_ipv6="no"
+	fi
+	AC_MSG_RESULT(["$v6type, $v6lib"])
+])