X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fpppd.h;h=59b98d023bd111d4786711e5434b74cf5aaced31;hp=d7254c7bfe68a9c6adeb2ccb7fdb7bbecb2718de;hb=8a7284f9bb1d3cb7b6380706454e9fdf5966008c;hpb=1707ae587c89bb038a218d64880dd8ba1bac67bc diff --git a/pppd/pppd.h b/pppd/pppd.h index d7254c7..59b98d0 100644 --- 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.15 1996/08/28 06:42:10 paulus Exp $ + * $Id: pppd.h,v 1.18 1997/03/04 03:42:48 paulus Exp $ */ /* @@ -38,6 +38,7 @@ #else #include #define __V(x) (va_alist) va_dcl +#define const #endif /* @@ -114,9 +115,10 @@ extern int refuse_chap; /* Don't wanna auth. ourselves with CHAP */ #define PHASE_DORMANT 2 #define PHASE_ESTABLISH 3 #define PHASE_AUTHENTICATE 4 -#define PHASE_NETWORK 5 -#define PHASE_TERMINATE 6 -#define PHASE_HOLDOFF 7 +#define PHASE_CALLBACK 5 +#define PHASE_NETWORK 6 +#define PHASE_TERMINATE 7 +#define PHASE_HOLDOFF 8 /* * The following struct gives the addresses of procedures to call @@ -266,9 +268,9 @@ int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); /* Configure IP addresses for i/f */ int cifaddr __P((int, u_int32_t, u_int32_t)); /* Reset i/f IP addresses */ -int sifdefaultroute __P((int, u_int32_t)); +int sifdefaultroute __P((int, u_int32_t, u_int32_t)); /* Create default route through i/f */ -int cifdefaultroute __P((int, u_int32_t)); +int cifdefaultroute __P((int, u_int32_t, u_int32_t)); /* Delete default route through i/f */ int sifproxyarp __P((int, u_int32_t)); /* Add proxy ARP entry for peer */ @@ -278,7 +280,7 @@ u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ int lock __P((char *)); /* Create lock file for device */ void unlock __P((void)); /* Delete previously-created lock file */ int daemon __P((int, int)); /* Detach us from terminal session */ -int logwtmp __P((char *, char *, char *)); +void logwtmp __P((const char *, const char *, const char *)); /* Write entry to wtmp file */ /* Procedures exported from options.c */ @@ -443,6 +445,12 @@ extern struct option_info devnam_info; #define CHAPDEBUG(x) #endif +#ifdef DEBUGIPXCP +#define IPXCPDEBUG(x) if (debug) syslog x +#else +#define IPXCPDEBUG(x) +#endif + #ifndef SIGTYPE #if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) #define SIGTYPE void