Merge branch 'rp-pppoe-error' of https://github.com/snickl/lpppd

[ppp.git] / pppd / fsm.h

diff --git a/pppd/fsm.h b/pppd/fsm.h
index 1916342b638721a0439937290e29c64bfff55a6c..87a78d38e8b2b48b1dfcf9c67d819bfc752d1253 100644 (file)
--- a/pppd/fsm.h
+++ b/pppd/fsm.h
@@ -1,28 +1,51 @@
 /*
  * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions.
  *
- * 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:
  *
- * $Id: fsm.h,v 1.7 1997/04/30 05:52:37 paulus Exp $
+ * 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.
+ *
+ * $Id: fsm.h,v 1.10 2004/11/13 02:28:15 paulus Exp $
  */
 
 /*
  * Packet header = Code, id, length.
  */
-#define HEADERLEN      (sizeof (u_char) + sizeof (u_char) + sizeof (u_short))
+#define HEADERLEN      4
 
 
 /*
@@ -53,6 +76,7 @@ typedef struct fsm {
     int retransmits;           /* Number of retransmissions left */
     int maxtermtransmits;      /* Maximum Terminate-Request transmissions */
     int nakloops;              /* Number of nak loops since last ack */
+    int rnakloops;             /* Number of naks received */
     int maxnakloops;           /* Maximum number of nak loops tolerated */
     struct fsm_callbacks *callbacks;   /* Callback routines */
     char *term_reason;         /* Reason for closing protocol */
@@ -70,7 +94,7 @@ typedef struct fsm_callbacks {
     int  (*ackci)              /* ACK our Configuration Information */
                __P((fsm *, u_char *, int));
     int  (*nakci)              /* NAK our Configuration Information */
-               __P((fsm *, u_char *, int));
+               __P((fsm *, u_char *, int, int));
     int  (*rejci)              /* Reject our Configuration Information */
                __P((fsm *, u_char *, int));
     int  (*reqci)              /* Request peer's Configuration Information */