Add pppx.4 and enable links to it.

ok dlg@

5 files changed, 86 insertions, 13 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index ab6d258e7bf..3ee8f2cff69 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.542 2013/01/12 13:02:21 sf Exp $
+#	$OpenBSD: Makefile,v 1.543 2013/01/29 15:42:20 yasuoka Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -44,7 +44,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	owtemp.4 pcagpio.4 pcaled.4 pcdisplay.4 pchb.4 pci.4 pcib.4 pcfadc.4 \
 	pcfiic.4 pciide.4 pckbc.4 pckbd.4 pcmcia.4 pcn.4 pcppi.4 pcscp.4 \
 	pf.4 pflog.4 pflow.4 pfsync.4 pgt.4 piixpm.4 pim.4 pipex.4 \
-	pms.4 ppb.4 ppp.4 pppoe.4 pty.4 puc.4 pwdog.4 qsphy.4 radio.4 \
+	pms.4 ppb.4 ppp.4 pppoe.4 pppx.4 pty.4 puc.4 pwdog.4 qsphy.4 radio.4 \
 	ral.4 random.4 ray.4 rd.4 rdac.4 re.4 rdcphy.4 rgephy.4 ricohrtc.4 \
 	rl.4 rlphy.4 route.4 rsu.4 rt.4 rtsx.4 rum.4 run.4 \
 	rtfps.4 rtii.4 rtw.4 safe.4 safte.4 san.4 sbt.4 sbus.4 schsio.4 \
diff --git a/share/man/man4/pipex.4 b/share/man/man4/pipex.4
index b86381ea68e..bce2f9c9b50 100644
--- a/share/man/man4/pipex.4
+++ b/share/man/man4/pipex.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pipex.4,v 1.4 2013/01/24 09:18:04 giovanni Exp $
+.\"	$OpenBSD: pipex.4,v 1.5 2013/01/29 15:42:20 yasuoka Exp $
 .\"
 .\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
 .\" Copyright (c) 2010 SUENAGA Hiroki <hsuenaga@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 24 2013 $
+.Dd $Mdocdate: January 29 2013 $
 .Dt PIPEX 4
 .Os
 .Sh NAME
@@ -281,7 +281,7 @@ struct pipex_session_descr_req {
 .El
 .Sh SEE ALSO
 .Xr ioctl 2 ,
-.\" .Xr pppx 4 ,
+.Xr pppx 4 ,
 .Xr tun 4 ,
 .Xr npppd 8 ,
 .Xr sysctl 8
diff --git a/share/man/man4/pppx.4 b/share/man/man4/pppx.4
new file mode 100644
index 00000000000..627bfb45c54
--- /dev/null
+++ b/share/man/man4/pppx.4
@@ -0,0 +1,74 @@
+.\"	$OpenBSD: pppx.4,v 1.1 2013/01/29 15:42:20 yasuoka Exp $
+.\"
+.\" Copyright (c) 2013 YASUOKA Masahiko <yasuoka@yasuoka.net>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: January 29 2013 $
+.Dt PPPX 4
+.Os
+.Sh NAME
+.Nm pppx
+.Nd ppp multiplexer device
+.Sh SYNOPSIS
+.Cd "pseudo-device pppx"
+.Pp
+.Fd #include <sys/socket.h>
+.Fd #include <sys/ioctl.h>
+.Fd #include <net/pipex.h>
+.Sh DESCRIPTION
+The
+.Nm
+driver works with
+.Xr npppd 8
+daemon,
+allocates a network interface for each Point-to-Point Protocol (PPP)
+session by request from the daemon.
+It also works with
+.Xr pipex 4
+to accelerate the performance of packet forwarding and supports ioctls
+which are added by
+.Xr pipex 4 .
+.Pp
+To use
+.Nm
+from
+.Xr npppd 8
+daemon the administrator need to configure the interface configuration
+in
+.Xr npppd.conf 5 .
+Also the administrator needs to enable
+.Xr pipex 4
+by setting
+.Va net.pipex.enable
+to
+.Sq 1
+using
+.Xr sysctl 8 .
+.Sh SEE ALSO
+.Xr inet 4 ,
+.Xr inet6 4 ,
+.Xr pipex 4 ,
+.Xr hostname.if 5 ,
+.Xr npppd.conf 5 ,
+.Xr npppd 8 ,
+.Xr netstart 8 ,
+.Xr sysctl 8
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 5.3 .
+.Sh AUTHORS
+.An David Gwynne Aq dlg@openbsd.org
+.An Claudio Jeker Aq claudio@openbsd.org
diff --git a/usr.sbin/npppd/npppd/npppd.8 b/usr.sbin/npppd/npppd/npppd.8
index 4a6f5473069..87fbb37a4be 100644
--- a/usr.sbin/npppd/npppd/npppd.8
+++ b/usr.sbin/npppd/npppd/npppd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: npppd.8,v 1.4 2012/09/20 20:28:09 jmc Exp $
+.\"	$OpenBSD: npppd.8,v 1.5 2013/01/29 15:42:20 yasuoka Exp $
 .\"
 .\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
 .\"
@@ -15,7 +15,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" The following requests are required for all man pages.
 .\"
-.Dd $Mdocdate: September 20 2012 $
+.Dd $Mdocdate: January 29 2013 $
 .Dt NPPPD 8
 .Os
 .Sh NAME
@@ -79,7 +79,7 @@ configuration file.
 .Sh SEE ALSO
 .Xr gre 4 ,
 .Xr pipex 4 ,
-.\".Xr pppx 4 ,
+.Xr pppx 4 ,
 .Xr tun 4 ,
 .Xr npppd.conf 5 ,
 .Xr npppctl 8 ,
diff --git a/usr.sbin/npppd/npppd/npppd.conf.5 b/usr.sbin/npppd/npppd/npppd.conf.5
index fb7894dcc1e..b7ca0933a8d 100644
--- a/usr.sbin/npppd/npppd/npppd.conf.5
+++ b/usr.sbin/npppd/npppd/npppd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: npppd.conf.5,v 1.5 2012/09/22 14:32:35 jmc Exp $
+.\"	$OpenBSD: npppd.conf.5,v 1.6 2013/01/29 15:42:20 yasuoka Exp $
 .\"
 .\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 22 2012 $
+.Dd $Mdocdate: January 29 2013 $
 .Dt NPPPD.CONF 5
 .Os
 .Sh NAME
@@ -483,8 +483,7 @@ setting is described below:
 Use
 .Xr tun 4
 or
-.\".Xr pppx 4
-pppx
+.Xr pppx 4
 and
 specify its name to
 .Ar ifname .
@@ -652,7 +651,7 @@ bind tunnel from L2TP authenticated by LOCAL to tun1
 .Ed
 .Sh SEE ALSO
 .Xr pipex 4 ,
-.\".Xr pppx 4 ,
+.Xr pppx 4 ,
 .Xr tun 4 ,
 .Xr npppctl 8 ,
 .Xr npppd 8