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) |
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 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.82 2020/04/30 17:12:20 markus Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.83 2020/07/05 23:59:45 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -187,7 +187,7 @@ static const struct { | |||
187 | { 0, NULL } | 187 | { 0, NULL } |
188 | }; | 188 | }; |
189 | 189 | ||
190 | /* Cleanup callback fired on closure of mux slave _session_ channel */ | 190 | /* Cleanup callback fired on closure of mux client _session_ channel */ |
191 | /* ARGSUSED */ | 191 | /* ARGSUSED */ |
192 | static void | 192 | static void |
193 | mux_master_session_cleanup_cb(struct ssh *ssh, int cid, void *unused) | 193 | 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) | |||
209 | channel_cancel_cleanup(ssh, c->self); | 209 | channel_cancel_cleanup(ssh, c->self); |
210 | } | 210 | } |
211 | 211 | ||
212 | /* Cleanup callback fired on closure of mux slave _control_ channel */ | 212 | /* Cleanup callback fired on closure of mux client _control_ channel */ |
213 | /* ARGSUSED */ | 213 | /* ARGSUSED */ |
214 | static void | 214 | static void |
215 | mux_master_control_cleanup_cb(struct ssh *ssh, int cid, void *unused) | 215 | 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, | |||
287 | "(expected %u)", __func__, ver, SSHMUX_VER); | 287 | "(expected %u)", __func__, ver, SSHMUX_VER); |
288 | return -1; | 288 | return -1; |
289 | } | 289 | } |
290 | debug2("%s: channel %d slave version %u", __func__, c->self, ver); | 290 | debug2("%s: channel %d client version %u", __func__, c->self, ver); |
291 | 291 | ||
292 | /* No extensions are presently defined */ | 292 | /* No extensions are presently defined */ |
293 | while (sshbuf_len(m) > 0) { | 293 | while (sshbuf_len(m) > 0) { |
@@ -401,7 +401,7 @@ mux_master_process_new_session(struct ssh *ssh, u_int rid, | |||
401 | /* Gather fds from client */ | 401 | /* Gather fds from client */ |
402 | for(i = 0; i < 3; i++) { | 402 | for(i = 0; i < 3; i++) { |
403 | if ((new_fd[i] = mm_receive_fd(c->sock)) == -1) { | 403 | if ((new_fd[i] = mm_receive_fd(c->sock)) == -1) { |
404 | error("%s: failed to receive fd %d from slave", | 404 | error("%s: failed to receive fd %d from client", |
405 | __func__, i); | 405 | __func__, i); |
406 | for (j = 0; j < i; j++) | 406 | for (j = 0; j < i; j++) |
407 | close(new_fd[j]); | 407 | close(new_fd[j]); |
@@ -994,7 +994,7 @@ mux_master_process_stdio_fwd(struct ssh *ssh, u_int rid, | |||
994 | /* Gather fds from client */ | 994 | /* Gather fds from client */ |
995 | for(i = 0; i < 2; i++) { | 995 | for(i = 0; i < 2; i++) { |
996 | if ((new_fd[i] = mm_receive_fd(c->sock)) == -1) { | 996 | if ((new_fd[i] = mm_receive_fd(c->sock)) == -1) { |
997 | error("%s: failed to receive fd %d from slave", | 997 | error("%s: failed to receive fd %d from client", |
998 | __func__, i); | 998 | __func__, i); |
999 | for (j = 0; j < i; j++) | 999 | for (j = 0; j < i; j++) |
1000 | close(new_fd[j]); | 1000 | close(new_fd[j]); |
@@ -1154,7 +1154,7 @@ mux_master_process_proxy(struct ssh *ssh, u_int rid, | |||
1154 | return 0; | 1154 | return 0; |
1155 | } | 1155 | } |
1156 | 1156 | ||
1157 | /* Channel callbacks fired on read/write from mux slave fd */ | 1157 | /* Channel callbacks fired on read/write from mux client fd */ |
1158 | static int | 1158 | static int |
1159 | mux_master_read_cb(struct ssh *ssh, Channel *c) | 1159 | mux_master_read_cb(struct ssh *ssh, Channel *c) |
1160 | { | 1160 | { |