Move the decision whether we want to request authentication from our
peer out from sppp_lcp_open() to sppp_lcp_up(). For one, this makes things look more symmetrical to sppp_lcp_close(), and somehow it also just occurred to me that an Up event following the open caused the value of the authentication option to be clobbered.
This commit is contained in:
parent
1c1d868e78
commit
2dea5ee664
@ -1858,6 +1858,14 @@ sppp_lcp_up(struct sppp *sp)
|
||||
sp->lcp.magic = 0;
|
||||
sp->lcp.protos = 0;
|
||||
sp->lcp.mru = sp->lcp.their_mru = PP_MTU;
|
||||
/*
|
||||
* If we are authenticator, negotiate LCP_AUTH
|
||||
*/
|
||||
if (sp->hisauth.proto != 0)
|
||||
sp->lcp.opts |= (1 << LCP_OPT_AUTH_PROTO);
|
||||
else
|
||||
sp->lcp.opts &= ~(1 << LCP_OPT_AUTH_PROTO);
|
||||
sp->pp_flags &= ~PP_NEEDAUTH;
|
||||
/*
|
||||
* If this interface is passive or dial-on-demand, and we are
|
||||
* still in Initial state, it means we've got an incoming
|
||||
@ -1914,14 +1922,6 @@ sppp_lcp_down(struct sppp *sp)
|
||||
static void
|
||||
sppp_lcp_open(struct sppp *sp)
|
||||
{
|
||||
/*
|
||||
* If we are authenticator, negotiate LCP_AUTH
|
||||
*/
|
||||
if (sp->hisauth.proto != 0)
|
||||
sp->lcp.opts |= (1 << LCP_OPT_AUTH_PROTO);
|
||||
else
|
||||
sp->lcp.opts &= ~(1 << LCP_OPT_AUTH_PROTO);
|
||||
sp->pp_flags &= ~PP_NEEDAUTH;
|
||||
sppp_open_event(&lcp, sp);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user