d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove struct physical::abort.

Browse Source
This commit is contained in:
Brian Somers 1998-03-20 19:47:22 +00:00
parent 2267893f11
commit 4c2d498275
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/ppp/modem.c
View File

@ -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.77.2.37 1998/03/16 22:54:12 brian Exp $
* $Id: modem.c,v 1.77.2.38 1998/03/18 21:53:48 brian Exp $
*
* TODO:
*/
@ -125,7 +125,6 @@ modem_Create(const char *name, struct datalink *dl)
p->fd = -1;
p->mbits = 0;
p->abort = 0;
p->dev_is_modem = 0;
p->out = NULL;
p->connect_count = 0;
@ -288,11 +287,7 @@ modem_Timeout(void *data)
StopTimer(&to->modem->link.Timer);
StartTimer(&to->modem->link.Timer);
if (to->modem->abort) {
/* Something went horribly wrong */
to->modem->abort = 0;
link_Close(&to->modem->link, to->bundle, 0, 0);
} else if (to->modem->dev_is_modem) {
if (to->modem->dev_is_modem) {
if (to->modem->fd >= 0) {
if (ioctl(to->modem->fd, TIOCMGET, &to->modem->mbits) < 0) {
LogPrintf(LogPHASE, "ioctl error (%s)!\n", strerror(errno));
@ -893,7 +888,7 @@ modem_StartOutput(struct link *l, struct bundle *bundle)
if (errno != EAGAIN) {
LogPrintf(LogERROR, "modem write (%d): %s\n", modem->fd,
strerror(errno));
modem->abort = 1;
link_Close(&modem->link, bundle, 0, 0);
}
}
}

3
usr.sbin/ppp/physical.h
View File

@ -16,7 +16,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: physical.h,v 1.1.2.14 1998/03/10 03:05:58 brian Exp $
* $Id: physical.h,v 1.1.2.15 1998/03/13 00:44:51 brian Exp $
*
*/
@ -27,7 +27,6 @@ struct physical {
struct hdlc hdlc; /* Our hdlc state */
int fd; /* File descriptor for this device */
int mbits; /* Current DCD status */
unsigned abort : 1; /* Something's gone horribly wrong */
unsigned dev_is_modem : 1; /* Is the device an actual modem?
Faked for sync devices, though...
(Possibly this should be