diff options
| author |   djm <djm@openbsd.org> | 2005-06-08 11:25:09 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2005-06-08 11:25:09 +0000 |
| commit | 218ecd15888e36f66b49764288685bf10975df70 (patch) | |
| tree | d0b1a5a83fa0b549e283df391d2235f9b56f8ef2 /usr.bin/ssh/ssh.c | |
| parent | squeeze +COMMENT in front of +DESC. (diff) | |
| download | wireguard-openbsd-218ecd15888e36f66b49764288685bf10975df70.tar.xz wireguard-openbsd-218ecd15888e36f66b49764288685bf10975df70.zip | |
add ControlMaster=auto/autoask options to support opportunistic multiplexing;
tested avsm@ and jakob@, ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index cd2b82cd99f..a6e7e75778b 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.241 2005/06/06 11:20:36 djm Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.242 2005/06/08 11:25:09 djm Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -381,8 +381,10 @@ again: } break; case 'M': - options.control_master = - (options.control_master >= 1) ? 2 : 1; + if (options.control_master == SSHCTL_MASTER_YES) + options.control_master = SSHCTL_MASTER_ASK; + else + options.control_master = SSHCTL_MASTER_YES; break; case 'p': options.port = a2port(optarg); @@ -611,11 +613,8 @@ again: } if (mux_command != 0 && options.control_path == NULL) fatal("No ControlPath specified for \"-O\" command"); - if (options.control_path != NULL && options.control_master == 0) { - if (mux_command == 0) - mux_command = SSHMUX_COMMAND_OPEN; + if (options.control_path != NULL) control_client(options.control_path); - } /* Open a connection to the remote host. */ if (ssh_connect(host, &hostaddr, options.port, @@ -1074,9 +1073,12 @@ ssh_control_listener(void) struct sockaddr_un addr; mode_t old_umask; - if (options.control_path == NULL || options.control_master <= 0) + if (options.control_path == NULL || + options.control_master == SSHCTL_MASTER_NO) return; + debug("setting up multiplex master socket"); + memset(&addr, '\0', sizeof(addr)); addr.sun_family = AF_UNIX; addr.sun_len = offsetof(struct sockaddr_un, sun_path) + @@ -1287,6 +1289,20 @@ control_client(const char *path) extern char **environ; u_int flags; + if (mux_command == 0) + mux_command = SSHMUX_COMMAND_OPEN; + + switch (options.control_master) { + case SSHCTL_MASTER_AUTO: + case SSHCTL_MASTER_AUTO_ASK: + debug("auto-mux: Trying existing master"); + /* FALLTHROUGH */ + case SSHCTL_MASTER_NO: + break; + default: + return; + } + memset(&addr, '\0', sizeof(addr)); addr.sun_family = AF_UNIX; addr.sun_len = offsetof(struct sockaddr_un, sun_path) + |