- stevesk@cvs.openbsd.org 2008/11/01 17:40:33

     [clientloop.c readconf.c readconf.h ssh.c]
     merge dynamic forward parsing into parse_forward(); 'i think this is OK' djm@

5 files changed, 62 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b6889fba..b095d974e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,10 @@
    - sobrado@cvs.openbsd.org 2008/11/01 11:14:36
      [ssh-keyscan.1 ssh-keyscan.c]
      the ellipsis is not an optional argument; while here, improve spacing.
+   - stevesk@cvs.openbsd.org 2008/11/01 17:40:33
+     [clientloop.c readconf.c readconf.h ssh.c]
+     merge dynamic forward parsing into parse_forward();
+     'i think this is OK' djm@
 
 20080906
  - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4826,4 +4830,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5121 2008/11/03 08:27:07 djm Exp $
+$Id: ChangeLog,v 1.5122 2008/11/03 08:27:34 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index 30e17d20c..0ed4194a6 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.202 2008/10/30 19:31:16 stevesk Exp $ */
+/* $OpenBSD: clientloop.c,v 1.203 2008/11/01 17:40:33 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -842,7 +842,7 @@ process_cmdline(void)
                 }
                 channel_request_rforward_cancel(cancel_host, cancel_port);
         } else {
-                if (!parse_forward(&fwd, s)) {
+                if (!parse_forward(&fwd, s, 0)) {
                         logit("Bad forwarding specification.");
                         goto out;
                 }
diff --git a/readconf.c b/readconf.c
index 73f6eb361..27be8df68 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.167 2008/06/26 11:46:31 grunk Exp $ */
+/* $OpenBSD: readconf.c,v 1.168 2008/11/01 17:40:33 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -706,56 +706,39 @@ parse_int:
 
         case oLocalForward:
         case oRemoteForward:
+        case oDynamicForward:
                 arg = strdelim(&s);
                 if (arg == NULL || *arg == '\0')
                         fatal("%.200s line %d: Missing port argument.",
                             filename, linenum);
-                arg2 = strdelim(&s);
-                if (arg2 == NULL || *arg2 == '\0')
-                        fatal("%.200s line %d: Missing target argument.",
-                            filename, linenum);
 
-                /* construct a string for parse_forward */
-                snprintf(fwdarg, sizeof(fwdarg), "%s:%s", arg, arg2);
+                if (opcode == oLocalForward ||
+                    opcode == oRemoteForward) {
+                        arg2 = strdelim(&s);
+                        if (arg2 == NULL || *arg2 == '\0')
+                                fatal("%.200s line %d: Missing target argument.",
+                                    filename, linenum);
 
-                if (parse_forward(&fwd, fwdarg) == 0)
+                        /* construct a string for parse_forward */
+                        snprintf(fwdarg, sizeof(fwdarg), "%s:%s", arg, arg2);
+                } else if (opcode == oDynamicForward) {
+                        strlcpy(fwdarg, arg, sizeof(fwdarg));
+                }
+
+                if (parse_forward(&fwd, fwdarg,
+                    opcode == oDynamicForward ? 1 : 0) == 0)
                         fatal("%.200s line %d: Bad forwarding specification.",
                             filename, linenum);
 
                 if (*activep) {
-                        if (opcode == oLocalForward)
+                        if (opcode == oLocalForward ||
+                            opcode == oDynamicForward)
                                 add_local_forward(options, &fwd);
                         else if (opcode == oRemoteForward)
                                 add_remote_forward(options, &fwd);
                 }
                 break;
 
-        case oDynamicForward:
-                arg = strdelim(&s);
-                if (!arg || *arg == '\0')
-                        fatal("%.200s line %d: Missing port argument.",
-                            filename, linenum);
-                memset(&fwd, '\0', sizeof(fwd));
-                fwd.connect_host = "socks";
-                fwd.listen_host = hpdelim(&arg);
-                if (fwd.listen_host == NULL ||
-                    strlen(fwd.listen_host) >= NI_MAXHOST)
-                        fatal("%.200s line %d: Bad forwarding specification.",
-                            filename, linenum);
-                if (arg) {
-                        fwd.listen_port = a2port(arg);
-                        fwd.listen_host = cleanhostname(fwd.listen_host);
-                } else {
-                        fwd.listen_port = a2port(fwd.listen_host);
-                        fwd.listen_host = NULL;
-                }
-                if (fwd.listen_port == 0)
-                        fatal("%.200s line %d: Badly formatted port number.",
-                            filename, linenum);
-                if (*activep)
-                        add_local_forward(options, &fwd);
-                break;
-
         case oClearAllForwardings:
                 intptr = &options->clear_forwardings;
                 goto parse_flag;
@@ -1219,11 +1202,14 @@ fill_default_options(Options * options)
 /*
  * parse_forward
  * parses a string containing a port forwarding specification of the form:
+ *   dynamicfwd == 0
  *      [listenhost:]listenport:connecthost:connectport
+ *   dynamicfwd == 1
+ *      [listenhost:]listenport
  * returns number of arguments parsed or zero on error
  */
 int
-parse_forward(Forward *fwd, const char *fwdspec)
+parse_forward(Forward *fwd, const char *fwdspec, int dynamicfwd)
 {
         int i;
         char *p, *cp, *fwdarg[4];
@@ -1245,6 +1231,18 @@ parse_forward(Forward *fwd, const char *fwdspec)
                 i = 0;  /* failure */
 
         switch (i) {
+        case 1:
+                fwd->listen_host = NULL;
+                fwd->listen_port = a2port(fwdarg[0]);
+                fwd->connect_host = xstrdup("socks");
+                break;
+
+        case 2:
+                fwd->listen_host = xstrdup(cleanhostname(fwdarg[0]));
+                fwd->listen_port = a2port(fwdarg[1]);
+                fwd->connect_host = xstrdup("socks");
+                break;
+
         case 3:
                 fwd->listen_host = NULL;
                 fwd->listen_port = a2port(fwdarg[0]);
@@ -1264,7 +1262,17 @@ parse_forward(Forward *fwd, const char *fwdspec)
 
         xfree(p);
 
-        if (fwd->listen_port == 0 || fwd->connect_port == 0)
+        if (dynamicfwd) {
+                if (!(i == 1 || i == 2))
+                        goto fail_free;
+        } else {
+                if (!(i == 3 || i == 4))
+                        goto fail_free;
+                if (fwd->connect_port == 0)
+                        goto fail_free;
+        }
+
+        if (fwd->listen_port == 0)
                 goto fail_free;
 
         if (fwd->connect_host != NULL &&
diff --git a/readconf.h b/readconf.h
index 47c7aef4e..c1387a896 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.74 2008/06/26 11:46:31 grunk Exp $ */
+/* $OpenBSD: readconf.h,v 1.75 2008/11/01 17:40:33 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -133,7 +133,7 @@ typedef struct {
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int      read_config_file(const char *, const char *, Options *, int);
-int      parse_forward(Forward *, const char *);
+int      parse_forward(Forward *, const char *, int);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);
diff --git a/ssh.c b/ssh.c
index 82d3ab26b..5bb67c5b1 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.321 2008/10/09 06:54:22 jmc Exp $ */
+/* $OpenBSD: ssh.c,v 1.322 2008/11/01 17:40:33 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -453,7 +453,7 @@ main(int ac, char **av)
                         break;
 
                 case 'L':
-                        if (parse_forward(&fwd, optarg))
+                        if (parse_forward(&fwd, optarg, 0))
                                 add_local_forward(&options, &fwd);
                         else {
                                 fprintf(stderr,
@@ -464,7 +464,7 @@ main(int ac, char **av)
                         break;
 
                 case 'R':
-                        if (parse_forward(&fwd, optarg)) {
+                        if (parse_forward(&fwd, optarg, 0)) {
                                 add_remote_forward(&options, &fwd);
                         } else {
                                 fprintf(stderr,
@@ -475,30 +475,14 @@ main(int ac, char **av)
                         break;
 
                 case 'D':
-                        cp = p = xstrdup(optarg);
-                        memset(&fwd, '\0', sizeof(fwd));
-                        fwd.connect_host = "socks";
-                        if ((fwd.listen_host = hpdelim(&cp)) == NULL) {
-                                fprintf(stderr, "Bad dynamic forwarding "
-                                    "specification '%.100s'\n", optarg);
-                                exit(255);
-                        }
-                        if (cp != NULL) {
-                                fwd.listen_port = a2port(cp);
-                                fwd.listen_host =
-                                    cleanhostname(fwd.listen_host);
+                        if (parse_forward(&fwd, optarg, 1)) {
+                                add_local_forward(&options, &fwd);
                         } else {
-                                fwd.listen_port = a2port(fwd.listen_host);
-                                fwd.listen_host = NULL;
-                        }
-
-                        if (fwd.listen_port == 0) {
-                                fprintf(stderr, "Bad dynamic port '%s'\n",
-                                    optarg);
+                                fprintf(stderr,
+                                    "Bad dynamic forwarding specification "
+                                    "'%s'\n", optarg);
                                 exit(255);
                         }
-                        add_local_forward(&options, &fwd);
-                        xfree(p);
                         break;
 
                 case 'C':