- djm@cvs.openbsd.org 2011/04/17 22:42:42

     [PROTOCOL.mux clientloop.c clientloop.h mux.c ssh.1 ssh.c]
     allow graceful shutdown of multiplexing: request that a mux server
     removes its listener socket and refuse future multiplexing requests;
     ok markus@

1 files changed, 3 insertions, 1 deletions

diff --git a/clientloop.h b/clientloop.h
index 52115db6e..37d072906 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.h,v 1.25 2010/06/25 23:15:36 djm Exp $ */
+/* $OpenBSD: clientloop.h,v 1.26 2011/04/17 22:42:41 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -45,6 +45,7 @@ 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 **);
 int      client_request_tun_fwd(int, int, int);
+void     client_stop_mux(void);
 
 /* Escape filter for protocol 2 sessions */
 void    *client_new_escape_filter_ctx(int);
@@ -64,6 +65,7 @@ void	 client_register_global_confirm(global_confirm_cb *, void *);
 #define SSHMUX_COMMAND_TERMINATE        3       /* Ask master to exit */
 #define SSHMUX_COMMAND_STDIO_FWD        4       /* Open stdio fwd (ssh -W) */
 #define SSHMUX_COMMAND_FORWARD          5       /* Forward only, no command */
+#define SSHMUX_COMMAND_STOP             6       /* Disable mux but not conn */
 
 void    muxserver_listen(void);
 void    muxclient(const char *);