src - FreeBSD source tree

diff options


context:
space:
mode:

author	cvs2svn <cvs2svn@FreeBSD.org>	2007-10-16 02:20:43 +0000
committer	cvs2svn <cvs2svn@FreeBSD.org>	2007-10-16 02:20:43 +0000
commit	f9e1714b05703289e26a2f151ce5249929fb6685 (patch)
tree	141b980baf520960c909a5d7039be9b94d68cdbb
parent	b5bfcb5d8ae026769a67b6230c15014efc32f7fe (diff)

This commit was manufactured by cvs2svn to create tagvendor/tcpdump/3.9.8

'tcpdump-vendor-v3_9_8'.

Notes

Notes: svn path=/vendor/tcpdump/dist/; revision=172683 svn path=/vendor/tcpdump/3.9.8/; revision=172685; tag=vendor/tcpdump/3.9.8

Diffstat

-rw-r--r--

contrib/tcpdump/acsite.m4

505

-rw-r--r--

contrib/tcpdump/dhcp6.h

200

-rw-r--r--

contrib/tcpdump/dhcp6opt.h

-rw-r--r--

contrib/tcpdump/lbl/gnuc.h

-rw-r--r--

contrib/tcpdump/missing/cdecl_ext.h

-rw-r--r--

contrib/tcpdump/nfsv2.h

262

-rw-r--r--

contrib/tcpdump/pf.h

-rw-r--r--

contrib/tcpdump/print-bxxp.c

-rw-r--r--

contrib/tcpdump/print-lcp.c

216

-rw-r--r--

contrib/tcpdump/savestr.c

-rw-r--r--

contrib/tcpdump/savestr.h

-rw-r--r--

contrib/tcpdump/tests/print-X.out

409

-rw-r--r--

contrib/tcpdump/tests/print-XX.out

419

13 files changed, 0 insertions, 2423 deletions

diff --git a/contrib/tcpdump/acsite.m4 b/contrib/tcpdump/acsite.m4
deleted file mode 100644
index 746faf1e1a4f..000000000000
--- a/contrib/tcpdump/acsite.m4
+++ /dev/null

@@ -1,505 +0,0 @@

-dnl @(#) $Header: acsite.m4,v 1.41 96/11/29 15:30:40 leres Exp $ (LBL)

-dnl

-dnl Redistribution and use in source and binary forms, with or without

-dnl modification, are permitted provided that: (1) source code distributions

-dnl retain the above copyright notice and this paragraph in its entirety, (2)

-dnl distributions including binary code include the above copyright notice and

-dnl this paragraph in its entirety in the documentation or other materials

-dnl provided with the distribution, and (3) all advertising materials mentioning

-dnl features or use of this software display the following acknowledgement:

-dnl ``This product includes software developed by the University of California,

-dnl Lawrence Berkeley Laboratory and its contributors.'' Neither the name of

-dnl the University nor the names of its contributors may be used to endorse

-dnl or promote products derived from this software without specific prior

-dnl written permission.

-dnl THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED

-dnl WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF

-dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

-dnl

-dnl LBL autoconf macros

-dnl

-dnl Determine which compiler we're using (cc or gcc)

-dnl If using gcc, determine the version number

-dnl If using cc, require that it support ansi prototypes

-dnl If using gcc, use -O2 (otherwise use -O)

-dnl If using cc, explicitly specify /usr/local/include

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_C_INIT(copt, incls)

-dnl

-dnl results:

-dnl

-dnl $1 (copt set)

-dnl $2 (incls set)

-dnl CC

-dnl ac_cv_gcc_vers

-dnl LBL_CFLAGS

-dnl

-dnl XXX need to add test to make sure ac_prog_cc hasn't been called

-AC_DEFUN(AC_LBL_C_INIT,

- [AC_PREREQ(2.12)

- $1=-O

- $2=""

- if test "${CFLAGS+set}" = set; then

- LBL_CFLAGS="$CFLAGS"

- fi

- if test -z "$CC" ; then

- case "$target_os" in

- bsdi*)

- AC_CHECK_PROG(SHLICC2, shlicc2, yes, no)

- if test $SHLICC2 = yes ; then

- CC=shlicc2

- export CC

- fi

- ;;

- esac

- fi

- AC_PROG_CC

- if test $ac_cv_prog_gcc = yes ; then

- if test "$SHLICC2" = yes ; then

- ac_cv_gcc_vers=2

- $1=-O2

- else

- AC_MSG_CHECKING(gcc version)

- AC_CACHE_VAL(ac_cv_gcc_vers,

- ac_cv_gcc_vers=`$CC -v 2>&1 | \

- sed -n -e '$s/.* //' -e '$s/\..*//p'`)

- AC_MSG_RESULT($ac_cv_gcc_vers)

- if test $ac_cv_gcc_vers -gt 1 ; then

- $1=-O2

- fi

- else

- AC_MSG_CHECKING(that $CC handles ansi prototypes)

- AC_CACHE_VAL(ac_cv_cc_ansi_prototypes,

- AC_TRY_COMPILE(

- [#include <sys/types.h>],

- [int frob(int, char *)],

- ac_cv_cc_ansi_prototypes=yes,

- ac_cv_cc_ansi_prototypes=no))

- AC_MSG_RESULT($ac_cv_cc_ansi_prototypes)

- if test $ac_cv_cc_ansi_prototypes = no ; then

- case "$target_os" in

- hpux*)

- AC_MSG_CHECKING(for HP-UX ansi compiler ($CC -Aa -D_HPUX_SOURCE))

- savedcflags="$CFLAGS"

- CFLAGS="-Aa -D_HPUX_SOURCE $CFLAGS"

- AC_CACHE_VAL(ac_cv_cc_hpux_cc_aa,

- AC_TRY_COMPILE(

- [#include <sys/types.h>],

- [int frob(int, char *)],

- ac_cv_cc_hpux_cc_aa=yes,

- ac_cv_cc_hpux_cc_aa=no))

- AC_MSG_RESULT($ac_cv_cc_hpux_cc_aa)

- if test $ac_cv_cc_hpux_cc_aa = no ; then

- AC_MSG_ERROR(see the INSTALL for more info)

- fi

- CFLAGS="$savedcflags"

- V_CCOPT="-Aa $V_CCOPT"

- AC_DEFINE(_HPUX_SOURCE)

- ;;

- *)

- AC_MSG_ERROR(see the INSTALL for more info)

- ;;

- esac

- fi

- $2=-I/usr/local/include

- case "$target_os" in

- irix*)

- V_CCOPT="$V_CCOPT -xansi -signed -g3"

- ;;

- osf*)

- V_CCOPT="$V_CCOPT -g3"

- ;;

- ultrix*)

- AC_MSG_CHECKING(that Ultrix $CC hacks const in prototypes)

- AC_CACHE_VAL(ac_cv_cc_const_proto,

- AC_TRY_COMPILE(

- [#include <sys/types.h>],

- [struct a { int b; };

- void c(const struct a *)],

- ac_cv_cc_const_proto=yes,

- ac_cv_cc_const_proto=no))

- AC_MSG_RESULT($ac_cv_cc_const_proto)

- if test $ac_cv_cc_const_proto = no ; then

- AC_DEFINE(const,)

- fi

- ;;

- esac

- fi

-])

-dnl

-dnl Use pfopen.c if available and pfopen() not in standard libraries

-dnl Require libpcap

-dnl Look for libpcap in ..

-dnl Use the installed libpcap if there is no local version

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_LIBPCAP(pcapdep, incls)

-dnl

-dnl results:

-dnl

-dnl $1 (pcapdep set)

-dnl $2 (incls appended)

-dnl LIBS

-dnl

-AC_DEFUN(AC_LBL_LIBPCAP,

- [pfopen=/usr/examples/packetfilter/pfopen.c

- if test -f $pfopen ; then

- AC_CHECK_FUNCS(pfopen)

- if test $ac_cv_func_pfopen = "no" ; then

- AC_MSG_RESULT(Using $pfopen)

- LIBS="$LIBS $pfopen"

- fi

- AC_MSG_CHECKING(for local pcap library)

- libpcap=FAIL

- lastdir=FAIL

- places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \

- egrep '/libpcap-[[0-9]]*\.[[0-9]]*(\.[[0-9]]*)?([[ab]][[0-9]]*)?$'`

- for dir in $places ../libpcap libpcap ; do

- basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//'`

- if test $lastdir = $basedir ; then

- dnl skip alphas when an actual release is present

- continue;

- fi

- lastdir=$dir

- if test -r $dir/pcap.c ; then

- libpcap=$dir/libpcap.a

- d=$dir

- dnl continue and select the last one that exists

- fi

- done

- if test $libpcap = FAIL ; then

- AC_MSG_RESULT(not found)

- AC_CHECK_LIB(pcap, main, libpcap="-lpcap")

- if test $libpcap = FAIL ; then

- AC_MSG_ERROR(see the INSTALL doc for more info)

- fi

- else

- $1=$libpcap

- $2="-I$d $$2"

- AC_MSG_RESULT($libpcap)

- fi

- LIBS="$libpcap $LIBS"])

-dnl

-dnl Define RETSIGTYPE and RETSIGVAL

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_TYPE_SIGNAL

-dnl

-dnl results:

-dnl

-dnl RETSIGTYPE (defined)

-dnl RETSIGVAL (defined)

-dnl

-AC_DEFUN(AC_LBL_TYPE_SIGNAL,

- [AC_TYPE_SIGNAL

- if test "$ac_cv_type_signal" = void ; then

- AC_DEFINE(RETSIGVAL,)

- else

- AC_DEFINE(RETSIGVAL,(0))

- fi

- case "$target_os" in

- irix*)

- AC_DEFINE(_BSD_SIGNALS)

- ;;

- *)

- AC_CHECK_FUNCS(sigset)

- if test $ac_cv_func_sigset = yes ; then

- AC_DEFINE(signal, sigset)

- fi

- ;;

- esac])

-dnl

-dnl If using gcc, see if fixincludes should be run

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_FIXINCLUDES

-dnl

-AC_DEFUN(AC_LBL_FIXINCLUDES,

- [if test $ac_cv_prog_gcc = yes ; then

- AC_MSG_CHECKING(if fixincludes is needed)

- AC_CACHE_VAL(ac_cv_gcc_fixincludes,

- AC_TRY_COMPILE(

- [/*

- * This generates a "duplicate case value" when fixincludes

- * has not be run.

- */

-# include <sys/types.h>

-# include <sys/time.h>

-# include <sys/ioctl.h>

-# ifdef HAVE_SYS_IOCCOM_H

-# include <sys/ioccom.h>

-# endif],

- [switch (0) {

- case _IO('A', 1):;

- case _IO('B', 1):;

- }],

- ac_cv_gcc_fixincludes=yes,

- ac_cv_gcc_fixincludes=no))

- AC_MSG_RESULT($ac_cv_gcc_fixincludes)

- if test $ac_cv_gcc_fixincludes = no ; then

- # Don't cache failure

- unset ac_cv_gcc_fixincludes

- AC_MSG_ERROR(see the INSTALL for more info)

- fi

- fi])

-dnl

-dnl Check for flex, default to lex

-dnl Require flex 2.4 or higher

-dnl Check for bison, default to yacc

-dnl Default to lex/yacc if both flex and bison are not available

-dnl Define the yy prefix string if using flex and bison

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_LEX_AND_YACC(lex, yacc, yyprefix)

-dnl

-dnl results:

-dnl

-dnl $1 (lex set)

-dnl $2 (yacc appended)

-dnl $3 (optional flex and bison -P prefix)

-dnl

-AC_DEFUN(AC_LBL_LEX_AND_YACC,

- [AC_CHECK_PROGS($1, flex, lex)

- if test "$$1" = flex ; then

- # The -V flag was added in 2.4

- AC_MSG_CHECKING(for flex 2.4 or higher)

- AC_CACHE_VAL(ac_cv_flex_v24,

- if flex -V >/dev/null 2>&1; then

- ac_cv_flex_v24=yes

- else

- ac_cv_flex_v24=no

- fi)

- AC_MSG_RESULT($ac_cv_flex_v24)

- if test $ac_cv_flex_v24 = no ; then

- s="2.4 or higher required"

- AC_MSG_WARN(ignoring obsolete flex executable ($s))

- $1=lex

- fi

- AC_CHECK_PROGS($2, bison, yacc)

- if test "$$2" = bison ; then

- $2="$$2 -y"

- fi

- if test "$$1" != lex -a "$$2" = yacc -o "$$1" = lex -a "$$2" != yacc ; then

- AC_MSG_WARN(don't have both flex and bison; reverting to lex/yacc)

- $1=lex

- $2=yacc

- fi

- if test "$$1" = flex -a -n "$3" ; then

- $1="$$1 -P$3"

- $2="$$2 -p $3"

- fi])

-dnl

-dnl Checks to see if union wait is used with WEXITSTATUS()

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_UNION_WAIT

-dnl

-dnl results:

-dnl

-dnl DECLWAITSTATUS (defined)

-dnl

-AC_DEFUN(AC_LBL_UNION_WAIT,

- [AC_MSG_CHECKING(if union wait is used)

- AC_CACHE_VAL(ac_cv_union_wait,

- AC_TRY_COMPILE([

-# include <sys/types.h>

-# include <sys/wait.h>],

- [int status;

- u_int i = WEXITSTATUS(status);

- u_int j = waitpid(0, &status, 0);],

- ac_cv_union_wait=no,

- ac_cv_union_wait=yes))

- AC_MSG_RESULT($ac_cv_union_wait)

- if test $ac_cv_union_wait = yes ; then

- AC_DEFINE(DECLWAITSTATUS,union wait)

- else

- AC_DEFINE(DECLWAITSTATUS,int)

- fi])

-dnl

-dnl Checks to see if the sockaddr struct has the 4.4 BSD sa_len member

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_SOCKADDR_SA_LEN

-dnl

-dnl results:

-dnl

-dnl HAVE_SOCKADDR_SA_LEN (defined)

-dnl

-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,

- [AC_MSG_CHECKING(if sockaddr struct has sa_len member)

- AC_CACHE_VAL(ac_cv_sockaddr_has_sa_len,

- AC_TRY_COMPILE([

-# include <sys/types.h>

-# include <sys/socket.h>],

- [u_int i = sizeof(((struct sockaddr *)0)->sa_len)],

- ac_cv_sockaddr_has_sa_len=yes,

- ac_cv_sockaddr_has_sa_len=no))

- AC_MSG_RESULT($ac_cv_sockaddr_has_sa_len)

- if test $ac_cv_sockaddr_has_sa_len = yes ; then

- AC_DEFINE(HAVE_SOCKADDR_SA_LEN)

- fi])

-dnl

-dnl Checks to see if -R is used

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_HAVE_RUN_PATH

-dnl

-dnl results:

-dnl

-dnl ac_cv_have_run_path (yes or no)

-dnl

-AC_DEFUN(AC_LBL_HAVE_RUN_PATH,

- [AC_MSG_CHECKING(for ${CC-cc} -R)

- AC_CACHE_VAL(ac_cv_have_run_path,

- [echo 'main(){}' > conftest.c

- ${CC-cc} -o conftest conftest.c -R/a1/b2/c3 >conftest.out 2>&1

- if test ! -s conftest.out ; then

- ac_cv_have_run_path=yes

- else

- ac_cv_have_run_path=no

- fi

- rm -f conftest*])

- AC_MSG_RESULT($ac_cv_have_run_path)

- ])

-dnl

-dnl Checks to see if unaligned memory accesses fail

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_UNALIGNED_ACCESS

-dnl

-dnl results:

-dnl

-dnl LBL_ALIGN (DEFINED)

-dnl

-AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,

- [AC_MSG_CHECKING(if unaligned accesses fail)

- AC_CACHE_VAL(ac_cv_unaligned_fail,

- [case "$target_cpu" in

- alpha|hp*|mips|sparc)

- ac_cv_unaligned_fail=yes

- ;;

- *)

- cat >conftest.c <<EOF

-# include <sys/types.h>

-# include <sys/wait.h>

-# include <stdio.h>

- unsigned char a[[5]] = { 1, 2, 3, 4, 5 };

- main() {

- unsigned int i;

- pid_t pid;

- int status;

- /* avoid "core dumped" message */

- pid = fork();

- if (pid < 0)

- exit(2);

- if (pid > 0) {

- /* parent */

- pid = waitpid(pid, &status, 0);

- if (pid < 0)

- exit(3);

- exit(!WIFEXITED(status));

- }

- /* child */

- i = *(unsigned int *)&a[[1]];

- printf("%d\n", i);

- exit(0);

- }

-EOF

- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \

- conftest.c $LIBS >/dev/null 2>&1

- if test ! -x conftest ; then

- dnl failed to compile for some reason

- ac_cv_unaligned_fail=yes

- else

- ./conftest >conftest.out

- if test ! -s conftest.out ; then

- ac_cv_unaligned_fail=yes

- else

- ac_cv_unaligned_fail=no

- fi

- rm -f conftest* core core.conftest

- ;;

- esac])

- AC_MSG_RESULT($ac_cv_unaligned_fail)

- if test $ac_cv_unaligned_fail = yes ; then

- AC_DEFINE(LBL_ALIGN)

- fi])

-dnl

-dnl If using gcc and the file .devel exists:

-dnl Compile with -g (if supported) and -Wall

-dnl If using gcc 2, do extra prototype checking

-dnl If an os prototype include exists, symlink os-proto.h to it

-dnl

-dnl usage:

-dnl

-dnl AC_LBL_DEVEL(copt)

-dnl

-dnl results:

-dnl

-dnl $1 (copt appended)

-dnl HAVE_OS_PROTO_H (defined)

-dnl os-proto.h (symlinked)

-dnl

-AC_DEFUN(AC_LBL_DEVEL,

- [rm -f os-proto.h

- if test "${LBL_CFLAGS+set}" = set; then

- $1="$$1 ${LBL_CFLAGS}"

- fi

- if test $ac_cv_prog_gcc = yes -a -f .devel ; then

- if test "${LBL_CFLAGS+set}" != set; then

- if test "$ac_cv_prog_cc_g" = yes ; then

- $1="-g $$1"

- fi

- $1="$$1 -Wall"

- if test $ac_cv_gcc_vers -gt 1 ; then

- $1="$$1 -Wmissing-prototypes -Wstrict-prototypes"

- fi

- os=`echo $target_os | sed -e 's/$[[0-9]][[0-9]]*$[[^0-9]].*$/\1/'`

- name="lbl/os-$os.h"

- if test -f $name ; then

- ln -s $name os-proto.h

- AC_DEFINE(HAVE_OS_PROTO_H)

- else

- AC_MSG_WARN(can't find $name)

- fi

- fi])

diff --git a/contrib/tcpdump/dhcp6.h b/contrib/tcpdump/dhcp6.h
deleted file mode 100644
index 8381b11f9195..000000000000
--- a/contrib/tcpdump/dhcp6.h
+++ /dev/null

@@ -1,200 +0,0 @@

-/* @(#) $Header: /tcpdump/master/tcpdump/Attic/dhcp6.h,v 1.4 2000/12/17 23:07:48 guy Exp $ (LBL) */

-/*

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * 3. Neither the name of the project nor the names of its contributors

- * may be used to endorse or promote products derived from this software

- * without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- */

-/*

- * draft-ietf-dhc-dhcpv6-15

- */

-#ifndef __DHCP6_H_DEFINED

-#define __DHCP6_H_DEFINED

-/* Error Values */

-#define DH6ERR_FAILURE 16

-#define DH6ERR_AUTHFAIL 17

-#define DH6ERR_POORLYFORMED 18

-#define DH6ERR_UNAVAIL 19

-#define DH6ERR_NOBINDING 20

-#define DH6ERR_INVALIDSOURCE 21

-#define DH6ERR_NOSERVER 23

-#define DH6ERR_ICMPERROR 64

-/* Message type */

-#define DH6_SOLICIT 1

-#define DH6_ADVERT 2

-#define DH6_REQUEST 3

-#define DH6_REPLY 4

-#define DH6_RELEASE 5

-#define DH6_RECONFIG 6

-/* Predefined addresses */

-#define DH6ADDR_ALLAGENT "ff02::1:2"

-#define DH6ADDR_ALLSERVER "ff05::1:3"

-#define DH6ADDR_ALLRELAY "ff05::1:4"

-#define DH6PORT_DOWNSTREAM "546"

-#define DH6PORT_UPSTREAM "547"

-/* Protocol constants */

-#define ADV_CLIENT_WAIT 2 /* sec */

-#define DEFAULT_SOLICIT_HOPCOUNT 4

-#define SERVER_MIN_ADV_DELAY 100 /* msec */

-#define SERVER_MAX_ADV_DELAY 1000 /* msec */

-#define REPLY_MSG_TIMEOUT 2 /* sec */

-#define REQUEST_MSG_MIN_RETRANS 10 /* retransmissions */

-#define RECONF_MSG_MIN_RETRANS 10 /* retransmissions */

-#define RECONF_MSG_RETRANS_INTERVAL 12 /* sec */

-#define RECONF_MMSG_MIN_RESP 2 /* sec */

-#define RECONF_MMSG_MAX_RESP 10 /* sec */

-#define RECONF_MULTICAST_REQUEST_WAIT 120 /* sec */

-#define MIN_SOLICIT_DELAY 1 /* sec */

-#define MAX_SOLICIT_DELAY 5 /* sec */

-#define XID_TIMEOUT 600 /* sec */

-/* DHCP6 base packet format */

-struct dhcp6_solicit {

- u_int8_t dh6sol_msgtype; /* DH6_SOLICIT */

- u_int8_t dh6sol_flags;

-#define DH6SOL_CLOSE 0x80

-#define DH6SOL_PREFIX 0x40

- /* XXX: solicit-ID is a 9-bit field...ugly! */

-#define DH6SOL_SOLICIT_ID_MASK 0x01ff

-#define DH6SOL_SOLICIT_ID_SHIFT 0

-#define DH6SOL_SOLICIT_ID(x) \

- (((x) & DH6SOL_SOLICIT_ID_MASK) >> DH6SOL_SOLICIT_ID_SHIFT)

-#define DH6SOL_SOLICIT_PLEN_MASK 0xfe00

-#define DH6SOL_SOLICIT_PLEN_SHIFT 9

-#define DH6SOL_SOLICIT_PLEN(x) \

- (((x) & DH6SOL_SOLICIT_PLEN_MASK) >> DH6SOL_SOLICIT_PLEN_SHIFT)

- u_int16_t dh6sol_plen_id; /* prefix-len and solict-ID */

- struct in6_addr dh6sol_cliaddr; /* client's lladdr */

- struct in6_addr dh6sol_relayaddr; /* relay agent's lladdr */

-};

-struct dhcp6_advert {

- u_int8_t dh6adv_msgtype; /* DH6_ADVERT */

- u_int8_t dh6adv_rsv_id; /* reserved and uppermost bit of ID */

- u_int8_t dh6adv_solcit_id; /* lower 8 bits of solicit-ID */

- u_int8_t dh6adv_pref;

- struct in6_addr dh6adv_cliaddr; /* client's link-local addr */

- struct in6_addr dh6adv_relayaddr; /* relay agent's (non-ll) addr */

- struct in6_addr dh6adv_serveraddr; /* server's addr */

- /* extensions */

-};

-struct dhcp6_request {

- u_int8_t dh6req_msgtype; /* DH6_REQUEST */

- u_int8_t dh6req_flags;

-#define DH6REQ_CLOSE 0x80

-#define DH6REQ_REBOOT 0x40

- u_int16_t dh6req_xid; /* transaction-ID */

- struct in6_addr dh6req_cliaddr; /* client's lladdr */

- struct in6_addr dh6req_relayaddr; /* relay agent's (non-ll) addr */

- struct in6_addr dh6req_serveraddr; /* server's addr */

- /* extensions */

-};

-struct dhcp6_reply {

- u_int8_t dh6rep_msgtype; /* DH6_REPLY */

- u_int8_t dh6rep_flagandstat;

-#define DH6REP_RELAYPRESENT 0x80

-#define DH6REP_STATMASK 0x7f

- u_int16_t dh6rep_xid; /* transaction-ID */

- struct in6_addr dh6rep_cliaddr; /* client's lladdr */

- /* struct in6_addr dh6rep_relayaddr; optional: relay address */

- /* extensions */

-};

-/* XXX: followings are based on older drafts */

-struct dhcp6_release {

- u_int8_t dh6rel_msgtype; /* DH6_RELEASE */

- u_int8_t dh6rel_flags;

-#define DH6REL_DIRECT 0x80

- u_int16_t dh6rel_xid; /* transaction-ID */

- struct in6_addr dh6rel_cliaddr; /* client's lladdr */

- struct in6_addr dh6rel_relayaddr; /* relay agent's (non-ll) addr */

- struct in6_addr dh6rel_reladdr; /* server's addr to be released */

- /* extensions */

-};

-struct dhcp6_reconfig {

- u_int8_t dh6cfg_msgtype; /* DH6_RECONFIG */

- u_int8_t dh6cfg_flags;

-#define DH6REP_NOREPLY 0x80

- u_int16_t dh6cfg_xid; /* transaction-ID */

- struct in6_addr dh6cfg_servaddr; /* server's addr */

- /* extensions */

-};

-union dhcp6 {

- u_int8_t dh6_msgtype;

- struct dhcp6_solicit dh6_sol;

- struct dhcp6_advert dh6_adv;

- struct dhcp6_request dh6_req;

- struct dhcp6_reply dh6_rep;

- struct dhcp6_release dh6_rel;

- struct dhcp6_reconfig dh6_cfg;

-};

-/* DHCP6 extension */

-struct dhcp6e_ipaddr {

- u_int16_t dh6eip_type;

- u_int16_t dh6eip_len;

- u_int8_t dh6eip_status;

-#define DH6EX_IP_SUCCESS 0 /* request granted, no errors */

-#define DH6EX_IP_SECFAIL 18 /* Security parameters failed */

-#define DH6EX_IP_AAAAFAIL 20 /* AAAA Record Parameter Problem */

-#define DH6EX_IP_PTRFAIL 21 /* PTR Record Parameter Problem */

-#define DH6EX_IP_PARAMFAIL 22 /* Unable to honor required params */

-#define DH6EX_IP_DNSNAMEFAIL 23 /* DNS name string error */

-#define DH6EX_IP_NODYNDNS 24 /* dynDNS Not Implemented */

-#define DH6EX_IP_NOAUTHDNS 25 /* Authoritative DNS Server not found */

-#define DH6EX_IP_DNSFORMFAIL 33 /* DNS format error */

-#define DH6EX_IP_SERVFAIL 34 /* dynDNS unavailable at this time */

-#define DH6EX_IP_NXDOMAIN 35 /* name does not exist */

-#define DH6EX_IP_NOTIMP 36 /* DNS does not support the Opcode */

-#define DH6EX_IP_REFUSED 37 /* DNS refuses specified operation */

-#define DH6EX_IP_YXDOMAIN 38 /* name does not exist */

-#define DH6EX_IP_YXRRSET 39 /* RRset does not exist */

-#define DH6EX_IP_NXRRSET 40 /* RRset does not exist */

-#define DH6EX_IP_NOTAUTH 41 /* non authoritative name server */

-#define DH6EX_IP_NOTZONE 42 /* prerequisite out of zone */

- u_int8_t dh6eip_flags;

-#define DH6EX_IP_CLIANTADDR 0x80 /* C: cliant's addr */

-#define DH6EX_IP_LIFETIME 0x40 /* L: preferred/valid lifetime */

-#define DH6EX_IP_FORCEOPTS 0x20 /* Q: options are mandatory */

-#define DH6EX_IP_AAAA 0x10 /* A: DNS dynamic update for AAAA */

-#define DH6EX_IP_PTR 0x08 /* P: DNS dynamic update for PTR*/

- u_int8_t dh6eip_pad;

- u_int8_t dh6eip_prefixlen;

- /* struct in6_addr: client's address (if C bit = 1) */

- /* u_int: preferred lifetime (if L bit = 1) */

- /* u_int: valid lifetime (if L bit = 1) */

- /* string: DNS name */

-};

-#endif /*__DHCP6_H_DEFINED*/

diff --git a/contrib/tcpdump/dhcp6opt.h b/contrib/tcpdump/dhcp6opt.h
deleted file mode 100644
index fc6534dd1bb9..000000000000
--- a/contrib/tcpdump/dhcp6opt.h
+++ /dev/null

@@ -1,81 +0,0 @@

-/* @(#) $Header: /tcpdump/master/tcpdump/Attic/dhcp6opt.h,v 1.4 2001/09/17 21:57:51 fenner Exp $ (LBL) */