diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-09-21 19:16:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-09-22 09:14:53 +1000 |
commit | 609d7a66ce578abf259da2d5f6f68795c2bda731 (patch) | |
tree | fa0c5a5d6f04f69a6cd15bd4d3954412c4a1480c /channels.h | |
parent | 36945fa103176c00b39731e1fc1919a0d0808b81 (diff) |
upstream commit
Add 'reverse' dynamic forwarding which combines dynamic
forwarding (-D) with remote forwarding (-R) where the remote-forwarded port
expects SOCKS-requests.
The SSH server code is unchanged and the parsing happens at the SSH
clients side. Thus the full SOCKS-request is sent over the forwarded
channel and the client parses c->output. Parsing happens in
channel_before_prepare_select(), _before_ the select bitmask is
computed in the pre[] handlers, but after network input processing
in the post[] handlers.
help and ok djm@
Upstream-ID: aa25a6a3851064f34fe719e0bf15656ad5a64b89
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels.h b/channels.h index d1cf5dc6a..126b04345 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.129 2017/09/12 06:35:32 djm Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.130 2017/09/21 19:16:53 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -57,7 +57,9 @@ | |||
57 | #define SSH_CHANNEL_UNIX_LISTENER 18 /* Listening on a domain socket. */ | 57 | #define SSH_CHANNEL_UNIX_LISTENER 18 /* Listening on a domain socket. */ |
58 | #define SSH_CHANNEL_RUNIX_LISTENER 19 /* Listening to a R-style domain socket. */ | 58 | #define SSH_CHANNEL_RUNIX_LISTENER 19 /* Listening to a R-style domain socket. */ |
59 | #define SSH_CHANNEL_MUX_PROXY 20 /* proxy channel for mux-slave */ | 59 | #define SSH_CHANNEL_MUX_PROXY 20 /* proxy channel for mux-slave */ |
60 | #define SSH_CHANNEL_MAX_TYPE 21 | 60 | #define SSH_CHANNEL_RDYNAMIC_OPEN 21 /* reverse SOCKS, parsing request */ |
61 | #define SSH_CHANNEL_RDYNAMIC_FINISH 22 /* reverse SOCKS, finishing connect */ | ||
62 | #define SSH_CHANNEL_MAX_TYPE 23 | ||
61 | 63 | ||
62 | #define CHANNEL_CANCEL_PORT_STATIC -1 | 64 | #define CHANNEL_CANCEL_PORT_STATIC -1 |
63 | 65 | ||