* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RCSID "$Id: fsm.c,v 1.21 2004/02/02 02:52:51 carlsonj Exp $"
+#define RCSID "$Id: fsm.c,v 1.23 2004/11/13 02:28:15 paulus Exp $"
/*
* TODO:
#include "pppd.h"
#include "fsm.h"
-static const char rcsid[] = RCSID;
static void fsm_timeout __P((void *));
static void fsm_rconfreq __P((fsm *, int, u_char *, int));
* send a terminate-request message as configured.
*/
static void
-terminate_layer(f)
+terminate_layer(f, nextstate)
fsm *f;
+ int nextstate;
{
if( f->state != OPENED )
UNTIMEOUT(fsm_timeout, f); /* Cancel timeout */
* We've already fired off one Terminate-Request just to be nice
* to the peer, but we're not going to wait for a reply.
*/
- f->state = CLOSED;
+ f->state = nextstate == CLOSING ? CLOSED : STOPPED;
if( f->callbacks->finished )
(*f->callbacks->finished)(f);
return;
TIMEOUT(fsm_timeout, f, f->timeouttime);
--f->retransmits;
- f->state = CLOSING;
+ f->state = nextstate;
}
/*
case ACKRCVD:
case ACKSENT:
case OPENED:
- terminate_layer(f);
+ terminate_layer(f, CLOSING);
break;
}
}
f->nakloops = 0;
} else {
- /* we sent CONFACK or CONFREJ */
+ /* we sent CONFNAK or CONFREJ */
if (f->state != ACKRCVD)
f->state = REQSENT;
if( code == CONFNAK )
return;
}
f->seen_ack = 1;
+ f->rnakloops = 0;
switch (f->state) {
case CLOSED:
u_char *inp;
int len;
{
- int (*proc) __P((fsm *, u_char *, int));
int ret;
+ int treat_as_reject;
if (id != f->reqid || f->seen_ack) /* Expected id? */
return; /* Nope, toss... */
- proc = (code == CONFNAK)? f->callbacks->nakci: f->callbacks->rejci;
- if (!proc || !(ret = proc(f, inp, len))) {
- /* Nak/reject is bad - ignore it */
- error("Received bad configure-nak/rej: %P", inp, len);
- return;
+
+ if (code == CONFNAK) {
+ ++f->rnakloops;
+ treat_as_reject = (f->rnakloops >= f->maxnakloops);
+ if (f->callbacks->nakci == NULL
+ || !(ret = f->callbacks->nakci(f, inp, len, treat_as_reject))) {
+ error("Received bad configure-nak: %P", inp, len);
+ return;
+ }
+ } else {
+ f->rnakloops = 0;
+ if (f->callbacks->rejci == NULL
+ || !(ret = f->callbacks->rejci(f, inp, len))) {
+ error("Received bad configure-rej: %P", inp, len);
+ return;
+ }
}
+
f->seen_ack = 1;
switch (f->state) {
break;
case OPENED:
- terminate_layer(f);
+ terminate_layer(f, STOPPING);
break;
default:
if( f->callbacks->resetci )
(*f->callbacks->resetci)(f);
f->nakloops = 0;
+ f->rnakloops = 0;
}
if( !retransmit ){