Add pty, notty and record options.

[ppp.git] / pppd / options.c

diff --git a/pppd/options.c b/pppd/options.c
index 838a3b8d78738f6716b96b585d9f8e3ebdd8e6f8..7d5c71af36117b6e6ceae7290e79e8a54de2337f 100644 (file)
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -18,14 +18,13 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: options.c,v 1.51 1999/03/12 06:07:19 paulus Exp $";
+static char rcsid[] = "$Id: options.c,v 1.54 1999/03/22 05:55:33 paulus Exp $";
 #endif
 
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <syslog.h>
@@ -53,9 +52,6 @@ static char rcsid[] = "$Id: options.c,v 1.51 1999/03/12 06:07:19 paulus Exp $";
 
 #include <net/ppp-comp.h>
 
-#define FALSE  0
-#define TRUE   1
-
 #if defined(ultrix) || defined(NeXT)
 char *strdup __P((char *));
 #endif
@@ -69,7 +65,7 @@ int   dflag = 0;              /* Tell libpcap we want debugging */
 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 */
+char   devnam[MAXPATHLEN];     /* Device name */
 int    crtscts = 0;            /* Use hardware flow control */
 bool   modem = 1;              /* Use modem control lines */
 int    inspeed = 0;            /* Input/Output speed requested */
@@ -80,17 +76,18 @@ bool        updetach = 0;           /* Detach once link is up */
 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. */
+char   *ptycommand = NULL;     /* Command to run on other side of pty */
 int    maxconnect = 0;         /* Maximum connect time */
 char   user[MAXNAMELEN];       /* Username for PAP */
 char   passwd[MAXSECRETLEN];   /* Password for PAP */
 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    explicit_remote = 0;    /* User specified explicit remote name */
 bool   demand = 0;             /* do dial-on-demand */
 char   *ipparam = NULL;        /* Extra parameter for ip up/down scripts */
 int    idle_time_limit = 0;    /* Disconnect if idle for this many seconds */
 int    holdoff = 30;           /* # seconds to pause before reconnecting */
+bool   notty = 0;              /* Stdin/out is not a tty */
+char   *record_file = NULL;    /* File to record chars sent/received */
 
 extern option_t auth_options[];
 
@@ -98,6 +95,7 @@ struct option_info connector_info;
 struct option_info disconnector_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 */
@@ -119,6 +117,7 @@ static int readfile __P((char **));
 static int callfile __P((char **));
 static int showversion __P((char **));
 static int showhelp __P((char **));
+static void usage __P((void));
 
 #ifdef PPP_FILTER
 static int setpassfilter __P((char **));
@@ -129,6 +128,7 @@ static int setactivefilter __P((char **));
 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));
 
 /*
  * Valid arguments.
@@ -163,6 +163,13 @@ option_t general_options[] = {
     { "welcome", o_string, &welcomer,
       "Script to welcome client",
       OPT_A2INFO | OPT_PRIVFIX, &welcomer_info },
+    { "pty", o_string, &ptycommand,
+      "Script to run on pseudo-tty master side",
+      OPT_A2INFO | OPT_PRIVFIX, &ptycommand_info },
+    { "notty", o_bool, &notty,
+      "Input/output is not a tty", 1 },
+    { "record", o_string, &record_file,
+      "Record characters sent/received to file" },
     { "maxconnect", o_int, &maxconnect,
       "Set connection time limit", OPT_LLIMIT|OPT_NOINCR|OPT_ZEROINF },
     { "crtscts", o_int, &crtscts,
@@ -352,13 +359,6 @@ options_from_file(filename, must_exist, check_prot, priv)
        option_error("Can't open options file %s: %m", filename);
        return 0;
     }
-#if 0  /* check done by setting effective UID above */
-    if (check_prot && !readable(fileno(f))) {
-       option_error("Can't open options file %s: access denied", filename);
-       fclose(f);
-       return 0;
-    }
-#endif
 
     oldpriv = privileged_option;
     privileged_option = priv;
@@ -451,7 +451,7 @@ options_for_tty()
     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 */
     pl = strlen(_PATH_TTYOPT) + strlen(dev) + 1;
     path = malloc(pl);
@@ -589,7 +589,7 @@ process_option(opt, argv)
 
     case o_string:
        if (opt->flags & OPT_STATIC) {
-           strlcpy((char *)(opt->addr), opt->upper_limit, *argv);
+           strlcpy((char *)(opt->addr), *argv, opt->upper_limit);
        } else {
            sv = strdup(*argv);
            if (sv == NULL)
@@ -632,7 +632,7 @@ n_arguments(opt)
 /*
  * usage - print out a message telling how to use the program.
  */
-void
+static void
 usage()
 {
     if (phase == PHASE_INITIALIZE)
@@ -694,6 +694,7 @@ option_error __V((char *fmt, ...))
     syslog(LOG_ERR, "%s", buf);
 }
 
+#if 0
 /*
  * readable - check if a file is readable by the real user.
  */
@@ -719,6 +720,7 @@ readable(fd)
            return sbuf.st_mode & S_IRGRP;
     return sbuf.st_mode & S_IROTH;
 }
+#endif
 
 /*
  * Read a word from a file.
@@ -969,7 +971,7 @@ getword(f, word, newlinep, filename)
 /*
  * number_option - parse an unsigned numeric parameter for an option.
  */
-int
+static int
 number_option(str, valp, base)
     char *str;
     u_int32_t *valp;
@@ -1177,8 +1179,8 @@ setdevname(cp, quiet)
        return 0;
 
     if (strncmp("/dev/", cp, 5) != 0) {
-       strlcpy(dev, sizeof(dev), "/dev/");
-       strlcat(dev, sizeof(dev), cp);
+       strlcpy(dev, "/dev/", sizeof(dev));
+       strlcat(dev, cp, sizeof(dev));
        cp = dev;
     }
 
@@ -1198,8 +1200,8 @@ setdevname(cp, quiet)
        return -1;
     }
 
-    strlcpy(devnam, sizeof(devnam), cp);
-    default_device = FALSE;
+    strlcpy(devnam, cp, sizeof(devnam));
+    default_device = 0;
     devnam_info.priv = privileged_option;
     devnam_info.source = option_source;
   
@@ -1258,7 +1260,7 @@ setipaddr(arg)
            } else {
                remote = *(u_int32_t *)hp->h_addr;
                if (remote_name[0] == 0)
-                   strlcpy(remote_name, sizeof(remote_name), colon);
+                   strlcpy(remote_name, colon, sizeof(remote_name));
            }
        }
        if (bad_ip_adrs(remote)) {