1 files changed, 71 insertions, 3 deletions

diff --git a/readconf.c b/readconf.c
index d2c5a77f7..7933c5289 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.143 2005/07/30 02:03:47 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.145 2005/12/08 18:34:11 reyk Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -70,6 +70,10 @@ RCSID("$OpenBSD: readconf.c,v 1.143 2005/07/30 02:03:47 djm Exp $");
      Cipher none
      PasswordAuthentication no
 
+   Host vpn.fake.com
+     Tunnel yes
+     TunnelDevice 3
+
    # Defaults for various options
    Host *
      ForwardAgent no
@@ -107,6 +111,7 @@ typedef enum {
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
+        oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oProtocolKeepAlives, oSetupTimeOut,
         oDeprecated, oUnsupported
 } OpCodes;
@@ -199,6 +204,10 @@ static struct {
         { "controlpath", oControlPath },
         { "controlmaster", oControlMaster },
         { "hashknownhosts", oHashKnownHosts },
+        { "tunnel", oTunnel },
+        { "tunneldevice", oTunnelDevice },
+        { "localcommand", oLocalCommand },
+        { "permitlocalcommand", oPermitLocalCommand },
         { "protocolkeepalives", oProtocolKeepAlives },
         { "setuptimeout", oSetupTimeOut },
         { NULL, oBadOption }
@@ -267,6 +276,7 @@ clear_forwardings(Options *options)
                 xfree(options->remote_forwards[i].connect_host);
         }
         options->num_remote_forwards = 0;
+        options->tun_open = SSH_TUNMODE_NO;
 }
 
 /*
@@ -299,7 +309,7 @@ process_config_line(Options *options, const char *host,
                     int *activep)
 {
         char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256];
-        int opcode, *intptr, value;
+        int opcode, *intptr, value, value2;
         size_t len;
         Forward fwd;
 
@@ -556,9 +566,10 @@ parse_string:
                 goto parse_string;
 
         case oProxyCommand:
+                charptr = &options->proxy_command;
+parse_command:
                 if (s == NULL)
                         fatal("%.200s line %d: Missing argument.", filename, linenum);
-                charptr = &options->proxy_command;
                 len = strspn(s, WHITESPACE "=");
                 if (*activep && *charptr == NULL)
                         *charptr = xstrdup(s + len);
@@ -826,6 +837,49 @@ parse_int:
                 intptr = &options->hash_known_hosts;
                 goto parse_flag;
 
+        case oTunnel:
+                intptr = &options->tun_open;
+                arg = strdelim(&s);
+                if (!arg || *arg == '\0')
+                        fatal("%s line %d: Missing yes/point-to-point/"
+                            "ethernet/no argument.", filename, linenum);
+                value = 0;      /* silence compiler */
+                if (strcasecmp(arg, "ethernet") == 0)
+                        value = SSH_TUNMODE_ETHERNET;
+                else if (strcasecmp(arg, "point-to-point") == 0)
+                        value = SSH_TUNMODE_POINTOPOINT;
+                else if (strcasecmp(arg, "yes") == 0)
+                        value = SSH_TUNMODE_DEFAULT;
+                else if (strcasecmp(arg, "no") == 0)
+                        value = SSH_TUNMODE_NO;
+                else
+                        fatal("%s line %d: Bad yes/point-to-point/ethernet/"
+                            "no argument: %s", filename, linenum, arg);
+                if (*activep)
+                        *intptr = value;
+                break;
+
+        case oTunnelDevice:
+                arg = strdelim(&s);
+                if (!arg || *arg == '\0')
+                        fatal("%.200s line %d: Missing argument.", filename, linenum);
+                value = a2tun(arg, &value2);
+                if (value == SSH_TUNID_ERR)
+                        fatal("%.200s line %d: Bad tun device.", filename, linenum);
+                if (*activep) {
+                        options->tun_local = value;
+                        options->tun_remote = value2;
+                }
+                break;
+
+        case oLocalCommand:
+                charptr = &options->local_command;
+                goto parse_command;
+
+        case oPermitLocalCommand:
+                intptr = &options->permit_local_command;
+                goto parse_flag;
+
         case oSetupTimeOut:
                 intptr = &options->setuptimeout;
                 goto parse_int;
@@ -994,6 +1048,11 @@ initialize_options(Options * options)
         options->control_path = NULL;
         options->control_master = -1;
         options->hash_known_hosts = -1;
+        options->tun_open = -1;
+        options->tun_local = -1;
+        options->tun_remote = -1;
+        options->local_command = NULL;
+        options->permit_local_command = -1;
 }
 
 /*
@@ -1123,6 +1182,14 @@ fill_default_options(Options * options)
                 options->control_master = 0;
         if (options->hash_known_hosts == -1)
                 options->hash_known_hosts = 0;
+        if (options->tun_open == -1)
+                options->tun_open = SSH_TUNMODE_NO;
+        if (options->tun_local == -1)
+                options->tun_local = SSH_TUNID_ANY;
+        if (options->tun_remote == -1)
+                options->tun_remote = SSH_TUNID_ANY;
+        if (options->permit_local_command == -1)
+                options->permit_local_command = 0;
         if (options->setuptimeout == -1) {
                 /* in batch mode, default is 5mins */
                 if (options->batch_mode == 1)
@@ -1130,6 +1197,7 @@ fill_default_options(Options * options)
                 else
                         options->setuptimeout = 0;
         }
+        /* options->local_command should not be set by default */
         /* options->proxy_command should not be set by default */
         /* options->user will be set in the main program if appropriate */
         /* options->hostname will be set in the main program if appropriate */