X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fpppd.h;h=59b98d023bd111d4786711e5434b74cf5aaced31;hp=162757604fe4b8c5b7eb90d8825522ae327b1e58;hb=3278b141bac31dce7c1e45136a3c85e07dee6815;hpb=ccadb11e361406d549ddac1ce16dd67ee9dfae67 diff --git a/pppd/pppd.h b/pppd/pppd.h index 1627576..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.13 1996/05/27 00:02:42 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 /* @@ -63,6 +64,10 @@ 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 */ +extern int redirect_stderr;/* Connector's stderr should go to file */ +extern char peer_authname[];/* Authenticated name of peer */ +extern int privileged; /* We were run by real-uid root */ +extern int need_holdoff; /* Need holdoff period after link terminates */ /* * Variables set by command-line options. @@ -81,8 +86,8 @@ 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 *welcomer; /* Script to welcome client after connection */ -extern int maxconnect; /* maximum number of seconds for a connection */ -extern char user[]; /* Username for PAP */ +extern int maxconnect; /* Maximum connect time (seconds) */ +extern char user[]; /* Our name for authenticating ourselves */ 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 */ @@ -99,6 +104,8 @@ 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 */ +extern int refuse_pap; /* Don't wanna auth. ourselves with PAP */ +extern int refuse_chap; /* Don't wanna auth. ourselves with CHAP */ /* * Values for phase. @@ -108,9 +115,10 @@ extern int holdoff; /* Dead time before restarting */ #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 @@ -118,19 +126,34 @@ extern int holdoff; /* Dead time before restarting */ */ struct protent { u_short protocol; /* PPP protocol number */ - void (*init)(); /* Initialization procedure */ - void (*input)(); /* Process a received packet */ - void (*protrej)(); /* Process a received protocol-reject */ - void (*lowerup)(); /* Lower layer has come up */ - void (*lowerdown)(); /* Lower layer has gone down */ - void (*open)(); /* Open the protocol */ - void (*close)(); /* Close the protocol */ - int (*printpkt)(); /* Print a packet in readable form */ - void (*datainput)(); /* Process a received data packet */ + /* Initialization procedure */ + void (*init) __P((int unit)); + /* Process a received packet */ + void (*input) __P((int unit, u_char *pkt, int len)); + /* Process a received protocol-reject */ + void (*protrej) __P((int unit)); + /* Lower layer has come up */ + void (*lowerup) __P((int unit)); + /* Lower layer has gone down */ + void (*lowerdown) __P((int unit)); + /* Open the protocol */ + void (*open) __P((int unit)); + /* Close the protocol */ + void (*close) __P((int unit, char *reason)); + /* Print a packet in readable form */ + int (*printpkt) __P((u_char *pkt, int len, + void (*printer) __P((void *, char *, ...)), + void *arg)); + /* Process a received data packet */ + void (*datainput) __P((int unit, u_char *pkt, int len)); int enabled_flag; /* 0 iff protocol is disabled */ char *name; /* Text name of protocol */ - void (*check_options)(); /* Check requested options, assign dflts */ - int (*demand_conf)(); /* Configure interface for demand-dial */ + /* Check requested options, assign defaults */ + void (*check_options) __P((void)); + /* Configure interface for demand-dial */ + int (*demand_conf) __P((int unit)); + /* Say whether to bring up link for this pkt */ + int (*active_pkt) __P((u_char *pkt, int len)); }; /* Table of pointers to supported protocols */ @@ -171,7 +194,7 @@ void np_down __P((int, int)); /* a network protocol has gone down */ void np_finished __P((int, int)); /* a network protocol no longer needs link */ void auth_peer_fail __P((int, int)); /* peer failed to authenticate itself */ -void auth_peer_success __P((int, int)); +void auth_peer_success __P((int, int, char *, int)); /* peer successfully authenticated itself */ void auth_withpeer_fail __P((int, int)); /* we failed to authenticate ourselves */ @@ -179,6 +202,7 @@ void auth_withpeer_success __P((int, int)); /* we successfully authenticated ourselves */ void auth_check_options __P((void)); /* check authentication options supplied */ +void auth_reset __P((int)); /* check what secrets we have */ int check_passwd __P((int, char *, int, char *, int, char **, int *)); /* Check peer-supplied username/password */ int get_secret __P((int, char *, char *, char *, int *, int)); @@ -244,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 */ @@ -256,19 +280,41 @@ 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 */ int parse_args __P((int argc, char **argv)); /* Parse options from arguments given */ void usage __P((void)); /* Print a usage message */ -int options_from_file __P((char *filename, int must_exist, int check_prot)); +int options_from_file __P((char *filename, int must_exist, int check_prot, + int privileged)); /* Parse options from an options file */ int options_from_user __P((void)); /* Parse options from user's .ppprc */ int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ +void scan_args __P((int argc, char **argv)); + /* Look for tty name in command-line args */ int getword __P((FILE *f, char *word, int *newlinep, char *filename)); /* Read a word from a file */ +void option_error __P((char *fmt, ...)); + /* Print an error message about an option */ + +/* + * This structure is used to store information about certain + * options, such as where the option value came from (/etc/ppp/options, + * command line, etc.) and whether it came from a privileged source. + */ + +struct option_info { + int priv; /* was value set by sysadmin? */ + char *source; /* where option came from */ +}; + +extern struct option_info auth_req_info; +extern struct option_info connector_info; +extern struct option_info disconnector_info; +extern struct option_info welcomer_info; +extern struct option_info devnam_info; /* * Inline versions of get/put char/short/long. @@ -399,6 +445,12 @@ int getword __P((FILE *f, char *word, int *newlinep, char *filename)); #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