Merge branch 'master' of https://github.com/gburgessiv/ppp

[ppp.git] / pppd / options.c

diff --git a/pppd/options.c b/pppd/options.c
index 434ab95748fb34497af2d3fe79e43789638b1736..177488ca681392c3971e432642c7e97a0638a894 100644 (file)
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -96,6 +96,7 @@ int   default_device = 1;     /* Using /dev/tty or equivalent */
 char   devnam[MAXPATHLEN];     /* Device name */
 bool   nodetach = 0;           /* Don't detach from controlling tty */
 bool   updetach = 0;           /* Detach once link is up */
 char   devnam[MAXPATHLEN];     /* Device name */
 bool   nodetach = 0;           /* Don't detach from controlling tty */
 bool   updetach = 0;           /* Detach once link is up */

+bool   master_detach;          /* Detach when we're (only) multilink master */

 int    maxconnect = 0;         /* Maximum connect time */
 char   user[MAXNAMELEN];       /* Username for PAP */
 char   passwd[MAXSECRETLEN];   /* Password for PAP */
 int    maxconnect = 0;         /* Maximum connect time */
 char   user[MAXNAMELEN];       /* Username for PAP */
 char   passwd[MAXSECRETLEN];   /* Password for PAP */


@@ -113,6 +114,7 @@ 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   tune_kernel;            /* may alter kernel settings */
 int    connect_delay = 1000;   /* wait this many ms after connect script */
 int    req_unit = -1;          /* requested interface unit */

+char   req_ifname[MAXIFNAMELEN];       /* requested interface name */

 bool   multilink = 0;          /* Enable multilink operation */
 char   *bundle_name = NULL;    /* bundle name for multilink */
 bool   dump_options;           /* print out option values */
 bool   multilink = 0;          /* Enable multilink operation */
 char   *bundle_name = NULL;    /* bundle name for multilink */
 bool   dump_options;           /* print out option values */


@@ -120,6 +122,7 @@ bool        dryrun;                 /* print out option values and exit */
 char   *domain;                /* domain name set by domain option */
 int    child_wait = 5;         /* # seconds to wait for children at exit */
 struct userenv *userenv_list;  /* user environment variables */
 char   *domain;                /* domain name set by domain option */
 int    child_wait = 5;         /* # seconds to wait for children at exit */
 struct userenv *userenv_list;  /* user environment variables */

+int    dfl_route_metric = -1;  /* metric of the default route to set over the PPP link */

 
 #ifdef MAXOCTETS
 unsigned int  maxoctets = 0;    /* default - no limit */
 
 #ifdef MAXOCTETS
 unsigned int  maxoctets = 0;    /* default - no limit */


@@ -210,6 +213,9 @@ option_t general_options[] = {
       "Detach from controlling tty once link is up",
       OPT_PRIOSUB | OPT_A2CLR | 1, &nodetach },
 
       "Detach from controlling tty once link is up",
       OPT_PRIOSUB | OPT_A2CLR | 1, &nodetach },
 

+    { "master_detach", o_bool, &master_detach,
+      "Detach when we're multilink master but have no link", 1 },
+

     { "holdoff", o_int, &holdoff,
       "Set time in seconds before retrying connection",
       OPT_PRIO, &holdoff_specified },
     { "holdoff", o_int, &holdoff,
       "Set time in seconds before retrying connection",
       OPT_PRIO, &holdoff_specified },


@@ -279,6 +285,10 @@ option_t general_options[] = {
       "PPP interface unit number to use if possible",
       OPT_PRIO | OPT_LLIMIT, 0, 0 },
 
       "PPP interface unit number to use if possible",
       OPT_PRIO | OPT_LLIMIT, 0, 0 },
 

+    { "ifname", o_string, req_ifname,
+      "Set PPP interface name",
+      OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXIFNAMELEN },
+

     { "dump", o_bool, &dump_options,
       "Print out option values after parsing all options", 1 },
     { "dryrun", o_bool, &dryrun,
     { "dump", o_bool, &dump_options,
       "Print out option values after parsing all options", 1 },
     { "dryrun", o_bool, &dryrun,


@@ -295,6 +305,10 @@ option_t general_options[] = {
       "Unset user environment variable",
       OPT_A2PRINTER | OPT_NOPRINT, (void *)user_unsetprint },
 
       "Unset user environment variable",
       OPT_A2PRINTER | OPT_NOPRINT, (void *)user_unsetprint },
 

+    { "defaultroute-metric", o_int, &dfl_route_metric,
+      "Metric to use for the default route (Linux only; -1 for default behavior)",
+      OPT_PRIV|OPT_LLIMIT|OPT_INITONLY, NULL, 0, -1 },
+

 #ifdef HAVE_MULTILINK
     { "multilink", o_bool, &multilink,
       "Enable multilink operation", OPT_PRIO | 1 },
 #ifdef HAVE_MULTILINK
     { "multilink", o_bool, &multilink,
       "Enable multilink operation", OPT_PRIO | 1 },


@@ -772,10 +786,13 @@ process_option(opt, cmd, argv)
        if (opt->flags & OPT_STATIC) {
            strlcpy((char *)(opt->addr), *argv, opt->upper_limit);
        } else {
        if (opt->flags & OPT_STATIC) {
            strlcpy((char *)(opt->addr), *argv, opt->upper_limit);
        } else {

+           char **optptr = (char **)(opt->addr);

            sv = strdup(*argv);
            if (sv == NULL)
                novm("option argument");
            sv = strdup(*argv);
            if (sv == NULL)
                novm("option argument");

-           *(char **)(opt->addr) = sv;
+           if (*optptr)
+               free(*optptr);
+           *optptr = sv;

        }
        break;
 
        }
        break;
 


@@ -1146,6 +1163,7 @@ getword(f, word, newlinep, filename)
     len = 0;
     escape = 0;
     comment = 0;
     len = 0;
     escape = 0;
     comment = 0;

+    quoted = 0;

 
     /*
      * First skip white-space and comments.
 
     /*
      * First skip white-space and comments.


@@ -1203,15 +1221,6 @@ getword(f, word, newlinep, filename)
            break;
     }
 
            break;
     }
 

-    /*
-     * Save the delimiter for quoted strings.
-     */
-    if (!escape && (c == '"' || c == '\'')) {
-        quoted = c;
-       c = getc(f);
-    } else
-        quoted = 0;
-

     /*
      * Process characters until the end of the word.
      */
     /*
      * Process characters until the end of the word.
      */


@@ -1293,44 +1302,51 @@ getword(f, word, newlinep, filename)
            /*
             * Store the resulting character for the escape sequence.
             */
            /*
             * Store the resulting character for the escape sequence.
             */

-           if (len < MAXWORDLEN-1)
+           if (len < MAXWORDLEN) {

                word[len] = value;
                word[len] = value;

-           ++len;
+               ++len;
+           }

 
            if (!got)
                c = getc(f);
            continue;
 
            if (!got)
                c = getc(f);
            continue;

-

        }
 
        /*
        }
 
        /*

-        * Not escaped: see if we've reached the end of the word.
+        * Backslash starts a new escape sequence.

         */
         */

-       if (quoted) {
-           if (c == quoted)
-               break;
-       } else {
-           if (isspace(c) || c == '#') {
-               ungetc (c, f);
-               break;
-           }
+       if (c == '\\') {
+           escape = 1;
+           c = getc(f);
+           continue;

        }
 
        /*
        }
 
        /*

-        * Backslash starts an escape sequence.
+        * Not escaped: check for the start or end of a quoted
+        * section and see if we've reached the end of the word.

         */
         */

-       if (c == '\\') {
-           escape = 1;
+       if (quoted) {
+           if (c == quoted) {
+               quoted = 0;
+               c = getc(f);
+               continue;
+           }
+       } else if (c == '"' || c == '\'') {
+           quoted = c;

            c = getc(f);
            continue;
            c = getc(f);
            continue;

+       } else if (isspace(c) || c == '#') {
+           ungetc (c, f);
+           break;

        }
 
        /*
         * An ordinary character: store it in the word and get another.
         */
        }
 
        /*
         * An ordinary character: store it in the word and get another.
         */

-       if (len < MAXWORDLEN-1)
+       if (len < MAXWORDLEN) {

            word[len] = c;
            word[len] = c;

-       ++len;
+           ++len;
+       }

 
        c = getc(f);
     }
 
        c = getc(f);
     }


@@ -1351,6 +1367,9 @@ getword(f, word, newlinep, filename)
         */
        if (len == 0)
            return 0;
         */
        if (len == 0)
            return 0;

+       if (quoted)
+           option_error("warning: quoted word runs to end of file (%.20s...)",
+                        filename, word);

     }
 
     /*
     }
 
     /*