On Thu, Apr 02, 2020 at 09:07:23AM +0200, Martin Pieuchot wrote:
> On 29/03/20(Sun) 00:16, Vitaliy Makkoveev wrote:
> > pipex not used with tun(4)
>
> It seems an oversight from the addition of the new pppac(4) driver. See
> net/if_tun.c commits from January this year.
>
> So the right fix would be to replace tun(4) with pppac(4) and add a pppac.4
> manpage. Do you feel like tackling that?
Sure. Also PIPEXDSESSION describes pipex_session_stat_req instead of
pipex_session_close_req. I fixed it too.
Index: share/man/man4/pipex.4
===================================================================
RCS file: /cvs/src/share/man/man4/pipex.4,v
retrieving revision 1.11
diff -u -p -r1.11 pipex.4
--- share/man/man4/pipex.4 18 Apr 2017 03:21:48 -0000 1.11
+++ share/man/man4/pipex.4 2 Apr 2020 11:45:40 -0000
@@ -32,7 +32,7 @@
.Sh DESCRIPTION
.Nm
is used with
-.Xr tun 4
+.Xr pppac 4
and
.Xr pppx 4 ,
and handles PPP frames and forwards IP packets in-kernel.
@@ -51,7 +51,7 @@ using
adds some extensions to the
.Xr ioctl 2
requests to
-.Xr tun 4
+.Xr pppac 4
or
.Xr pppx 4
devices.
@@ -104,8 +104,7 @@ struct pipex_session_req {
uint16_t pr_peer_mru; /* peer's mru */
uint16_t pr_timeout_sec; /* idle timer */
- struct in_addr pr_ip_srcaddr; /* local IP address.
- not used by tun(4) */
+ struct in_addr pr_ip_srcaddr; /* local IP address */
struct in_addr pr_ip_address; /* framed IP address */
struct in_addr pr_ip_netmask; /* framed IP netmask */
struct sockaddr_in6 pr_ip6_address; /* framed IPv6 address */
@@ -171,10 +170,10 @@ struct pipex_mppe_req {
.It Dv PIPEXDSESSION Fa "struct pipex_session_close_req *"
Delete the specified session from the kernel.
Specify the session using a
-.Vt pipex_session_stat_req
+.Vt pipex_session_close_req
structure, which has the following definition:
.Bd -literal
-struct pipex_session_stat_req {
+struct pipex_session_close_req {
int psr_protocol; /* tunnel protocol */
uint16_t psr_session_id; /* session-id */
struct pipex_statistics psr_stat; /* statistics */
@@ -265,7 +264,7 @@ Set the
.Xr pppx 4
interface's description of the session.
This command doesn't work on
-.Xr tun 4
+.Xr pppac 4
devices.
Specify the session and its description using a
.Vt pipex_session_descr_req
@@ -280,8 +279,8 @@ struct pipex_session_descr_req {
.El
.Sh SEE ALSO
.Xr ioctl 2 ,
+.Xr pppax 4 ,
.Xr pppx 4 ,
-.Xr tun 4 ,
.Xr npppd 8 ,
.Xr sysctl 8
.Sh AUTHORS
