summaryrefslogtreecommitdiff
path: root/nchan.c
diff options
context:
space:
mode:
Diffstat (limited to 'nchan.c')
-rw-r--r--nchan.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/nchan.c b/nchan.c
index 3138cdd19..aee3f37b0 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $"); 26RCSID("$OpenBSD: nchan.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $");
27 27
28#include "ssh1.h" 28#include "ssh1.h"
29#include "ssh2.h" 29#include "ssh2.h"
@@ -42,15 +42,15 @@ RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $");
42 * tear down of channels: 42 * tear down of channels:
43 * 43 *
44 * 1.3: strict request-ack-protocol: 44 * 1.3: strict request-ack-protocol:
45 * CLOSE -> 45 * CLOSE ->
46 * <- CLOSE_CONFIRM 46 * <- CLOSE_CONFIRM
47 * 47 *
48 * 1.5: uses variations of: 48 * 1.5: uses variations of:
49 * IEOF -> 49 * IEOF ->
50 * <- OCLOSE 50 * <- OCLOSE
51 * <- IEOF 51 * <- IEOF
52 * OCLOSE -> 52 * OCLOSE ->
53 * i.e. both sides have to close the channel 53 * i.e. both sides have to close the channel
54 * 54 *
55 * 2.0: the EOF messages are optional 55 * 2.0: the EOF messages are optional
56 * 56 *
@@ -395,7 +395,7 @@ chan_mark_dead(Channel *c)
395} 395}
396 396
397int 397int
398chan_is_dead(Channel *c, int send) 398chan_is_dead(Channel *c, int do_send)
399{ 399{
400 if (c->type == SSH_CHANNEL_ZOMBIE) { 400 if (c->type == SSH_CHANNEL_ZOMBIE) {
401 debug2("channel %d: zombie", c->self); 401 debug2("channel %d: zombie", c->self);
@@ -416,7 +416,7 @@ chan_is_dead(Channel *c, int send)
416 return 0; 416 return 0;
417 } 417 }
418 if (!(c->flags & CHAN_CLOSE_SENT)) { 418 if (!(c->flags & CHAN_CLOSE_SENT)) {
419 if (send) { 419 if (do_send) {
420 chan_send_close2(c); 420 chan_send_close2(c);
421 } else { 421 } else {
422 /* channel would be dead if we sent a close */ 422 /* channel would be dead if we sent a close */