diff options
| author | Damien Miller <djm@mindrot.org> | 2005-07-06 09:44:19 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-07-06 09:44:19 +1000 |
| commit | 1339002e8b05d89b10767849d9ee9be55e460f4c (patch) | |
| tree | 58e307b74579313f31732dfdf21f756d6a051ce9 /clientloop.h | |
| parent | a7270309fc5e95b29c91d0190b13ef5a9b1df339 (diff) | |
| download | openssh-git-1339002e8b05d89b10767849d9ee9be55e460f4c.tar.gz | |
- djm@cvs.openbsd.org 2005/07/04 00:58:43
[channels.c clientloop.c clientloop.h misc.c misc.h ssh.c ssh_config.5]
implement support for X11 and agent forwarding over multiplex slave
connections. Because of protocol limitations, the slave connections inherit
the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding
their own.
ok dtucker@ "put it in" deraadt@
Diffstat (limited to 'clientloop.h')
| -rw-r--r-- | clientloop.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/clientloop.h b/clientloop.h index 71c61b5d..aed2d918 100644 --- a/clientloop.h +++ b/clientloop.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.h,v 1.13 2005/06/16 03:38:36 djm Exp $ */ +/* $OpenBSD: clientloop.h,v 1.14 2005/07/04 00:58:43 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -43,6 +43,9 @@ void client_global_request_reply_fwd(int, u_int32_t, void *); void client_session2_setup(int, int, int, const char *, struct termios *, int, Buffer *, char **, dispatch_fn *); +/* Multiplexing protocol version */ +#define SSHMUX_VER 1 + /* Multiplexing control protocol flags */ #define SSHMUX_COMMAND_OPEN 1 /* Open new connection */ #define SSHMUX_COMMAND_ALIVE_CHECK 2 /* Check master is alive */ @@ -50,3 +53,5 @@ void client_session2_setup(int, int, int, const char *, struct termios *, #define SSHMUX_FLAG_TTY (1) /* Request tty on open */ #define SSHMUX_FLAG_SUBSYS (1<<1) /* Subsystem request on open */ +#define SSHMUX_FLAG_X11_FWD (1<<2) /* Request X11 forwarding */ +#define SSHMUX_FLAG_AGENT_FWD (1<<3) /* Request agent forwarding */ |