don't fall over in the charshunt if we get an EAGAIN or EINTR

[ppp.git] / pppd / pppd.8

diff --git a/pppd/pppd.8 b/pppd/pppd.8
index d02d02daa22f059c192f3d02913a191df8bc3146..359403df549f0d1919e4e4086efda47107aa9838 100644 (file)
--- a/pppd/pppd.8
+++ b/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
 .\" manual page [] for pppd 2.3

-.\" $Id: pppd.8,v 1.48 1999/09/30 19:58:21 masputra Exp $
+.\" $Id: pppd.8,v 1.51 1999/12/23 01:29:11 paulus Exp $

 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph


@@ -93,17 +93,6 @@ but will be unable to request the modem stop sending to the
 computer. This mode retains the ability to use DTR as
 a modem control line.
 .TP
 computer. This mode retains the ability to use DTR as
 a modem control line.
 .TP

-.B cdtrcts
-Use a non-standard hardware flow control (i.e. DTR/CTS) to control
-the flow of data on the serial port.  If neither the \fIcrtscts\fR,
-the \fInocrtscts\fR, the \fIcdtrcts\fR nor the \fInocdtrcts\fR
-option is given, the hardware flow control setting for the serial
-port is left unchanged.
-Some serial ports (such as Macintosh serial ports) lack a true
-RTS output. Such serial ports use this mode to implement true
-bi-directional flow control. The sacrifice is that this flow
-control mode does not permit using DTR as a modem control line.
-.TP

 .B defaultroute
 Add a default route to the system routing tables, using the peer as
 the gateway, when IPCP negotiation is successfully completed.
 .B defaultroute
 Add a default route to the system routing tables, using the peer as
 the gateway, when IPCP negotiation is successfully completed.


@@ -223,6 +212,17 @@ Alternatively, a value of 0 for \fInr\fR or \fInt\fR disables
 compression in the corresponding direction.  Use \fInobsdcomp\fR or
 \fIbsdcomp 0\fR to disable BSD-Compress compression entirely.
 .TP
 compression in the corresponding direction.  Use \fInobsdcomp\fR or
 \fIbsdcomp 0\fR to disable BSD-Compress compression entirely.
 .TP

+.B cdtrcts
+Use a non-standard hardware flow control (i.e. DTR/CTS) to control
+the flow of data on the serial port.  If neither the \fIcrtscts\fR,
+the \fInocrtscts\fR, the \fIcdtrcts\fR nor the \fInocdtrcts\fR
+option is given, the hardware flow control setting for the serial
+port is left unchanged.
+Some serial ports (such as Macintosh serial ports) lack a true
+RTS output. Such serial ports use this mode to implement true
+bi-directional flow control. The sacrifice is that this flow
+control mode does not permit using DTR as a modem control line.
+.TP

 .B chap-interval \fIn
 If this option is given, pppd will rechallenge the peer every \fIn\fR
 seconds.
 .B chap-interval \fIn
 If this option is given, pppd will rechallenge the peer every \fIn\fR
 seconds.


@@ -235,6 +235,14 @@ Set the maximum number of CHAP challenge transmissions to \fIn\fR
 Set the CHAP restart interval (retransmission timeout for challenges)
 to \fIn\fR seconds (default 3).
 .TP
 Set the CHAP restart interval (retransmission timeout for challenges)
 to \fIn\fR seconds (default 3).
 .TP

+.B connect-delay \fIn
+Wait for up \fIn\fR milliseconds after the connect script finishes for
+a valid PPP packet from the peer.  At the end of this time, or when a
+valid PPP packet is received from the peer, pppd will commence
+negotiation by sending its first LCP packet.  The default value is
+1000 (1 second).  This wait period only applies if the \fBconnect\fR
+or \fBpty\fR option is used.
+.TP

 .B debug
 Enables connection debugging facilities.
 If this option is given, pppd will log the contents of all
 .B debug
 Enables connection debugging facilities.
 If this option is given, pppd will log the contents of all


@@ -292,7 +300,7 @@ to the peer.  This option is privileged.
 .TP
 .B hide-password
 When logging the contents of PAP packets, this option causes pppd to
 .TP
 .B hide-password
 When logging the contents of PAP packets, this option causes pppd to

-exclude the password string from the log.
+exclude the password string from the log.  This is the default.

 .TP
 .B holdoff \fIn
 Specifies how many seconds to wait before re-initiating the link after
 .TP
 .B holdoff \fIn
 Specifies how many seconds to wait before re-initiating the link after


@@ -735,7 +743,9 @@ rather than a specific terminal device.  Pppd will allocate itself a
 pseudo-tty master/slave pair and use the slave as its terminal
 device.  The \fIscript\fR will be run in a child process with the
 pseudo-tty master as its standard input and output.  An explicit
 pseudo-tty master/slave pair and use the slave as its terminal
 device.  The \fIscript\fR will be run in a child process with the
 pseudo-tty master as its standard input and output.  An explicit

-device name may not be given if this option is used.
+device name may not be given if this option is used.  (Note: if the
+\fIrecord\fR option is used in conjuction with the \fIpty\fR option,
+the child process will have pipes on its standard input and output.)

 .TP
 .B receive-all
 With this option, pppd will accept all control characters from the
 .TP
 .B receive-all
 With this option, pppd will accept all control characters from the


@@ -773,6 +783,10 @@ Handshake Authentication Protocol] authentication.
 Require the peer to authenticate itself using PAP [Password
 Authentication Protocol] authentication.
 .TP
 Require the peer to authenticate itself using PAP [Password
 Authentication Protocol] authentication.
 .TP

+.B show-password
+When logging the contents of PAP packets, this option causes pppd to
+show the password string in the log message.
+.TP

 .B silent
 With this option, pppd will not transmit LCP packets to initiate a
 connection until a valid LCP packet is received from the peer (as for
 .B silent
 With this option, pppd will not transmit LCP packets to initiate a
 connection until a valid LCP packet is received from the peer (as for


@@ -799,7 +813,9 @@ the \fIname\fR option).  This option is not normally needed since the
 .B usepeerdns
 Ask the peer for up to 2 DNS server addresses.  The addresses supplied
 by the peer (if any) are passed to the /etc/ppp/ip-up script in the
 .B usepeerdns
 Ask the peer for up to 2 DNS server addresses.  The addresses supplied
 by the peer (if any) are passed to the /etc/ppp/ip-up script in the

-environment variables DNS1 and DNS2.
+environment variables DNS1 and DNS2.  In addition, pppd will create an
+/etc/ppp/resolv.conf file containing one or two nameserver lines with
+the address(es) supplied by the peer.

 .TP
 .B user \fIname
 Sets the name used for authenticating the local system to the peer to
 .TP
 .B user \fIname
 Sets the name used for authenticating the local system to the peer to