* New upstream release (LP: #535029).

  - After a transition period of about 10 years, this release disables SSH
    protocol 1 by default.  Clients and servers that need to use the
    legacy protocol must explicitly enable it in ssh_config / sshd_config
    or on the command-line.
  - Remove the libsectok/OpenSC-based smartcard code and add support for
    PKCS#11 tokens.  This support is enabled by default in the Debian
    packaging, since it now doesn't involve additional library
    dependencies (closes: #231472, LP: #16918).
  - Add support for certificate authentication of users and hosts using a
    new, minimal OpenSSH certificate format (closes: #482806).
  - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
  - Add the ability to revoke keys in sshd(8) and ssh(1).  (For the Debian
    package, this overlaps with the key blacklisting facility added in
    openssh 1:4.7p1-9, but with different file formats and slightly
    different scopes; for the moment, I've roughly merged the two.)
  - Various multiplexing improvements, including support for requesting
    port-forwardings via the multiplex protocol (closes: #360151).
  - Allow setting an explicit umask on the sftp-server(8) commandline to
    override whatever default the user has (closes: #496843).
  - Many sftp client improvements, including tab-completion, more options,
    and recursive transfer support for get/put (LP: #33378).  The old
    mget/mput commands never worked properly and have been removed
    (closes: #270399, #428082).
  - Do not prompt for a passphrase if we fail to open a keyfile, and log
    the reason why the open failed to debug (closes: #431538).
  - Prevent sftp from crashing when given a "-" without a command.  Also,
    allow whitespace to follow a "-" (closes: #531561).

1 files changed, 19 insertions, 4 deletions

diff --git a/channels.h b/channels.h
index 1488ed7e5..cc71885f4 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.98 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.103 2010/01/26 01:28:35 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -53,7 +53,9 @@
 #define SSH_CHANNEL_CONNECTING          12
 #define SSH_CHANNEL_DYNAMIC             13
 #define SSH_CHANNEL_ZOMBIE              14      /* Almost dead. */
-#define SSH_CHANNEL_MAX_TYPE            15
+#define SSH_CHANNEL_MUX_LISTENER        15      /* Listener for mux conn. */
+#define SSH_CHANNEL_MUX_CLIENT          16      /* Conn. to mux slave */
+#define SSH_CHANNEL_MAX_TYPE            17
 
 struct Channel;
 typedef struct Channel Channel;
@@ -81,6 +83,9 @@ struct channel_connect {
         struct addrinfo *ai, *aitop;
 };
 
+/* Callbacks for mux channels back into client-specific code */
+typedef int mux_callback_fn(struct Channel *);
+
 struct Channel {
         int     type;           /* channel type/state */
         int     self;           /* my own channel identifier */
@@ -92,12 +97,16 @@ struct Channel {
         int     wfd;            /* write fd */
         int     efd;            /* extended fd */
         int     sock;           /* sock fd */
-        int     ctl_fd;         /* control fd (client sharing) */
+        int     ctl_chan;       /* control channel (multiplexed connections) */
         int     isatty;         /* rfd is a tty */
         int     wfd_isatty;     /* wfd is a tty */
         int     client_tty;     /* (client) TTY has been requested */
         int     force_drain;    /* force close on iEOF */
-        int     delayed;                /* fdset hack */
+        int     delayed;        /* post-select handlers for newly created
+                                 * channels are delayed until the first call
+                                 * to a matching pre-select handler. 
+                                 * this way post-select handlers are not
+                                 * accidenly called if a FD gets reused */
         Buffer  input;          /* data read from socket, to be sent over
                                  * encrypted connection */
         Buffer  output;         /* data received over encrypted connection for
@@ -138,6 +147,10 @@ struct Channel {
 
         /* non-blocking connect */
         struct channel_connect  connect_ctx;
+
+        /* multiplexing protocol hook, called for each packet received */
+        mux_callback_fn         *mux_rcb;
+        void                    *mux_ctx;
 };
 
 #define CHAN_EXTENDED_IGNORE            0
@@ -168,6 +181,7 @@ struct Channel {
 #define CHAN_CLOSE_RCVD                 0x02
 #define CHAN_EOF_SENT                   0x04
 #define CHAN_EOF_RCVD                   0x08
+#define CHAN_LOCAL                      0x10
 
 #define CHAN_RBUF       16*1024
 
@@ -239,6 +253,7 @@ void	 channel_clear_adm_permitted_opens(void);
 void     channel_print_adm_permitted_opens(void);
 int      channel_input_port_forward_request(int, int);
 Channel *channel_connect_to(const char *, u_short, char *, char *);
+Channel *channel_connect_stdio_fwd(const char*, u_short, int, int);
 Channel *channel_connect_by_listen_address(u_short, char *, char *);
 int      channel_request_remote_forwarding(const char *, u_short,
              const char *, u_short);