diff options
author | brian <brian@FreeBSD.org> | 1998-08-02 06:56:40 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 1998-08-02 06:56:40 +0000 |
commit | 1312bb150c062ced1db2a2ab034b2eefdcd84693 (patch) | |
tree | a3fb709059b54a4405db55f77d85445e6b890fe6 | |
parent | d36ff66a00e83e5968e8ef1a0f76edaa7171e693 (diff) | |
download | FreeBSD-src-1312bb150c062ced1db2a2ab034b2eefdcd84693.zip FreeBSD-src-1312bb150c062ced1db2a2ab034b2eefdcd84693.tar.gz |
On receipt of a sig 15, do a full bundle_Close() even if
our current phase is PHASE_DEAD as it's possible that there
are links stuck in OPENING waiting for a redial timer.
-rw-r--r-- | usr.sbin/ppp/bundle.c | 5 | ||||
-rw-r--r-- | usr.sbin/ppp/main.c | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c index 559c28b..c59bad4 100644 --- a/usr.sbin/ppp/bundle.c +++ b/usr.sbin/ppp/bundle.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bundle.c,v 1.28 1998/07/28 21:54:50 brian Exp $ + * $Id: bundle.c,v 1.29 1998/07/29 18:21:11 brian Exp $ */ #include <sys/param.h> @@ -461,9 +461,6 @@ bundle_Close(struct bundle *bundle, const char *name, int how) struct datalink *dl, *this_dl; int others_active; - if (bundle->phase == PHASE_TERMINATE || bundle->phase == PHASE_DEAD) - return; - others_active = 0; this_dl = NULL; diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c index 0d13bcc..0ac4785 100644 --- a/usr.sbin/ppp/main.c +++ b/usr.sbin/ppp/main.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.138 1998/06/27 14:17:28 brian Exp $ + * $Id: main.c,v 1.139 1998/06/27 14:18:07 brian Exp $ * * TODO: */ @@ -85,8 +85,7 @@ void Cleanup(int excode) { SignalBundle->CleaningUp = 1; - if (bundle_Phase(SignalBundle) != PHASE_DEAD) - bundle_Close(SignalBundle, NULL, CLOSE_STAYDOWN); + bundle_Close(SignalBundle, NULL, CLOSE_STAYDOWN); } void |