diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-07-05 23:59:45 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-07-15 15:07:42 +1000 |
| commit | 6d755706a0059eb9e2d63517f288b75cbc3b4701 (patch) | |
| tree | adb003b1adcea270f4480baa4ff83d495b3478f3 /mux.c | |
| parent | b0c1e8384d5e136ebdf895d1434aea7dd8661a1c (diff) | |
| download | openssh-git-6d755706a0059eb9e2d63517f288b75cbc3b4701.tar.gz | |
upstream: some language improvements; ok markus
OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
Diffstat (limited to 'mux.c')
| -rw-r--r-- | mux.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.82 2020/04/30 17:12:20 markus Exp $ */ +/* $OpenBSD: mux.c,v 1.83 2020/07/05 23:59:45 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -187,7 +187,7 @@ static const struct { { 0, NULL } }; -/* Cleanup callback fired on closure of mux slave _session_ channel */ +/* Cleanup callback fired on closure of mux client _session_ channel */ /* ARGSUSED */ static void mux_master_session_cleanup_cb(struct ssh *ssh, int cid, void *unused) @@ -209,7 +209,7 @@ mux_master_session_cleanup_cb(struct ssh *ssh, int cid, void *unused) channel_cancel_cleanup(ssh, c->self); } -/* Cleanup callback fired on closure of mux slave _control_ channel */ +/* Cleanup callback fired on closure of mux client _control_ channel */ /* ARGSUSED */ static void mux_master_control_cleanup_cb(struct ssh *ssh, int cid, void *unused) @@ -287,7 +287,7 @@ mux_master_process_hello(struct ssh *ssh, u_int rid, "(expected %u)", __func__, ver, SSHMUX_VER); return -1; } - debug2("%s: channel %d slave version %u", __func__, c->self, ver); + debug2("%s: channel %d client version %u", __func__, c->self, ver); /* No extensions are presently defined */ while (sshbuf_len(m) > 0) { @@ -401,7 +401,7 @@ mux_master_process_new_session(struct ssh *ssh, u_int rid, /* Gather fds from client */ for(i = 0; i < 3; i++) { if ((new_fd[i] = mm_receive_fd(c->sock)) == -1) { - error("%s: failed to receive fd %d from slave", + error("%s: failed to receive fd %d from client", __func__, i); for (j = 0; j < i; j++) close(new_fd[j]); @@ -994,7 +994,7 @@ mux_master_process_stdio_fwd(struct ssh *ssh, u_int rid, /* Gather fds from client */ for(i = 0; i < 2; i++) { if ((new_fd[i] = mm_receive_fd(c->sock)) == -1) { - error("%s: failed to receive fd %d from slave", + error("%s: failed to receive fd %d from client", __func__, i); for (j = 0; j < i; j++) close(new_fd[j]); @@ -1154,7 +1154,7 @@ mux_master_process_proxy(struct ssh *ssh, u_int rid, return 0; } -/* Channel callbacks fired on read/write from mux slave fd */ +/* Channel callbacks fired on read/write from mux client fd */ static int mux_master_read_cb(struct ssh *ssh, Channel *c) { |