Update to state of pppd-new directory

[ppp.git] / pppd / pppd.h

diff --git a/pppd/pppd.h b/pppd/pppd.h
index 4973e144e809ca1417779541e50fb31c7dfa9c6f..bbf04fde4b7898a1f63f281d056bb77dbd77bbf2 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.4 1994/09/01 00:36:05 paulus Exp $
+ * $Id: pppd.h,v 1.8.2.1 1995/06/01 07:01:37 paulus Exp $
  */
 
 /*
@@ -25,21 +25,12 @@
 
 #ifndef __PPPD_H__
 #define __PPPD_H__
-#include "args.h"
 
 #include <sys/param.h>         /* for MAXPATHLEN and BSD4_4, if defined */
+#include <sys/types.h>         /* for u_int32_t, if defined */
+#include <net/ppp_defs.h>
 
-#define NPPP   1               /* One PPP interface supported (per process) */
-
-/*
- * A 32-bit unsigned integral type.
- */
-
-#ifdef UINT32
-typedef        UINT32          uint32;
-#else
-typedef unsigned long  uint32;
-#endif
+#define NUM_PPP        1               /* One PPP interface supported (per process) */
 
 /*
  * Limits.
@@ -58,7 +49,6 @@ extern int    hungup;         /* Physical layer has disconnected */
 extern int     ifunit;         /* Interface unit number */
 extern char    ifname[];       /* Interface name */
 extern int     fd;             /* Serial device file descriptor */
-extern int     s;              /* Socket descriptor */
 extern char    hostname[];     /* Our hostname */
 extern u_char  outpacket_buf[]; /* Buffer for outgoing packets */
 extern int     phase;          /* Current state of link - see values below */
@@ -76,7 +66,7 @@ extern char   devnam[];       /* Device name */
 extern int     crtscts;        /* Use hardware flow control */
 extern int     modem;          /* Use modem control lines */
 extern int     inspeed;        /* Input/Output speed requested */
-extern uint32  netmask;        /* IP netmask to set on interface */
+extern u_int32_t netmask;      /* IP netmask to set on interface */
 extern int     lockflag;       /* Create lock file to lock the serial dev */
 extern int     nodetach;       /* Don't detach from controlling tty */
 extern char    *connector;     /* Script to establish physical link */
@@ -93,34 +83,44 @@ extern char our_name[];     /* Our name for authentication purposes */
 extern char    remote_name[];  /* Peer's name for authentication */
 extern int     usehostname;    /* Use hostname for our_name */
 extern int     disable_defaultip; /* Don't use hostname for default IP adrs */
+extern int     demand;         /* Do dial-on-demand */
+extern char    *ipparam;       /* Extra parameter for ip up/down scripts */
+extern int     cryptpap;       /* Others' PAP passwords are encrypted */
+extern int     idle_time_limit;/* Shut down link if idle for this long */
+extern int     holdoff;        /* Dead time before restarting */
 
 /*
  * Values for phase.
  */
 #define PHASE_DEAD             0
-#define PHASE_ESTABLISH                1
-#define PHASE_AUTHENTICATE     2
-#define PHASE_NETWORK          3
-#define PHASE_TERMINATE                4
+#define PHASE_DORMANT          1
+#define PHASE_ESTABLISH                2
+#define PHASE_AUTHENTICATE     3
+#define PHASE_NETWORK          4
+#define PHASE_TERMINATE                5
+#define PHASE_HOLDOFF          6
 
 /*
  * Prototypes.
  */
-void quit __ARGS((void));      /* Cleanup and exit */
-void timeout __ARGS((void (*)(), caddr_t, int));
+void quit __P((void)); /* Cleanup and exit */
+void timeout __P((void (*)(), caddr_t, int));
                                /* Look-alike of kernel's timeout() */
-void untimeout __ARGS((void (*)(), caddr_t));
+void untimeout __P((void (*)(), caddr_t));
                                /* Look-alike of kernel's untimeout() */
-void output __ARGS((int, u_char *, int));
+void output __P((int, u_char *, int));
                                /* Output a PPP packet */
-void demuxprotrej __ARGS((int, int));
+void demuxprotrej __P((int, int));
                                /* Demultiplex a Protocol-Reject */
-int  check_passwd __ARGS((int, char *, int, char *, int, char **, int *));
+int  check_passwd __P((int, char *, int, char *, int, char **, int *));
                                /* Check peer-supplied username/password */
-int  get_secret __ARGS((int, char *, char *, char *, int *, int));
+int  get_secret __P((int, char *, char *, char *, int *, int));
                                /* get "secret" for chap */
-uint32 GetMask __ARGS((uint32)); /* get netmask for address */
-void die __ARGS((int));
+u_int32_t GetMask __P((u_int32_t)); /* get netmask for address */
+void die __P((int));
+void np_up __P((int, int));
+void np_down __P((int, int));
+void np_finished __P((int, int));
 
 /*
  * Inline versions of get/put char/short/long.
@@ -161,7 +161,9 @@ void die __ARGS((int));
 #define INCPTR(n, cp)  ((cp) += (n))
 #define DECPTR(n, cp)  ((cp) -= (n))
 
+#undef  FALSE
 #define FALSE  0
+#undef  TRUE
 #define TRUE   1
 
 /*
@@ -183,8 +185,8 @@ void die __ARGS((int));
  * MAKEHEADER - Add Header fields to a packet.
  */
 #define MAKEHEADER(p, t) { \
-    PUTCHAR(ALLSTATIONS, p); \
-    PUTCHAR(UI, p); \
+    PUTCHAR(PPP_ALLSTATIONS, p); \
+    PUTCHAR(PPP_UI, p); \
     PUTSHORT(t, p); }
 
 
@@ -198,9 +200,9 @@ void die __ARGS((int));
 #endif
 
 #ifndef LOG_PPP                        /* we use LOG_LOCAL2 for syslog by default */
-#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUG) \
+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
   || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-  || defined(DEBUGCHAP) 
+  || defined(DEBUGCHAP) || defined(DEBUG)
 #define LOG_PPP LOG_LOCAL2
 #else
 #define LOG_PPP LOG_DAEMON
@@ -213,6 +215,12 @@ void die __ARGS((int));
 #define MAINDEBUG(x)
 #endif
 
+#ifdef DEBUGSYS
+#define SYSDEBUG(x)    if (debug) syslog x
+#else
+#define SYSDEBUG(x)
+#endif
+
 #ifdef DEBUGFSM
 #define FSMDEBUG(x)    if (debug) syslog x
 #else