- dtucker@cvs.openbsd.org 2010/01/11 01:39:46

     [ssh_config channels.c ssh.1 channels.h ssh.c]
     Add a 'netcat mode' (ssh -W).  This connects stdio on the client to a
     single port forward on the server.  This allows, for example, using ssh as
     a ProxyCommand to route connections via intermediate servers.
     bz #1618, man page help from jmc@, ok markus@

1 files changed, 30 insertions, 1 deletions

diff --git a/channels.c b/channels.c
index 87dbe96d3..e8589d8c4 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.300 2010/01/09 23:04:13 dtucker Exp $ */
+/* $OpenBSD: channels.c,v 1.301 2010/01/11 01:39:46 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1217,6 +1217,35 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
         return 1;
 }
 
+Channel *
+channel_connect_stdio_fwd(const char *host_to_connect, u_short port_to_connect)
+{
+        Channel *c;
+        int in, out;
+
+        debug("channel_connect_stdio_fwd %s:%d", host_to_connect,
+            port_to_connect);
+
+        in = dup(STDIN_FILENO);
+        out = dup(STDOUT_FILENO);
+        if (in < 0 || out < 0)
+                fatal("channel_connect_stdio_fwd: dup() in/out failed");
+
+        c = channel_new("stdio-forward", SSH_CHANNEL_OPENING, in, out,
+            -1, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,
+            0, "stdio-forward", /*nonblock*/0);
+
+        c->path = xstrdup(host_to_connect);
+        c->host_port = port_to_connect;
+        c->listening_port = 0;
+        c->force_drain = 1;
+
+        channel_register_fds(c, in, out, -1, 0, 1, 0);
+        port_open_helper(c, "direct-tcpip");
+
+        return c;
+}
+
 /* dynamic port forwarding */
 static void
 channel_pre_dynamic(Channel *c, fd_set *readset, fd_set *writeset)