switch IPv6 advanced API from RFC2292 to RFC3542 (2292 is superseded by 3542).

the kernel still handles RFC2292 set/getsockopts, so that compiled binary
has no trouble running.  userland sees RFC3542 symbols only on header file
so new code has to use RFC3542 API.

bump libc shlib minor for function additions.

tested on i386/amd64 by jmc, i386 by brad. checked by deraadt.

7 files changed, 971 insertions, 5 deletions

diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc
index db2738f868..39d441a96a 100644
--- a/src/lib/libc/net/Makefile.inc
+++ b/src/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile.inc,v 1.42 2005/10/02 14:48:48 jmc Exp $
+#       $OpenBSD: Makefile.inc,v 1.43 2006/12/09 01:12:28 itojun Exp $
 
 # net sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net
@@ -31,6 +31,7 @@ MAN+=	byteorder.3 ethers.3 gai_strerror.3 getaddrinfo.3 gethostbyname.3 \
         getifaddrs.3 getnameinfo.3 getnetent.3 getprotoent.3 \
         getrrsetbyname.3 getservent.3 if_indextoname.3 inet.3 \
         inet_net.3 inet6_option_space.3 inet6_rthdr_space.3 \
+        inet6_opt_init.3 inet6_rth_space.3 \
         ipx.3 link_addr.3 net_addrcmp.3 \
         rcmd.3 rcmdsh.3 resolver.3
 
@@ -88,3 +89,14 @@ MLINKS+=inet6_rthdr_space.3 inet6_rthdr_init.3 \
         inet6_rthdr_space.3 inet6_rthdr_segments.3 \
         inet6_rthdr_space.3 inet6_rthdr_getaddr.3 \
         inet6_rthdr_space.3 inet6_rthdr_getflags.3
+MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \
+        inet6_opt_init.3 inet6_opt_finish.3 \
+        inet6_opt_init.3 inet6_opt_set_val.3 \
+        inet6_opt_init.3 inet6_opt_next.3 \
+        inet6_opt_init.3 inet6_opt_find.3 \
+        inet6_opt_init.3 inet6_opt_get_val.3
+MLINKS+=inet6_rth_space.3 inet6_rth_init.3 \
+        inet6_rth_space.3 inet6_rth_add.3 \
+        inet6_rth_space.3 inet6_rth_reverse.3 \
+        inet6_rth_space.3 inet6_rth_segments.3 \
+        inet6_rth_space.3 inet6_rth_getaddr.3 \
diff --git a/src/lib/libc/net/inet6_opt_init.3 b/src/lib/libc/net/inet6_opt_init.3
new file mode 100644
index 0000000000..a97eb0f28b
--- /dev/null
+++ b/src/lib/libc/net/inet6_opt_init.3
@@ -0,0 +1,336 @@
+.\"     $OpenBSD: inet6_opt_init.3,v 1.1 2006/12/09 01:12:28 itojun Exp $
+.\"     $KAME: inet6_opt_init.3,v 1.7 2004/12/27 05:08:23 itojun Exp $
+.\"
+.\" Copyright (C) 2004 WIDE Project.
+.\" All rights reserved.
+.\"
+.\" 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.
+.\"
+.Dd December 23, 2004
+.Dt INET6_OPT_INIT 3
+.Os
+.\"
+.Sh NAME
+.Nm inet6_opt_init ,
+.Nm inet6_opt_append ,
+.Nm inet6_opt_finish ,
+.Nm inet6_opt_set_val ,
+.Nm inet6_opt_next ,
+.Nm inet6_opt_find ,
+.Nm inet6_opt_get_val
+.Nd IPv6 Hop-by-Hop and Destination Options manipulation
+.\"
+.Sh SYNOPSIS
+.In netinet/in.h
+.Ft "int"
+.Fn inet6_opt_init "void *extbuf" "socklen_t extlen"
+.Ft "int"
+.Fn inet6_opt_append "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t len" "u_int8_t align" "void **databufp"
+.Ft "int"
+.Fn inet6_opt_finish "void *extbuf" "socklen_t extlen" "int offset"
+.Ft "int"
+.Fn inet6_opt_set_val "void *databuf" "int offset" "void *val" "socklen_t vallen"
+.Ft "int"
+.Fn inet6_opt_next "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t *typep" "socklen_t *lenp" "void **databufp"
+.Ft "int"
+.Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t *lenp" "void **databufp"
+.Ft "int"
+.Fn inet6_opt_get_val "void *databuf" "socklen_t offset" "void *val" "socklen_t vallen"
+.\"
+.Sh DESCRIPTION
+Building and parsing the Hop-by-Hop and Destination options is
+complicated.
+The advanced sockets API defines a set of functions to
+help applications create and manipulate Hop-by-Hope and Destination
+options.
+.\"This man page describes the functions specified in
+.\"IETF Draft RFC3542 while the
+.\".Xr inet6_options_space 3
+.\"man page documents the functions defined in RFC 2292.
+.\"It is expected
+.\"that this set of functions will supersede those in RFC 2292 but for
+.\"the time being both APIs are retained.
+These functions use the
+formatting rules specified in Appendix B in RFC2460, i.e., that the
+largest field is placed last in the option.
+The function prototypes
+for these functions are all contained in the header file
+.Aq netinet/in.h .
+.\"
+.Ss inet6_opt_init
+The
+.Fn inet6_opt_init
+function
+returns the number of bytes needed for an empty
+extension header, one without any options.
+If the
+.Va extbuf
+argument points to a valid section of memory
+then the
+.Fn inet6_opt_init
+function also initializes the extension header's length field.
+When attempting to initialize an extension buffer passed in the
+.Va extbuf argument
+.Fa extlen
+must be a positive multiple of 8 or else the function fails and
+returns \-1 to the caller.
+.\"
+.Ss inet6_opt_append
+The
+.Fn inet6_opt_append
+function can perform to different jobs.
+When a valid
+.Fa extbuf
+argument is supplied it appends an option to the extension buffer and
+returns the updated total length as well as a pointer to the newly
+created option in
+.Fa databufp .
+If the value
+of
+.Fa extbuf
+is
+.Dv NULL
+then the
+.Fn inet6_opt_append function only reports what the total length would
+be if the option were actually appended.
+The
+.Fa len
+and
+.Fa align
+arguments specify the length of the option and the required data
+alignment which must be used when appending the option.
+The
+.Fa offset
+argument should be the length returned by the
+.Fn inet6_opt_init
+function or a previous call to
+.Fn inet6_opt_append .
+.Pp
+The
+.Fa type
+argument is the 8-bit option type.
+.Pp
+After
+.Fn inet6_opt_append
+has been called, the application can use the buffer pointed to by
+.Fa databufp
+directly, or use
+.Fn inet6_opt_set_val
+to specify the data to be contained in the option.
+.Pp
+Option types of
+.Li 0
+and
+.Li 1
+are reserved for the
+.Li Pad1
+and
+.Li PadN
+options.
+All other values from 2 through 255 may be used by applications.
+.Pp
+The length of the option data is contained in an 8-bit value and so
+may contain any value from 0 through 255.
+.Pp
+The
+.Fa align
+parameter must have a value of 1, 2, 4, or 8 and cannot exceed the
+value of
+.Fa len .
+The alignment values represent no alignment, 16 bit, 32 bit and 64 bit
+alignments respectively.
+.\"
+.Ss inet6_opt_finish
+The
+.Fn inet6_opt_finish
+calculates the final padding necessary to make the extension header a
+multiple of 8 bytes, as required by the IPv6 extension header
+specification, and returns the extension header's updated total
+length.
+The
+.Fa offset
+argument should be the length returned by
+.Fn inet6_opt_init
+or
+.Fn inet6_opt_append .
+When
+.Fa extbuf
+is not
+.Dv NULL
+the function also sets up the appropriate padding bytes by inserting a
+Pad1 or PadN option of the proper length.
+.Pp
+If the extension header is too small to contain the proper padding
+then an error of \-1 is returned to the caller.
+.\"
+.Ss inet6_opt_set_val
+The
+.Fn inet6_opt_set_val
+function inserts data items of various sizes into the data portion of
+the option.
+The
+.Fa databuf
+argument is a pointer to memory that was returned by the
+.Fn inet6_opt_append
+call and the
+.Fa offset argument specifies where the option should be placed in the
+data buffer.
+The
+.Fa val
+argument points to an area of memory containing the data to be
+inserted into the extension header, and the
+.Fa vallen
+argument indicates how much data to copy.
+.Pp
+The caller should ensure that each field is aligned on its natural
+boundaries as described in Appendix B of RFC2460.
+.Pp
+The function returns the offset for the next field which is calculated as
+.Fa offset
++
+.Fa vallen
+and is used when composing options with multiple fields.
+.\"
+.Ss inet6_opt_next
+The
+.Fn inet6_opt_next
+function parses received extension headers.
+The
+.Fa extbuf
+and
+.Fa extlen
+arguments specify the location and length of the extension header
+being parsed.
+The
+.Fa offset
+argument should either be zero, for the first option, or the length value
+returned by a previous call to
+.Fn inet6_opt_next
+or
+.Fn inet6_opt_find .
+The return value specifies the position where to continue scanning the
+extension buffer.
+The option is returned in the arguments
+.Fa typep , lenp ,
+and
+.Fa databufp .
+.Fa typep, lenp,
+and
+.Fa databufp
+point to the 8-bit option type, the 8-bit option length and the option
+data respectively.
+This function does not return any PAD1 or PADN options.
+When an error occurs or there are no more options the return
+value is \-1.
+.\"
+.Ss inet6_opt_find
+The
+.Fn inet6_opt_find
+function searches the extension buffer for a particular option type,
+passed in through the
+.Fa type
+argument.
+If the option is found then the
+.Fa lenp
+and
+.Fa databufp
+arguments are updated to point to the option's length and data
+respectively.
+.Fa extbuf
+and
+.Fa extlen
+must point to a valid extension buffer and give its length.
+The
+.Fa offset
+argument can be used to search from a location anywhere in the
+extension header.
+.Ss inet6_opt_get_val
+The
+.Fn inet6_opt_get_val
+function extracts data items of various sizes in the data portion of
+the option.
+The
+.Fa databuf
+is a pointer returned by the
+.Fn inet6_opt_next
+or
+.Fn inet6_opt_find
+functions.
+The
+.Fa val
+argument points where the data will be extracted.
+The
+.Fa offset
+argument specifies from where in the data portion of the option the
+value should be extracted; the first byte of option data is specified
+by an offset of zero.
+.Pp
+It is expected that each field is aligned on its natural boundaries as
+described in Appendix B of RFC2460.
+.Pp
+The function returns the offset for the next field
+by calculating
+.Fa offset
++
+.Fa vallen
+which can be used when extracting option content with multiple fields.
+Robust receivers must verify alignment before calling this function.
+.\"
+.Sh DIAGNOSTICS
+All the functions return
+\-1
+on an error.
+.\"
+.Sh EXAMPLES
+RFC3542 gives comprehensive examples in Section 23.
+.Pp
+KAME also provides examples in the
+.Pa advapitest
+directory of its kit.
+.\"
+.Sh SEE ALSO
+.Rs
+.%A W. Stevens
+.%A M. Thomas
+.%A E. Nordmark
+.%A T. Jinmei
+.%T "Advanced Sockets API for IPv6"
+.%N RFC3542
+.%D October 2002
+.Re
+.Rs
+.%A S. Deering
+.%A R. Hinden
+.%T "Internet Protocol, Version 6 (IPv6) Specification"
+.%N RFC2460
+.%D December 1998
+.Re
+.Sh HISTORY
+The implementation first appeared in KAME advanced networking kit.
+.Sh STANDARDS
+The functions are documented in
+.Dq Advanced Sockets API for IPv6
+.Pq RFC3542 .
+.\"
diff --git a/src/lib/libc/net/inet6_option_space.3 b/src/lib/libc/net/inet6_option_space.3
index 5beec487ac..956cf9d815 100644
--- a/src/lib/libc/net/inet6_option_space.3
+++ b/src/lib/libc/net/inet6_option_space.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: inet6_option_space.3,v 1.18 2005/01/11 17:45:41 jaredy Exp $
+.\"     $OpenBSD: inet6_option_space.3,v 1.19 2006/12/09 01:12:28 itojun Exp $
 .\"     $KAME: inet6_option_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -70,6 +70,11 @@ All of the prototypes
 for the option functions are defined in the
 .Aq Pa netinet/in.h
 header file.
+.Pp
+RFC 2292 was superseded by RFC 3542.
+Functions described in this document were deprecated.
+See
+.Xr inet6_opt_init 3 .
 .\"
 .Ss inet6_option_space
 In order to determine the amount of space necessary to hold any option
diff --git a/src/lib/libc/net/inet6_rth_space.3 b/src/lib/libc/net/inet6_rth_space.3
new file mode 100644
index 0000000000..ab593b202a
--- /dev/null
+++ b/src/lib/libc/net/inet6_rth_space.3
@@ -0,0 +1,220 @@
+.\"     $OpenBSD: inet6_rth_space.3,v 1.1 2006/12/09 01:12:28 itojun Exp $
+.\"     $KAME: inet6_rth_space.3,v 1.7 2005/01/05 03:00:44 itojun Exp $
+.\"
+.\" Copyright (C) 2004 WIDE Project.
+.\" All rights reserved.
+.\"
+.\" 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.
+.\"
+.Dd December 24, 2004
+.Dt INET6_RTH_SPACE 3
+.Os
+.\"
+.Sh NAME
+.Nm inet6_rth_space ,
+.Nm inet6_rth_init ,
+.Nm inet6_rth_add ,
+.Nm inet6_rth_reverse ,
+.Nm inet6_rth_segments ,
+.Nm inet6_rth_getaddr
+.Nd IPv6 Routing Header Options manipulation
+.\"
+.Sh SYNOPSIS
+.In netinet/in.h
+.Ft socklen_t
+.Fn inet6_rth_space "int" "int"
+.Ft "void *"
+.Fn inet6_rth_init "void *" "socklen_t" "int" "int"
+.Ft int
+.Fn inet6_rth_add "void *" "const struct in6_addr *"
+.Ft int
+.Fn inet6_rth_reverse "const void *" "void *"
+.Ft int
+.Fn inet6_rth_segments "const void *"
+.Ft "struct in6_addr *"
+.Fn inet6_rth_getaddr "const void *" "int"
+.\"
+.Sh DESCRIPTION
+The IPv6 Advanced API, RFC 3542, defines the functions that an
+application calls to build and examine IPv6 Routing headers.
+Routing headers are used to perform source routing in IPv6 networks.
+The RFC uses the word 
+.Dq segments
+to describe addresses and that is the term used here as well.
+All of the functions are defined in the header file
+.Aq netinet/in.h .
+The functions described in this manual page all operate
+on routing header structures which are defined in
+.Aq netinet/ip6.h
+but which should not need to be modified outside the use of this API.
+The size and shape of the route header structures may change, so using
+the APIs is a more portable, long term, solution.
+.Pp
+The functions in the API are split into two groups, those that build a
+routing header and those that parse a received routing header.
+We will describe the builder functions followed by the parser functions.
+.Ss inet6_rth_space
+The
+.Fn inet6_rth_space
+function returns the number of bytes required to hold a Routing Header
+of the type, specified in the
+.Fa type 
+argument and containing the number of addresses specified in the
+.Fa segments
+argumment.
+When the type is 
+.Dv IPV6_RTHDR_TYPE_0
+the number of segments must be from 0 through 127.
+The return value from this function is the number of bytes required to
+store the routing header.
+If the value 0 is returned then either the
+route header type was not recognized or another error occurred.
+.Ss inet6_rth_init
+The
+.Fn inet6_rth_init
+function initializes the pre-allocated buffer pointed to by
+.Fa bp
+to contain a routing header of the specified type.
+The
+.Fa bp_len
+argument is used to verify that the buffer is large enough.
+The caller must allocate the buffer pointed to by bp.
+The necessary buffer size should be determined by calling
+.Fn inet6_rth_space
+described in the previous sections.
+.Pp
+The
+.Fn inet6_rth_init
+function returns a pointer to
+.Fa bp
+on success and
+.Dv NULL
+when there is an error.
+.Ss inet6_rth_add
+The
+.Fn inet6_rth_add
+function adds the IPv6 address pointed to by
+.Fa addr
+to the end of the routing header being constructed.
+.Pp
+A successful addition results in the function returning 0, otherwise
+\-1 is returned.
+.Ss inet6_rth_reverse
+The
+.Fn inet6_rth_reverse
+function takes a routing header, pointed to by the
+argument
+.Fa in ,
+and writes a new routing header into the argument pointed to by
+.Fa out .
+The routing header at that sends datagrams along the reverse of that
+route.
+Both arguments are allowed to point to the same buffer meaning
+that the reversal can occur in place.
+.Pp
+The return value of the function is 0 on success, or \-1 when
+there is an error.
+.\"
+.Pp
+The next set of functions operate on a routing header that the
+application wants to parse.
+In the usual case such a routing header
+is received from the network, although these functions can also be
+used with routing headers that the application itself created.
+.Ss inet6_rth_segments
+The
+.Fn inet6_rth_segments
+function returns the number of segments contained in the
+routing header pointed to by
+.Fa bp .
+The return value is the number of segments contained in the routing
+header, or \-1 if an error occurred.
+It is not an error for 0 to be
+returned as a routing header may contain 0 segments.
+.\"
+.Ss inet6_rth_getaddr
+The
+.Fn inet6_rth_getaddr
+function is used to retrieve a single address from a routing header.
+The
+.Fa index
+is the location in the routing header from which the application wants
+to retrieve an address.
+The 
+.Fa index 
+parameter must have a value between 0 and one less than the number of
+segments present in the routing header.
+The
+.Fn inet6_rth_segments 
+function, described in the last section, should be used to determine
+the total number of segments in the routing header.
+The
+.Fn inet6_rth_getaddr
+function returns a pointer to an IPv6 address on success or 
+.Dv NULL
+when an error has occurred.
+.\"
+.Sh DIAGNOSTICS
+The
+.Fn inet6_rth_space
+and
+.Fn inet6_rth_getaddr
+functions return 0 on errors.
+.Pp
+The
+.Fn inet6_rthdr_init
+function returns
+.Dv NULL
+on error.
+The
+.Fn inet6_rth_add
+and
+.Fn inet6_rth_reverse
+functions return 0 on success, or \-1 upon an error.
+.\"
+.Sh EXAMPLES
+RFC 3542 gives extensive examples in Section 21, Appendix B.
+.Pp
+KAME also provides examples in the advapitest directory of its kit.
+.\"
+.Sh SEE ALSO
+.Rs
+.%A W. Stevens
+.%A M. Thomas
+.%A E. Nordmark
+.%A T. Jinmei
+.%T "Advanced Sockets API for IPv6"
+.%N RFC 3542
+.%D May 2003
+.Re
+.Rs
+.%A S. Deering
+.%A R. Hinden
+.%T "Internet Protocol, Version 6 (IPv6) Specification"
+.%N RFC2460
+.%D December 1998
+.Re
+.Sh HISTORY
+The implementation first appeared in KAME advanced networking kit.
diff --git a/src/lib/libc/net/inet6_rthdr_space.3 b/src/lib/libc/net/inet6_rthdr_space.3
index 7c00c42e42..4a0d22843d 100644
--- a/src/lib/libc/net/inet6_rthdr_space.3
+++ b/src/lib/libc/net/inet6_rthdr_space.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: inet6_rthdr_space.3,v 1.17 2005/01/11 17:45:41 jaredy Exp $
+.\"     $OpenBSD: inet6_rthdr_space.3,v 1.18 2006/12/09 01:12:28 itojun Exp $
 .\"     $KAME: inet6_rthdr_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -88,6 +88,11 @@ Please note that RFC 2292 uses the term
 instead of the term
 .Dq addresses
 but they are considered equivalent for this manual page.
+.Pp
+RFC 2292 was superseded by RFC 3542.
+Functions described in this document were deprecated.
+See
+.Xr inet6_rth_space 3 .
 .\"
 .Ss inet6_rthdr_space
 The
diff --git a/src/lib/libc/net/ip6opt.c b/src/lib/libc/net/ip6opt.c
index d3d68a54bf..b215f9ac3e 100644
--- a/src/lib/libc/net/ip6opt.c
+++ b/src/lib/libc/net/ip6opt.c
@@ -1,4 +1,5 @@
-/*      $OpenBSD: ip6opt.c,v 1.3 2006/12/08 21:32:59 itojun Exp $       */
+/*      $OpenBSD: ip6opt.c,v 1.4 2006/12/09 01:12:28 itojun Exp $       */
+/*      $KAME: ip6opt.c,v 1.18 2005/06/15 07:11:35 keiichi Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -103,8 +104,10 @@ inet6_option_append(struct cmsghdr *cmsg, const u_int8_t *typep, int multx,
                 return (-1);
         if (plusy < 0 || plusy > 7)
                 return (-1);
+#if 0
         if (typep[0] > 255)
                 return (-1);
+#endif
 
         /*
          * If this is the first option, allocate space for the
@@ -369,3 +372,225 @@ inet6_insert_padopt(u_char *p, int len)
                  return;
         }
 }
+
+/*
+ * The following functions are defined in RFC3542, which is a successor
+ * of RFC2292.
+ */
+
+int
+inet6_opt_init(void *extbuf, socklen_t extlen)
+{
+        struct ip6_ext *ext = (struct ip6_ext *)extbuf;
+
+        if (extlen < 0 || (extlen % 8))
+                return (-1);
+
+        if (ext) {
+                if (extlen == 0)
+                        return (-1);
+                ext->ip6e_len = (extlen >> 3) - 1;
+        }
+
+        return (2);             /* sizeof the next and the length fields */
+}
+
+int
+inet6_opt_append(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
+                 socklen_t len, u_int8_t align, void **databufp)
+{
+        int currentlen = offset, padlen = 0;
+
+        /*
+         * The option type must have a value from 2 to 255, inclusive.
+         * (0 and 1 are reserved for the Pad1 and PadN options, respectively.)
+         */
+#if 0 /* always false */
+        if (type < 2 || type > 255)
+#else
+        if (type < 2)
+#endif
+                return (-1);
+
+        /*
+         * The option data length must have a value between 0 and 255,
+         * inclusive, and is the length of the option data that follows.
+         */
+        if (len < 0 || len > 255)
+                return (-1);
+
+        /*
+         * The align parameter must have a value of 1, 2, 4, or 8.
+         * The align value can not exceed the value of len.
+         */
+        if (align != 1 && align != 2 && align != 4 && align != 8)
+                return (-1);
+        if (align > len)
+                return (-1);
+
+        /* Calculate the padding length. */
+        currentlen += 2 + len;  /* 2 means "type + len" */
+        if (currentlen % align)
+                padlen = align - (currentlen % align);
+
+        /* The option must fit in the extension header buffer. */
+        currentlen += padlen;
+        if (extlen &&           /* XXX: right? */
+            currentlen > extlen)
+                return (-1);
+
+        if (extbuf) {
+                u_int8_t *optp = (u_int8_t *)extbuf + offset;
+
+                if (padlen == 1) {
+                        /* insert a Pad1 option */
+                        *optp = IP6OPT_PAD1;
+                        optp++;
+                } else if (padlen > 0) {
+                        /* insert a PadN option for alignment */
+                        *optp++ = IP6OPT_PADN;
+                        *optp++ = padlen - 2;
+                        memset(optp, 0, padlen - 2);
+                        optp += (padlen - 2);
+                }
+
+                *optp++ = type;
+                *optp++ = len;
+
+                *databufp = optp;
+        }
+
+        return (currentlen);
+}
+
+int
+inet6_opt_finish(void *extbuf, socklen_t extlen, int offset)
+{
+        int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0;;
+
+        if (extbuf) {
+                u_int8_t *padp;
+                int padlen = updatelen - offset;
+
+                if (updatelen > extlen)
+                        return (-1);
+
+                padp = (u_int8_t *)extbuf + offset;
+                if (padlen == 1)
+                        *padp = IP6OPT_PAD1;
+                else if (padlen > 0) {
+                        *padp++ = IP6OPT_PADN;
+                        *padp++ = (padlen - 2);
+                        memset(padp, 0, padlen - 2);
+                }
+        }
+
+        return (updatelen);
+}
+
+int
+inet6_opt_set_val(void *databuf, int offset, void *val, socklen_t vallen)
+{
+
+        memcpy((u_int8_t *)databuf + offset, val, vallen);
+        return (offset + vallen);
+}
+
+int
+inet6_opt_next(void *extbuf, socklen_t extlen, int offset, u_int8_t *typep,
+               socklen_t *lenp, void **databufp)
+{
+        u_int8_t *optp, *lim;
+        int optlen;
+
+        /* Validate extlen. XXX: is the variable really necessary?? */
+        if (extlen == 0 || (extlen % 8))
+                return (-1);
+        lim = (u_int8_t *)extbuf + extlen;
+
+        /*
+         * If this is the first time this function called for this options
+         * header, simply return the 1st option.
+         * Otherwise, search the option list for the next option.
+         */
+        if (offset == 0)
+                optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
+        else
+                optp = (u_int8_t *)extbuf + offset;
+
+        /* Find the next option skipping any padding options. */
+        while (optp < lim) {
+                switch(*optp) {
+                case IP6OPT_PAD1:
+                        optp++;
+                        break;
+                case IP6OPT_PADN:
+                        if ((optlen = ip6optlen(optp, lim)) == 0)
+                                goto optend;
+                        optp += optlen;
+                        break;
+                default:        /* found */
+                        if ((optlen = ip6optlen(optp, lim)) == 0)
+                                goto optend;
+                        *typep = *optp;
+                        *lenp = optlen - 2;
+                        *databufp = optp + 2;
+                        return (optp + optlen - (u_int8_t *)extbuf);
+                }
+        }
+
+  optend:
+        *databufp = NULL; /* for safety */
+        return (-1);
+}
+
+int
+inet6_opt_find(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
+               socklen_t *lenp, void **databufp)
+{
+        u_int8_t *optp, *lim;
+        int optlen;
+
+        /* Validate extlen. XXX: is the variable really necessary?? */
+        if (extlen == 0 || (extlen % 8))
+                return (-1);
+        lim = (u_int8_t *)extbuf + extlen;
+
+        /*
+         * If this is the first time this function called for this options
+         * header, simply return the 1st option.
+         * Otherwise, search the option list for the next option.
+         */
+        if (offset == 0)
+                optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
+        else
+                optp = (u_int8_t *)extbuf + offset;
+
+        /* Find the specified option */
+        while (optp < lim) {
+                if ((optlen = ip6optlen(optp, lim)) == 0)
+                        goto optend;
+
+                if (*optp == type) { /* found */
+                        *lenp = optlen - 2;
+                        *databufp = optp + 2;
+                        return (optp + optlen - (u_int8_t *)extbuf);
+                }
+
+                optp += optlen;
+        }
+
+  optend:
+        *databufp = NULL; /* for safety */
+        return (-1);
+}
+
+int
+inet6_opt_get_val(void *databuf, int offset, void *val, socklen_t vallen)
+{
+
+        /* we can't assume alignment here */
+        memcpy(val, (u_int8_t *)databuf + offset, vallen);
+
+        return (offset + vallen);
+}
diff --git a/src/lib/libc/net/rthdr.c b/src/lib/libc/net/rthdr.c
index 36ac5a3554..d10334e027 100644
--- a/src/lib/libc/net/rthdr.c
+++ b/src/lib/libc/net/rthdr.c
@@ -1,4 +1,5 @@
-/*      $OpenBSD: rthdr.c,v 1.7 2005/03/25 13:24:12 otto Exp $  */
+/*      $OpenBSD: rthdr.c,v 1.8 2006/12/09 01:12:28 itojun Exp $        */
+/*      $KAME: rthdr.c,v 1.22 2006/02/09 08:18:58 keiichi Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -39,6 +40,10 @@
 #include <string.h>
 #include <stdio.h>
 
+/*
+ * RFC2292 API
+ */
+
 size_t
 inet6_rthdr_space(int type, int seg)
 {
@@ -213,3 +218,161 @@ inet6_rthdr_getflags(const struct cmsghdr *cmsg, int index)
                 return (-1);
         }
 }
+
+/*
+ * RFC3542 (2292bis) API
+ */
+
+socklen_t
+inet6_rth_space(int type, int segments)
+{
+        switch (type) {
+        case IPV6_RTHDR_TYPE_0:
+                return (((segments * 2) + 1) << 3);
+        default:
+                return (0);     /* type not suppported */
+        }
+}
+
+void *
+inet6_rth_init(void *bp, socklen_t bp_len, int type, int segments)
+{
+        struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
+        struct ip6_rthdr0 *rth0;
+
+        switch (type) {
+        case IPV6_RTHDR_TYPE_0:
+                /* length validation */
+                if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments))
+                        return (NULL);
+
+                memset(bp, 0, bp_len);
+                rth0 = (struct ip6_rthdr0 *)rth;
+                rth0->ip6r0_len = segments * 2;
+                rth0->ip6r0_type = IPV6_RTHDR_TYPE_0;
+                rth0->ip6r0_segleft = 0;
+                rth0->ip6r0_reserved = 0;
+                break;
+        default:
+                return (NULL);  /* type not supported */
+        }
+
+        return (bp);
+}
+
+int
+inet6_rth_add(void *bp, const struct in6_addr *addr)
+{
+        struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
+        struct ip6_rthdr0 *rth0;
+        struct in6_addr *nextaddr;
+
+        switch (rth->ip6r_type) {
+        case IPV6_RTHDR_TYPE_0:
+                rth0 = (struct ip6_rthdr0 *)rth;
+                nextaddr = (struct in6_addr *)(rth0 + 1) + rth0->ip6r0_segleft;
+                *nextaddr = *addr;
+                rth0->ip6r0_segleft++;
+                break;
+        default:
+                return (-1);    /* type not supported */
+        }
+
+        return (0);
+}
+
+int
+inet6_rth_reverse(const void *in, void *out)
+{
+        struct ip6_rthdr *rth_in = (struct ip6_rthdr *)in;
+        struct ip6_rthdr0 *rth0_in, *rth0_out;
+        int i, segments;
+
+        switch (rth_in->ip6r_type) {
+        case IPV6_RTHDR_TYPE_0:
+                rth0_in = (struct ip6_rthdr0 *)in;
+                rth0_out = (struct ip6_rthdr0 *)out;
+
+                /* parameter validation XXX too paranoid? */
+                if (rth0_in->ip6r0_len % 2)
+                        return (-1);
+                segments = rth0_in->ip6r0_len / 2;
+
+                /* we can't use memcpy here, since in and out may overlap */
+                memmove((void *)rth0_out, (void *)rth0_in,
+                        ((rth0_in->ip6r0_len) + 1) << 3);
+                rth0_out->ip6r0_segleft = segments;
+
+                /* reverse the addresses */
+                for (i = 0; i < segments / 2; i++) {
+                        struct in6_addr addr_tmp, *addr1, *addr2;
+
+                        addr1 = (struct in6_addr *)(rth0_out + 1) + i;
+                        addr2 = (struct in6_addr *)(rth0_out + 1) +
+                            (segments - i - 1);
+                        addr_tmp = *addr1;
+                        *addr1 = *addr2;
+                        *addr2 = addr_tmp;
+                }
+                
+                break;
+        default:
+                return (-1);    /* type not supported */
+        }
+
+        return (0);
+}
+
+int
+inet6_rth_segments(const void *bp)
+{
+        struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
+        struct ip6_rthdr0 *rh0;
+        int addrs;
+
+        switch (rh->ip6r_type) {
+        case IPV6_RTHDR_TYPE_0:
+                rh0 = (struct ip6_rthdr0 *)bp;
+
+                /*
+                 * Validation for a type-0 routing header.
+                 * Is this too strict?
+                 */
+                if ((rh0->ip6r0_len % 2) != 0 ||
+                    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
+                        return (-1);
+
+                return (addrs);
+        default:
+                return (-1);    /* unknown type */
+        }
+}
+
+struct in6_addr *
+inet6_rth_getaddr(const void *bp, int idx)
+{
+        struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
+        struct ip6_rthdr0 *rh0;
+        int addrs;
+
+        switch (rh->ip6r_type) {
+        case IPV6_RTHDR_TYPE_0:
+                 rh0 = (struct ip6_rthdr0 *)bp;
+                 
+                /*
+                 * Validation for a type-0 routing header.
+                 * Is this too strict?
+                 */
+                if ((rh0->ip6r0_len % 2) != 0 ||
+                    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
+                        return (NULL);
+
+                if (idx < 0 || addrs <= idx)
+                        return (NULL);
+
+                return (((struct in6_addr *)(rh0 + 1)) + idx);
+        default:
+                return (NULL);  /* unknown type */
+                break;
+        }
+}