PPPoE updates: don't exit if discovery fails, cope with both

[ppp.git] / pppd / fsm.c

diff --git a/pppd/fsm.c b/pppd/fsm.c
index b5b8148f9a2c5af079212f45193dc98d85963f53..4a5c2a80c31166f8dc3fb84d3743083186bfebc4 100644 (file)
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -1,23 +1,46 @@
 /*
  * fsm.c - {Link, IP} Control Protocol Finite State Machine.
  *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: fsm.c,v 1.17 1999/08/13 06:46:12 paulus Exp $"
+#define RCSID  "$Id: fsm.c,v 1.20 2003/06/29 10:06:14 paulus Exp $"
 
 /*
  * TODO:
@@ -383,6 +406,7 @@ fsm_rconfreq(f, id, inp, len)
        if( f->callbacks->down )
            (*f->callbacks->down)(f);   /* Inform upper layers */
        fsm_sconfreq(f, 0);             /* Send initial Configure-Request */
+       f->state = REQSENT;
        break;
 
     case STOPPED:
@@ -562,10 +586,10 @@ fsm_rtermreq(f, id, p, len)
            info("%s terminated by peer (%0.*v)", PROTO_NAME(f), len, p);
        } else
            info("%s terminated by peer", PROTO_NAME(f));
-       if (f->callbacks->down)
-           (*f->callbacks->down)(f);   /* Inform upper layers */
        f->retransmits = 0;
        f->state = STOPPING;
+       if (f->callbacks->down)
+           (*f->callbacks->down)(f);   /* Inform upper layers */
        TIMEOUT(fsm_timeout, f, f->timeouttime);
        break;
     }
@@ -603,6 +627,7 @@ fsm_rtermack(f)
        if (f->callbacks->down)
            (*f->callbacks->down)(f);   /* Inform upper layers */
        fsm_sconfreq(f, 0);
+       f->state = REQSENT;
        break;
     }
 }