*/
#ifndef lint
-static char rcsid[] = "$Id: options.c,v 1.7 1994/05/18 06:34:15 paulus Exp $";
+static char rcsid[] = "$Id: options.c,v 1.15 1994/09/16 02:34:52 paulus Exp $";
#endif
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
-#include <stdlib.h>
#include <limits.h>
+#include <stdlib.h>
#include <termios.h>
#include <syslog.h>
#include <string.h>
#include "ipcp.h"
#include "upap.h"
#include "chap.h"
+#include "ccp.h"
#define FALSE 0
#define TRUE 1
char *strdup __ARGS((char *));
#endif
-#if defined(ultrix) || defined(sun)
-#define GETGROUPS_TYPE int
-#else
-#define GETGROUPS_TYPE gid_t
+#ifndef GIDSET_TYPE
+#define GIDSET_TYPE gid_t
#endif
+/*
+ * Option variables and default values.
+ */
+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 */
+uint32 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 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 */
+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 */
+
/*
* Prototypes
*/
static int setsilent __ARGS((void));
static int noopt __ARGS((void));
static int setnovj __ARGS((void));
+static int setnovjccomp __ARGS((void));
+static int setvjslots __ARGS((char **));
static int reqpap __ARGS((void));
static int nopap __ARGS((void));
static int setupapfile __ARGS((char **));
static int setdomain __ARGS((char **));
static int setnetmask __ARGS((char **));
static int setcrtscts __ARGS((void));
+static int setnocrtscts __ARGS((void));
+static int setxonxoff __ARGS((void));
static int setnodetach __ARGS((void));
static int setmodem __ARGS((void));
static int setlocal __ARGS((void));
static int setchapintv __ARGS((char **));
static int setipcpaccl __ARGS((void));
static int setipcpaccr __ARGS((void));
+static int setlcpechointv __ARGS((char **));
+static int setlcpechofails __ARGS((char **));
+static int setbsdcomp __ARGS((char **));
+static int setnobsdcomp __ARGS((void));
static int number_option __ARGS((char *, long *, int));
static int readable __ARGS((int fd));
-/*
- * Option variables
- */
-extern char *progname;
-extern int debug;
-extern int kdebugflag;
-extern int modem;
-extern int lockflag;
-extern int crtscts;
-extern int nodetach;
-extern char *connector;
-extern char *disconnector;
-extern int inspeed;
-extern char devname[];
-extern int default_device;
-extern u_long netmask;
-extern int detach;
-extern char user[];
-extern char passwd[];
-extern int auth_required;
-extern int proxyarp;
-extern int persist;
-extern int uselogin;
-extern char our_name[];
-extern char remote_name[];
-int usehostname;
-int disable_defaultip;
-
/*
* Valid arguments.
*/
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, noipaddr, /* Disable IP address negotiation */
- "-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 */
- "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. */
- "crtscts", 0, setcrtscts, /* set h/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 */
- "proxyarp", 0, setproxyarp, /* Add proxy ARP entry */
- "persist", 0, setpersist, /* Keep on reopening connection after close */
- "login", 0, setdologin, /* Use system password database for UPAP */
- "noipdefault", 0, setnoipdflt, /* Don't use name for default IP adrs */
- "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 timeout for UPAP */
- "pap-max-authreq", 1, setpapreqs, /* Set max #xmits for auth-reqs */
- "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 */
- NULL
+ {"-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, noipaddr}, /* Disable IP address negotiation */
+ {"-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. */
+ {"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 */
+ {"proxyarp", 0, setproxyarp}, /* Add proxy ARP entry */
+ {"persist", 0, setpersist}, /* Keep on reopening connection after close */
+ {"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 timeout for UPAP */
+ {"pap-max-authreq", 1, setpapreqs}, /* Set max #xmits for auth-reqs */
+ {"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 */
+ {NULL, 0, NULL}
};
+#ifndef IMPLEMENTATION
+#define IMPLEMENTATION ""
+#endif
+
static char *usage_string = "\
-pppd version %s patch level %d\n\
+pppd version %s patch level %d%s\n\
Usage: %s [ arguments ], where arguments are:\n\
<device> Communicate over the named device\n\
<speed> Set the baud rate to <speed>\n\
*/
usage()
{
- fprintf(stderr, usage_string, VERSION, PATCHLEVEL, progname);
+ fprintf(stderr, usage_string, VERSION, PATCHLEVEL, IMPLEMENTATION,
+ progname);
}
/*
pw = getpwuid(getuid());
if (pw == NULL || (user = pw->pw_dir) == NULL || user[0] == 0)
- return;
+ return 1;
file = _PATH_USEROPT;
path = malloc(strlen(user) + strlen(file) + 2);
if (path == NULL)
char *dev, *path;
int ret;
- dev = strrchr(devname, '/');
+ dev = strrchr(devnam, '/');
if (dev == NULL)
- dev = devname;
+ dev = devnam;
else
++dev;
if (strcmp(dev, "tty") == 0)
uid_t uid;
int ngroups, i;
struct stat sbuf;
- GETGROUPS_TYPE groups[NGROUPS_MAX];
+ GIDSET_TYPE groups[NGROUPS_MAX];
uid = getuid();
if (uid == 0)
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);
+ return 0;
+ }
check_access(ufile, *argv);
/* get username */
/*
- * setnovj - diable vj compression
+ * setnovj - disable vj compression
*/
static int
setnovj()
return (1);
}
+
+/*
+ * setnovjccomp - disable VJ connection-ID compression
+ */
+static int
+setnovjccomp()
+{
+ ipcp_wantoptions[0].cflag = 0;
+ ipcp_allowoptions[0].cflag = 0;
+}
+
+
+/*
+ * setvjslots - set maximum number of connection slots for VJ compression
+ */
+static int
+setvjslots(argv)
+ char **argv;
+{
+ int value;
+
+ 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;
+}
+
+
/*
* setconnector - Set a program to connect to a serial line
*/
return -1;
}
- (void) strncpy(devname, cp, MAXPATHLEN);
- devname[MAXPATHLEN-1] = 0;
+ (void) strncpy(devnam, cp, MAXPATHLEN);
+ devnam[MAXPATHLEN-1] = 0;
default_device = FALSE;
return 1;
{
struct hostent *hp;
char *colon, *index();
- u_long local, remote;
+ uint32 local, remote;
ipcp_options *wo = &ipcp_wantoptions[0];
/*
setipdefault()
{
struct hostent *hp;
- u_long local;
+ uint32 local;
ipcp_options *wo = &ipcp_wantoptions[0];
/*
setnetmask(argv)
char **argv;
{
- u_long mask;
+ uint32 mask;
if ((mask = inet_addr(*argv)) == -1 || (netmask & ~mask) != 0) {
fprintf(stderr, "Invalid netmask %s\n", *argv);
* been set.
*/
/* ARGSUSED */
-u_long
+uint32
GetMask(addr)
- u_long addr;
+ uint32 addr;
{
return(netmask);
}
return (1);
}
+static int
+setnocrtscts()
+{
+ crtscts = -1;
+ return (1);
+}
+
+static int
+setxonxoff()
+{
+ crtscts = 2;
+ return (1);
+}
+
static int
setnodetach()
{
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.
*/
setlcptimeout(argv)
char **argv;
{
- return int_option(*argv, &lcp_fsm[0].timeouttime, 0);
+ return int_option(*argv, &lcp_fsm[0].timeouttime);
}
static int setlcpterm(argv)
char **argv;
{
- return int_option(*argv, &lcp_fsm[0].maxtermtransmits, 0);
+ return int_option(*argv, &lcp_fsm[0].maxtermtransmits);
}
static int setlcpconf(argv)
char **argv;
{
- return int_option(*argv, &lcp_fsm[0].maxconfreqtransmits, 0);
+ return int_option(*argv, &lcp_fsm[0].maxconfreqtransmits);
}
static int setlcpfails(argv)
char **argv;
{
- return int_option(*argv, &lcp_fsm[0].maxnakloops, 0);
+ return int_option(*argv, &lcp_fsm[0].maxnakloops);
}
static int setipcptimeout(argv)
char **argv;
{
- return int_option(*argv, &ipcp_fsm[0].timeouttime, 0);
+ return int_option(*argv, &ipcp_fsm[0].timeouttime);
}
static int setipcpterm(argv)
char **argv;
{
- return int_option(*argv, &ipcp_fsm[0].maxtermtransmits, 0);
+ return int_option(*argv, &ipcp_fsm[0].maxtermtransmits);
}
static int setipcpconf(argv)
char **argv;
{
- return int_option(*argv, &ipcp_fsm[0].maxconfreqtransmits, 0);
+ return int_option(*argv, &ipcp_fsm[0].maxconfreqtransmits);
}
static int setipcpfails(argv)
char **argv;
{
- return int_option(*argv, &lcp_fsm[0].maxnakloops, 0);
+ return int_option(*argv, &lcp_fsm[0].maxnakloops);
}
static int setpaptimeout(argv)
char **argv;
{
- return int_option(*argv, &upap[0].us_timeouttime, 0);
+ return int_option(*argv, &upap[0].us_timeouttime);
}
static int setpapreqs(argv)
char **argv;
{
- return int_option(*argv, &upap[0].us_maxtransmits, 0);
+ return int_option(*argv, &upap[0].us_maxtransmits);
}
static int setchaptimeout(argv)
char **argv;
{
- return int_option(*argv, &chap[0].timeouttime, 0);
+ return int_option(*argv, &chap[0].timeouttime);
}
static int setchapchal(argv)
char **argv;
{
- return int_option(*argv, &chap[0].max_transmits, 0);
+ return int_option(*argv, &chap[0].max_transmits);
}
static int setchapintv(argv)
char **argv;
{
- return int_option(*argv, &chap[0].chal_interval, 0);
+ 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 < MIN_BSD_BITS || rbits > MAX_BSD_BITS)
+ || abits != 0 && (abits < MIN_BSD_BITS || abits > MAX_BSD_BITS)) {
+ fprintf(stderr, "%s: bsdcomp option values must be 0 or %d .. %d\n",
+ progname, MIN_BSD_BITS, MAX_BSD_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;
+ return 1;
+}
+
+static int setnobsdcomp()
+{
+ ccp_wantoptions[0].bsd_compress = 0;
+ ccp_allowoptions[0].bsd_compress = 0;
}
projects / ppp.git / blobdiff