tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/01/14 13:40:10

Browse Source 
[nchan.c]
     correct fn names for ssh2, do not switch from closed to closed; ok provos@
This commit is contained in:
Damien Miller 2002-01-22 23:28:13 +11:00
parent fcfc43b617
commit ebc11d3012
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -169,7 +169,10 @@
- markus@cvs.openbsd.org 2002/01/14 13:34:07 - markus@cvs.openbsd.org 2002/01/14 13:34:07
[nchan.c] [nchan.c]
merge chan_[io]buf_empty[12]; ok provos@ merge chan_[io]buf_empty[12]; ok provos@
- markus@cvs.openbsd.org 2002/01/14 13:40:10
[nchan.c]
correct fn names for ssh2, do not switch from closed to closed;
ok provos@
20020121 20020121
- (djm) Rework ssh-rand-helper: - (djm) Rework ssh-rand-helper:
@ -7317,4 +7320,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1770 2002/01/22 12:27:45 djm Exp $ $Id: ChangeLog,v 1.1771 2002/01/22 12:28:13 djm Exp $

13
nchan.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: nchan.c,v 1.39 2002/01/14 13:34:07 markus Exp $"); RCSID("$OpenBSD: nchan.c,v 1.40 2002/01/14 13:40:10 markus Exp $");
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"
@ -274,7 +274,7 @@ chan_send_oclose1(Channel *c)
* the same for SSH2 * the same for SSH2
*/ */
static void static void
chan_rcvd_oclose2(Channel *c) chan_rcvd_close2(Channel *c)
{ {
debug("channel %d: rcvd close", c->self); debug("channel %d: rcvd close", c->self);
if (c->flags & CHAN_CLOSE_RCVD) if (c->flags & CHAN_CLOSE_RCVD)
@ -298,12 +298,13 @@ chan_rcvd_oclose2(Channel *c)
switch (c->istate) { switch (c->istate) {
case CHAN_INPUT_OPEN: case CHAN_INPUT_OPEN:
chan_shutdown_read(c); chan_shutdown_read(c);
chan_set_istate(c, CHAN_INPUT_CLOSED);
break; break;
case CHAN_INPUT_WAIT_DRAIN: case CHAN_INPUT_WAIT_DRAIN:
chan_send_eof2(c); chan_send_eof2(c);
chan_set_istate(c, CHAN_INPUT_CLOSED);
break; break;
} }
chan_set_istate(c, CHAN_INPUT_CLOSED);
} }
static void static void
chan_ibuf_empty2(Channel *c) chan_ibuf_empty2(Channel *c)
@ -311,7 +312,7 @@ chan_ibuf_empty2(Channel *c)
chan_ibuf_empty1(c); chan_ibuf_empty1(c);
} }
static void static void
chan_rcvd_ieof2(Channel *c) chan_rcvd_eof2(Channel *c)
{ {
debug("channel %d: rcvd eof", c->self); debug("channel %d: rcvd eof", c->self);
if (c->ostate == CHAN_OUTPUT_OPEN) if (c->ostate == CHAN_OUTPUT_OPEN)
@ -446,11 +447,11 @@ void
chan_init(void) chan_init(void)
{ {
if (compat20) { if (compat20) {
chan_rcvd_oclose = chan_rcvd_oclose2; chan_rcvd_oclose = chan_rcvd_close2;
chan_read_failed = chan_read_failed_12; chan_read_failed = chan_read_failed_12;
chan_ibuf_empty = chan_ibuf_empty2; chan_ibuf_empty = chan_ibuf_empty2;
chan_rcvd_ieof = chan_rcvd_ieof2; chan_rcvd_ieof = chan_rcvd_eof2;
chan_write_failed = chan_write_failed2; chan_write_failed = chan_write_failed2;
chan_obuf_empty = chan_obuf_empty2; chan_obuf_empty = chan_obuf_empty2;
} else { } else {