- djm@cvs.openbsd.org 2005/03/01 10:09:52

     [auth-options.c channels.c channels.h clientloop.c compat.c compat.h]
     [misc.c misc.h readconf.c readconf.h servconf.c ssh.1 ssh.c ssh_config.5]
     [sshd_config.5]
     bz#413: allow optional specification of bind address for port forwardings.
     Patch originally by Dan Astorian, but worked on by several people
     Adds GatewayPorts=clientspecified option on server to allow remote
     forwards to bind to client-specified ports.

1 files changed, 43 insertions, 1 deletions

diff --git a/misc.c b/misc.c
index a90125505..2e366f81b 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.27 2004/12/11 01:48:56 dtucker Exp $");
+RCSID("$OpenBSD: misc.c,v 1.28 2005/03/01 10:09:52 djm Exp $");
 
 #include "misc.h"
 #include "log.h"
@@ -275,6 +275,48 @@ convtime(const char *s)
         return total;
 }
 
+/*
+ * Search for next delimiter between hostnames/addresses and ports.
+ * Argument may be modified (for termination).
+ * Returns *cp if parsing succeeds.
+ * *cp is set to the start of the next delimiter, if one was found.
+ * If this is the last field, *cp is set to NULL.
+ */
+char *
+hpdelim(char **cp)
+{
+        char *s, *old;
+
+        if (cp == NULL || *cp == NULL)
+                return NULL;
+
+        old = s = *cp;
+        if (*s == '[') {
+                if ((s = strchr(s, ']')) == NULL)
+                        return NULL;
+                else
+                        s++;
+        } else if ((s = strpbrk(s, ":/")) == NULL)
+                s = *cp + strlen(*cp); /* skip to end (see first case below) */
+
+        switch (*s) {
+        case '\0':
+                *cp = NULL;     /* no more fields*/
+                break;
+        
+        case ':':
+        case '/':
+                *s = '\0';      /* terminate */
+                *cp = s + 1;
+                break;
+        
+        default:
+                return NULL;
+        }
+
+        return old;
+}
+
 char *
 cleanhostname(char *host)
 {