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

Pass the correct output options to the ccp output initialisation

Browse Source 
routine rather than passing it the first requested output option.

Ensure that options are freed correctly even if we don't reach
TLU.
This commit is contained in:
brian 2000-11-07 04:29:33 +00:00
parent e30917a73e
commit a38b1bf086
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,20 @@ static void
CcpLayerFinish(struct fsm *fp)
{
/* We're now down */
struct ccp *ccp = fsm2ccp(fp);
struct ccp_opt *next;
log_Printf(LogCCP, "%s: LayerFinish.\n", fp->link->name);
/*
* Nuke options that may be left over from sending a REQ but never
* coming up.
*/
while (ccp->out.opt) {
next = ccp->out.opt->next;
free(ccp->out.opt);
ccp->out.opt = next;
}
}
/* Called when CCP has reached the OPEN state */
@ -385,6 +398,8 @@ CcpLayerUp(struct fsm *fp)
{
/* We're now up */
struct ccp *ccp = fsm2ccp(fp);
struct ccp_opt **o;
int f;
log_Printf(LogCCP, "%s: LayerUp.\n", fp->link->name);
@ -400,10 +415,14 @@ CcpLayerUp(struct fsm *fp)
}
}
o = &ccp->out.opt;
for (f = 0; f < ccp->out.algorithm; f++)
if (IsEnabled(ccp->cfg.neg[algorithm[f]->Neg]))
o = &(*o)->next;
if (ccp->out.state == NULL && ccp->out.algorithm >= 0 &&
ccp->out.algorithm < NALGORITHMS) {
ccp->out.state = (*algorithm[ccp->out.algorithm]->o.Init)
(&ccp->out.opt->val);
ccp->out.state = (*algorithm[ccp->out.algorithm]->o.Init)(&(*o)->val);
if (ccp->out.state == NULL) {
log_Printf(LogERROR, "%s: %s (out) initialisation failure\n",
fp->link->name, protoname(ccp->my_proto));

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

@ -82,13 +82,13 @@ struct ccp {
struct {
int algorithm; /* Algorithm in use */
void *state; /* Returned by implementations Init() */
struct lcp_opt opt; /* Set by implementations OptInit() */
struct lcp_opt opt; /* Set by implementation's OptInit() */
} in;
struct {
int algorithm; /* Algorithm in use */
void *state; /* Returned by implementations Init() */
struct ccp_opt *opt; /* Set by implementations OptInit() */
struct ccp_opt *opt; /* Set by implementation's OptInit() */
} out;
u_int32_t his_reject; /* Request codes rejected by peer */