tedu faith(4), suggested by todd@ some weeks ago after a submission by

dhill.

ok krw@, mikeb@, tedu@ (implicit)

3 files changed, 4 insertions, 144 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 3ee8f2cff69..3c99efa6bd4 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.543 2013/01/29 15:42:20 yasuoka Exp $
+#	$OpenBSD: Makefile,v 1.544 2013/03/14 11:18:37 mpi Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -22,7 +22,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	eap.4 ec.4 eephy.4 ef.4 eg.4 ehci.4 eisa.4 el.4 em.4 emc.4 gcu.4 \
 	emu.4 enc.4 endrun.4 envy.4 ep.4 epic.4 esa.4 \
 	eso.4 ess.4 et.4 etphy.4 ex.4 exphy.4 \
-	faith.4 fd.4 fdc.4 fins.4 fintek.4 fms.4 fpa.4 fxp.4 gdt.4 \
+	fd.4 fdc.4 fins.4 fintek.4 fms.4 fpa.4 fxp.4 gdt.4 \
 	gentbi.4 gem.4 gif.4 \
 	glenv.4 gpio.4 gpiodcf.4 gpioiic.4 gpioow.4 gpr.4 gre.4 gscsio.4 gtp.4 \
 	hds.4 hifn.4 hil.4 hilid.4 hilkbd.4 hilms.4 hme.4 hotplug.4 hsq.4 \
diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
deleted file mode 100644
index ffb0d079fba..00000000000
--- a/share/man/man4/faith.4
+++ /dev/null
@@ -1,136 +0,0 @@
-.\"	$OpenBSD: faith.4,v 1.19 2012/09/26 17:34:38 jmc Exp $
-.\"	$KAME: faith.4,v 1.10 2001/06/30 00:42:48 itojun Exp $
-.\"
-.\" Copyright (C) 1995, 1996, 1997, and 1998 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 $Mdocdate: September 26 2012 $
-.Dt FAITH 4
-.Os
-.Sh NAME
-.Nm faith
-.Nd IPv6-to-IPv4 TCP relay capturing interface
-.Sh SYNOPSIS
-.Cd "pseudo-device faith" Op Ar count
-.Sh DESCRIPTION
-The
-.Nm
-interface captures IPv6 TCP traffic,
-for implementing userland IPv6-to-IPv4 TCP relay
-similar to
-.Xr faithd 8 .
-.Pp
-A
-.Nm
-interface can be created at runtime using the
-.Ic ifconfig faith Ns Ar N Ic create
-command or by setting up a
-.Xr hostname.if 5
-configuration file for
-.Xr netstart 8 .
-.Pp
-Special action will be taken when IPv6 TCP traffic is seen on a router,
-and the routing table suggests routing it to the
-.Nm
-interface.
-In this case, the packet will be accepted by the router,
-regardless of the list of IPv6 interface addresses assigned to the router.
-The packet is captured by an IPv6 TCP socket, if it has the
-.Dv IN6P_FAITH
-flag turned on and it has matching address/port pairs.
-Thus,
-.Nm
-allows captured IPv6 TCP traffic to be relayed to some
-specific destination addresses.
-Userland programs, such as
-.Xr faithd 8
-can use this behavior to relay IPv6 TCP traffic to IPv4 TCP traffic.
-The program can accept some specific IPv6 TCP traffic, perform
-.Xr getsockname 2
-to get the IPv6 destination address specified by the client,
-and perform application-specific address mapping to relay IPv6 TCP to IPv4 TCP.
-.Pp
-The
-.Dv IN6P_FAITH
-flag on an IPv6 TCP socket can be set by using
-.Xr setsockopt 2 ,
-with level set to
-.Dv IPPROTO_IPV6
-and optname set to
-.Dv IPv6_FAITH .
-.Pp
-To handle error reports by ICMPv6, some of the ICMPv6 packets routed to the
-.Nm
-interface will be delivered to IPv6 TCP, as well.
-.Pp
-To understand how
-.Nm
-can be used, take a look at the source code of
-.Xr faithd 8 .
-.Pp
-As the
-.Nm
-interface implements a potentially dangerous operation,
-great care must be taken when configuring the
-.Nm
-interface.
-To avoid possible misuse, the
-.Xr sysctl 8
-variable
-.Li net.inet6.ip6.keepfaith
-must be set to
-.Li 1
-prior to use of the interface.
-When
-.Li net.inet6.ip6.keepfaith
-is
-.Li 0 ,
-no packet is captured by the
-.Nm
-interface.
-.Pp
-The
-.Nm
-interface is intended to be used on routers, not on hosts.
-.\"
-.Sh SEE ALSO
-.Xr inet 4 ,
-.Xr inet6 4 ,
-.Xr hostname.if 5 ,
-.Xr faithd 8 ,
-.Xr netstart 8
-.Sh STANDARDS
-.Rs
-.%A J. Hagino
-.%A K. Yamamoto
-.%D June 2001
-.%R RFC 3142
-.%T "An IPv6-to-IPv4 transport relay translator"
-.Re
-.Sh HISTORY
-The FAITH IPv6-to-IPv4 TCP relay translator first appeared in
-WIDE hydrangea IPv6 stack.
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 6e581383b16..8d8ded893e1 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ip6.4,v 1.29 2012/09/26 17:34:38 jmc Exp $
+.\"	$OpenBSD: ip6.4,v 1.30 2013/03/14 11:18:37 mpi Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -26,7 +26,7 @@
 .\" 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 $Mdocdate: September 26 2012 $
+.Dd $Mdocdate: March 14 2013 $
 .Dt IP6 4
 .Os
 .Sh NAME
@@ -401,10 +401,6 @@ With
 .Ox
 IPv6 sockets are always IPv6-only, so the socket option is read-only
 (not modifiable).
-.It Dv IPV6_FAITH Fa "int *"
-Get or set the status of whether
-.Xr faith 4
-connections can be made to this socket.
 .It Dv IPV6_USE_MIN_MTU Fa "int *"
 Get or set whether the minimal IPv6 maximum transmission unit (MTU) size
 will be used to avoid fragmentation from occurring for subsequent