sorry angelos, they are not used any more :-P

3 files changed, 0 insertions, 239 deletions

diff --git a/sys/netinet6/icmpv6.h b/sys/netinet6/icmpv6.h
deleted file mode 100644
index 11a337f3809..00000000000
--- a/sys/netinet6/icmpv6.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $OpenBSD: icmpv6.h,v 1.2 1999/12/10 08:53:17 angelos Exp $ */
-
-/*
-%%% portions-copyright-nrl-97
-Portions of this software are Copyright 1997-1998 by Randall Atkinson,
-Ronald Lee, Daniel McDonald, Bao Phan, and Chris Winters. All Rights
-Reserved. All rights under this copyright have been assigned to the US
-Naval Research Laboratory (NRL). The NRL Copyright Notice and License
-Agreement Version 1.1 (January 17, 1995) applies to these portions of the
-software.
-You should have received a copy of the license with this software. If you
-didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
-
-*/
-
-#ifndef _NETINET6_ICMPV6_H
-#define _NETINET6_ICMPV6_H 1
-
-#include <netinet6/ipv6.h>
-
-struct icmpv6hdr {
-  uint8_t     icmpv6_type;   /* type field */
-  uint8_t     icmpv6_code;   /* code field */
-  uint16_t    icmpv6_cksum;  /* checksum field */
-  union {
-    uint32_t  un_data32[1]; /* type-specific field */
-    uint16_t  un_data16[2]; /* type-specific field */
-    uint8_t   un_data8[4];  /* type-specific field */
-  } icmpv6_dataun;
-};
-
-#define icmpv6_data32    icmpv6_dataun.un_data32
-#define icmpv6_data16    icmpv6_dataun.un_data16
-#define icmpv6_data8     icmpv6_dataun.un_data8
-#define icmpv6_pptr      icmpv6_data32[0]  /* parameter prob */
-#define icmpv6_mtu       icmpv6_data32[0]  /* packet too big */
-#define icmpv6_id        icmpv6_data16[0]  /* echo request/reply */
-#define icmpv6_seq       icmpv6_data16[1]  /* echo request/reply */
-#define icmpv6_maxdelay  icmpv6_data16[0]  /* mcast group membership */
-
-#define ICMPV6_DST_UNREACH           1
-#define ICMPV6_PACKET_TOOBIG         2
-#define ICMPV6_TIME_EXCEEDED         3 
-#define ICMPV6_PARAMETER_PROBLEM     4
-
-#define ICMPV6_INFOMSG_MASK          128 /* all informational messages */
-#define ICMPV6_ECHO_REQUEST          128
-#define ICMPV6_ECHO_REPLY            129
-#define ICMPV6_MEMBERSHIP_QUERY      130
-#define ICMPV6_MEMBERSHIP_REPORT     131
-#define ICMPV6_MEMBERSHIP_REDUCTION  132
-
-#define ICMPV6_UNREACH_NOROUTE       0
-#define ICMPV6_UNREACH_ADMIN         1 /* administratively prohibited */
-#define ICMPV6_UNREACH_NOTNEIGHBOR   2 /* not a neighbor (and must be) */
-#define ICMPV6_UNREACH_ADDRESS       3
-#define ICMPV6_UNREACH_PORT          4
-
-#define ICMPV6_EXCEEDED_HOPS         0 /* Hop Limit == 0 in transit */
-#define ICMPV6_EXCEEDED_REASSEMBLY   1 /* Reassembly time out */
-
-#define ICMPV6_PARAMPROB_HDR         0 /* erroneous header field */
-#define ICMPV6_PARAMPROB_NEXTHDR     1 /* unrecognized Next Header */
-#define ICMPV6_PARAMPROB_OPTION      2 /* unrecognized option */
-
-struct icmpv6_filter {
-  uint32_t data[8];  /* 8*32 = 256 bits */
-};
-
-#define ICMPV6_FILTER_WILLPASS(type, filterp) \
-  ((((filterp)->data[(type) >> 5]) & (1 << ((type) & 31))) == 0)
-#define ICMPV6_FILTER_WILLBLOCK(type, filterp) \
-  ((((filterp)->data[(type) >> 5]) & (1 << ((type) & 31))) != 0)
-#define ICMPV6_FILTER_SETPASS(type, filterp) \
-  ((((filterp)->data[(type) >> 5]) &= ~(1 << ((type) & 31))))
-#define ICMPV6_FILTER_SETBLOCK(type, filterp) \
-  ((((filterp)->data[(type) >> 5]) |=  (1 << ((type) & 31))))
-#define ICMPV6_FILTER_SETPASSALL(filterp) \
-  memset((filterp), 0, sizeof(struct icmpv6_filter))
-#define ICMPV6_FILTER_SETBLOCKALL(filterp) \
-  memset((filterp), 0xff, sizeof(struct icmpv6_filter))
-
-#endif /* _NETINET6_ICMPV6_H */
diff --git a/sys/netinet6/icmpv6_var.h b/sys/netinet6/icmpv6_var.h
deleted file mode 100644
index ad468c848c7..00000000000
--- a/sys/netinet6/icmpv6_var.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $OpenBSD: icmpv6_var.h,v 1.5 1999/12/10 08:53:17 angelos Exp $ */
-
-/*
-%%% copyright-nrl-95
-This software is Copyright 1995-1998 by Randall Atkinson, Ronald Lee,
-Daniel McDonald, Bao Phan, and Chris Winters. All Rights Reserved. All
-rights under this copyright have been assigned to the US Naval Research
-Laboratory (NRL). The NRL Copyright Notice and License Agreement Version
-1.1 (January 17, 1995) applies to this software.
-You should have received a copy of the license with this software. If you
-didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
-
-*/
-#ifndef _NETINET6_ICMPV6_VAR_H
-#define _NETINET6_ICMPV6_VAR_H 1
-
-#if defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802
-#define _ICMPV6STAT_TYPE u_quad_t
-#else /* defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802 */
-#define _ICMPV6STAT_TYPE u_long
-#endif /* defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802 */
-
-struct icmpv6stat
-{
-  _ICMPV6STAT_TYPE icps_error;
-  _ICMPV6STAT_TYPE icps_tooshort;
-  _ICMPV6STAT_TYPE icps_checksum;
-  _ICMPV6STAT_TYPE icps_outhist[ICMPV6_MAXTYPE+1];
-  _ICMPV6STAT_TYPE icps_badlen;
-  _ICMPV6STAT_TYPE icps_badcode;
-  _ICMPV6STAT_TYPE icps_reflect;    /* Number of in-kernel responses */
-  _ICMPV6STAT_TYPE icps_inhist[ICMPV6_MAXTYPE+1];
-};
-
-/*
- * Names for ICMPV6 sysctl objects
- */
-#define	ICMPV6CTL_STATS		1	/* statistics */
-#define ICMPV6CTL_MAXID		2
-
-#define ICMPV6CTL_NAMES { \
-	{ 0, 0 }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-
-#define	ICMPV6CTL_VARS { \
-	0, \
-	0, \
-}
-
-#if defined(_KERNEL) || defined(KERNEL)
-struct	icmpv6stat icmpv6stat;
-#endif /* defined(_KERNEL) || defined(KERNEL) */
-#endif /* _NETINET6_ICMPV6_VAR_H */
diff --git a/sys/netinet6/nd6_protocol.h b/sys/netinet6/nd6_protocol.h
deleted file mode 100644
index 0121a7390b6..00000000000
--- a/sys/netinet6/nd6_protocol.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $OpenBSD: nd6_protocol.h,v 1.3 1999/12/10 08:53:17 angelos Exp $ */
-
-/*
-%%% portions-copyright-nrl-97
-Portions of this software are Copyright 1997-1998 by Randall Atkinson,
-Ronald Lee, Daniel McDonald, Bao Phan, and Chris Winters. All Rights
-Reserved. All rights under this copyright have been assigned to the US
-Naval Research Laboratory (NRL). The NRL Copyright Notice and License
-Agreement Version 1.1 (January 17, 1995) applies to these portions of the
-software.
-You should have received a copy of the license with this software. If you
-didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
-
-*/
-
-#ifndef _NETINET6_ND6_PROTOCOL_H
-#define _NETINET6_ND6_PROTOCOL_H 1
-
-#include <netinet6/icmpv6.h>
-
-#define ND6_ROUTER_SOLICITATION         133
-#define ND6_ROUTER_ADVERTISEMENT        134
-#define ND6_NEIGHBOR_SOLICITATION       135
-#define ND6_NEIGHBOR_ADVERTISEMENT      136
-#define ND6_REDIRECT                    137
-
-enum nd6_option {
-	ND6_OPT_SOURCE_LINKADDR=1,
-	ND6_OPT_TARGET_LINKADDR=2,
-	ND6_OPT_PREFIX_INFORMATION=3,
-	ND6_OPT_REDIRECTED_HEADER=4,
-	ND6_OPT_MTU=5,
-	ND6_OPT_ENDOFLIST=256
-};
-
-struct nd_router_solicit {     /* router solicitation */
-	struct icmpv6hdr rsol_hdr;
-};
-
-#define rsol_type               rsol_hdr.icmpv6_type
-#define rsol_code               rsol_hdr.icmpv6_code
-#define rsol_cksum              rsol_hdr.icmpv6_cksum
-#define rsol_reserved           rsol_hdr.icmpv6_data32[0]
-
-struct nd_router_advert {       /* router advertisement */
-	struct icmpv6hdr radv_hdr;
-	uint32_t   radv_reachable;   /* reachable time */
-	uint32_t   radv_retransmit;  /* reachable retransmit time */
-};
-
-#define radv_type               radv_hdr.icmpv6_type
-#define radv_code               radv_hdr.icmpv6_code
-#define radv_cksum              radv_hdr.icmpv6_cksum
-#define radv_maxhoplimit        radv_hdr.icmpv6_data8[0]
-#define radv_m_o_res            radv_hdr.icmpv6_data8[1]
-#define ND6_RADV_M_BIT          0x80
-#define ND6_RADV_O_BIT          0x40
-#define radv_router_lifetime    radv_hdr.icmpv6_data16[1]
-
-struct nd6_nsolicitation {      /* neighbor solicitation */
-	struct icmpv6hdr  nsol6_hdr;
-	struct in6_addr   nsol6_target;
-};
-
-struct nd6_nadvertisement {     /* neighbor advertisement */
-	struct icmpv6hdr  nadv6_hdr;
-	struct in6_addr   nadv6_target;
-};
-
-#define nadv6_flags nadv6_hdr.icmpv6_data32[0]
-#define ND6_NADVERFLAG_ISROUTER      0x80
-#define ND6_NADVERFLAG_SOLICITED     0x40
-#define ND6_NADVERFLAG_OVERRIDE      0x20
-
-struct nd6_redirect {           /* redirect */
-	struct icmpv6hdr  redirect_hdr;
-	struct in6_addr   redirect_target;
-	struct in6_addr   redirect_destination;
-};
-
-struct nd6_opt_prefix_info {    /* prefix information */
-	uint8_t    opt_type;
-	uint8_t    opt_length;
-	uint8_t    opt_prefix_length;
-	uint8_t    opt_l_a_res;
-	uint32_t   opt_valid_life;
-	uint32_t   opt_preferred_life;
-	uint32_t   opt_reserved2;
-	struct in6_addr  opt_prefix;
-};
-
-#define ND6_OPT_PI_L_BIT        0x80
-#define ND6_OPT_PI_A_BIT        0x40
-
-struct nd6_opt_mtu {            /* MTU option */
-	uint8_t   opt_type;
-	uint8_t   opt_length;
-	uint16_t  opt_reserved;
-	uint32_t  opt_mtu;
-};
-
-#endif /* _NETINET6_ND6_PROTOCOL_H */