diff options
| author |   markus <markus@openbsd.org> | 2017-09-21 19:16:53 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2017-09-21 19:16:53 +0000 |
| commit | a20bf331ebfb68035488f133976bc07bdf7b6f92 (patch) | |
| tree | 7405717963b3265c69599f466ea92ed9d46cdf1f /usr.bin/ssh/ssh.c | |
| parent | Shorten and otherwise tweak the verbiage (diff) | |
| download | wireguard-openbsd-a20bf331ebfb68035488f133976bc07bdf7b6f92.tar.xz wireguard-openbsd-a20bf331ebfb68035488f133976bc07bdf7b6f92.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 2451dfd9758..d4c25ea5088 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.463 2017/09/12 06:32:07 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.464 2017/09/21 19:16:53 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -837,7 +837,8 @@ main(int ac, char **av) break; case 'R': - if (parse_forward(&fwd, optarg, 0, 1)) { + if (parse_forward(&fwd, optarg, 0, 1) || + parse_forward(&fwd, optarg, 1, 1)) { add_remote_forward(&options, &fwd); } else { fprintf(stderr, |