diff options
| author |   djm <djm@openbsd.org> | 2010-01-30 02:54:53 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-01-30 02:54:53 +0000 |
| commit | 7c20ca9be23ec6ae755606a6a4f68cee3832c91e (patch) | |
| tree | 335343edadfd34c46b3d44f770f531199217a9fa | |
| parent | kill correct channel (was killing already-dead mux channel, not (diff) | |
| download | wireguard-openbsd-7c20ca9be23ec6ae755606a6a4f68cee3832c91e.tar.xz wireguard-openbsd-7c20ca9be23ec6ae755606a6a4f68cee3832c91e.zip | |
don't mark channel as read failed if it is already closing; suppresses
harmless error messages when connecting to SSH.COM Tectia server
report by imorgan AT nas.nasa.gov
| -rw-r--r-- | usr.bin/ssh/mux.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index 4761d348b06..ef8e20acacf 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.13 2010/01/29 20:16:17 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.14 2010/01/30 02:54:53 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -197,8 +197,10 @@ mux_master_control_cleanup_cb(int cid, void *unused) debug2("%s: channel %d: not open", __func__, sc->self); chan_mark_dead(sc); } else { - chan_read_failed(sc); - chan_write_failed(sc); + if (sc->istate == CHAN_INPUT_OPEN) + chan_read_failed(sc); + if (sc->ostate == CHAN_OUTPUT_OPEN) + chan_write_failed(sc); } } channel_cancel_cleanup(c->self); |