tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: s/process_mux_master/mux_master_process/ in mux master 

function names,

Gives better symmetry with the existing mux_client_*() names and makes
it more obvious when a message comes from the master vs client (they
are interleved in ControlMaster=auto mode).

no functional change beyond prefixing a could of log messages with
__func__ where they were previously lacking.

OpenBSD-Commit-ID: b01f7c3fdf92692e1713a822a89dc499333daf75
This commit is contained in:
djm@openbsd.org 2018-09-26 01:48:57 +00:00 committed by Damien Miller
parent c2fa53cd64
commit 9d883a1ce4
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.75 2018/07/31 03:07:24 djm Exp $ */ /* $OpenBSD: mux.c,v 1.76 2018/09/26 01:48:57 djm Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -164,23 +164,23 @@ struct mux_master_state {
static void mux_session_confirm(struct ssh *, int, int, void *); static void mux_session_confirm(struct ssh *, int, int, void *);
static void mux_stdio_confirm(struct ssh *, int, int, void *); static void mux_stdio_confirm(struct ssh *, int, int, void *);
static int process_mux_master_hello(struct ssh *, u_int, static int mux_master_process_hello(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_new_session(struct ssh *, u_int, static int mux_master_process_new_session(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_alive_check(struct ssh *, u_int, static int mux_master_process_alive_check(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_terminate(struct ssh *, u_int, static int mux_master_process_terminate(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_open_fwd(struct ssh *, u_int, static int mux_master_process_open_fwd(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_close_fwd(struct ssh *, u_int, static int mux_master_process_close_fwd(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_stdio_fwd(struct ssh *, u_int, static int mux_master_process_stdio_fwd(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_stop_listening(struct ssh *, u_int, static int mux_master_process_stop_listening(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static int process_mux_proxy(struct ssh *, u_int, static int mux_master_process_proxy(struct ssh *, u_int,
Channel *, struct sshbuf *, struct sshbuf *); Channel *, struct sshbuf *, struct sshbuf *);
static const struct { static const struct {
@ -188,15 +188,15 @@ static const struct {
int (*handler)(struct ssh *, u_int, Channel *, int (*handler)(struct ssh *, u_int, Channel *,
struct sshbuf *, struct sshbuf *); struct sshbuf *, struct sshbuf *);
} mux_master_handlers[] = { } mux_master_handlers[] = {
{ MUX_MSG_HELLO, process_mux_master_hello }, { MUX_MSG_HELLO, mux_master_process_hello },
{ MUX_C_NEW_SESSION, process_mux_new_session }, { MUX_C_NEW_SESSION, mux_master_process_new_session },
{ MUX_C_ALIVE_CHECK, process_mux_alive_check }, { MUX_C_ALIVE_CHECK, mux_master_process_alive_check },
{ MUX_C_TERMINATE, process_mux_terminate }, { MUX_C_TERMINATE, mux_master_process_terminate },
{ MUX_C_OPEN_FWD, process_mux_open_fwd }, { MUX_C_OPEN_FWD, mux_master_process_open_fwd },
{ MUX_C_CLOSE_FWD, process_mux_close_fwd }, { MUX_C_CLOSE_FWD, mux_master_process_close_fwd },
{ MUX_C_NEW_STDIO_FWD, process_mux_stdio_fwd }, { MUX_C_NEW_STDIO_FWD, mux_master_process_stdio_fwd },
{ MUX_C_STOP_LISTENING, process_mux_stop_listening }, { MUX_C_STOP_LISTENING, mux_master_process_stop_listening },
{ MUX_C_PROXY, process_mux_proxy }, { MUX_C_PROXY, mux_master_process_proxy },
{ 0, NULL } { 0, NULL }
}; };
@ -264,7 +264,7 @@ env_permitted(char *env)
return 0; return 0;
ret = snprintf(name, sizeof(name), "%.*s", (int)(cp - env), env); ret = snprintf(name, sizeof(name), "%.*s", (int)(cp - env), env);
if (ret <= 0 || (size_t)ret >= sizeof(name)) { if (ret <= 0 || (size_t)ret >= sizeof(name)) {
error("env_permitted: name '%.100s...' too long", env); error("%s: name '%.100s...' too long", __func__, env);
return 0; return 0;
} }
@ -278,7 +278,7 @@ env_permitted(char *env)
/* Mux master protocol message handlers */ /* Mux master protocol message handlers */
static int static int
process_mux_master_hello(struct ssh *ssh, u_int rid, mux_master_process_hello(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
u_int ver; u_int ver;
@ -296,8 +296,8 @@ process_mux_master_hello(struct ssh *ssh, u_int rid,
return -1; return -1;
} }
if (ver != SSHMUX_VER) { if (ver != SSHMUX_VER) {
error("Unsupported multiplexing protocol version %d " error("%s: unsupported multiplexing protocol version %u "
"(expected %d)", ver, SSHMUX_VER); "(expected %u)", __func__, ver, SSHMUX_VER);
return -1; return -1;
} }
debug2("%s: channel %d slave version %u", __func__, c->self, ver); debug2("%s: channel %d slave version %u", __func__, c->self, ver);
@ -305,14 +305,16 @@ process_mux_master_hello(struct ssh *ssh, u_int rid,
/* No extensions are presently defined */ /* No extensions are presently defined */
while (sshbuf_len(m) > 0) { while (sshbuf_len(m) > 0) {
char *name = NULL; char *name = NULL;
size_t value_len = 0;
if ((r = sshbuf_get_cstring(m, &name, NULL)) != 0 || if ((r = sshbuf_get_cstring(m, &name, NULL)) != 0 ||
(r = sshbuf_skip_string(m)) != 0) { /* value */ (r = sshbuf_get_string_direct(m, NULL, &value_len)) != 0) {
error("%s: malformed extension: %s", error("%s: malformed extension: %s",
__func__, ssh_err(r)); __func__, ssh_err(r));
return -1; return -1;
} }
debug2("Unrecognised slave extension \"%s\"", name); debug2("%s: Unrecognised extension \"%s\" length %zu",
__func__, name, value_len);
free(name); free(name);
} }
state->hello_rcvd = 1; state->hello_rcvd = 1;
@ -343,7 +345,7 @@ reply_error(struct sshbuf *reply, u_int type, u_int rid, const char *msg)
} }
static int static int
process_mux_new_session(struct ssh *ssh, u_int rid, mux_master_process_new_session(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
Channel *nc; Channel *nc;
@ -391,8 +393,8 @@ process_mux_new_session(struct ssh *ssh, u_int rid,
cctx->env[env_len++] = cp; cctx->env[env_len++] = cp;
cctx->env[env_len] = NULL; cctx->env[env_len] = NULL;
if (env_len > MUX_MAX_ENV_VARS) { if (env_len > MUX_MAX_ENV_VARS) {
error(">%d environment variables received, ignoring " error("%s: >%d environment variables received, "
"additional", MUX_MAX_ENV_VARS); "ignoring additional", __func__, MUX_MAX_ENV_VARS);
break; break;
} }
} }
@ -509,7 +511,7 @@ process_mux_new_session(struct ssh *ssh, u_int rid,
} }
static int static int
process_mux_alive_check(struct ssh *ssh, u_int rid, mux_master_process_alive_check(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
int r; int r;
@ -526,7 +528,7 @@ process_mux_alive_check(struct ssh *ssh, u_int rid,
} }
static int static int
process_mux_terminate(struct ssh *ssh, u_int rid, mux_master_process_terminate(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
debug2("%s: channel %d: terminate request", __func__, c->self); debug2("%s: channel %d: terminate request", __func__, c->self);
@ -694,7 +696,7 @@ mux_confirm_remote_forward(struct ssh *ssh, int type, u_int32_t seq, void *ctxt)
} }
static int static int
process_mux_open_fwd(struct ssh *ssh, u_int rid, mux_master_process_open_fwd(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
struct Forward fwd; struct Forward fwd;
@ -823,7 +825,7 @@ process_mux_open_fwd(struct ssh *ssh, u_int rid,
if (!channel_setup_local_fwd_listener(ssh, &fwd, if (!channel_setup_local_fwd_listener(ssh, &fwd,
&options.fwd_opts)) { &options.fwd_opts)) {
fail: fail:
logit("slave-requested %s failed", fwd_desc); logit("%s: requested %s failed", __func__, fwd_desc);
reply_error(reply, MUX_S_FAILURE, rid, reply_error(reply, MUX_S_FAILURE, rid,
"Port forwarding failed"); "Port forwarding failed");
goto out; goto out;
@ -861,7 +863,7 @@ process_mux_open_fwd(struct ssh *ssh, u_int rid,
} }
static int static int
process_mux_close_fwd(struct ssh *ssh, u_int rid, mux_master_process_close_fwd(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
struct Forward fwd, *found_fwd; struct Forward fwd, *found_fwd;
@ -973,7 +975,7 @@ process_mux_close_fwd(struct ssh *ssh, u_int rid,
} }
static int static int
process_mux_stdio_fwd(struct ssh *ssh, u_int rid, mux_master_process_stdio_fwd(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
Channel *nc; Channel *nc;
@ -1111,7 +1113,7 @@ mux_stdio_confirm(struct ssh *ssh, int id, int success, void *arg)
} }
static int static int
process_mux_stop_listening(struct ssh *ssh, u_int rid, mux_master_process_stop_listening(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
debug("%s: channel %d: stop listening", __func__, c->self); debug("%s: channel %d: stop listening", __func__, c->self);
@ -1141,7 +1143,7 @@ process_mux_stop_listening(struct ssh *ssh, u_int rid,
} }
static int static int
process_mux_proxy(struct ssh *ssh, u_int rid, mux_master_process_proxy(struct ssh *ssh, u_int rid,
Channel *c, struct sshbuf *m, struct sshbuf *reply) Channel *c, struct sshbuf *m, struct sshbuf *reply)
{ {
int r; int r;