diff options
author | Damien Miller <djm@mindrot.org> | 2010-01-30 17:36:33 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-01-30 17:36:33 +1100 |
commit | 0dac03febdb52ccf0dfe19dcb1d7e895264b218a (patch) | |
tree | 942553819cd425c54a07720d6b3a99df7cb0a3ca /mux.c | |
parent | 133d9d313e1058ed5d028abb450de253c00a4c5d (diff) |
- djm@cvs.openbsd.org 2010/01/29 20:16:17
[mux.c]
kill correct channel (was killing already-dead mux channel, not
its session channel)
Diffstat (limited to 'mux.c')
-rw-r--r-- | mux.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.13 2010/01/29 20:16:17 djm Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.14 2010/01/30 02:54:53 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 | * |
@@ -214,8 +214,10 @@ mux_master_control_cleanup_cb(int cid, void *unused) | |||
214 | debug2("%s: channel %d: not open", __func__, sc->self); | 214 | debug2("%s: channel %d: not open", __func__, sc->self); |
215 | chan_mark_dead(sc); | 215 | chan_mark_dead(sc); |
216 | } else { | 216 | } else { |
217 | chan_read_failed(sc); | 217 | if (sc->istate == CHAN_INPUT_OPEN) |
218 | chan_write_failed(sc); | 218 | chan_read_failed(sc); |
219 | if (sc->ostate == CHAN_OUTPUT_OPEN) | ||
220 | chan_write_failed(sc); | ||
219 | } | 221 | } |
220 | } | 222 | } |
221 | channel_cancel_cleanup(c->self); | 223 | channel_cancel_cleanup(c->self); |