Header file reorganization and cleaning up the public API for pppd version 2.5.0...

[ppp.git] / pppd / fsm.h

diff --git a/pppd/fsm.h b/pppd/fsm.h
index 1cda6cffbde6b8addb4da1279689bc2b8caf153f..071b844448aa59ba2bc44c9b01ee90f8735f6198 100644 (file)
--- a/pppd/fsm.h
+++ b/pppd/fsm.h
@@ -72,9 +72,9 @@ typedef struct fsm {
     int protocol;              /* Data Link Layer Protocol field value */
     int state;                 /* State */
     int flags;                 /* Contains option bits */
-    u_char id;                 /* Current id */
-    u_char reqid;              /* Current request id */
-    u_char seen_ack;           /* Have received valid Ack/Nak/Rej to Req */
+    unsigned char id;                  /* Current id */
+    unsigned char reqid;               /* Current request id */
+    unsigned char seen_ack;            /* Have received valid Ack/Nak/Rej to Req */
     int timeouttime;           /* Timeout time in milliseconds */
     int maxconfreqtransmits;   /* Maximum Configure-Request transmissions */
     int retransmits;           /* Number of retransmissions left */
@@ -92,15 +92,15 @@ typedef struct fsm_callbacks {
     void (*resetci)(fsm *);    /* Reset our Configuration Information */
     int  (*cilen)(fsm *);      /* Length of our Configuration Information */
     void (*addci)              /* Add our Configuration Information */
-               (fsm *, u_char *, int *);
+               (fsm *, unsigned char *, int *);
     int  (*ackci)              /* ACK our Configuration Information */
-               (fsm *, u_char *, int);
+               (fsm *, unsigned char *, int);
     int  (*nakci)              /* NAK our Configuration Information */
-               (fsm *, u_char *, int, int);
+               (fsm *, unsigned char *, int, int);
     int  (*rejci)              /* Reject our Configuration Information */
-               (fsm *, u_char *, int);
+               (fsm *, unsigned char *, int);
     int  (*reqci)              /* Request peer's Configuration Information */
-               (fsm *, u_char *, int *, int);
+               (fsm *, unsigned 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 */
@@ -108,7 +108,7 @@ typedef struct fsm_callbacks {
     void (*protreject)(int);   /* Called when Protocol-Reject received */
     void (*retransmit)(fsm *); /* Retransmission is necessary */
     int  (*extcode)            /* Called when unknown code received */
-               (fsm *, int, int, u_char *, int);
+               (fsm *, int, int, unsigned char *, int);
     char *proto_name;          /* String name for protocol (for messages) */
 } fsm_callbacks;
 
@@ -153,9 +153,9 @@ 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_input (fsm *, unsigned char *, int);
 void fsm_protreject (fsm *);
-void fsm_sdata (fsm *, int, int, u_char *, int);
+void fsm_sdata (fsm *, int, int, unsigned char *, int);
 
 
 /*