aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>1999-04-21 08:03:35 +0000
committerBrian Somers <brian@FreeBSD.org>1999-04-21 08:03:35 +0000
commit1599fce5c6637c4febde5ffd7455c40415cd0d6d (patch)
treed9fa276794ad2011bb930f83c2e6396088bcb8ec /usr.sbin
parentbb31204c9bdf450018336051ef0914902d9ed169 (diff)
downloadsrc-1599fce5c6637c4febde5ffd7455c40415cd0d6d.tar.gz
src-1599fce5c6637c4febde5ffd7455c40415cd0d6d.zip
If ioctl TIOCMGET fails, continue. The device may be
a pseudo device created by an interactive version of rlogin/telnet/ssh & friends
Notes
Notes: svn path=/head/; revision=45906
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ppp/modem.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index b7908c9c7343..b05465c140e2 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: modem.c,v 1.108 1999/04/03 11:54:00 brian Exp $
+ * $Id: modem.c,v 1.109 1999/04/03 12:01:38 brian Exp $
*
* TODO:
*/
@@ -287,9 +287,10 @@ modem_Timeout(void *data)
if (modem->fd >= 0) {
if (ioctl(modem->fd, TIOCMGET, &modem->mbits) < 0) {
- log_Printf(LogPHASE, "%s: ioctl error (%s)!\n", modem->link.name,
- strerror(errno));
- datalink_Down(modem->dl, CLOSE_NORMAL);
+ log_Printf(LogPHASE, "%s: Carrier not required (pseudo tty ?)\n",
+ modem->link.name);
+ timer_Stop(&modem->Timer);
+ modem->mbits = TIOCM_CD;
return;
}
} else