X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fpppd.h;h=e164bb573a3692bf28148c831af54ab93242bc2f;hp=78494a526b5392d42268b6ce073233cdacb7be09;hb=bb516501a9c0acb4dd8c3fadc81ca9d74e338272;hpb=72fffb5e747cf8401eebf5fbb5a011d9a4f688a7 diff --git a/pppd/pppd.h b/pppd/pppd.h index 78494a5..e164bb5 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.14 1996/07/01 01:19:55 paulus Exp $ + * $Id: pppd.h,v 1.19 1997/04/30 05:56:55 paulus Exp $ */ /* @@ -38,6 +38,7 @@ #else #include #define __V(x) (va_alist) va_dcl +#define const #endif /* @@ -65,6 +66,8 @@ 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. @@ -84,7 +87,7 @@ 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 connect time (seconds) */ -extern char user[]; /* Username for PAP */ +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 */ @@ -94,6 +97,7 @@ 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 explicit_remote;/* remote_name specified with remotename opt */ 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 */ @@ -103,6 +107,16 @@ 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 */ +#ifdef PPP_FILTER +extern struct bpf_program pass_filter; /* Filter for pkts to pass */ +extern struct bpf_program active_filter; /* Filter for link-active pkts */ +#endif + + +#ifdef MSLANMAN +extern int ms_lanman; /* Nonzero if use LanMan password instead of NT */ + /* Has meaning only with MS-CHAP challenges */ +#endif /* * Values for phase. @@ -112,9 +126,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 @@ -163,9 +178,9 @@ extern struct protent *protocols[]; void die __P((int)); /* Cleanup and exit */ void quit __P((void)); /* like die(1) */ void novm __P((char *)); /* Say we ran out of memory, and die */ -void timeout __P((void (*func)(), caddr_t arg, int t)); +void timeout __P((void (*func)(void *), void *arg, int t)); /* Call func(arg) after t seconds */ -void untimeout __P((void (*func)(), caddr_t arg)); +void untimeout __P((void (*func)(void *), void *arg)); /* Cancel call to func(arg) */ int run_program __P((char *prog, char **args, int must_exist)); /* Run program prog with args in child */ @@ -173,7 +188,7 @@ void demuxprotrej __P((int, int)); /* Demultiplex a Protocol-Reject */ void format_packet __P((u_char *, int, void (*) (void *, char *, ...), void *)); /* Format a packet in human-readable form */ -void log_packet __P((u_char *, int, char *)); +void log_packet __P((u_char *, int, char *, int)); /* Format a packet and log it with syslog */ void print_string __P((char *, int, void (*) (void *, char *, ...), void *)); /* Format a string for output */ @@ -264,9 +279,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 */ @@ -276,14 +291,19 @@ 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 */ +#ifdef PPP_FILTER +int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); + /* Set filter programs in kernel */ +#endif /* 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 */ @@ -291,6 +311,25 @@ 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. @@ -421,6 +460,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