- stevesk@cvs.openbsd.org 2008/12/29 02:23:26

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index 5a8727eb904e3bb7873804a88495093eae147cef..fdeedc351d94ea2102bbadc30b393a3645dd9078 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.200 2008/07/10 18:08:11 markus Exp $ */
+/* $OpenBSD: clientloop.c,v 1.207 2008/12/09 22:37:33 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -107,7 +107,6 @@
 #include "atomicio.h"
 #include "sshpty.h"
 #include "misc.h"
-#include "monitor_fdpass.h"
 #include "match.h"
 #include "msg.h"
 
@@ -741,14 +740,14 @@ client_expect_confirm(int id, const char *request, int do_close)
 void
 client_register_global_confirm(global_confirm_cb *cb, void *ctx)
 {
-       struct global_confirm *gc, *first_gc;
+       struct global_confirm *gc, *last_gc;
 
        /* Coalesce identical callbacks */
-       first_gc = TAILQ_LAST(&global_confirms, global_confirms);
-       if (first_gc && first_gc->cb == cb && first_gc->ctx == ctx) {
-               if (++first_gc->ref_count >= INT_MAX)
-                       fatal("%s: first_gc->ref_count = %d",
-                           __func__, first_gc->ref_count);
+       last_gc = TAILQ_LAST(&global_confirms, global_confirms);
+       if (last_gc && last_gc->cb == cb && last_gc->ctx == ctx) {
+               if (++last_gc->ref_count >= INT_MAX)
+                       fatal("%s: last_gc->ref_count = %d",
+                           __func__, last_gc->ref_count);
                return;
        }
 
@@ -765,7 +764,7 @@ process_cmdline(void)
        void (*handler)(int);
        char *s, *cmd, *cancel_host;
        int delete = 0;
-       int local = 0;
+       int local = 0, remote = 0, dynamic = 0;
        u_short cancel_port;
        Forward fwd;
 
@@ -790,6 +789,8 @@ process_cmdline(void)
                    "Request local forward");
                logit("      -R[bind_address:]port:host:hostport    "
                    "Request remote forward");
+               logit("      -D[bind_address:]port                  "
+                   "Request dynamic forward");
                logit("      -KR[bind_address:]port                 "
                    "Cancel remote forward");
                if (!options.permit_local_command)
@@ -809,17 +810,22 @@ process_cmdline(void)
                delete = 1;
                s++;
        }
-       if (*s != 'L' && *s != 'R') {
+       if (*s == 'L')
+               local = 1;
+       else if (*s == 'R')
+               remote = 1;
+       else if (*s == 'D')
+               dynamic = 1;
+       else {
                logit("Invalid command.");
                goto out;
        }
-       if (*s == 'L')
-               local = 1;
-       if (local && delete) {
+
+       if ((local || dynamic) && delete) {
                logit("Not supported.");
                goto out;
        }
-       if ((!local || delete) && !compat20) {
+       if (remote && delete && !compat20) {
                logit("Not supported for SSH protocol version 1.");
                goto out;
        }
@@ -843,11 +849,11 @@ process_cmdline(void)
                }
                channel_request_rforward_cancel(cancel_host, cancel_port);
        } else {
-               if (!parse_forward(&fwd, s)) {
+               if (!parse_forward(&fwd, s, dynamic ? 1 : 0)) {
                        logit("Bad forwarding specification.");
                        goto out;
                }
-               if (local) {
+               if (local || dynamic) {
                        if (channel_setup_local_fwd_listener(fwd.listen_host,
                            fwd.listen_port, fwd.connect_host,
                            fwd.connect_port, options.gateway_ports) < 0) {
@@ -1036,7 +1042,6 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
 Supported escape sequences:\r\n\
   %c.  - terminate session\r\n\
   %cB  - send a BREAK to the remote system\r\n\
-  %cC  - open a command line\r\n\
   %cR  - Request rekey (SSH protocol 2 only)\r\n\
   %c#  - list forwarded connections\r\n\
   %c?  - this message\r\n\
@@ -1045,8 +1050,7 @@ Supported escape sequences:\r\n\
                                            escape_char, escape_char,
                                            escape_char, escape_char,
                                            escape_char, escape_char,
-                                           escape_char, escape_char,
-                                           escape_char);
+                                           escape_char, escape_char);
                                } else {
                                        snprintf(string, sizeof string,
 "%c?\r\n\
@@ -1081,6 +1085,8 @@ Supported escape sequences:\r\n\
                                continue;
 
                        case 'C':
+                               if (c && c->ctl_fd != -1)
+                                       goto noescape;
                                process_cmdline();
                                continue;
 
@@ -1722,7 +1728,7 @@ client_request_tun_fwd(int tun_mode, int local_tun, int remote_tun)
                return 0;
 
        if (!compat20) {
-               error("Tunnel forwarding is not support for protocol 1");
+               error("Tunnel forwarding is not supported for protocol 1");
                return -1;
        }
 
@@ -1846,7 +1852,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
        if (reply) {
                packet_start(success ?
                    SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
-               packet_put_int(id);
+               packet_put_int(c->remote_id);
                packet_send();
        }
        xfree(rtype);