Added -vjccid and vj-max-slots options, and reorganized in

[ppp.git] / pppd / options.c

diff --git a/pppd/options.c b/pppd/options.c
index 2375cf50df33841b9a66ece47ef5e56e21b12545..d6f89e2ab097db056be71b2dce3bad59ff17d80f 100644 (file)
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: options.c,v 1.20 1995/06/12 11:22:51 paulus Exp $";
+static char rcsid[] = "$Id: options.c,v 1.24 1995/08/16 01:39:35 paulus Exp $";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -138,7 +138,9 @@ static int setremote __P((char **));
 static int setauth __P((void));
 static int readfile __P((char **));
 static int setdefaultroute __P((void));
 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 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 setpersist __P((void));
 static int setdologin __P((void));
 static int setusehostname __P((void));


@@ -153,6 +155,7 @@ static int setipcpconf __P((char **));
 static int setipcpfails __P((char **));
 static int setpaptimeout __P((char **));
 static int setpapreqs __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 setchaptimeout __P((char **));
 static int setchapchal __P((char **));
 static int setchapintv __P((char **));


@@ -165,7 +168,7 @@ static int setnobsdcomp __P((void));
 static int setipparam __P((char **));
 static int setpapcrypt __P((void));
 
 static int setipparam __P((char **));
 static int setpapcrypt __P((void));
 

-static int number_option __P((char *, long *, int));
+static int number_option __P((char *, u_int32_t *, int));

 static int readable __P((int fd));
 
 void usage();
 static int readable __P((int fd));
 
 void usage();


@@ -222,7 +225,9 @@ static struct cmd {
     {"auth", 0, setauth},      /* Require authentication from peer */
     {"file", 1, readfile},     /* Take options from a file */
     {"defaultroute", 0, setdefaultroute}, /* Add default route */
     {"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, setproxyarp}, /* Add proxy ARP entry */

+    {"-proxyarp", 0, setnoproxyarp}, /* disable proxyarp option */

     {"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 */
     {"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 */


@@ -236,8 +241,9 @@ static struct cmd {
     {"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 */
     {"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-restart", 1, setpaptimeout}, /* Set retransmit timeout for PAP */

     {"pap-max-authreq", 1, setpapreqs}, /* Set max #xmits for auth-reqs */
     {"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 */
     {"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 */


@@ -495,7 +501,7 @@ readable(fd)
 
 /*
  * Read a word from a file.
 
 /*
  * Read a word from a file.

- * Words are delimited by white-space or by quotes (", or ').
+ * Words are delimited by white-space or by quotes (" or ').

  * Quotes, white-space and \ may be escaped with \.
  * \<newline> is ignored.
  */
  * Quotes, white-space and \ may be escaped with \.
  * \<newline> is ignored.
  */


@@ -741,17 +747,17 @@ getword(f, word, newlinep, filename)
 }
 
 /*
 }
 
 /*

- * number_option - parse a numeric parameter for an option
+ * number_option - parse an unsigned numeric parameter for an option.

  */
 static int
 number_option(str, valp, base)
     char *str;
  */
 static int
 number_option(str, valp, base)
     char *str;

-    long *valp;
+    u_int32_t *valp;

     int base;
 {
     char *ptr;
 
     int base;
 {
     char *ptr;
 

-    *valp = strtol(str, &ptr, base);
+    *valp = strtoul(str, &ptr, base);

     if (ptr == str) {
        fprintf(stderr, "%s: invalid number: %s\n", progname, str);
        return 0;
     if (ptr == str) {
        fprintf(stderr, "%s: invalid number: %s\n", progname, str);
        return 0;


@@ -770,7 +776,7 @@ int_option(str, valp)
     char *str;
     int *valp;
 {
     char *str;
     int *valp;
 {

-    long v;
+    u_int32_t v;

 
     if (!number_option(str, &v, 0))
        return 0;
 
     if (!number_option(str, &v, 0))
        return 0;


@@ -893,7 +899,7 @@ static int
 setmru(argv)
     char **argv;
 {
 setmru(argv)
     char **argv;
 {

-    long mru;
+    u_int32_t mru;

 
     if (!number_option(*argv, &mru, 0))
        return 0;
 
     if (!number_option(*argv, &mru, 0))
        return 0;


@@ -910,7 +916,7 @@ static int
 setmtu(argv)
     char **argv;
 {
 setmtu(argv)
     char **argv;
 {

-    long mtu;
+    u_int32_t mtu;

 
     if (!number_option(*argv, &mtu, 0))
        return 0;
 
     if (!number_option(*argv, &mtu, 0))
        return 0;


@@ -1130,7 +1136,12 @@ static int
 setdomain(argv)
     char **argv;
 {
 setdomain(argv)
     char **argv;
 {

-    strncat(hostname, *argv, MAXNAMELEN - strlen(hostname));
+    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);
 }
     hostname[MAXNAMELEN-1] = 0;
     return (1);
 }


@@ -1143,7 +1154,7 @@ static int
 setasyncmap(argv)
     char **argv;
 {
 setasyncmap(argv)
     char **argv;
 {

-    long asyncmap;
+    u_int32_t asyncmap;

 
     if (!number_option(*argv, &asyncmap, 16))
        return 0;
 
     if (!number_option(*argv, &asyncmap, 16))
        return 0;


@@ -1489,17 +1500,41 @@ setauth()
 static int
 setdefaultroute()
 {
 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;
 }
 
     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()
 {
 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;
 }
 
     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()
 {
 static int
 setpersist()
 {


@@ -1598,6 +1633,13 @@ setpaptimeout(argv)
     return int_option(*argv, &upap[0].us_timeouttime);
 }
 
     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;
 static int
 setpapreqs(argv)
     char **argv;