diff options
| author | des <des@FreeBSD.org> | 2004-10-28 16:03:53 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-10-28 16:03:53 +0000 |
| commit | d5d493f03ae792146848e3cba16bb9e667c73125 (patch) | |
| tree | da81db150f0171c7861edf6e1f6b1fb45f81a6a7 /crypto/openssh/nchan.c | |
| parent | c69db9c5a2d88a51f8d2394cf37717ba93f07152 (diff) | |
| download | FreeBSD-src-d5d493f03ae792146848e3cba16bb9e667c73125.zip FreeBSD-src-d5d493f03ae792146848e3cba16bb9e667c73125.tar.gz | |
Vendor import of OpenSSH 3.9p1.
Diffstat (limited to 'crypto/openssh/nchan.c')
| -rw-r--r-- | crypto/openssh/nchan.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/openssh/nchan.c b/crypto/openssh/nchan.c index 3138cdd..aee3f37 100644 --- a/crypto/openssh/nchan.c +++ b/crypto/openssh/nchan.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $"); +RCSID("$OpenBSD: nchan.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $"); #include "ssh1.h" #include "ssh2.h" @@ -42,15 +42,15 @@ RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $"); * tear down of channels: * * 1.3: strict request-ack-protocol: - * CLOSE -> - * <- CLOSE_CONFIRM + * CLOSE -> + * <- CLOSE_CONFIRM * * 1.5: uses variations of: - * IEOF -> - * <- OCLOSE - * <- IEOF - * OCLOSE -> - * i.e. both sides have to close the channel + * IEOF -> + * <- OCLOSE + * <- IEOF + * OCLOSE -> + * i.e. both sides have to close the channel * * 2.0: the EOF messages are optional * @@ -395,7 +395,7 @@ chan_mark_dead(Channel *c) } int -chan_is_dead(Channel *c, int send) +chan_is_dead(Channel *c, int do_send) { if (c->type == SSH_CHANNEL_ZOMBIE) { debug2("channel %d: zombie", c->self); @@ -416,7 +416,7 @@ chan_is_dead(Channel *c, int send) return 0; } if (!(c->flags & CHAN_CLOSE_SENT)) { - if (send) { + if (do_send) { chan_send_close2(c); } else { /* channel would be dead if we sent a close */ |
