X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Foptions.c;h=c92e2ddfbf8e120253f1793693cc95a58ac93fcb;hp=ba5bfe6e44d78dae361d771019e267ae84308c68;hb=c65dfbde7e6096272ffacd1c69f444b36a4b707a;hpb=7e37b204c4f1e186f276dd9f0822cb86dfce406a diff --git a/pppd/options.c b/pppd/options.c index ba5bfe6..c92e2dd 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -17,14 +17,13 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static char rcsid[] = "$Id: options.c,v 1.29 1996/01/18 03:35:38 paulus Exp $"; -#endif +#define RCSID "$Id: options.c,v 1.76 2000/08/01 01:38:30 paulus Exp $" +#include #include #include #include -#include +#include #include #include #include @@ -34,6 +33,14 @@ static char rcsid[] = "$Id: options.c,v 1.29 1996/01/18 03:35:38 paulus Exp $"; #include #include #include +#include +#ifdef PLUGIN +#include +#endif +#ifdef PPP_FILTER +#include +#include /* XXX: To get struct pcap */ +#endif #include "pppd.h" #include "pathnames.h" @@ -45,295 +52,214 @@ static char rcsid[] = "$Id: options.c,v 1.29 1996/01/18 03:35:38 paulus Exp $"; #include "chap.h" #include "ccp.h" -#ifdef IPX_CHANGE -#include "ipxcp.h" -#endif /* IPX_CHANGE */ - #include -#define FALSE 0 -#define TRUE 1 - #if defined(ultrix) || defined(NeXT) char *strdup __P((char *)); #endif -#ifndef GIDSET_TYPE -#define GIDSET_TYPE gid_t -#endif +static const char rcsid[] = RCSID; /* * Option variables and default values. */ +#ifdef PPP_FILTER +int dflag = 0; /* Tell libpcap we want debugging */ +#endif int debug = 0; /* Debug flag */ int kdebugflag = 0; /* Tell kernel to print debug messages */ int default_device = 1; /* Using /dev/tty or equivalent */ -char devnam[MAXPATHLEN] = "/dev/tty"; /* Device name */ -int crtscts = 0; /* Use hardware flow control */ -int modem = 1; /* Use modem control lines */ -int inspeed = 0; /* Input/Output speed requested */ +char devnam[MAXPATHLEN]; /* Device name */ u_int32_t netmask = 0; /* IP netmask to set on interface */ -int lockflag = 0; /* Create lock file to lock the serial dev */ -int nodetach = 0; /* Don't detach from controlling tty */ -char *connector = NULL; /* Script to establish physical link */ -char *disconnector = NULL; /* Script to disestablish physical link */ -char *welcomer = NULL; /* Script to run after phys link estab. */ +bool nodetach = 0; /* Don't detach from controlling tty */ +bool updetach = 0; /* Detach once link is up */ int maxconnect = 0; /* Maximum connect time */ char user[MAXNAMELEN]; /* Username for PAP */ char passwd[MAXSECRETLEN]; /* Password for PAP */ -int auth_required = 0; /* Peer is required to authenticate */ -int defaultroute = 0; /* assign default route through interface */ -int proxyarp = 0; /* Set up proxy ARP entry for peer */ -int persist = 0; /* Reopen link after it goes down */ -int uselogin = 0; /* Use /etc/passwd for checking PAP */ -int lcp_echo_interval = 0; /* Interval between LCP echo-requests */ -int lcp_echo_fails = 0; /* Tolerance to unanswered echo-requests */ +bool persist = 0; /* Reopen link after it goes down */ char our_name[MAXNAMELEN]; /* Our name for authentication purposes */ -char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ -int usehostname = 0; /* Use hostname for our_name */ -int disable_defaultip = 0; /* Don't use hostname for default IP adrs */ -int demand = 0; /* do dial-on-demand */ +bool demand = 0; /* do dial-on-demand */ char *ipparam = NULL; /* Extra parameter for ip up/down scripts */ -int cryptpap; /* Passwords in pap-secrets are encrypted */ int idle_time_limit = 0; /* Disconnect if idle for this many seconds */ int holdoff = 30; /* # seconds to pause before reconnecting */ +bool holdoff_specified; /* true if a holdoff value has been given */ +int log_to_fd = 1; /* send log messages to this fd too */ +int maxfail = 10; /* max # of unsuccessful connection attempts */ +char linkname[MAXPATHLEN]; /* logical name for link */ +bool tune_kernel; /* may alter kernel settings */ +int connect_delay = 1000; /* wait this many ms after connect script */ +int req_unit = -1; /* requested interface unit */ +bool multilink = 0; /* Enable multilink operation */ +char *bundle_name = NULL; /* bundle name for multilink */ + +extern option_t auth_options[]; +extern struct stat devstat; + +struct option_info initializer_info; +struct option_info connect_script_info; +struct option_info disconnect_script_info; +struct option_info welcomer_info; +struct option_info devnam_info; +struct option_info ptycommand_info; + +#ifdef PPP_FILTER +struct bpf_program pass_filter;/* Filter program for packets to pass */ +struct bpf_program active_filter; /* Filter program for link-active pkts */ +pcap_t pc; /* Fake struct pcap so we can compile expr */ +#endif + +char *current_option; /* the name of the option being parsed */ +int privileged_option; /* set iff the current option came from root */ +char *option_source; /* string saying where the option came from */ +bool log_to_file; /* log_to_fd is a file opened by us */ +bool log_to_specific_fd; /* log_to_fd was specified by user option */ +bool no_override; /* don't override previously-set options */ /* * Prototypes */ -static int setdebug __P((void)); -static int setkdebug __P((char **)); -static int setpassive __P((void)); -static int setsilent __P((void)); -static int noopt __P((void)); -static int setnovj __P((void)); -static int setnovjccomp __P((void)); -static int setvjslots __P((char **)); -static int reqpap __P((void)); -static int nopap __P((void)); -static int setupapfile __P((char **)); -static int nochap __P((void)); -static int reqchap __P((void)); +static int setdevname __P((char *)); +static int setipaddr __P((char *)); static int setspeed __P((char *)); -static int noaccomp __P((void)); -static int noasyncmap __P((void)); -static int noip __P((void)); -static int nomagicnumber __P((void)); -static int setasyncmap __P((char **)); -static int setescape __P((char **)); -static int setmru __P((char **)); -static int setmtu __P((char **)); -static int nomru __P((void)); -static int nopcomp __P((void)); -static int setconnector __P((char **)); -static int setdisconnector __P((char **)); -static int setwelcomer __P((char **)); -static int setmaxconnect __P((char **)); +static int noopt __P((char **)); static int setdomain __P((char **)); static int setnetmask __P((char **)); -static int setcrtscts __P((void)); -static int setnocrtscts __P((void)); -static int setxonxoff __P((void)); -static int setnodetach __P((void)); -static int setmodem __P((void)); -static int setlocal __P((void)); -static int setlock __P((void)); -static int setname __P((char **)); -static int setuser __P((char **)); -static int setremote __P((char **)); -static int setauth __P((void)); static int readfile __P((char **)); -static int setdefaultroute __P((void)); -static int setnodefaultroute __P((void)); -static int setproxyarp __P((void)); -static int setnoproxyarp __P((void)); -static int setpersist __P((void)); -static int setdologin __P((void)); -static int setusehostname __P((void)); -static int setnoipdflt __P((void)); -static int setlcptimeout __P((char **)); -static int setlcpterm __P((char **)); -static int setlcpconf __P((char **)); -static int setlcpfails __P((char **)); -static int setipcptimeout __P((char **)); -static int setipcpterm __P((char **)); -static int setipcpconf __P((char **)); -static int setipcpfails __P((char **)); -static int setpaptimeout __P((char **)); -static int setpapreqs __P((char **)); -static int setpapreqtime __P((char **)); -static int setchaptimeout __P((char **)); -static int setchapchal __P((char **)); -static int setchapintv __P((char **)); -static int setipcpaccl __P((void)); -static int setipcpaccr __P((void)); -static int setlcpechointv __P((char **)); -static int setlcpechofails __P((char **)); -static int setbsdcomp __P((char **)); -static int setnobsdcomp __P((void)); -static int setdeflate __P((char **)); -static int setnodeflate __P((void)); -static int setdemand __P((void)); -static int setpred1comp __P((void)); -static int setnopred1comp __P((void)); -static int setipparam __P((char **)); -static int setpapcrypt __P((void)); -static int setidle __P((char **)); -static int setholdoff __P((char **)); - -#ifdef IPX_CHANGE -static int setipxproto __P((void)); -static int resetipxproto __P((void)); -static int setipxanet __P((void)); -static int setipxalcl __P((void)); -static int setipxarmt __P((void)); -static int setipxnetwork __P((char **)); -static int setipxnode __P((char **)); -static int setipxrouter __P((char **)); -static int setipxname __P((char **)); -static int setipxcptimeout __P((char **)); -static int setipxcpterm __P((char **)); -static int setipxcpconf __P((char **)); -static int setipxcpfails __P((char **)); -#endif /* IPX_CHANGE */ - -#ifdef USE_MS_DNS -static int setdnsaddr __P((char **)); +static int callfile __P((char **)); +static int showversion __P((char **)); +static int showhelp __P((char **)); +static void usage __P((void)); +static int setlogfile __P((char **)); +#ifdef PLUGIN +static int loadplugin __P((char **)); +#endif + +#ifdef PPP_FILTER +static int setpassfilter __P((char **)); +static int setactivefilter __P((char **)); #endif +static option_t *find_option __P((char *name)); +static int process_option __P((option_t *, char **)); +static int n_arguments __P((option_t *)); static int number_option __P((char *, u_int32_t *, int)); -static int readable __P((int fd)); -void usage(); +/* + * Structure to store extra lists of options. + */ +struct option_list { + option_t *options; + struct option_list *next; +}; + +static struct option_list *extra_options = NULL; /* * Valid arguments. */ -static struct cmd { - char *cmd_name; - int num_args; - int (*cmd_func)(); -} cmds[] = { - {"-all", 0, noopt}, /* Don't request/allow any options */ - {"-ac", 0, noaccomp}, /* Disable Address/Control compress */ - {"-am", 0, noasyncmap}, /* Disable asyncmap negotiation */ - {"-as", 1, setasyncmap}, /* set the desired async map */ - {"-d", 0, setdebug}, /* Increase debugging level */ - {"-detach", 0, setnodetach}, /* don't fork */ - {"-ip", 0, noip}, /* Disable IP and IPCP */ - {"-mn", 0, nomagicnumber}, /* Disable magic number negotiation */ - {"-mru", 0, nomru}, /* Disable mru negotiation */ - {"-p", 0, setpassive}, /* Set passive mode */ - {"-pc", 0, nopcomp}, /* Disable protocol field compress */ - {"+ua", 1, setupapfile}, /* Get PAP user and password from file */ - {"+pap", 0, reqpap}, /* Require PAP auth from peer */ - {"-pap", 0, nopap}, /* Don't allow UPAP authentication with peer */ - {"+chap", 0, reqchap}, /* Require CHAP authentication from peer */ - {"-chap", 0, nochap}, /* Don't allow CHAP authentication with peer */ - {"-vj", 0, setnovj}, /* disable VJ compression */ - {"-vjccomp", 0, setnovjccomp}, /* disable VJ connection-ID compression */ - {"vj-max-slots", 1, setvjslots}, /* Set maximum VJ header slots */ - {"asyncmap", 1, setasyncmap}, /* set the desired async map */ - {"escape", 1, setescape}, /* set chars to escape on transmission */ - {"connect", 1, setconnector}, /* A program to set up a connection */ - {"disconnect", 1, setdisconnector}, /* program to disconnect serial dev. */ - {"welcome", 1, setwelcomer},/* Script to welcome client */ - {"maxconnect", 1, setmaxconnect}, /* specify a maximum connect time */ - {"crtscts", 0, setcrtscts}, /* set h/w flow control */ - {"-crtscts", 0, setnocrtscts}, /* clear h/w flow control */ - {"xonxoff", 0, setxonxoff}, /* set s/w flow control */ - {"debug", 0, setdebug}, /* Increase debugging level */ - {"kdebug", 1, setkdebug}, /* Enable kernel-level debugging */ - {"domain", 1, setdomain}, /* Add given domain name to hostname*/ - {"mru", 1, setmru}, /* Set MRU value for negotiation */ - {"mtu", 1, setmtu}, /* Set our MTU */ - {"netmask", 1, setnetmask}, /* set netmask */ - {"passive", 0, setpassive}, /* Set passive mode */ - {"silent", 0, setsilent}, /* Set silent mode */ - {"modem", 0, setmodem}, /* Use modem control lines */ - {"local", 0, setlocal}, /* Don't use modem control lines */ - {"lock", 0, setlock}, /* Lock serial device (with lock file) */ - {"name", 1, setname}, /* Set local name for authentication */ - {"user", 1, setuser}, /* Set username for PAP auth with peer */ - {"usehostname", 0, setusehostname}, /* Must use hostname for auth. */ - {"remotename", 1, setremote}, /* Set remote name for authentication */ - {"auth", 0, setauth}, /* Require authentication from peer */ - {"file", 1, readfile}, /* Take options from a file */ - {"defaultroute", 0, setdefaultroute}, /* Add default route */ - {"-defaultroute", 0, setnodefaultroute}, /* disable defaultroute option */ - {"proxyarp", 0, setproxyarp}, /* Add proxy ARP entry */ - {"-proxyarp", 0, setnoproxyarp}, /* disable proxyarp option */ - {"persist", 0, setpersist}, /* Keep on reopening connection after close */ - {"demand", 0, setdemand}, /* Dial on demand */ - {"login", 0, setdologin}, /* Use system password database for UPAP */ - {"noipdefault", 0, setnoipdflt}, /* Don't use name for default IP adrs */ - {"lcp-echo-failure", 1, setlcpechofails}, /* consecutive echo failures */ - {"lcp-echo-interval", 1, setlcpechointv}, /* time for lcp echo events */ - {"lcp-restart", 1, setlcptimeout}, /* Set timeout for LCP */ - {"lcp-max-terminate", 1, setlcpterm}, /* Set max #xmits for term-reqs */ - {"lcp-max-configure", 1, setlcpconf}, /* Set max #xmits for conf-reqs */ - {"lcp-max-failure", 1, setlcpfails}, /* Set max #conf-naks for LCP */ - {"ipcp-restart", 1, setipcptimeout}, /* Set timeout for IPCP */ - {"ipcp-max-terminate", 1, setipcpterm}, /* Set max #xmits for term-reqs */ - {"ipcp-max-configure", 1, setipcpconf}, /* Set max #xmits for conf-reqs */ - {"ipcp-max-failure", 1, setipcpfails}, /* Set max #conf-naks for IPCP */ - {"pap-restart", 1, setpaptimeout}, /* Set retransmit timeout for PAP */ - {"pap-max-authreq", 1, setpapreqs}, /* Set max #xmits for auth-reqs */ - {"pap-timeout", 1, setpapreqtime}, /* Set time limit for peer PAP auth. */ - {"chap-restart", 1, setchaptimeout}, /* Set timeout for CHAP */ - {"chap-max-challenge", 1, setchapchal}, /* Set max #xmits for challenge */ - {"chap-interval", 1, setchapintv}, /* Set interval for rechallenge */ - {"ipcp-accept-local", 0, setipcpaccl}, /* Accept peer's address for us */ - {"ipcp-accept-remote", 0, setipcpaccr}, /* Accept peer's address for it */ - {"bsdcomp", 1, setbsdcomp}, /* request BSD-Compress */ - {"-bsdcomp", 0, setnobsdcomp}, /* don't allow BSD-Compress */ - {"deflate", 1, setdeflate}, /* request Deflate compression */ - {"-deflate", 0, setnodeflate}, /* don't allow Deflate compression */ - {"predictor1", 0, setpred1comp}, /* request Predictor-1 */ - {"-predictor1", 0, setnopred1comp}, /* don't allow Predictor-1 */ - {"ipparam", 1, setipparam}, /* set ip script parameter */ - {"papcrypt", 0, setpapcrypt}, /* PAP passwords encrypted */ - {"idle", 1, setidle}, /* idle time limit (seconds) */ - {"holdoff", 1, setholdoff}, /* set holdoff time (seconds) */ - -#ifdef IPX_CHANGE - {"ipx-network", 1, setipxnetwork}, /* IPX network number */ - {"ipxcp-accept-network", 0, setipxanet}, /* Accept peer netowrk */ - {"ipx-node", 1, setipxnode}, /* IPX node number */ - {"ipxcp-accept-local", 0, setipxalcl}, /* Accept our address */ - {"ipxcp-accept-remote", 0, setipxarmt}, /* Accept peer's address */ - {"ipx-routing", 1, setipxrouter}, /* IPX routing proto number */ - {"ipx-router-name", 1, setipxname}, /* IPX router name */ - {"ipxcp-restart", 1, setipxcptimeout}, /* Set timeout for IPXCP */ - {"ipxcp-max-terminate", 1, setipxcpterm}, /* max #xmits for term-reqs */ - {"ipxcp-max-configure", 1, setipxcpconf}, /* max #xmits for conf-reqs */ - {"ipxcp-max-failure", 1, setipxcpfails}, /* max #conf-naks for IPXCP */ -#if 0 - {"ipx-compression", 1, setipxcompression}, /* IPX compression number */ +option_t general_options[] = { + { "debug", o_int, &debug, + "Increase debugging level", OPT_INC|OPT_NOARG|1 }, + { "-d", o_int, &debug, + "Increase debugging level", OPT_INC|OPT_NOARG|1 }, + { "kdebug", o_int, &kdebugflag, + "Set kernel driver debug level" }, + { "nodetach", o_bool, &nodetach, + "Don't detach from controlling tty", 1 }, + { "-detach", o_bool, &nodetach, + "Don't detach from controlling tty", 1 }, + { "updetach", o_bool, &updetach, + "Detach from controlling tty once link is up", 1 }, + { "holdoff", o_int, &holdoff, + "Set time in seconds before retrying connection" }, + { "idle", o_int, &idle_time_limit, + "Set time in seconds before disconnecting idle link" }, + { "-all", o_special_noarg, (void *)noopt, + "Don't request/allow any LCP or IPCP options (useless)" }, + { "maxconnect", o_int, &maxconnect, + "Set connection time limit", OPT_LLIMIT|OPT_NOINCR|OPT_ZEROINF }, + { "domain", o_special, (void *)setdomain, + "Add given domain name to hostname" }, + { "mtu", o_int, &lcp_allowoptions[0].mru, + "Set our MTU", OPT_LIMITS, NULL, MAXMRU, MINMRU }, + { "netmask", o_special, (void *)setnetmask, + "set netmask" }, + { "file", o_special, (void *)readfile, + "Take options from a file", OPT_PREPASS }, + { "call", o_special, (void *)callfile, + "Take options from a privileged file", OPT_PREPASS }, + { "persist", o_bool, &persist, + "Keep on reopening connection after close", 1 }, + { "nopersist", o_bool, &persist, + "Turn off persist option" }, + { "demand", o_bool, &demand, + "Dial on demand", OPT_INITONLY | 1, &persist }, + { "--version", o_special_noarg, (void *)showversion, + "Show version number" }, + { "--help", o_special_noarg, (void *)showhelp, + "Show brief listing of options" }, + { "-h", o_special_noarg, (void *)showhelp, + "Show brief listing of options" }, + { "logfd", o_int, &log_to_fd, + "Send log messages to this file descriptor", + 0, &log_to_specific_fd }, + { "logfile", o_special, (void *)setlogfile, + "Append log messages to this file" }, + { "nolog", o_int, &log_to_fd, + "Don't send log messages to any file", + OPT_NOARG | OPT_VAL(-1) }, + { "nologfd", o_int, &log_to_fd, + "Don't send log messages to any file descriptor", + OPT_NOARG | OPT_VAL(-1) }, + { "linkname", o_string, linkname, + "Set logical name for link", + OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, + { "maxfail", o_int, &maxfail, + "Maximum number of unsuccessful connection attempts to allow" }, + { "ktune", o_bool, &tune_kernel, + "Alter kernel settings as necessary", 1 }, + { "noktune", o_bool, &tune_kernel, + "Don't alter kernel settings", 0 }, + { "connect-delay", o_int, &connect_delay, + "Maximum time (in ms) to wait after connect script finishes" }, + { "unit", o_int, &req_unit, + "PPP interface unit number to use if possible", OPT_LLIMIT, 0, 0 }, +#ifdef HAVE_MULTILINK + { "multilink", o_bool, &multilink, + "Enable multilink operation", 1 }, + { "nomultilink", o_bool, &multilink, + "Disable multilink operation", 0 }, + { "mp", o_bool, &multilink, + "Enable multilink operation", 1 }, + { "nomp", o_bool, &multilink, + "Disable multilink operation", 0 }, + { "bundle", o_string, &bundle_name, + "Bundle name for multilink" }, +#endif /* HAVE_MULTILINK */ +#ifdef PLUGIN + { "plugin", o_special, (void *)loadplugin, + "Load a plug-in module into pppd", OPT_PRIV }, #endif - {"+ipx", 0, setipxproto}, /* Enable IPXCP (and IPX) */ - {"-ipx", 0, resetipxproto}, /* Disable IPXCP (and IPX) */ -#endif /* IPX_CHANGE */ -#ifdef _linux_ - {"idle-disconnect", 1, setidle}, /* seconds for disconnect of idle IP */ +#ifdef PPP_FILTER + { "pdebug", o_int, &dflag, + "libpcap debugging" }, + { "pass-filter", 1, setpassfilter, + "set filter for packets to pass" }, + { "active-filter", 1, setactivefilter, + "set filter for active pkts" }, #endif -#ifdef USE_MS_DNS - {"ms-dns", 1, setdnsaddr}, /* DNS address(es) for the peer's use */ -#endif - - {NULL, 0, NULL} + { NULL } }; - #ifndef IMPLEMENTATION #define IMPLEMENTATION "" #endif static char *usage_string = "\ -pppd version %s patch level %d%s\n\ -Usage: %s [ arguments ], where arguments are:\n\ +pppd version %s.%d%s\n\ +Usage: %s [ options ], where options are:\n\ Communicate over the named device\n\ Set the baud rate to \n\ : Set the local and/or remote interface IP\n\ @@ -346,143 +272,188 @@ Usage: %s [ arguments ], where arguments are:\n\ file Take options from file \n\ modem Use modem control lines\n\ mru Set MRU value to for negotiation\n\ - netmask Set interface netmask to \n\ See pppd(8) for more options.\n\ "; - /* - * parse_args - parse a string of arguments, from the command - * line or from a file. + * parse_args - parse a string of arguments from the command line. */ int parse_args(argc, argv) int argc; char **argv; { - char *arg, *val; - struct cmd *cmdp; + char *arg; + option_t *opt; int ret; + privileged_option = privileged; + option_source = "command line"; while (argc > 0) { arg = *argv++; --argc; /* - * First see if it's a command. + * First see if it's an option in the new option list. */ - for (cmdp = cmds; cmdp->cmd_name; cmdp++) - if (!strcmp(arg, cmdp->cmd_name)) - break; - - if (cmdp->cmd_name != NULL) { - if (argc < cmdp->num_args) { - fprintf(stderr, "Too few parameters for command %s\n", arg); + opt = find_option(arg); + if (opt != NULL) { + int n = n_arguments(opt); + if (argc < n) { + option_error("too few parameters for option %s", arg); return 0; } - if (!(*cmdp->cmd_func)(argv)) + current_option = arg; + if (!process_option(opt, argv)) return 0; - argc -= cmdp->num_args; - argv += cmdp->num_args; + argc -= n; + argv += n; + continue; + } - } else { - /* - * Maybe a tty name, speed or IP address? - */ - if ((ret = setdevname(arg)) == 0 - && (ret = setspeed(arg)) == 0 - && (ret = setipaddr(arg)) == 0) { - fprintf(stderr, "%s: unrecognized command\n", arg); - usage(); - return 0; - } - if (ret < 0) /* error */ - return 0; + /* + * Maybe a tty name, speed or IP address? + */ + if ((ret = setdevname(arg)) == 0 + && (ret = setspeed(arg)) == 0 + && (ret = setipaddr(arg)) == 0) { + option_error("unrecognized option '%s'", arg); + usage(); + return 0; } + if (ret < 0) /* error */ + return 0; } return 1; } +#if 0 /* - * usage - print out a message telling how to use the program. + * scan_args - scan the command line arguments to get the tty name, + * if specified. Also checks whether the notty or pty option was given. */ void -usage() +scan_args(argc, argv) + int argc; + char **argv; { - fprintf(stderr, usage_string, VERSION, PATCHLEVEL, IMPLEMENTATION, - progname); + char *arg; + option_t *opt; + + privileged_option = privileged; + while (argc > 0) { + arg = *argv++; + --argc; + + if (strcmp(arg, "notty") == 0 || strcmp(arg, "pty") == 0) + using_pty = 1; + + /* Skip options and their arguments */ + opt = find_option(arg); + if (opt != NULL) { + int n = n_arguments(opt); + argc -= n; + argv += n; + continue; + } + + /* Check if it's a tty name and copy it if so */ + (void) setdevname(arg, 1); + } } +#endif /* * options_from_file - Read a string of options from a file, * and interpret them. */ int -options_from_file(filename, must_exist, check_prot) +options_from_file(filename, must_exist, check_prot, priv) char *filename; int must_exist; int check_prot; + int priv; { FILE *f; - int i, newline, ret; - struct cmd *cmdp; + int i, newline, ret, err; + option_t *opt; + int oldpriv; + char *oldsource; char *argv[MAXARGS]; char args[MAXARGS][MAXWORDLEN]; char cmd[MAXWORDLEN]; - if ((f = fopen(filename, "r")) == NULL) { - if (!must_exist && errno == ENOENT) + if (check_prot) + seteuid(getuid()); + f = fopen(filename, "r"); + err = errno; + if (check_prot) + seteuid(0); + if (f == NULL) { + errno = err; + if (!must_exist) { + if (err != ENOENT && err != ENOTDIR) + warn("Warning: can't open options file %s: %m", filename); return 1; - perror(filename); - return 0; - } - if (check_prot && !readable(fileno(f))) { - fprintf(stderr, "%s: access denied\n", filename); - fclose(f); + } + option_error("Can't open options file %s: %m", filename); return 0; } + oldpriv = privileged_option; + privileged_option = priv; + oldsource = option_source; + option_source = strdup(filename); + if (option_source == NULL) + option_source = "file"; + ret = 0; while (getword(f, cmd, &newline, filename)) { /* * First see if it's a command. */ - for (cmdp = cmds; cmdp->cmd_name; cmdp++) - if (!strcmp(cmd, cmdp->cmd_name)) - break; - - if (cmdp->cmd_name != NULL) { - for (i = 0; i < cmdp->num_args; ++i) { + opt = find_option(cmd); + if (opt != NULL) { + int n = n_arguments(opt); + for (i = 0; i < n; ++i) { if (!getword(f, args[i], &newline, filename)) { - fprintf(stderr, - "In file %s: too few parameters for command %s\n", - filename, cmd); - fclose(f); - return 0; + option_error( + "In file %s: too few parameters for option '%s'", + filename, cmd); + goto err; } argv[i] = args[i]; } - if (!(*cmdp->cmd_func)(argv)) { - fclose(f); - return 0; + current_option = cmd; + if ((opt->flags & OPT_DEVEQUIV) && no_override) { + option_error("the %s option may not be used in the %s file", + cmd, filename); + goto err; } + if (!process_option(opt, argv)) + goto err; + continue; + } - } else { - /* - * Maybe a tty name, speed or IP address? - */ - if ((ret = setdevname(cmd)) == 0 - && (ret = setspeed(cmd)) == 0 - && (ret = setipaddr(cmd)) == 0) { - fprintf(stderr, "In file %s: unrecognized command %s\n", - filename, cmd); - fclose(f); - return 0; - } - if (ret < 0) /* error */ - return 0; + /* + * Maybe a tty name, speed or IP address? + */ + if ((i = setdevname(cmd)) == 0 + && (i = setspeed(cmd)) == 0 + && (i = setipaddr(cmd)) == 0) { + option_error("In file %s: unrecognized option '%s'", + filename, cmd); + goto err; } + if (i < 0) /* error */ + goto err; } - return 1; + ret = 1; + +err: + fclose(f); + privileged_option = oldpriv; + option_source = oldsource; + return ret; } /* @@ -495,18 +466,18 @@ options_from_user() char *user, *path, *file; int ret; struct passwd *pw; + size_t pl; pw = getpwuid(getuid()); if (pw == NULL || (user = pw->pw_dir) == NULL || user[0] == 0) return 1; file = _PATH_USEROPT; - path = malloc(strlen(user) + strlen(file) + 2); + pl = strlen(user) + strlen(file) + 2; + path = malloc(pl); if (path == NULL) novm("init file name"); - strcpy(path, user); - strcat(path, "/"); - strcat(path, file); - ret = options_from_file(path, 0, 1); + slprintf(path, pl, "%s/%s", user, file); + ret = options_from_file(path, 0, 1, privileged); free(path); return ret; } @@ -514,42 +485,369 @@ options_from_user() /* * options_for_tty - See if an options file exists for the serial * device, and if so, interpret options from it. + * We only allow the per-tty options file to override anything from + * the command line if it is something that the user can't override + * once it has been set by root. */ int options_for_tty() { char *dev, *path, *p; int ret; + size_t pl; dev = devnam; if (strncmp(dev, "/dev/", 5) == 0) dev += 5; - if (strcmp(dev, "tty") == 0) + if (dev[0] == 0 || strcmp(dev, "tty") == 0) return 1; /* don't look for /etc/ppp/options.tty */ - path = malloc(strlen(_PATH_TTYOPT) + strlen(dev) + 1); + pl = strlen(_PATH_TTYOPT) + strlen(dev) + 1; + path = malloc(pl); if (path == NULL) novm("tty init file name"); - strcpy(path, _PATH_TTYOPT); + slprintf(path, pl, "%s%s", _PATH_TTYOPT, dev); /* Turn slashes into dots, for Solaris case (e.g. /dev/term/a) */ - for (p = path + strlen(path); *dev != 0; ++dev) - *p++ = (*dev == '/'? '.': *dev); - *p = 0; - ret = options_from_file(path, 0, 0); + for (p = path + strlen(_PATH_TTYOPT); *p != 0; ++p) + if (*p == '/') + *p = '.'; + no_override = 1; + ret = options_from_file(path, 0, 0, 1); + no_override = 0; free(path); return ret; } /* - * readable - check if a file is readable by the real user. + * options_from_list - process a string of options in a wordlist. + */ +int +options_from_list(w, priv) + struct wordlist *w; + int priv; +{ + char *argv[MAXARGS]; + option_t *opt; + int i, ret = 0; + + privileged_option = priv; + option_source = "secrets file"; + + while (w != NULL) { + /* + * First see if it's a command. + */ + opt = find_option(w->word); + if (opt != NULL) { + int n = n_arguments(opt); + struct wordlist *w0 = w; + for (i = 0; i < n; ++i) { + w = w->next; + if (w == NULL) { + option_error( + "In secrets file: too few parameters for option '%s'", + w0->word); + goto err; + } + argv[i] = w->word; + } + current_option = w0->word; + if (!process_option(opt, argv)) + goto err; + continue; + } + + /* + * Maybe a tty name, speed or IP address? + */ + if ((i = setdevname(w->word)) == 0 + && (i = setspeed(w->word)) == 0 + && (i = setipaddr(w->word)) == 0) { + option_error("In secrets file: unrecognized option '%s'", + w->word); + goto err; + } + if (i < 0) /* error */ + goto err; + } + ret = 1; + +err: + return ret; +} + +/* + * find_option - scan the option lists for the various protocols + * looking for an entry with the given name. + * This could be optimized by using a hash table. + */ +static option_t * +find_option(name) + char *name; +{ + option_t *opt; + struct option_list *list; + int i; + + for (list = extra_options; list != NULL; list = list->next) + for (opt = list->options; opt->name != NULL; ++opt) + if (strcmp(name, opt->name) == 0) + return opt; + for (opt = general_options; opt->name != NULL; ++opt) + if (strcmp(name, opt->name) == 0) + return opt; + for (opt = auth_options; opt->name != NULL; ++opt) + if (strcmp(name, opt->name) == 0) + return opt; + for (i = 0; protocols[i] != NULL; ++i) + if ((opt = protocols[i]->options) != NULL) + for (; opt->name != NULL; ++opt) + if (strcmp(name, opt->name) == 0) + return opt; + return NULL; +} + +/* + * process_option - process one new-style option. + */ +static int +process_option(opt, argv) + option_t *opt; + char **argv; +{ + u_int32_t v; + int iv, a; + char *sv; + int (*parser) __P((char **)); + + if (no_override && (opt->flags & OPT_SEENIT)) { + struct option_info *ip = (struct option_info *) opt->addr2; + if (!(privileged && (opt->flags & OPT_PRIVFIX))) + return 1; + if (!ip || ip->priv) + return 1; + warn("%s option from per-tty file overrides command line", opt->name); + } + if ((opt->flags & OPT_INITONLY) && phase != PHASE_INITIALIZE) { + option_error("it's too late to use the %s option", opt->name); + return 0; + } + if ((opt->flags & OPT_PRIV) && !privileged_option) { + option_error("using the %s option requires root privilege", opt->name); + return 0; + } + if ((opt->flags & OPT_ENABLE) && *(bool *)(opt->addr2) == 0) { + option_error("%s option is disabled", opt->name); + return 0; + } + if ((opt->flags & OPT_PRIVFIX) && !privileged_option) { + struct option_info *ip = (struct option_info *) opt->addr2; + if (ip && ip->priv) { + option_error("%s option cannot be overridden", opt->name); + return 0; + } + } + opt->flags |= OPT_SEENIT; + + switch (opt->type) { + case o_bool: + v = opt->flags & OPT_VALUE; + *(bool *)(opt->addr) = v; + if (opt->addr2 && (opt->flags & OPT_A2COPY)) + *(bool *)(opt->addr2) = v; + break; + + case o_int: + iv = 0; + if ((opt->flags & OPT_NOARG) == 0) { + if (!int_option(*argv, &iv)) + return 0; + if ((((opt->flags & OPT_LLIMIT) && iv < opt->lower_limit) + || ((opt->flags & OPT_ULIMIT) && iv > opt->upper_limit)) + && !((opt->flags & OPT_ZEROOK && iv == 0))) { + char *zok = (opt->flags & OPT_ZEROOK)? " zero or": ""; + switch (opt->flags & OPT_LIMITS) { + case OPT_LLIMIT: + option_error("%s value must be%s >= %d", + opt->name, zok, opt->lower_limit); + break; + case OPT_ULIMIT: + option_error("%s value must be%s <= %d", + opt->name, zok, opt->upper_limit); + break; + case OPT_LIMITS: + option_error("%s value must be%s between %d and %d", + opt->name, opt->lower_limit, opt->upper_limit); + break; + } + return 0; + } + } + a = opt->flags & OPT_VALUE; + if (a >= 128) + a -= 256; /* sign extend */ + iv += a; + if (opt->flags & OPT_INC) + iv += *(int *)(opt->addr); + if ((opt->flags & OPT_NOINCR) && !privileged_option) { + int oldv = *(int *)(opt->addr); + if ((opt->flags & OPT_ZEROINF) ? + (oldv != 0 && (iv == 0 || iv > oldv)) : (iv > oldv)) { + option_error("%s value cannot be increased", opt->name); + return 0; + } + } + *(int *)(opt->addr) = iv; + if (opt->addr2 && (opt->flags & OPT_A2COPY)) + *(int *)(opt->addr2) = iv; + break; + + case o_uint32: + if (opt->flags & OPT_NOARG) { + v = opt->flags & OPT_VALUE; + } else if (!number_option(*argv, &v, 16)) + return 0; + if (opt->flags & OPT_OR) + v |= *(u_int32_t *)(opt->addr); + *(u_int32_t *)(opt->addr) = v; + if (opt->addr2 && (opt->flags & OPT_A2COPY)) + *(u_int32_t *)(opt->addr2) = v; + break; + + case o_string: + if (opt->flags & OPT_STATIC) { + strlcpy((char *)(opt->addr), *argv, opt->upper_limit); + } else { + sv = strdup(*argv); + if (sv == NULL) + novm("option argument"); + *(char **)(opt->addr) = sv; + } + break; + + case o_special_noarg: + case o_special: + parser = (int (*) __P((char **))) opt->addr; + if (!(*parser)(argv)) + return 0; + break; + } + + if (opt->addr2) { + if (opt->flags & OPT_A2INFO) { + struct option_info *ip = (struct option_info *) opt->addr2; + ip->priv = privileged_option; + ip->source = option_source; + } else if ((opt->flags & (OPT_A2COPY|OPT_ENABLE)) == 0) + *(bool *)(opt->addr2) = 1; + } + + return 1; +} + +/* + * n_arguments - tell how many arguments an option takes + */ +static int +n_arguments(opt) + option_t *opt; +{ + return (opt->type == o_bool || opt->type == o_special_noarg + || (opt->flags & OPT_NOARG))? 0: 1; +} + +/* + * add_options - add a list of options to the set we grok. + */ +void +add_options(opt) + option_t *opt; +{ + struct option_list *list; + + list = malloc(sizeof(*list)); + if (list == 0) + novm("option list entry"); + list->options = opt; + list->next = extra_options; + extra_options = list; +} + +/* + * usage - print out a message telling how to use the program. + */ +static void +usage() +{ + if (phase == PHASE_INITIALIZE) + fprintf(stderr, usage_string, VERSION, PATCHLEVEL, IMPLEMENTATION, + progname); +} + +/* + * showhelp - print out usage message and exit. + */ +static int +showhelp(argv) + char **argv; +{ + if (phase == PHASE_INITIALIZE) { + usage(); + exit(0); + } + return 0; +} + +/* + * showversion - print out the version number and exit. */ static int +showversion(argv) + char **argv; +{ + if (phase == PHASE_INITIALIZE) { + fprintf(stderr, "pppd version %s.%d%s\n", + VERSION, PATCHLEVEL, IMPLEMENTATION); + exit(0); + } + return 0; +} + +/* + * option_error - print a message about an error in an option. + * The message is logged, and also sent to + * stderr if phase == PHASE_INITIALIZE. + */ +void +option_error __V((char *fmt, ...)) +{ + va_list args; + char buf[256]; + +#if defined(__STDC__) + va_start(args, fmt); +#else + char *fmt; + va_start(args); + fmt = va_arg(args, char *); +#endif + vslprintf(buf, sizeof(buf), fmt, args); + va_end(args); + if (phase == PHASE_INITIALIZE) + fprintf(stderr, "%s: %s\n", progname, buf); + syslog(LOG_ERR, "%s", buf); +} + +#if 0 +/* + * readable - check if a file is readable by the real user. + */ +int readable(fd) int fd; { uid_t uid; - int ngroups, i; + int i; struct stat sbuf; - GIDSET_TYPE groups[NGROUPS_MAX]; uid = getuid(); if (uid == 0) @@ -560,12 +858,12 @@ readable(fd) return sbuf.st_mode & S_IRUSR; if (sbuf.st_gid == getgid()) return sbuf.st_mode & S_IRGRP; - ngroups = getgroups(NGROUPS_MAX, groups); for (i = 0; i < ngroups; ++i) if (sbuf.st_gid == groups[i]) return sbuf.st_mode & S_IRGRP; return sbuf.st_mode & S_IROTH; } +#endif /* * Read a word from a file. @@ -786,7 +1084,7 @@ getword(f, word, newlinep, filename) if (ferror(f)) { if (errno == 0) errno = EIO; - perror(filename); + option_error("Error reading %s: %m", filename); die(1); } /* @@ -801,8 +1099,8 @@ getword(f, word, newlinep, filename) * Warn if the word was too long, and append a terminating null. */ if (len >= MAXWORDLEN) { - fprintf(stderr, "%s: warning: word in file %s too long (%.20s...)\n", - progname, filename, word); + option_error("warning: word in file %s too long (%.20s...)", + filename, word); len = MAXWORDLEN - 1; } word[len] = 0; @@ -826,7 +1124,8 @@ number_option(str, valp, base) *valp = strtoul(str, &ptr, base); if (ptr == str) { - fprintf(stderr, "%s: invalid number: %s\n", progname, str); + option_error("invalid numeric parameter '%s' for %s option", + str, current_option); return 0; } return 1; @@ -838,7 +1137,7 @@ number_option(str, valp, base) * the base is assumed to be 0, and *valp is not changed * if there is an error. */ -static int +int int_option(str, valp) char *str; int *valp; @@ -853,7 +1152,7 @@ int_option(str, valp) /* - * The following procedures execute commands. + * The following procedures parse options. */ /* @@ -863,1226 +1162,384 @@ static int readfile(argv) char **argv; { - return options_from_file(*argv, 1, 1); + return options_from_file(*argv, 1, 1, privileged_option); } /* - * setdebug - Set debug (command line argument). + * callfile - take commands from /etc/ppp/peers/. + * Name may not contain /../, start with / or ../, or end in /.. */ static int -setdebug() +callfile(argv) + char **argv; { - debug++; - return (1); + char *fname, *arg, *p; + int l, ok; + + arg = *argv; + ok = 1; + if (arg[0] == '/' || arg[0] == 0) + ok = 0; + else { + for (p = arg; *p != 0; ) { + if (p[0] == '.' && p[1] == '.' && (p[2] == '/' || p[2] == 0)) { + ok = 0; + break; + } + while (*p != '/' && *p != 0) + ++p; + if (*p == '/') + ++p; + } + } + if (!ok) { + option_error("call option value may not contain .. or start with /"); + return 0; + } + + l = strlen(arg) + strlen(_PATH_PEERFILES) + 1; + if ((fname = (char *) malloc(l)) == NULL) + novm("call file name"); + slprintf(fname, l, "%s%s", _PATH_PEERFILES, arg); + + ok = options_from_file(fname, 1, 1, 1); + + free(fname); + return ok; +} + +#ifdef PPP_FILTER +/* + * setpassfilter - Set the pass filter for packets + */ +static int +setpassfilter(argv) + char **argv; +{ + pc.linktype = DLT_PPP; + pc.snapshot = PPP_HDRLEN; + + if (pcap_compile(&pc, &pass_filter, *argv, 1, netmask) == 0) + return 1; + option_error("error in pass-filter expression: %s\n", pcap_geterr(&pc)); + return 0; } /* - * setkdebug - Set kernel debugging level. + * setactivefilter - Set the active filter for packets */ static int -setkdebug(argv) +setactivefilter(argv) char **argv; { - return int_option(*argv, &kdebugflag); + pc.linktype = DLT_PPP; + pc.snapshot = PPP_HDRLEN; + + if (pcap_compile(&pc, &active_filter, *argv, 1, netmask) == 0) + return 1; + option_error("error in active-filter expression: %s\n", pcap_geterr(&pc)); + return 0; } +#endif /* * noopt - Disable all options. */ static int -noopt() +noopt(argv) + char **argv; { BZERO((char *) &lcp_wantoptions[0], sizeof (struct lcp_options)); BZERO((char *) &lcp_allowoptions[0], sizeof (struct lcp_options)); BZERO((char *) &ipcp_wantoptions[0], sizeof (struct ipcp_options)); BZERO((char *) &ipcp_allowoptions[0], sizeof (struct ipcp_options)); -#ifdef IPX_CHANGE - BZERO((char *) &ipxcp_wantoptions[0], sizeof (struct ipxcp_options)); - BZERO((char *) &ipxcp_allowoptions[0], sizeof (struct ipxcp_options)); -#endif /* IPX_CHANGE */ - return (1); } /* - * noaccomp - Disable Address/Control field compression negotiation. + * setdomain - Set domain name to append to hostname */ static int -noaccomp() +setdomain(argv) + char **argv; { - lcp_wantoptions[0].neg_accompression = 0; - lcp_allowoptions[0].neg_accompression = 0; + if (!privileged_option) { + option_error("using the domain option requires root privilege"); + return 0; + } + gethostname(hostname, MAXNAMELEN); + if (**argv != 0) { + if (**argv != '.') + strncat(hostname, ".", MAXNAMELEN - strlen(hostname)); + strncat(hostname, *argv, MAXNAMELEN - strlen(hostname)); + } + hostname[MAXNAMELEN-1] = 0; return (1); } /* - * noasyncmap - Disable async map negotiation. + * setspeed - Set the speed. */ static int -noasyncmap() +setspeed(arg) + char *arg; { - lcp_wantoptions[0].neg_asyncmap = 0; - lcp_allowoptions[0].neg_asyncmap = 0; - return (1); + char *ptr; + int spd; + + if (no_override && inspeed != 0) + return 1; + spd = strtol(arg, &ptr, 0); + if (ptr == arg || *ptr != 0 || spd == 0) + return 0; + if (!no_override || inspeed == 0) + inspeed = spd; + return 1; } /* - * noip - Disable IP and IPCP. + * setdevname - Set the device name. */ static int -noip() +setdevname(cp) + char *cp; { - ipcp_protent.enabled_flag = 0; - return (1); -} + struct stat statbuf; + char dev[MAXPATHLEN]; + if (*cp == 0) + return 0; -/* - * nomagicnumber - Disable magic number negotiation. - */ -static int -nomagicnumber() -{ - lcp_wantoptions[0].neg_magicnumber = 0; - lcp_allowoptions[0].neg_magicnumber = 0; - return (1); -} - - -/* - * nomru - Disable mru negotiation. - */ -static int -nomru() -{ - lcp_wantoptions[0].neg_mru = 0; - lcp_allowoptions[0].neg_mru = 0; - return (1); -} - - -/* - * setmru - Set MRU for negotiation. - */ -static int -setmru(argv) - char **argv; -{ - u_int32_t mru; - - if (!number_option(*argv, &mru, 0)) - return 0; - lcp_wantoptions[0].mru = mru; - lcp_wantoptions[0].neg_mru = 1; - return (1); -} - - -/* - * setmru - Set the largest MTU we'll use. - */ -static int -setmtu(argv) - char **argv; -{ - u_int32_t mtu; - - if (!number_option(*argv, &mtu, 0)) - return 0; - if (mtu < MINMRU || mtu > MAXMRU) { - fprintf(stderr, "mtu option value of %ld is too %s\n", mtu, - (mtu < MINMRU? "small": "large")); - return 0; + if (strncmp("/dev/", cp, 5) != 0) { + strlcpy(dev, "/dev/", sizeof(dev)); + strlcat(dev, cp, sizeof(dev)); + cp = dev; } - lcp_allowoptions[0].mru = mtu; - return (1); -} - - -/* - * nopcomp - Disable Protocol field compression negotiation. - */ -static int -nopcomp() -{ - lcp_wantoptions[0].neg_pcompression = 0; - lcp_allowoptions[0].neg_pcompression = 0; - return (1); -} - - -/* - * setpassive - Set passive mode (don't give up if we time out sending - * LCP configure-requests). - */ -static int -setpassive() -{ - lcp_wantoptions[0].passive = 1; - return (1); -} - - -/* - * setsilent - Set silent mode (don't start sending LCP configure-requests - * until we get one from the peer). - */ -static int -setsilent() -{ - lcp_wantoptions[0].silent = 1; - return 1; -} + /* + * Check if there is a character device by this name. + */ + if (stat(cp, &statbuf) < 0) { + if (errno == ENOENT) + return 0; + option_error("Couldn't stat %s: %m", cp); + return -1; + } + if (!S_ISCHR(statbuf.st_mode)) { + option_error("%s is not a character device", cp); + return -1; + } -/* - * nopap - Disable PAP authentication with peer. - */ -static int -nopap() -{ - lcp_allowoptions[0].neg_upap = 0; - return (1); -} + if (phase != PHASE_INITIALIZE) { + option_error("device name cannot be changed after initialization"); + return -1; + } + if (no_override) { + option_error("per-tty options file may not specify device name"); + return -1; + } + if (devnam_info.priv && !privileged_option) { + option_error("device name cannot be overridden"); + return -1; + } -/* - * reqpap - Require PAP authentication from peer. - */ -static int -reqpap() -{ - lcp_wantoptions[0].neg_upap = 1; - auth_required = 1; + strlcpy(devnam, cp, sizeof(devnam)); + devstat = statbuf; + default_device = 0; + devnam_info.priv = privileged_option; + devnam_info.source = option_source; + return 1; } /* - * setupapfile - specifies UPAP info for authenticating with peer. + * setipaddr - Set the IP address */ static int -setupapfile(argv) - char **argv; +setipaddr(arg) + char *arg; { - FILE * ufile; - int l; - - lcp_allowoptions[0].neg_upap = 1; + struct hostent *hp; + char *colon; + u_int32_t local, remote; + ipcp_options *wo = &ipcp_wantoptions[0]; + static int seen_local = 0, seen_remote = 0; - /* open user info file */ - if ((ufile = fopen(*argv, "r")) == NULL) { - fprintf(stderr, "unable to open user login data file %s\n", *argv); - return 0; - } - if (!readable(fileno(ufile))) { - fprintf(stderr, "%s: access denied\n", *argv); + /* + * IP address pair separated by ":". + */ + if ((colon = strchr(arg, ':')) == NULL) return 0; + + /* + * If colon first character, then no local addr. + */ + if (colon != arg && !(no_override && seen_local)) { + *colon = '\0'; + if ((local = inet_addr(arg)) == (u_int32_t) -1) { + if ((hp = gethostbyname(arg)) == NULL) { + option_error("unknown host: %s", arg); + return -1; + } else { + local = *(u_int32_t *)hp->h_addr; + } + } + if (bad_ip_adrs(local)) { + option_error("bad local IP address %s", ip_ntoa(local)); + return -1; + } + if (local != 0) + wo->ouraddr = local; + *colon = ':'; + seen_local = 1; } - check_access(ufile, *argv); - - /* get username */ - if (fgets(user, MAXNAMELEN - 1, ufile) == NULL - || fgets(passwd, MAXSECRETLEN - 1, ufile) == NULL){ - fprintf(stderr, "Unable to read user login data file %s.\n", *argv); - return 0; + + /* + * If colon last character, then no remote addr. + */ + if (*++colon != '\0' && !(no_override && seen_remote)) { + if ((remote = inet_addr(colon)) == (u_int32_t) -1) { + if ((hp = gethostbyname(colon)) == NULL) { + option_error("unknown host: %s", colon); + return -1; + } else { + remote = *(u_int32_t *)hp->h_addr; + if (remote_name[0] == 0) + strlcpy(remote_name, colon, sizeof(remote_name)); + } + } + if (bad_ip_adrs(remote)) { + option_error("bad remote IP address %s", ip_ntoa(remote)); + return -1; + } + if (remote != 0) + wo->hisaddr = remote; + seen_remote = 1; } - fclose(ufile); - - /* get rid of newlines */ - l = strlen(user); - if (l > 0 && user[l-1] == '\n') - user[l-1] = 0; - l = strlen(passwd); - if (l > 0 && passwd[l-1] == '\n') - passwd[l-1] = 0; - - return (1); -} - - -/* - * nochap - Disable CHAP authentication with peer. - */ -static int -nochap() -{ - lcp_allowoptions[0].neg_chap = 0; - return (1); -} - - -/* - * reqchap - Require CHAP authentication from peer. - */ -static int -reqchap() -{ - lcp_wantoptions[0].neg_chap = 1; - auth_required = 1; - return (1); -} - - -/* - * setnovj - disable vj compression - */ -static int -setnovj() -{ - ipcp_wantoptions[0].neg_vj = 0; - ipcp_allowoptions[0].neg_vj = 0; - return (1); -} - -/* - * setnovjccomp - disable VJ connection-ID compression - */ -static int -setnovjccomp() -{ - ipcp_wantoptions[0].cflag = 0; - ipcp_allowoptions[0].cflag = 0; return 1; } /* - * setvjslots - set maximum number of connection slots for VJ compression + * setnetmask - set the netmask to be used on the interface. */ static int -setvjslots(argv) +setnetmask(argv) char **argv; { - int value; + u_int32_t mask; + int n; + char *p; - if (!int_option(*argv, &value)) - return 0; - if (value < 2 || value > 16) { - fprintf(stderr, "pppd: vj-max-slots value must be between 2 and 16\n"); - return 0; - } - ipcp_wantoptions [0].maxslotindex = - ipcp_allowoptions[0].maxslotindex = value - 1; - return 1; -} + /* + * Unfortunately, if we use inet_addr, we can't tell whether + * a result of all 1s is an error or a valid 255.255.255.255. + */ + p = *argv; + n = parse_dotted_ip(p, &mask); + mask = htonl(mask); -/* - * setconnector - Set a program to connect to a serial line - */ -static int -setconnector(argv) - char **argv; -{ - connector = strdup(*argv); - if (connector == NULL) - novm("connect script"); - - return (1); -} + if (n == 0 || p[n] != 0 || (netmask & ~mask) != 0) { + option_error("invalid netmask value '%s'", *argv); + return 0; + } -/* - * setdisconnector - Set a program to disconnect from the serial line - */ -static int -setdisconnector(argv) - char **argv; -{ - disconnector = strdup(*argv); - if (disconnector == NULL) - novm("disconnect script"); - + netmask = mask; return (1); } -/* - * setwelcomer - Set a program to welcome a client after connection - */ -static int -setwelcomer(argv) - char **argv; -{ - welcomer = strdup(*argv); - if (welcomer == NULL) - novm("welcome script"); - - return (1); +int +parse_dotted_ip(p, vp) + char *p; + u_int32_t *vp; +{ + int n; + u_int32_t v, b; + char *endp, *p0 = p; + + v = 0; + for (n = 3;; --n) { + b = strtoul(p, &endp, 0); + if (endp == p) + return 0; + if (b > 255) { + if (n < 3) + return 0; + /* accept e.g. 0xffffff00 */ + *vp = b; + return endp - p0; + } + v |= b << (n * 8); + p = endp; + if (n == 0) + break; + if (*p != '.') + return 0; + ++p; + } + *vp = v; + return p - p0; } -/* - * setmaxconnect - Set the maximum connect time - */ static int -setmaxconnect(argv) +setlogfile(argv) char **argv; { - int value; - - if (!int_option(*argv, &value)) - return 0; - if (value < 0) { - fprintf(stderr, "pppd: maxconnect time must be positive\n"); - return 0; + int fd, err; + + if (!privileged_option) + seteuid(getuid()); + fd = open(*argv, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0644); + if (fd < 0 && errno == EEXIST) + fd = open(*argv, O_WRONLY | O_APPEND); + err = errno; + if (!privileged_option) + seteuid(0); + if (fd < 0) { + errno = err; + option_error("Can't open log file %s: %m", *argv); + return 0; } - maxconnect = value; + if (log_to_file && log_to_fd >= 0) + close(log_to_fd); + log_to_fd = fd; + log_to_file = 1; return 1; } -/* - * setdomain - Set domain name to append to hostname - */ +#ifdef PLUGIN static int -setdomain(argv) +loadplugin(argv) char **argv; { - gethostname(hostname, MAXNAMELEN); - if (**argv != 0) { - if (**argv != '.') - strncat(hostname, ".", MAXNAMELEN - strlen(hostname)); - strncat(hostname, *argv, MAXNAMELEN - strlen(hostname)); + char *arg = *argv; + void *handle; + const char *err; + void (*init) __P((void)); + + handle = dlopen(arg, RTLD_GLOBAL | RTLD_NOW); + if (handle == 0) { + err = dlerror(); + if (err != 0) + option_error("%s", err); + option_error("Couldn't load plugin %s", arg); + return 0; } - hostname[MAXNAMELEN-1] = 0; - return (1); -} - - -/* - * setasyncmap - add bits to asyncmap (what we request peer to escape). - */ -static int -setasyncmap(argv) - char **argv; -{ - u_int32_t asyncmap; - - if (!number_option(*argv, &asyncmap, 16)) + init = (void (*)(void))dlsym(handle, "plugin_init"); + if (init == 0) { + option_error("%s has no initialization entry point", arg); + dlclose(handle); return 0; - lcp_wantoptions[0].asyncmap |= asyncmap; - lcp_wantoptions[0].neg_asyncmap = 1; - return(1); -} - - -/* - * setescape - add chars to the set we escape on transmission. - */ -static int -setescape(argv) - char **argv; -{ - int n, ret; - char *p, *endp; - - p = *argv; - ret = 1; - while (*p) { - n = strtol(p, &endp, 16); - if (p == endp) { - fprintf(stderr, "%s: invalid hex number: %s\n", progname, p); - return 0; - } - p = endp; - if (n < 0 || 0x20 <= n && n <= 0x3F || n == 0x5E || n > 0xFF) { - fprintf(stderr, "%s: can't escape character 0x%x\n", progname, n); - ret = 0; - } else - xmit_accm[0][n >> 5] |= 1 << (n & 0x1F); - while (*p == ',' || *p == ' ') - ++p; } - return ret; -} - - -/* - * setspeed - Set the speed. - */ -static int -setspeed(arg) - char *arg; -{ - char *ptr; - int spd; - - spd = strtol(arg, &ptr, 0); - if (ptr == arg || *ptr != 0 || spd == 0) - return 0; - inspeed = spd; - return 1; -} - - -/* - * setdevname - Set the device name. - */ -int -setdevname(cp) - char *cp; -{ - struct stat statbuf; - char *tty, *ttyname(); - char dev[MAXPATHLEN]; - - if (strncmp("/dev/", cp, 5) != 0) { - strcpy(dev, "/dev/"); - strncat(dev, cp, MAXPATHLEN - 5); - dev[MAXPATHLEN-1] = 0; - cp = dev; - } - - /* - * Check if there is a device by this name. - */ - if (stat(cp, &statbuf) < 0) { - if (errno == ENOENT) - return 0; - syslog(LOG_ERR, cp); - return -1; - } - - (void) strncpy(devnam, cp, MAXPATHLEN); - devnam[MAXPATHLEN-1] = 0; - default_device = FALSE; - - return 1; -} - - -/* - * setipaddr - Set the IP address - */ -int -setipaddr(arg) - char *arg; -{ - struct hostent *hp; - char *colon; - u_int32_t local, remote; - ipcp_options *wo = &ipcp_wantoptions[0]; - - /* - * IP address pair separated by ":". - */ - if ((colon = strchr(arg, ':')) == NULL) - return 0; - - /* - * If colon first character, then no local addr. - */ - if (colon != arg) { - *colon = '\0'; - if ((local = inet_addr(arg)) == -1) { - if ((hp = gethostbyname(arg)) == NULL) { - fprintf(stderr, "unknown host: %s\n", arg); - return -1; - } else { - local = *(u_int32_t *)hp->h_addr; - if (our_name[0] == 0) { - strncpy(our_name, arg, MAXNAMELEN); - our_name[MAXNAMELEN-1] = 0; - } - } - } - if (bad_ip_adrs(local)) { - fprintf(stderr, "bad local IP address %s\n", ip_ntoa(local)); - return -1; - } - if (local != 0) - wo->ouraddr = local; - *colon = ':'; - } - - /* - * If colon last character, then no remote addr. - */ - if (*++colon != '\0') { - if ((remote = inet_addr(colon)) == -1) { - if ((hp = gethostbyname(colon)) == NULL) { - fprintf(stderr, "unknown host: %s\n", colon); - return -1; - } else { - remote = *(u_int32_t *)hp->h_addr; - if (remote_name[0] == 0) { - strncpy(remote_name, colon, MAXNAMELEN); - remote_name[MAXNAMELEN-1] = 0; - } - } - } - if (bad_ip_adrs(remote)) { - fprintf(stderr, "bad remote IP address %s\n", ip_ntoa(remote)); - return -1; - } - if (remote != 0) - wo->hisaddr = remote; - } - - return 1; -} - - -/* - * setnoipdflt - disable setipdefault() - */ -static int -setnoipdflt() -{ - disable_defaultip = 1; - return 1; -} - - -/* - * setipcpaccl - accept peer's idea of our address - */ -static int -setipcpaccl() -{ - ipcp_wantoptions[0].accept_local = 1; - return 1; -} - - -/* - * setipcpaccr - accept peer's idea of its address - */ -static int -setipcpaccr() -{ - ipcp_wantoptions[0].accept_remote = 1; - return 1; -} - - -/* - * setnetmask - set the netmask to be used on the interface. - */ -static int -setnetmask(argv) - char **argv; -{ - u_int32_t mask; - - if ((mask = inet_addr(*argv)) == -1 || (netmask & ~mask) != 0) { - fprintf(stderr, "Invalid netmask %s\n", *argv); - return 0; - } - - netmask = mask; - return (1); -} - -static int -setcrtscts() -{ - crtscts = 1; - return (1); -} - -static int -setnocrtscts() -{ - crtscts = -1; - return (1); -} - -static int -setxonxoff() -{ - lcp_wantoptions[0].asyncmap |= 0x000A0000; /* escape ^S and ^Q */ - lcp_wantoptions[0].neg_asyncmap = 1; - - crtscts = -2; - return (1); -} - -static int -setnodetach() -{ - nodetach = 1; - return (1); -} - -static int -setdemand() -{ - demand = 1; - return 1; -} - -static int -setmodem() -{ - modem = 1; - return 1; -} - -static int -setlocal() -{ - modem = 0; - return 1; -} - -static int -setlock() -{ - lockflag = 1; - return 1; -} - -static int -setusehostname() -{ - usehostname = 1; - return 1; -} - -static int -setname(argv) - char **argv; -{ - if (our_name[0] == 0) { - strncpy(our_name, argv[0], MAXNAMELEN); - our_name[MAXNAMELEN-1] = 0; - } - return 1; -} - -static int -setuser(argv) - char **argv; -{ - strncpy(user, argv[0], MAXNAMELEN); - user[MAXNAMELEN-1] = 0; - return 1; -} - -static int -setremote(argv) - char **argv; -{ - strncpy(remote_name, argv[0], MAXNAMELEN); - remote_name[MAXNAMELEN-1] = 0; - return 1; -} - -static int -setauth() -{ - auth_required = 1; - return 1; -} - -static int -setdefaultroute() -{ - if (!ipcp_allowoptions[0].default_route) { - fprintf(stderr, "%s: defaultroute option is disabled\n", progname); - return 0; - } - ipcp_wantoptions[0].default_route = 1; - return 1; -} - -static int -setnodefaultroute() -{ - ipcp_allowoptions[0].default_route = 0; - ipcp_wantoptions[0].default_route = 0; - return 1; -} - -static int -setproxyarp() -{ - if (!ipcp_allowoptions[0].proxy_arp) { - fprintf(stderr, "%s: proxyarp option is disabled\n", progname); - return 0; - } - ipcp_wantoptions[0].proxy_arp = 1; - return 1; -} - -static int -setnoproxyarp() -{ - ipcp_wantoptions[0].proxy_arp = 0; - ipcp_allowoptions[0].proxy_arp = 0; - return 1; -} - -static int -setpersist() -{ - persist = 1; - return 1; -} - -static int -setdologin() -{ - uselogin = 1; - return 1; -} - -/* - * Functions to set the echo interval for modem-less monitors - */ - -static int -setlcpechointv(argv) - char **argv; -{ - return int_option(*argv, &lcp_echo_interval); -} - -static int -setlcpechofails(argv) - char **argv; -{ - return int_option(*argv, &lcp_echo_fails); -} - -/* - * Functions to set timeouts, max transmits, etc. - */ -static int -setlcptimeout(argv) - char **argv; -{ - return int_option(*argv, &lcp_fsm[0].timeouttime); -} - -static int -setlcpterm(argv) - char **argv; -{ - return int_option(*argv, &lcp_fsm[0].maxtermtransmits); -} - -static int -setlcpconf(argv) - char **argv; -{ - return int_option(*argv, &lcp_fsm[0].maxconfreqtransmits); -} - -static int -setlcpfails(argv) - char **argv; -{ - return int_option(*argv, &lcp_fsm[0].maxnakloops); -} - -static int -setipcptimeout(argv) - char **argv; -{ - return int_option(*argv, &ipcp_fsm[0].timeouttime); -} - -static int -setipcpterm(argv) - char **argv; -{ - return int_option(*argv, &ipcp_fsm[0].maxtermtransmits); -} - -static int -setipcpconf(argv) - char **argv; -{ - return int_option(*argv, &ipcp_fsm[0].maxconfreqtransmits); -} - -static int -setipcpfails(argv) - char **argv; -{ - return int_option(*argv, &lcp_fsm[0].maxnakloops); -} - -static int -setpaptimeout(argv) - char **argv; -{ - return int_option(*argv, &upap[0].us_timeouttime); -} - -static int -setpapreqtime(argv) - char **argv; -{ - return int_option(*argv, &upap[0].us_reqtimeout); -} - -static int -setpapreqs(argv) - char **argv; -{ - return int_option(*argv, &upap[0].us_maxtransmits); -} - -static int -setchaptimeout(argv) - char **argv; -{ - return int_option(*argv, &chap[0].timeouttime); -} - -static int -setchapchal(argv) - char **argv; -{ - return int_option(*argv, &chap[0].max_transmits); -} - -static int -setchapintv(argv) - char **argv; -{ - return int_option(*argv, &chap[0].chal_interval); -} - -static int -setbsdcomp(argv) - char **argv; -{ - int rbits, abits; - char *str, *endp; - - str = *argv; - abits = rbits = strtol(str, &endp, 0); - if (endp != str && *endp == ',') { - str = endp + 1; - abits = strtol(str, &endp, 0); - } - if (*endp != 0 || endp == str) { - fprintf(stderr, "%s: invalid argument format for bsdcomp option\n", - progname); - return 0; - } - if (rbits != 0 && (rbits < BSD_MIN_BITS || rbits > BSD_MAX_BITS) - || abits != 0 && (abits < BSD_MIN_BITS || abits > BSD_MAX_BITS)) { - fprintf(stderr, "%s: bsdcomp option values must be 0 or %d .. %d\n", - progname, BSD_MIN_BITS, BSD_MAX_BITS); - return 0; - } - if (rbits > 0) { - ccp_wantoptions[0].bsd_compress = 1; - ccp_wantoptions[0].bsd_bits = rbits; - } else - ccp_wantoptions[0].bsd_compress = 0; - if (abits > 0) { - ccp_allowoptions[0].bsd_compress = 1; - ccp_allowoptions[0].bsd_bits = abits; - } else - ccp_allowoptions[0].bsd_compress = 0; + info("Plugin %s loaded.", arg); + (*init)(); return 1; } - -static int -setnobsdcomp() -{ - ccp_wantoptions[0].bsd_compress = 0; - ccp_allowoptions[0].bsd_compress = 0; - return 1; -} - -static int -setdeflate(argv) - char **argv; -{ - int rbits, abits; - char *str, *endp; - - str = *argv; - abits = rbits = strtol(str, &endp, 0); - if (endp != str && *endp == ',') { - str = endp + 1; - abits = strtol(str, &endp, 0); - } - if (*endp != 0 || endp == str) { - fprintf(stderr, "%s: invalid argument format for deflate option\n", - progname); - return 0; - } - if (rbits != 0 && (rbits < DEFLATE_MIN_SIZE || rbits > DEFLATE_MAX_SIZE) - || abits != 0 && (abits < DEFLATE_MIN_SIZE - || abits > DEFLATE_MAX_SIZE)) { - fprintf(stderr, "%s: deflate option values must be 0 or %d .. %d\n", - progname, DEFLATE_MIN_SIZE, DEFLATE_MAX_SIZE); - return 0; - } - if (rbits > 0) { - ccp_wantoptions[0].deflate = 1; - ccp_wantoptions[0].deflate_size = rbits; - } else - ccp_wantoptions[0].deflate = 0; - if (abits > 0) { - ccp_allowoptions[0].deflate = 1; - ccp_allowoptions[0].deflate_size = abits; - } else - ccp_allowoptions[0].deflate = 0; - return 1; -} - -static int -setnodeflate() -{ - ccp_wantoptions[0].deflate = 0; - ccp_allowoptions[0].deflate = 0; - return 1; -} - -static int -setpred1comp() -{ - ccp_wantoptions[0].predictor_1 = 1; - ccp_allowoptions[0].predictor_1 = 1; - return 1; -} - -static int -setnopred1comp() -{ - ccp_wantoptions[0].predictor_1 = 0; - ccp_allowoptions[0].predictor_1 = 0; - return 1; -} - -static int -setipparam(argv) - char **argv; -{ - ipparam = strdup(*argv); - if (ipparam == NULL) - novm("ipparam string"); - - return 1; -} - -static int -setpapcrypt() -{ - cryptpap = 1; - return 1; -} - -static int -setidle(argv) - char **argv; -{ - return int_option(*argv, &idle_time_limit); -} - -static int -setholdoff(argv) - char **argv; -{ - return int_option(*argv, &holdoff); -} - -#ifdef IPX_CHANGE -static int -setipxrouter (argv) - char **argv; -{ - ipxcp_wantoptions[0].neg_router = 1; - ipxcp_allowoptions[0].neg_router = 1; - return int_option(*argv, &ipxcp_wantoptions[0].router); -} - -static int -setipxname (argv) - char **argv; -{ - char *dest = ipxcp_wantoptions[0].name; - char *src = *argv; - int count; - char ch; - - ipxcp_wantoptions[0].neg_name = 1; - ipxcp_allowoptions[0].neg_name = 1; - memset (dest, '\0', sizeof (ipxcp_wantoptions[0].name)); - - count = 0; - while (*src) { - ch = *src++; - if (! isalnum (ch) && ch != '_') { - fprintf (stderr, - "%s: IPX router name must be alphanumeric or _\n", - progname); - return 0; - } - - if (count >= sizeof (ipxcp_wantoptions[0].name)) { - fprintf (stderr, - "%s: IPX router name is limited to %d characters\n", - progname, - sizeof (ipxcp_wantoptions[0].name) - 1); - return 0; - } - - dest[count++] = toupper (ch); - } - - return 1; -} - -static int -setipxcptimeout (argv) - char **argv; -{ - return int_option(*argv, &ipxcp_fsm[0].timeouttime); -} - -static int -setipxcpterm (argv) - char **argv; -{ - return int_option(*argv, &ipxcp_fsm[0].maxtermtransmits); -} - -static int -setipxcpconf (argv) - char **argv; -{ - return int_option(*argv, &ipxcp_fsm[0].maxconfreqtransmits); -} - -static int -setipxcpfails (argv) - char **argv; -{ - return int_option(*argv, &ipxcp_fsm[0].maxnakloops); -} - -static int -setipxnetwork(argv) - char **argv; -{ - ipxcp_wantoptions[0].neg_nn = 1; - return int_option(*argv, &ipxcp_wantoptions[0].our_network); -} - -static int -setipxanet() -{ - ipxcp_wantoptions[0].accept_network = 1; - ipxcp_allowoptions[0].accept_network = 1; -} - -static int -setipxalcl() -{ - ipxcp_wantoptions[0].accept_local = 1; - ipxcp_allowoptions[0].accept_local = 1; -} - -static int -setipxarmt() -{ - ipxcp_wantoptions[0].accept_remote = 1; - ipxcp_allowoptions[0].accept_remote = 1; -} - -static u_char * -setipxnodevalue(src,dst) -u_char *src, *dst; -{ - int indx; - int item; - - for (;;) { - if (!isxdigit (*src)) - break; - - for (indx = 0; indx < 5; ++indx) { - dst[indx] <<= 4; - dst[indx] |= (dst[indx + 1] >> 4) & 0x0F; - } - - item = toupper (*src) - '0'; - if (item > 9) - item -= 7; - - dst[5] = (dst[5] << 4) | item; - ++src; - } - return src; -} - -static int -setipxnode(argv) - char **argv; -{ - char *end; - - memset (&ipxcp_wantoptions[0].our_node[0], 0, 6); - memset (&ipxcp_wantoptions[0].his_node[0], 0, 6); - - end = setipxnodevalue (*argv, &ipxcp_wantoptions[0].our_node[0]); - if (*end == ':') - end = setipxnodevalue (++end, &ipxcp_wantoptions[0].his_node[0]); - - if (*end == '\0') { - ipxcp_wantoptions[0].neg_node = 1; - return 1; - } - - fprintf(stderr, "%s: invalid argument for ipx-node option\n", - progname); - return 0; -} - -static int -setipxproto() -{ - ipx_enabled = 1; /* Enable IPXCP and IPX protocol */ - return 1; -} - -static int -resetipxproto() -{ - ipx_enabled = 0; /* Disable IPXCP and IPX protocol */ - return 1; -} -#endif /* IPX_CHANGE */ - -#ifdef USE_MS_DNS -/* - * setdnsaddr - set the dns address(es) - */ - -static int -setdnsaddr(argv) - char **argv; -{ - u_int32_t dns; - struct hostent *hp; - - dns = inet_addr(*argv); - if (dns == -1) { - if ((hp = gethostbyname(*argv)) == NULL) { - fprintf(stderr, "Invalid DNS Address %s\n", *argv); - return 0; - } - dns = *(u_int32_t *)hp->h_addr; - } - - if (ipcp_allowoptions[0].dnsaddr[0] == 0) { - ipcp_allowoptions[0].dnsaddr[0] = dns; - } else { - ipcp_allowoptions[0].dnsaddr[1] = dns; - } - - return (1); -} -#endif /* USE_MS_DNS */ +#endif /* PLUGIN */