diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /channels.h | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels.h b/channels.h index a97dd9007..2674f096e 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.83 2005/12/30 15:56:37 reyk Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.88 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -38,8 +38,6 @@ | |||
38 | #ifndef CHANNEL_H | 38 | #ifndef CHANNEL_H |
39 | #define CHANNEL_H | 39 | #define CHANNEL_H |
40 | 40 | ||
41 | #include "buffer.h" | ||
42 | |||
43 | /* Definitions for channel types. */ | 41 | /* Definitions for channel types. */ |
44 | #define SSH_CHANNEL_X11_LISTENER 1 /* Listening for inet X11 conn. */ | 42 | #define SSH_CHANNEL_X11_LISTENER 1 /* Listening for inet X11 conn. */ |
45 | #define SSH_CHANNEL_PORT_LISTENER 2 /* Listening on a port. */ | 43 | #define SSH_CHANNEL_PORT_LISTENER 2 /* Listening on a port. */ |
@@ -207,11 +205,13 @@ int channel_find_open(void); | |||
207 | void channel_set_af(int af); | 205 | void channel_set_af(int af); |
208 | void channel_permit_all_opens(void); | 206 | void channel_permit_all_opens(void); |
209 | void channel_add_permitted_opens(char *, int); | 207 | void channel_add_permitted_opens(char *, int); |
208 | int channel_add_adm_permitted_opens(char *, int); | ||
210 | void channel_clear_permitted_opens(void); | 209 | void channel_clear_permitted_opens(void); |
211 | void channel_input_port_forward_request(int, int); | 210 | void channel_clear_adm_permitted_opens(void); |
211 | int channel_input_port_forward_request(int, int); | ||
212 | int channel_connect_to(const char *, u_short); | 212 | int channel_connect_to(const char *, u_short); |
213 | int channel_connect_by_listen_address(u_short); | 213 | int channel_connect_by_listen_address(u_short); |
214 | void channel_request_remote_forwarding(const char *, u_short, | 214 | int channel_request_remote_forwarding(const char *, u_short, |
215 | const char *, u_short); | 215 | const char *, u_short); |
216 | int channel_setup_local_fwd_listener(const char *, u_short, | 216 | int channel_setup_local_fwd_listener(const char *, u_short, |
217 | const char *, u_short, int); | 217 | const char *, u_short, int); |