diff options
| author | brian <brian@FreeBSD.org> | 2000-05-26 08:26:56 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2000-05-26 08:26:56 +0000 |
| commit | c756c66b2986c4a7c3427bef70b6e0d629ae3157 (patch) | |
| tree | 78f0cb0c731f7c925917b92fba23e71c9ef8a611 /usr.sbin/ppp/bundle.c | |
| parent | 1816cb0fd44645f74aeeaeeb1d5c532324e2dcc3 (diff) | |
| download | FreeBSD-src-c756c66b2986c4a7c3427bef70b6e0d629ae3157.zip FreeBSD-src-c756c66b2986c4a7c3427bef70b6e0d629ae3157.tar.gz | |
When we do a ``dial'' or ``open'' from DATALINK_READY, go to
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>
Diffstat (limited to 'usr.sbin/ppp/bundle.c')
| -rw-r--r-- | usr.sbin/ppp/bundle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c index 938bbea..e0ec63c 100644 --- a/usr.sbin/ppp/bundle.c +++ b/usr.sbin/ppp/bundle.c @@ -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; |
