pppd: Fix SIGSEGV in EAP-TLS code when TLS verify method is not specified

[ppp.git] / pppd / fsm.h

diff --git a/pppd/fsm.h b/pppd/fsm.h
index 2627fbf65864297a517968cc7fca91d1ece6b178..75a36d52fe94e9172a0578ef5491a06e2fb26344 100644 (file)
--- a/pppd/fsm.h
+++ b/pppd/fsm.h
@@ -39,7 +39,7 @@
  * 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.9 2002/12/04 23:03:32 paulus Exp $
+ * $Id: fsm.h,v 1.10 2004/11/13 02:28:15 paulus Exp $
  */
 
 /*
@@ -76,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 */
@@ -84,34 +85,26 @@ typedef struct fsm {
 
 
 typedef struct fsm_callbacks {
-    void (*resetci)            /* Reset our Configuration Information */
-               __P((fsm *));
-    int  (*cilen)              /* Length of our Configuration Information */
-               __P((fsm *));
+    void (*resetci)(fsm *);    /* Reset our Configuration Information */
+    int  (*cilen)(fsm *);      /* Length of our Configuration Information */
     void (*addci)              /* Add our Configuration Information */
-               __P((fsm *, u_char *, int *));
+               (fsm *, u_char *, int *);
     int  (*ackci)              /* ACK our Configuration Information */
-               __P((fsm *, u_char *, int));
+               (fsm *, u_char *, int);
     int  (*nakci)              /* NAK our Configuration Information */
-               __P((fsm *, u_char *, int));
+               (fsm *, u_char *, int, int);
     int  (*rejci)              /* Reject our Configuration Information */
-               __P((fsm *, u_char *, int));
+               (fsm *, u_char *, int);
     int  (*reqci)              /* Request peer's Configuration Information */
-               __P((fsm *, u_char *, int *, int));
-    void (*up)                 /* Called when fsm reaches OPENED state */
-               __P((fsm *));
-    void (*down)               /* Called when fsm leaves OPENED state */
-               __P((fsm *));
-    void (*starting)           /* Called when we want the lower layer */
-               __P((fsm *));
-    void (*finished)           /* Called when we don't want the lower layer */
-               __P((fsm *));
-    void (*protreject)         /* Called when Protocol-Reject received */
-               __P((int));
-    void (*retransmit)         /* Retransmission is necessary */
-               __P((fsm *));
+               (fsm *, u_char *, int *, int);
+    void (*up)(fsm *);         /* Called when fsm reaches OPENED state */
+    void (*down)(fsm *);       /* Called when fsm leaves OPENED state */
+    void (*starting)(fsm *);   /* Called when we want the lower layer */
+    void (*finished)(fsm *);   /* Called when we don't want the lower layer */
+    void (*protreject)(int);   /* Called when Protocol-Reject received */
+    void (*retransmit)(fsm *); /* Retransmission is necessary */
     int  (*extcode)            /* Called when unknown code received */
-               __P((fsm *, int, int, u_char *, int));
+               (fsm *, int, int, u_char *, int);
     char *proto_name;          /* String name for protocol (for messages) */
 } fsm_callbacks;
 
@@ -151,14 +144,14 @@ typedef struct fsm_callbacks {
 /*
  * Prototypes
  */
-void fsm_init __P((fsm *));
-void fsm_lowerup __P((fsm *));
-void fsm_lowerdown __P((fsm *));
-void fsm_open __P((fsm *));
-void fsm_close __P((fsm *, char *));
-void fsm_input __P((fsm *, u_char *, int));
-void fsm_protreject __P((fsm *));
-void fsm_sdata __P((fsm *, int, int, u_char *, int));
+void fsm_init (fsm *);
+void fsm_lowerup (fsm *);
+void fsm_lowerdown (fsm *);
+void fsm_open (fsm *);
+void fsm_close (fsm *, char *);
+void fsm_input (fsm *, u_char *, int);
+void fsm_protreject (fsm *);
+void fsm_sdata (fsm *, int, int, u_char *, int);
 
 
 /*