N_PPP ->NUM_PPP

diff --git a/pppd/auth.c b/pppd/auth.c
index 61a1b72d4723fb5e2e45b3c7226fa4c08f8bcdc6..406661b113b4a97286797fb4f3a3d45211468262 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.11 1994/10/22 11:54:04 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.12 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -78,9 +78,9 @@ struct wordlist {
 #define TRUE   1
 
 /* Records which authentication operations haven't completed yet. */
-static int auth_pending[N_PPP];
+static int auth_pending[NUM_PPP];
 static int logged_in;
-static struct wordlist *addresses[N_PPP];
+static struct wordlist *addresses[NUM_PPP];
 
 /* Bits in auth_pending[] */
 #define UPAP_WITHPEER  1

diff --git a/pppd/ccp.c b/pppd/ccp.c
index 24bf6ccd0e3393dd691dde490048e5feb62e4055..90f83fad1429e4d453307223e49db1bdfa825d51 100644 (file)
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -26,7 +26,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ccp.c,v 1.5 1994/09/21 06:47:37 paulus Exp $";
+static char rcsid[] = "$Id: ccp.c,v 1.6 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 #include <syslog.h>
@@ -36,11 +36,11 @@ static char rcsid[] = "$Id: ccp.c,v 1.5 1994/09/21 06:47:37 paulus Exp $";
 #include "fsm.h"
 #include "ccp.h"
 
-fsm ccp_fsm[N_PPP];
-ccp_options ccp_wantoptions[N_PPP];    /* what to request the peer to use */
-ccp_options ccp_gotoptions[N_PPP];     /* what the peer agreed to do */
-ccp_options ccp_allowoptions[N_PPP];   /* what we'll agree to do */
-ccp_options ccp_hisoptions[N_PPP];     /* what we agreed to do */
+fsm ccp_fsm[NUM_PPP];
+ccp_options ccp_wantoptions[NUM_PPP];  /* what to request the peer to use */
+ccp_options ccp_gotoptions[NUM_PPP];   /* what the peer agreed to do */
+ccp_options ccp_allowoptions[NUM_PPP]; /* what we'll agree to do */
+ccp_options ccp_hisoptions[NUM_PPP];   /* what we agreed to do */
 
 /*
  * Callbacks for fsm code.
@@ -102,7 +102,7 @@ static fsm_callbacks ccp_callbacks = {
 /*
  * Local state (mainly for handling reset-reqs and reset-acks
  */
-static int ccp_localstate[N_PPP];
+static int ccp_localstate[NUM_PPP];
 #define RACK_PENDING   1       /* waiting for reset-ack */
 #define RREQ_REPEAT    2       /* send another reset-req if no reset-ack */
 

diff --git a/pppd/chap.c b/pppd/chap.c
index b7a95cc2b04517d3a3f0792407ed8df162c339f8..a0400b9348c44aaf7823865ab120532a11f88e9f 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: chap.c,v 1.5 1994/10/22 11:54:04 paulus Exp $";
+static char rcsid[] = "$Id: chap.c,v 1.6 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 /*
@@ -36,7 +36,7 @@ static char rcsid[] = "$Id: chap.c,v 1.5 1994/10/22 11:54:04 paulus Exp $";
 #include "chap.h"
 #include "md5.h"
 
-chap_state chap[N_PPP];                /* CHAP state; one for each unit */
+chap_state chap[NUM_PPP];              /* CHAP state; one for each unit */
 
 static void ChapChallengeTimeout __P((caddr_t));
 static void ChapResponseTimeout __P((caddr_t));

diff --git a/pppd/fsm.c b/pppd/fsm.c
index 426e86d79814fbbaa7342503b8873aca61fa768c..4e504f20808785a693f649ccc5afa362acc00363 100644 (file)
--- a/pppd/fsm.c
+++ b/pppd/fsm.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: fsm.c,v 1.6 1994/10/22 11:54:04 paulus Exp $";
+static char rcsid[] = "$Id: fsm.c,v 1.7 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 /*
@@ -48,7 +48,7 @@ static void fsm_sconfreq __P((fsm *, int));
 
 #define PROTO_NAME(f)  ((f)->callbacks->proto_name)
 
-int peer_mru[N_PPP];
+int peer_mru[NUM_PPP];
 
 
 /*

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index f20257931721952fb8b7a967c7d3d739f12c35eb..9032f73eb71c30e6c6f542ffc1d0a05f342b6b00 100644 (file)
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.13 1994/10/22 11:54:04 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.14 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 /*
@@ -38,13 +38,13 @@ static char rcsid[] = "$Id: ipcp.c,v 1.13 1994/10/22 11:54:04 paulus Exp $";
 #include "pathnames.h"
 
 /* global vars */
-ipcp_options ipcp_wantoptions[N_PPP];  /* Options that we want to request */
-ipcp_options ipcp_gotoptions[N_PPP];   /* Options that peer ack'd */
-ipcp_options ipcp_allowoptions[N_PPP]; /* Options we allow peer to request */
-ipcp_options ipcp_hisoptions[N_PPP];   /* Options that we ack'd */
+ipcp_options ipcp_wantoptions[NUM_PPP];        /* Options that we want to request */
+ipcp_options ipcp_gotoptions[NUM_PPP]; /* Options that peer ack'd */
+ipcp_options ipcp_allowoptions[NUM_PPP];       /* Options we allow peer to request */
+ipcp_options ipcp_hisoptions[NUM_PPP]; /* Options that we ack'd */
 
 /* local vars */
-static int cis_received[N_PPP];                /* # Conf-Reqs received */
+static int cis_received[NUM_PPP];              /* # Conf-Reqs received */
 
 /*
  * Callbacks for fsm code.  (CI = Configuration Information)
@@ -60,7 +60,7 @@ static void ipcp_up __P((fsm *));             /* We're UP */
 static void ipcp_down __P((fsm *));            /* We're DOWN */
 static void ipcp_script __P((fsm *, char *)); /* Run an up/down script */
 
-fsm ipcp_fsm[N_PPP];           /* IPCP fsm structure */
+fsm ipcp_fsm[NUM_PPP];         /* IPCP fsm structure */
 
 static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */
     ipcp_resetci,              /* Reset our Configuration Information */

diff --git a/pppd/lcp.c b/pppd/lcp.c
index ee9999b96696b7436b2b61f916a0ff3b38f621c4..c8c27ac2df1dc4adb0472b909b3bba792670cfe1 100644 (file)
--- a/pppd/lcp.c
+++ b/pppd/lcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: lcp.c,v 1.14 1994/09/21 06:47:37 paulus Exp $";
+static char rcsid[] = "$Id: lcp.c,v 1.15 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 /*
@@ -48,12 +48,12 @@ static char rcsid[] = "$Id: lcp.c,v 1.14 1994/09/21 06:47:37 paulus Exp $";
 #endif
 
 /* global vars */
-fsm lcp_fsm[N_PPP];                    /* LCP fsm structure (global)*/
-lcp_options lcp_wantoptions[N_PPP];    /* Options that we want to request */
-lcp_options lcp_gotoptions[N_PPP];     /* Options that peer ack'd */
-lcp_options lcp_allowoptions[N_PPP];   /* Options we allow peer to request */
-lcp_options lcp_hisoptions[N_PPP];     /* Options that we ack'd */
-u_int32_t xmit_accm[N_PPP][8];         /* extended transmit ACCM */
+fsm lcp_fsm[NUM_PPP];                  /* LCP fsm structure (global)*/
+lcp_options lcp_wantoptions[NUM_PPP];  /* Options that we want to request */
+lcp_options lcp_gotoptions[NUM_PPP];   /* Options that peer ack'd */
+lcp_options lcp_allowoptions[NUM_PPP]; /* Options we allow peer to request */
+lcp_options lcp_hisoptions[NUM_PPP];   /* Options that we ack'd */
+u_int32_t xmit_accm[NUM_PPP][8];               /* extended transmit ACCM */
 
 static u_int32_t lcp_echos_pending = 0;        /* Number of outstanding echo msgs */
 static u_int32_t lcp_echo_number   = 0;        /* ID number of next echo frame */

diff --git a/pppd/pppd.h b/pppd/pppd.h
index c2ed6671a90ad2b2f6e74e4bb67af21f5f069596..ff8deadbbcb4e56c6b885782c17f40f6bc7adc2c 100644 (file)
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pppd.h,v 1.5 1994/09/21 06:47:37 paulus Exp $
+ * $Id: pppd.h,v 1.6 1994/10/24 04:31:11 paulus Exp $
  */
 
 /*
@@ -30,7 +30,7 @@
 #include <sys/types.h>         /* for u_int32_t, if defined */
 #include <net/ppp_defs.h>
 
-#define N_PPP  1               /* One PPP interface supported (per process) */
+#define NUM_PPP        1               /* One PPP interface supported (per process) */
 
 /*
  * Limits.

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 8251f480f0dc8874d9c0082fa945b30e63492882..e099973cea651fb42c4728b3b5048a3a20cd3201 100644 (file)
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -122,7 +122,7 @@ int set_kdebugflag (int requested_level)
 
 void establish_ppp (void)
 {
-    int pppdisc = N_PPP;
+    int pppdisc = NUM_PPP;
     int sig    = SIGIO;
 
     if (ioctl(fd, TIOCEXCL, 0) < 0) {

diff --git a/pppd/upap.c b/pppd/upap.c
index d5ad3eee541df39a56639f37e46eb876a6809d1b..afbc180b56709c27434498536352e31cba85d07a 100644 (file)
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: upap.c,v 1.4 1994/10/22 11:54:04 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.5 1994/10/24 04:31:11 paulus Exp $";
 #endif
 
 /*
@@ -35,7 +35,7 @@ static char rcsid[] = "$Id: upap.c,v 1.4 1994/10/22 11:54:04 paulus Exp $";
 #include "upap.h"
 
 
-upap_state upap[N_PPP];                /* UPAP state; one for each unit */
+upap_state upap[NUM_PPP];              /* UPAP state; one for each unit */
 
 
 static void upap_timeout __P((caddr_t));