Merge branch 'master' of https://github.com/gburgessiv/ppp

[ppp.git] / pppd / fsm.c

diff --git a/pppd/fsm.c b/pppd/fsm.c
index 4a5c2a80c31166f8dc3fb84d3743083186bfebc4..e9bd34f0e8f48fd0da69e4ffea3349691975f435 100644 (file)
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -40,7 +40,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: fsm.c,v 1.20 2003/06/29 10:06:14 paulus Exp $"
+#define RCSID  "$Id: fsm.c,v 1.23 2004/11/13 02:28:15 paulus Exp $"
 
 /*
  * TODO:
@@ -201,6 +201,44 @@ fsm_open(f)
     }
 }
 
+/*
+ * terminate_layer - Start process of shutting down the FSM
+ *
+ * Cancel any timeout running, notify upper layers we're done, and
+ * send a terminate-request message as configured.
+ */
+static void
+terminate_layer(f, nextstate)
+    fsm *f;
+    int nextstate;
+{
+    if( f->state != OPENED )
+       UNTIMEOUT(fsm_timeout, f);      /* Cancel timeout */
+    else if( f->callbacks->down )
+       (*f->callbacks->down)(f);       /* Inform upper layers we're down */
+
+    /* Init restart counter and send Terminate-Request */
+    f->retransmits = f->maxtermtransmits;
+    fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
+             (u_char *) f->term_reason, f->term_reason_len);
+
+    if (f->retransmits == 0) {
+       /*
+        * User asked for no terminate requests at all; just close it.
+        * 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 = nextstate == CLOSING ? CLOSED : STOPPED;
+       if( f->callbacks->finished )
+           (*f->callbacks->finished)(f);
+       return;
+    }
+
+    TIMEOUT(fsm_timeout, f, f->timeouttime);
+    --f->retransmits;
+
+    f->state = nextstate;
+}
 
 /*
  * fsm_close - Start closing connection.
@@ -230,19 +268,7 @@ fsm_close(f, reason)
     case ACKRCVD:
     case ACKSENT:
     case OPENED:
-       if( f->state != OPENED )
-           UNTIMEOUT(fsm_timeout, f);  /* Cancel timeout */
-       else if( f->callbacks->down )
-           (*f->callbacks->down)(f);   /* Inform upper layers we're down */
-
-       /* Init restart counter, send Terminate-Request */
-       f->retransmits = f->maxtermtransmits;
-       fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
-                 (u_char *) f->term_reason, f->term_reason_len);
-       TIMEOUT(fsm_timeout, f, f->timeouttime);
-       --f->retransmits;
-
-       f->state = CLOSING;
+       terminate_layer(f, CLOSING);
        break;
     }
 }
@@ -442,7 +468,7 @@ fsm_rconfreq(f, id, inp, len)
        f->nakloops = 0;
 
     } else {
-       /* we sent CONFACK or CONFREJ */
+       /* we sent CONFNAK or CONFREJ */
        if (f->state != ACKRCVD)
            f->state = REQSENT;
        if( code == CONFNAK )
@@ -470,6 +496,7 @@ fsm_rconfack(f, id, inp, len)
        return;
     }
     f->seen_ack = 1;
+    f->rnakloops = 0;
 
     switch (f->state) {
     case CLOSED:
@@ -518,17 +545,29 @@ fsm_rconfnakrej(f, code, id, inp, len)
     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) {
@@ -689,17 +728,7 @@ fsm_protreject(f)
        break;
 
     case OPENED:
-       if( f->callbacks->down )
-           (*f->callbacks->down)(f);
-
-       /* Init restart counter, send Terminate-Request */
-       f->retransmits = f->maxtermtransmits;
-       fsm_sdata(f, TERMREQ, f->reqid = ++f->id,
-                 (u_char *) f->term_reason, f->term_reason_len);
-       TIMEOUT(fsm_timeout, f, f->timeouttime);
-       --f->retransmits;
-
-       f->state = STOPPING;
+       terminate_layer(f, STOPPING);
        break;
 
     default:
@@ -725,6 +754,7 @@ fsm_sconfreq(f, retransmit)
        if( f->callbacks->resetci )
            (*f->callbacks->resetci)(f);
        f->nakloops = 0;
+       f->rnakloops = 0;
     }
 
     if( !retransmit ){