Import of OpenSSH 4.2p1

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

diff --git a/openssh/clientloop.h b/openssh/clientloop.h
index b23c111cbd6cc51954247d2117c7d9be53284a19..aed2d918b1d7acdb2bf342f69120d27959febf3d 100644 (file)
--- a/openssh/clientloop.h
+++ b/openssh/clientloop.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: clientloop.h,v 1.12 2004/11/07 00:01:46 djm Exp $     */
+/*     $OpenBSD: clientloop.h,v 1.14 2005/07/04 00:58:43 djm Exp $     */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,10 +37,15 @@
 
 /* Client side main loop for the interactive session. */
 int     client_loop(int, int, int);
+void    client_x11_get_proto(const char *, const char *, u_int,
+           char **, char **);
 void    client_global_request_reply_fwd(int, u_int32_t, void *);
 void    client_session2_setup(int, int, int, const char *, struct termios *,
            int, Buffer *, char **, dispatch_fn *);
 
+/* Multiplexing protocol version */
+#define SSHMUX_VER                     1
+
 /* Multiplexing control protocol flags */
 #define SSHMUX_COMMAND_OPEN            1       /* Open new connection */
 #define SSHMUX_COMMAND_ALIVE_CHECK     2       /* Check master is alive */
@@ -48,3 +53,5 @@ void   client_session2_setup(int, int, int, const char *, struct termios *,
 
 #define SSHMUX_FLAG_TTY                        (1)     /* Request tty on open */
 #define SSHMUX_FLAG_SUBSYS             (1<<1)  /* Subsystem request on open */
+#define SSHMUX_FLAG_X11_FWD            (1<<2)  /* Request X11 forwarding */
+#define SSHMUX_FLAG_AGENT_FWD          (1<<3)  /* Request agent forwarding */