vtun-iproute.patch

   1 diff -uNr vtun-2.5b1/cfg_file.y vtun-2.5b1-iproute/cfg_file.y
   2 --- vtun-2.5b1/cfg_file.y       Thu Jul 26 03:17:47 2001
   3 +++ vtun-2.5b1-iproute/cfg_file.y       Tue Aug 21 01:11:41 2001
   4 @@ -74,7 +74,7 @@
   5  %token K_PASSWD K_PROG K_PPP K_SPEED K_IFCFG K_FWALL K_ROUTE K_DEVICE
   6  %token K_MULTI K_SRCADDR K_IFACE K_ADDR
   7  %token K_TYPE K_PROT K_COMPRESS K_ENCRYPT K_KALIVE K_STAT
   8 -%token K_UP K_DOWN K_SYSLOG
   9 +%token K_UP K_DOWN K_SYSLOG K_IPROUTE
  10
  11  %token <str> K_HOST K_ERROR
  12  %token <str> WORD PATH STRING
  13 @@ -175,6 +175,11 @@
  14                           vtun.fwall = strdup($2);
  15                         }
  16
  17 +  | K_IPROUTE PATH     {
  18 +                         free(vtun.iproute);
  19 +                         vtun.iproute = strdup($2);
  20 +                       }
  21 +
  22    | K_SYSLOG  syslog_opt
  23
  24    | K_PERSIST NUM      {
  25 @@ -418,6 +423,11 @@
  26                                         VTUN_CMD_WAIT);
  27                         }
  28
  29 +  | K_IPROUTE STRING   {
  30 +                         add_cmd(parse_cmds, strdup(vtun.iproute),strdup($2),
  31 +                                       VTUN_CMD_WAIT);
  32 +                       }
  33 +
  34    | K_ERROR            {
  35                           cfg_error("Unknown cmd '%s'",$1);
  36                           YYABORT;
  37 diff -uNr vtun-2.5b1/cfg_kwords.h vtun-2.5b1-iproute/cfg_kwords.h
  38 --- vtun-2.5b1/cfg_kwords.h     Mon Jun 11 00:48:38 2001
  39 +++ vtun-2.5b1-iproute/cfg_kwords.h     Tue Aug 21 01:04:15 2001
  40 @@ -53,6 +53,7 @@
  41     { "ifcfg",   K_IFCFG },
  42     { "firewall", K_FWALL },
  43     { "route",   K_ROUTE },
  44 +   { "ip",      K_IPROUTE },
  45     { "keepalive",K_KALIVE },
  46     { "stat",    K_STAT },
  47     { "syslog",   K_SYSLOG },
  48 diff -uNr vtun-2.5b1/main.c vtun-2.5b1-iproute/main.c
  49 --- vtun-2.5b1/main.c   Mon Jun 11 00:48:38 2001
  50 +++ vtun-2.5b1-iproute/main.c   Tue Aug 21 01:08:44 2001
  51 @@ -67,6 +67,7 @@
  52       vtun.ifcfg = strdup("/sbin/ifconfig");
  53       vtun.route = strdup("/sbin/route");
  54       vtun.fwall = strdup("/sbin/ipchains");
  55 +     vtun.iproute = strdup("/sbin/ip");
  56
  57       vtun.svr_name = NULL;
  58       vtun.svr_port = -1;
  59 diff -uNr vtun-2.5b1/vtun.h vtun-2.5b1-iproute/vtun.h
  60 --- vtun-2.5b1/vtun.h   Mon Jun 11 00:48:38 2001
  61 +++ vtun-2.5b1-iproute/vtun.h   Tue Aug 21 01:07:27 2001
  62 @@ -167,6 +167,7 @@
  63     char *ifcfg;                 /* Command to configure net devices */
  64     char *route;                 /* Command to configure routing */
  65     char *fwall;         /* Command to configure FireWall */
  66 +   char *iproute;       /* iproute command */
  67
  68     char *svr_name;       /* Server's host name */
  69     int  svr_port;       /* Server's port */
  70 diff -uNr vtun-2.5b1/vtund.conf.5 vtun-2.5b1-iproute/vtund.conf.5
  71 --- vtun-2.5b1/vtund.conf.5     Mon Jun 11 00:48:38 2001
  72 +++ vtun-2.5b1-iproute/vtund.conf.5     Tue Aug 21 01:17:08 2001
  73 @@ -70,6 +70,9 @@
  74  .IP \fBroute\ \fIpath\fR
  75  path to \fBroute\fR(8) program.  Can be used in session sections.
  76
  77 +.IP \fBip\ \fIpath\fR
  78 +path to \fBiproute\fR(8) program.  Can be used in session sections.
  79 +
  80  .IP \fBfirewall\ \fIpath\fR
  81  program for the firewall setup.
  82
  83 @@ -228,6 +231,8 @@
  84  run program specified by \fBifconfig\fR statement in \fBoptions\fR section.
  85  .IP \fBroute\ \fIarguments\fR
  86  run program specified by \fBroute\fR statement in \fBoptions\fR section.
  87 +.IP \fBip\ \fIarguments\fR
  88 +run program specified by \fBip\fR statement in \fBoptions\fR section.
  89  .IP \fBfirewall\ \fIarguments\fR
  90  run program specified by \fBfirewall\fR statement in \fBoptions\fR section.
  91  .RE