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.
This commit is contained in:
Brian Somers 1998-08-02 06:56:40 +00:00
parent 35517ab7e8
commit 94245ac66c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=38008
2 changed files with 3 additions and 7 deletions

View File

@ -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;

View File

@ -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