diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-02 15:29:40 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-02 15:29:40 +1000 |
commit | 4b3ed647d5b328cf68e6a8ffbee490d8e0683e82 (patch) | |
tree | ab21f41c022d2d8f1f8d2a3814f77d10d4c72e7e /channels.h | |
parent | 9e01ff28664921ce9b6500681333e42fb133b4d0 (diff) |
- markus@cvs.openbsd.org 2014/06/27 16:41:56
[channels.c channels.h clientloop.c ssh.c]
fix remote fwding with same listen port but different listen address
with gerhard@, ok djm@
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels.h b/channels.h index 4fab9d7c4..4745b9a7d 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.113 2013/06/07 15:37:52 dtucker Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.114 2014/06/27 16:41:56 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -266,7 +266,8 @@ void channel_print_adm_permitted_opens(void); | |||
266 | int channel_input_port_forward_request(int, int); | 266 | int channel_input_port_forward_request(int, int); |
267 | Channel *channel_connect_to(const char *, u_short, char *, char *); | 267 | Channel *channel_connect_to(const char *, u_short, char *, char *); |
268 | Channel *channel_connect_stdio_fwd(const char*, u_short, int, int); | 268 | Channel *channel_connect_stdio_fwd(const char*, u_short, int, int); |
269 | Channel *channel_connect_by_listen_address(u_short, char *, char *); | 269 | Channel *channel_connect_by_listen_address(const char *, u_short, |
270 | char *, char *); | ||
270 | int channel_request_remote_forwarding(const char *, u_short, | 271 | int channel_request_remote_forwarding(const char *, u_short, |
271 | const char *, u_short); | 272 | const char *, u_short); |
272 | int channel_setup_local_fwd_listener(const char *, u_short, | 273 | int channel_setup_local_fwd_listener(const char *, u_short, |