Merged hpn13v5 to trunk.

[gssapi-openssh.git] / openssh / channels.h

diff --git a/openssh/channels.h b/openssh/channels.h
index 776fbc8457b4be37bc7fb8566901041e88d91f5a..419c009501053e9643ffca0f4d5189e255ac23d4 100644 (file)
--- a/openssh/channels.h
+++ b/openssh/channels.h
@@ -243,21 +243,21 @@ int        channel_add_adm_permitted_opens(char *, int);
 void    channel_clear_permitted_opens(void);
 void    channel_clear_adm_permitted_opens(void);
 void    channel_print_adm_permitted_opens(void);
-int      channel_input_port_forward_request(int, int, int, int);
+int      channel_input_port_forward_request(int, int);
 Channel        *channel_connect_to(const char *, u_short, char *, char *);
 Channel        *channel_connect_by_listen_address(u_short, char *, char *);
 int     channel_request_remote_forwarding(const char *, u_short,
             const char *, u_short);
 int     channel_setup_local_fwd_listener(const char *, u_short,
-            const char *, u_short, int, int, int);
+            const char *, u_short, int);
 void    channel_request_rforward_cancel(const char *host, u_short port);
-int     channel_setup_remote_fwd_listener(const char *, u_short, int, int, int);
+int     channel_setup_remote_fwd_listener(const char *, u_short, int);
 int     channel_cancel_rport_listener(const char *, u_short);
 
 /* x11 forwarding */
 
 int     x11_connect_display(void);
-int     x11_create_display_inet(int, int, int, u_int *, int **, int, int);
+int     x11_create_display_inet(int, int, int, u_int *, int **);
 void     x11_input_open(int, u_int32_t, void *);
 void    x11_request_forwarding_with_spoofing(int, const char *, const char *,
             const char *);
@@ -283,4 +283,7 @@ void         chan_rcvd_ieof(Channel *);
 void    chan_write_failed(Channel *);
 void    chan_obuf_empty(Channel *);
 
+/* hpn handler */
+void     channel_set_hpn(int, int);
+
 #endif