*/
#ifndef lint
-static char rcsid[] = "$Id: options.c,v 1.3 1994/01/10 00:19:28 paulus Exp $";
+static char rcsid[] = "$Id: options.c,v 1.9 1994/05/25 06:25:48 paulus Exp $";
#endif
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
+#include <limits.h>
#include <stdlib.h>
#include <termios.h>
#include <syslog.h>
#include <string.h>
#include <netdb.h>
+#include <pwd.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <netinet/in.h>
#include "ppp.h"
#include "pppd.h"
#define FALSE 0
#define TRUE 1
+#ifdef ultrix
+char *strdup __ARGS((char *));
+#endif
+
+#ifndef GIDSET_TYPE
+#define GIDSET_TYPE int
+#endif
/*
* Prototypes
*/
static int setdebug __ARGS((void));
+static int setkdebug __ARGS((char **));
static int setpassive __ARGS((void));
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 noipaddr __ARGS((void));
static int nomagicnumber __ARGS((void));
static int setasyncmap __ARGS((char **));
+static int setescape __ARGS((char **));
static int setmru __ARGS((char **));
+static int setmtu __ARGS((char **));
static int nomru __ARGS((void));
static int nopcomp __ARGS((void));
static int setconnector __ARGS((char **));
+static int setdisconnector __ARGS((char **));
static int setdomain __ARGS((char **));
static int setnetmask __ARGS((char **));
static int setcrtscts __ARGS((void));
+static int setxonxoff __ARGS((void));
static int setnodetach __ARGS((void));
static int setmodem __ARGS((void));
static int setlocal __ARGS((void));
+static int setlock __ARGS((void));
static int setname __ARGS((char **));
static int setuser __ARGS((char **));
static int setremote __ARGS((char **));
static int setpersist __ARGS((void));
static int setdologin __ARGS((void));
static int setusehostname __ARGS((void));
+static int setnoipdflt __ARGS((void));
static int setlcptimeout __ARGS((char **));
static int setlcpterm __ARGS((char **));
static int setlcpconf __ARGS((char **));
static int setchaptimeout __ARGS((char **));
static int setchapchal __ARGS((char **));
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 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 int proxyarp;
extern int persist;
extern int uselogin;
+extern u_long lcp_echo_interval;
+extern u_long lcp_echo_fails;
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 */
- "connect", 1, setconnector, /* A program to set up a connection */
- "crtscts", 0, setcrtscts, /* set h/w flow control */
- "debug", 0, setdebug, /* Increase debugging level */
- "domain", 1, setdomain, /* Add given domain name to hostname*/
- "mru", 1, setmru, /* Set MRU value for negotiation */
- "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 */
- "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 */
- "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 */
- 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 */
+ {"xonxoff", 0, setxonxoff}, /* set s/w flow control */
+ {"-crtscts", 0, setxonxoff}, /* another name for xonxoff */
+ {"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 */
+ {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\
See pppd(8) for more options.\n\
";
-/*
-Options omitted:
- -all Don't request/allow any options\n\
- -ac Disable Address/Control compression\n\
- -am Disable asyncmap negotiation\n\
- -as <n> Set the desired async map to hex <n>\n\
- -d Increase debugging level\n\
- -detach Don't fork to background\n\
- -ip Disable IP address negotiation\n\
- -mn Disable magic number negotiation\n\
- -mru Disable mru negotiation\n\
- -p Set passive mode\n\
- -pc Disable protocol field compression\n\
- +ua <f> Get username and password for authenticating\n\
- with peer using PAP from file <f>\n\
- +pap Require PAP authentication from peer\n\
- -pap Don't agree to authenticating with peer using PAP\n\
- +chap Require CHAP authentication from peer\n\
- -chap Don't agree to authenticating with peer using CHAP\n\
- -vj disable VJ compression\n\
- -auth Don't agree to authenticate with peer\n\
- debug Increase debugging level\n\
- domain <d> Append domain name <d> to hostname for authentication\n\
- passive Set passive mode\n\
- local Don't use modem control lines\n\
- proxyarp Add proxy ARP entry\n\
-*/
-
/*
* parse_args - parse a string of arguments, from the command
{
char *arg, *val;
struct cmd *cmdp;
+ int ret;
while (argc > 0) {
arg = *argv++;
/*
* Maybe a tty name, speed or IP address?
*/
- if (!setdevname(arg) && !setspeed(arg) && !setipaddr(arg)) {
+ 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;
}
}
return 1;
*/
usage()
{
- fprintf(stderr, usage_string, VERSION, PATCHLEVEL, progname);
+ fprintf(stderr, usage_string, VERSION, PATCHLEVEL, IMPLEMENTATION,
+ progname);
}
/*
* and interpret them.
*/
int
-options_from_file(filename, must_exist)
+options_from_file(filename, must_exist, check_prot)
char *filename;
int must_exist;
+ int check_prot;
{
FILE *f;
- int i, newline;
+ int i, newline, ret;
struct cmd *cmdp;
char *argv[MAXARGS];
char args[MAXARGS][MAXWORDLEN];
if (!must_exist && errno == ENOENT)
return 1;
perror(filename);
- exit(1);
+ return 0;
}
+ if (check_prot && !readable(fileno(f))) {
+ fprintf(stderr, "%s: access denied\n", filename);
+ fclose(f);
+ return 0;
+ }
+
while (getword(f, cmd, &newline, filename)) {
/*
* First see if it's a command.
/*
* Maybe a tty name, speed or IP address?
*/
- if (!setdevname(cmd) && !setspeed(cmd) && !setipaddr(cmd)) {
+ 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;
}
}
return 1;
{
char *user, *path, *file;
int ret;
+ struct passwd *pw;
- if ((user = getenv("HOME")) == NULL)
- return;
- file = "/.ppprc";
- path = malloc(strlen(user) + strlen(file) + 1);
+ 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);
if (path == NULL)
novm("init file name");
strcpy(path, user);
+ strcat(path, "/");
strcat(path, file);
- ret = options_from_file(path, 0);
+ ret = options_from_file(path, 0, 1);
free(path);
return ret;
}
+/*
+ * options_for_tty - See if an options file exists for the serial
+ * device, and if so, interpret options from it.
+ */
+int
+options_for_tty()
+{
+ char *dev, *path;
+ int ret;
+
+ dev = strrchr(devname, '/');
+ if (dev == NULL)
+ dev = devname;
+ else
+ ++dev;
+ if (strcmp(dev, "tty") == 0)
+ return 1; /* don't look for /etc/ppp/options.tty */
+ path = malloc(strlen(_PATH_TTYOPT) + strlen(dev) + 1);
+ if (path == NULL)
+ novm("tty init file name");
+ strcpy(path, _PATH_TTYOPT);
+ strcat(path, dev);
+ ret = options_from_file(path, 0, 0);
+ free(path);
+ return ret;
+}
+
+/*
+ * readable - check if a file is readable by the real user.
+ */
+static int
+readable(fd)
+ int fd;
+{
+ uid_t uid;
+ int ngroups, i;
+ struct stat sbuf;
+ GIDSET_TYPE groups[NGROUPS_MAX];
+
+ uid = getuid();
+ if (uid == 0)
+ return 1;
+ if (fstat(fd, &sbuf) != 0)
+ return 0;
+ if (sbuf.st_uid == uid)
+ 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;
+}
+
/*
* Read a word from a file.
* Words are delimited by white-space or by quotes (").
readfile(argv)
char **argv;
{
- return options_from_file(*argv, 1);
+ return options_from_file(*argv, 1, 1);
}
/*
setdebug()
{
debug++;
- setlogmask(LOG_UPTO(LOG_DEBUG));
return (1);
}
+/*
+ * setkdebug - Set kernel debugging level.
+ */
+static int
+setkdebug(argv)
+ char **argv;
+{
+ return int_option(*argv, &kdebugflag);
+}
+
/*
* noopt - Disable all options.
*/
}
+/*
+ * setmru - Set the largest MTU we'll use.
+ */
+static int
+setmtu(argv)
+ char **argv;
+{
+ long mtu;
+
+ if (!number_option(*argv, &mtu, 0))
+ return 0;
+ if (mtu < MINMRU || mtu > MAXMRU) {
+ fprintf(stderr, "mtu option value of %d is too %s\n", mtu,
+ (mtu < MINMRU? "small": "large"));
+ return 0;
+ }
+ lcp_allowoptions[0].mru = mtu;
+ return (1);
+}
+
+
/*
* nopcomp - Disable Protocol field compression negotiation.
*/
/* open user info file */
if ((ufile = fopen(*argv, "r")) == NULL) {
fprintf(stderr, "unable to open user login data file %s\n", *argv);
- exit(1);
+ return 0;
}
check_access(ufile, *argv);
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);
- exit(2);
+ return 0;
}
fclose(ufile);
/*
- * 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);
}
+/*
+ * setdisconnector - Set a program to disconnect from the serial line
+ */
+static int
+setdisconnector(argv)
+ char **argv;
+{
+ disconnector = strdup(*argv);
+ if (disconnector == NULL)
+ novm("disconnector string");
+
+ return (1);
+}
+
/*
* setdomain - Set domain name to append to hostname
return (1);
}
+
+/*
+ * setasyncmap - add bits to asyncmap (what we request peer to escape).
+ */
static int
setasyncmap(argv)
char **argv;
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", n);
+ ret = 0;
+ } else
+ xmit_accm[0][n >> 5] |= 1 << (n & 0x1F);
+ while (*p == ',' || *p == ' ')
+ ++p;
+ }
+ return ret;
+}
+
+
/*
* setspeed - Set the speed.
*/
*/
if (stat(cp, &statbuf) < 0) {
if (errno == ENOENT)
- return (0);
+ return 0;
syslog(LOG_ERR, cp);
- exit(1);
+ return -1;
}
(void) strncpy(devname, cp, MAXPATHLEN);
devname[MAXPATHLEN-1] = 0;
default_device = FALSE;
- return (1);
+ return 1;
}
* IP address pair separated by ":".
*/
if ((colon = index(arg, ':')) == NULL)
- return (0);
+ return 0;
/*
* If colon first character, then no local addr.
*colon = '\0';
if ((local = inet_addr(arg)) == -1) {
if ((hp = gethostbyname(arg)) == NULL) {
- fprintf(stderr, "unknown host: %s", arg);
- local = 0;
+ fprintf(stderr, "unknown host: %s\n", arg);
+ return -1;
} else {
local = *(long *)hp->h_addr;
if (our_name[0] == 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 != '\0') {
if ((remote = inet_addr(colon)) == -1) {
if ((hp = gethostbyname(colon)) == NULL) {
- fprintf(stderr, "unknown host: %s", colon);
- remote = 0;
+ fprintf(stderr, "unknown host: %s\n", colon);
+ return -1;
} else {
remote = *(long *)hp->h_addr;
if (remote_name[0] == 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);
+ 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;
}
/*
* If local IP address already given, don't bother.
*/
- if (wo->ouraddr != 0)
+ if (wo->ouraddr != 0 || disable_defaultip)
return;
/*
* and take the first IP address as our local IP address.
* If there isn't an IP address for our hostname, too bad.
*/
+ wo->accept_local = 1; /* don't insist on this default value */
if ((hp = gethostbyname(hostname)) == NULL)
return;
local = *(long *)hp->h_addr;
- if (local != 0)
+ if (local != 0 && !bad_ip_adrs(local))
wo->ouraddr = local;
}
char **argv;
{
u_long mask;
-
- if ((mask = inet_addr(*argv)) == -1) {
+
+ if ((mask = inet_addr(*argv)) == -1 || (netmask & ~mask) != 0) {
fprintf(stderr, "Invalid netmask %s\n", *argv);
- exit(1);
+ return 0;
}
netmask = mask;
return (1);
}
+/*
+ * Return user specified netmask. A value of zero means no netmask has
+ * been set.
+ */
+/* ARGSUSED */
+u_long
+GetMask(addr)
+ u_long addr;
+{
+ return(netmask);
+}
+
+
static int
setcrtscts()
{
return (1);
}
+static int
+setxonxoff()
+{
+ crtscts = 2;
+ return (1);
+}
+
static int
setnodetach()
{
return 1;
}
+static int
+setlock()
+{
+ lockflag = 1;
+ return 1;
+}
+
static int
setusehostname()
{
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);
}
projects / ppp.git / blobdiff