X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fpppd.h;h=03dd28a20261656685cbc28b9dd6a7572cc1d8e1;hp=f33c0fb944b44c66f50874414208e6df41d72cee;hb=37a8acc7ee2527693d0c8ba82b2eaea249abde34;hpb=f7ee87797ae1851c7bfb57752185b66f127326e8 diff --git a/pppd/pppd.h b/pppd/pppd.h index f33c0fb..03dd28a 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.57 2001/02/22 03:15:21 paulus Exp $ + * $Id: pppd.h,v 1.58 2001/03/08 05:11:16 paulus Exp $ */ /* @@ -32,6 +32,7 @@ #include /* for u_int32_t, if defined */ #include /* for struct timeval */ #include +#include "patchlevel.h" #if defined(__STDC__) #include @@ -83,7 +84,8 @@ typedef struct { int upper_limit; int lower_limit; const char *source; - int priority; + short int priority; + short int winner; } option_t; /* Values for flags */ @@ -98,15 +100,23 @@ typedef struct { #define OPT_ULIMIT 0x8000 /* check value against upper limit */ #define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT) #define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */ +#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */ +#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */ #define OPT_NOINCR 0x20000 /* value mustn't be increased */ #define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */ -#define OPT_MULTIPART 0x80000 /* optionally sets multiple variables */ -#define OPT_A2COPY 0x200000 /* addr2 -> second location to rcv value */ -#define OPT_ENABLE 0x400000 /* use *addr2 as enable for option */ -#define OPT_PRIVFIX 0x800000 /* user can't override if set by root */ -#define OPT_INITONLY 0x2000000 /* option can only be set in init phase */ -#define OPT_DEVEQUIV 0x4000000 /* equiv to device name */ +#define OPT_PRIO 0x80000 /* process option priorities for this option */ +#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */ +#define OPT_ALIAS 0x200000 /* option is alias for previous option */ +#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */ +#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */ +#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */ +#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */ +#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */ +#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */ #define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV) +#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */ +#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */ +#define OPT_NOPRINT 0x40000000 /* don't print this option at all */ #define OPT_VAL(x) ((x) & OPT_VALUE) @@ -194,8 +204,7 @@ extern int link_stats_valid; /* set if link_stats is valid */ extern int link_connect_time; /* time the link was up for */ extern int using_pty; /* using pty as device (notty or pty opt.) */ extern int log_to_fd; /* logging to this fd as well as syslog */ -extern bool log_to_file; /* log_to_fd is a file */ -extern bool log_to_specific_fd; /* log_to_fd was specified by user */ +extern bool log_default; /* log_to_fd is default (stdout) */ extern char *no_ppp_msg; /* message to print if ppp not in kernel */ extern volatile int status; /* exit status for pppd */ extern bool devnam_fixed; /* can no longer change devnam */ @@ -208,8 +217,6 @@ extern struct notifier *phasechange; /* for notifications of phase changes */ extern struct notifier *exitnotify; /* for notification that we're exiting */ extern struct notifier *sigreceived; /* notification of received signal */ extern int listen_time; /* time to listen first (ms) */ -extern char *current_option; /* option we're processing now */ -extern int option_priority; /* priority of current options */ /* Values for do_callback and doing_callback */ #define CALLBACK_DIALIN 1 /* we are expecting the call back */ @@ -263,6 +270,8 @@ extern int req_unit; /* interface unit number to use */ extern bool multilink; /* enable multilink operation */ extern bool noendpoint; /* don't send or accept endpt. discrim. */ extern char *bundle_name; /* bundle name for multilink */ +extern bool dump_options; /* print out option values */ +extern bool dryrun; /* check everything, print options, exit */ #ifdef PPP_FILTER extern struct bpf_program pass_filter; /* Filter for pkts to pass */ @@ -277,6 +286,7 @@ extern bool ms_lanman; /* Use LanMan password instead of NT */ extern char *current_option; /* the name of the option being parsed */ extern int privileged_option; /* set iff the current option came from root */ extern char *option_source; /* string saying where the option came from */ +extern int option_priority; /* priority of current options */ /* * Values for phase. @@ -335,6 +345,48 @@ struct protent { /* Table of pointers to supported protocols */ extern struct protent *protocols[]; +/* + * This struct contains pointers to a set of procedures for + * doing operations on a "channel". A channel provides a way + * to send and receive PPP packets - the canonical example is + * a serial port device in PPP line discipline (or equivalently + * with PPP STREAMS modules pushed onto it). + */ +struct channel { + /* set of options for this channel */ + option_t *options; + /* find and process a per-channel options file */ + void (*process_extra_options) __P((void)); + /* check all the options that have been given */ + void (*check_options) __P((void)); + /* get the channel ready to do PPP, return a file descriptor */ + int (*connect) __P((void)); + /* we're finished doing PPP on the channel */ + void (*disconnect) __P((void)); + /* set the transmit-side PPP parameters of the channel */ + void (*send_config) __P((int, u_int32_t, int, int)); + /* set the receive-side PPP parameters of the channel */ + void (*recv_config) __P((int, u_int32_t, int, int)); + /* cleanup on error or normal exit */ + void (*cleanup) __P((void)); + /* close the device, called in children after fork */ + void (*close) __P((void)); +}; + +extern struct channel *the_channel; + +#define ppp_send_config(unit, mtu, accm, pc, acc) \ +do { \ + if (the_channel->send_config) \ + (*the_channel->send_config)((mtu), (accm), (pc), (acc)); \ +} while (0) + +#define ppp_recv_config(unit, mtu, accm, pc, acc) \ +do { \ + if (the_channel->send_config) \ + (*the_channel->recv_config)((mtu), (accm), (pc), (acc)); \ +} while (0) + /* * Prototypes. */ @@ -366,12 +418,6 @@ void notify __P((struct notifier *, int)); /* Procedures exported from tty.c. */ void tty_init __P((void)); -void tty_device_check __P((void)); -void tty_check_options __P((void)); -int connect_tty __P((void)); -void disconnect_tty __P((void)); -void tty_close_fds __P((void)); -void cleanup_tty __P((void)); /* Procedures exported from utils.c. */ void log_packet __P((u_char *, int, char *, int)); @@ -388,6 +434,9 @@ void notice __P((char *, ...)); /* log a notice-level message */ void warn __P((char *, ...)); /* log a warning message */ void error __P((char *, ...)); /* log an error message */ void fatal __P((char *, ...)); /* log an error message and die(1) */ +void init_pr_log __P((char *, int)); /* initialize for using pr_log */ +void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */ +void end_pr_log __P((void)); /* finish up after using pr_log */ /* Procedures exported from auth.c */ void link_required __P((int)); /* we are starting to use the link */ @@ -458,11 +507,11 @@ void add_fd __P((int)); /* Add fd to set to wait for */ void remove_fd __P((int)); /* Remove fd from set to wait for */ int read_packet __P((u_char *)); /* Read PPP packet */ int get_loop_output __P((void)); /* Read pkts from loopback */ -void ppp_send_config __P((int, int, u_int32_t, int, int)); +void tty_send_config __P((int, u_int32_t, int, int)); /* Configure i/f transmit parameters */ -void ppp_set_xaccm __P((int, ext_accm)); +void tty_set_xaccm __P((ext_accm)); /* Set extended transmit ACCM */ -void ppp_recv_config __P((int, int, u_int32_t, int, int)); +void tty_recv_config __P((int, u_int32_t, int, int)); /* Configure i/f receive parameters */ int ccp_test __P((int, u_char *, int, int)); /* Test support for compression scheme */ @@ -473,6 +522,7 @@ int get_idle_time __P((int, struct ppp_idle *)); /* Find out how long link has been idle */ int get_ppp_stats __P((int, struct pppd_stats *)); /* Return link statistics */ +void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */ int sifvjcomp __P((int, int, int, int)); /* Configure VJ TCP header compression */ int sifup __P((int)); /* Configure i/f up for one protocol */ @@ -533,6 +583,11 @@ void option_error __P((char *fmt, ...)); int int_option __P((char *, int *)); /* Simplified number_option for decimal ints */ void add_options __P((option_t *)); /* Add extra options */ +void check_options __P((void)); /* check values after all options parsed */ +int override_value __P((const char *, int, const char *)); + /* override value if permitted by priority */ +void print_options __P((void (*) __P((void *, char *, ...)), void *)); + /* print out values of all options */ int parse_dotted_ip __P((char *, u_int32_t *));