X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fpppd.h;h=66b0107efca7dc9fc2751a4b820fe16a7da4b530;hp=fcd170ddcb1b0a8bb6c51e6d4325ed88663e134f;hb=7ff1691466ad589562e84516e29a4a83bab71e1f;hpb=b4052495e0a36df0a6d8a69931a9fd5881081fad diff --git a/pppd/pppd.h b/pppd/pppd.h index fcd170d..66b0107 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.2 1994/04/18 04:08:41 paulus Exp $ + * $Id: pppd.h,v 1.8 1995/04/26 06:46:31 paulus Exp $ */ /* @@ -25,15 +25,17 @@ #ifndef __PPPD_H__ #define __PPPD_H__ -#include "args.h" #include /* for MAXPATHLEN and BSD4_4, if defined */ +#include /* for u_int32_t, if defined */ +#include -#define NPPP 1 /* One PPP interface supported (per process) */ +#define NUM_PPP 1 /* One PPP interface supported (per process) */ /* * Limits. */ + #define MAXWORDLEN 1024 /* max length of word in file (incl null) */ #define MAXARGS 1 /* max # args to a command */ #define MAXNAMELEN 256 /* max length of hostname or name for auth */ @@ -42,14 +44,47 @@ /* * Global variables. */ -extern int debug; /* Debug flag */ -extern int ifunit; /* Interface unit number */ -extern char ifname[]; /* Interface name */ -extern int fd; /* Device file descriptor */ -extern int s; /* socket descriptor */ -extern char hostname[]; /* hostname */ -extern u_char outpacket_buf[]; /* buffer for outgoing packets */ -extern int phase; /* See values below */ + +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 char hostname[]; /* Our hostname */ +extern u_char outpacket_buf[]; /* Buffer for outgoing packets */ +extern int phase; /* Current state of link - see values below */ +extern int baud_rate; /* Current link speed in bits/sec */ +extern char *progname; /* Name of this program */ + +/* + * Variables set by command-line options. + */ + +extern int debug; /* Debug flag */ +extern int kdebugflag; /* Tell kernel to print debug messages */ +extern int default_device; /* Using /dev/tty or equivalent */ +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 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 */ +extern char *disconnector; /* Script to disestablish physical link */ +extern char user[]; /* Username for PAP */ +extern char passwd[]; /* Password for PAP */ +extern int auth_required; /* Peer is required to authenticate */ +extern int proxyarp; /* Set up proxy ARP entry for peer */ +extern int persist; /* Reopen link after it goes down */ +extern int uselogin; /* Use /etc/passwd for checking PAP */ +extern int lcp_echo_interval; /* Interval between LCP echo-requests */ +extern int lcp_echo_fails; /* Tolerance to unanswered echo-requests */ +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 char *ipparam; /* Extra parameter for ip up/down scripts */ +extern int cryptpap; /* Others' PAP passwords are encrypted */ /* * Values for phase. @@ -63,21 +98,21 @@ extern int phase; /* See values below */ /* * 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 */ -u_long GetMask __ARGS((u_long)); /* get netmask for address */ - +u_int32_t GetMask __P((u_int32_t)); /* get netmask for address */ +void die __P((int)); /* * Inline versions of get/put char/short/long. @@ -89,7 +124,7 @@ u_long GetMask __ARGS((u_long)); /* get netmask for address */ (c) = *(cp)++; \ } #define PUTCHAR(c, cp) { \ - *(cp)++ = (c); \ + *(cp)++ = (u_char) (c); \ } @@ -98,8 +133,8 @@ u_long GetMask __ARGS((u_long)); /* get netmask for address */ (s) |= *(cp)++; \ } #define PUTSHORT(s, cp) { \ - *(cp)++ = (s) >> 8; \ - *(cp)++ = (s); \ + *(cp)++ = (u_char) ((s) >> 8); \ + *(cp)++ = (u_char) (s); \ } #define GETLONG(l, cp) { \ @@ -109,15 +144,20 @@ u_long GetMask __ARGS((u_long)); /* get netmask for address */ (l) |= *(cp)++; \ } #define PUTLONG(l, cp) { \ - *(cp)++ = (l) >> 24; \ - *(cp)++ = (l) >> 16; \ - *(cp)++ = (l) >> 8; \ - *(cp)++ = (l); \ + *(cp)++ = (u_char) ((l) >> 24); \ + *(cp)++ = (u_char) ((l) >> 16); \ + *(cp)++ = (u_char) ((l) >> 8); \ + *(cp)++ = (u_char) (l); \ } #define INCPTR(n, cp) ((cp) += (n)) #define DECPTR(n, cp) ((cp) -= (n)) +#undef FALSE +#define FALSE 0 +#undef TRUE +#define TRUE 1 + /* * System dependent definitions for user-level 4.3BSD UNIX implementation. */ @@ -137,8 +177,8 @@ u_long GetMask __ARGS((u_long)); /* get netmask for address */ * 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); }