hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-11 17:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initialize CcpInfo protocols to -1 (none, not OUI).

Browse Source 
Don't Call Term() for an algorithm that hasn't been Init()d.
This commit is contained in:
Brian Somers 1998-01-04 20:25:41 +00:00
parent 6f584bd599
commit 79d1bdaedb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32246
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.sbin/ppp/ccp.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: ccp.c,v 1.25 1997/12/17 21:21:53 brian Exp $
* $Id: ccp.c,v 1.26 1997/12/24 09:28:52 brian Exp $
*
* TODO:
* o Support other compression protocols
@ -43,7 +43,7 @@
#include "pred.h"
#include "deflate.h"
struct ccpstate CcpInfo;
struct ccpstate CcpInfo = { -1, -1 };
static void CcpSendConfigReq(struct fsm *);
static void CcpSendTerminateReq(struct fsm *);
@ -138,16 +138,14 @@ ReportCcpStatus(struct cmdargs const *arg)
static void
ccpstateInit(void)
{
if (CcpInfo.in_init)
(*algorithm[in_algorithm]->i.Term)();
if (CcpInfo.out_init)
(*algorithm[out_algorithm]->o.Term)();
in_algorithm = -1;
out_algorithm = -1;
memset(&CcpInfo, '\0', sizeof CcpInfo);
CcpInfo.his_proto = CcpInfo.my_proto = -1;
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS) {
(*algorithm[in_algorithm]->i.Term)();
in_algorithm = -1;
}
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS) {
(*algorithm[out_algorithm]->o.Term)();
out_algorithm = -1;
}
}
void
@ -245,10 +243,14 @@ CcpLayerUp(struct fsm *fp)
LogPrintf(LogCCP, "Out = %s[%d], In = %s[%d]\n",
protoname(CcpInfo.my_proto), CcpInfo.my_proto,
protoname(CcpInfo.his_proto), CcpInfo.his_proto);
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS)
if (!CcpInfo.in_init && in_algorithm >= 0 && in_algorithm < NALGORITHMS) {
(*algorithm[in_algorithm]->i.Init)();
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS)
CcpInfo.in_init = 1;
}
if (!CcpInfo.out_init && out_algorithm >= 0 && out_algorithm < NALGORITHMS) {
(*algorithm[out_algorithm]->o.Init)();
CcpInfo.out_init = 1;
}
}
void

5
usr.sbin/ppp/ccp.h
View File

@ -15,7 +15,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: ccp.h,v 1.10 1997/12/03 10:23:45 brian Exp $
* $Id: ccp.h,v 1.11 1997/12/03 23:27:55 brian Exp $
*
* TODO:
*/
@ -42,6 +42,9 @@ struct ccpstate {
u_long his_reject; /* Request codes rejected by peer */
u_long my_reject; /* Request codes I have rejected */
int out_init; /* Init called for out algorithm */
int in_init; /* Init called for in algorithm */
u_long uncompout, compout;
u_long uncompin, compin;
};