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

When we do a `dial'' or `open'' from DATALINK_READY, go to

Browse Source 
DATALINK_CARRIER and turn off scripting.

This should fix instances where ``term'' is used followed by ~.
and then ``dial''/``open'' (it currently just sits there looking
at you).

Reported by: Tim Vanderhoek <vanderh@ecf.utoronto.ca>
This commit is contained in:
Brian Somers 2000-05-26 08:26:56 +00:00
parent 6de9811ef7
commit 5e269efe6e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/ppp/bundle.c
View File

@ -1076,13 +1076,12 @@ bundle_Open(struct bundle *bundle, const char *name, int mask, int force)
if ((mask & dl->physical->type) &&
(dl->state == DATALINK_CLOSED ||
(force && dl->state == DATALINK_OPENING &&
dl->dial.timer.state == TIMER_RUNNING))) {
if (force) /* Ignore redial timeout ? */
timer_Stop(&dl->dial.timer);
dl->dial.timer.state == TIMER_RUNNING) ||
dl->state == DATALINK_READY)) {
timer_Stop(&dl->dial.timer); /* We're finished with this */
datalink_Up(dl, 1, 1);
if (mask & PHYS_AUTO)
/* Only one AUTO link at a time */
break;
break; /* Only one AUTO link at a time */
}
if (name != NULL)
break;

6
usr.sbin/ppp/datalink.c
View File

@ -969,8 +969,10 @@ datalink_Up(struct datalink *dl, int runscripts, int packetmode)
case DATALINK_READY:
if (!dl->script.packetmode && packetmode) {
dl->script.packetmode = 1;
if (dl->state == DATALINK_READY)
datalink_LoginDone(dl);
if (dl->state == DATALINK_READY) {
dl->script.run = 0;
datalink_NewState(dl, DATALINK_CARRIER);
}
}
break;
}