diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2017-05-26 19:35:50 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-27 15:35:52 +1000 |
| commit | 6cf711752cc2a7ffaad1fb4de18cae65715ed8bb (patch) | |
| tree | 0ee922e3cbfa28687f768e918cb15f3755ce15b4 /channels.c | |
| parent | 364f0d5edea27767fb0f915ea7fc61aded88d3e8 (diff) | |
upstream commit
remove SSH_CHANNEL_XXX_DRAINING (ssh1 only); ok djm@
Upstream-ID: e2e225b6ac67b84dd024f38819afff2554fafe42
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.360 2017/05/26 19:34:12 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.361 2017/05/26 19:35:50 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -242,8 +242,6 @@ channel_lookup(int id) case SSH_CHANNEL_DYNAMIC: case SSH_CHANNEL_OPENING: case SSH_CHANNEL_OPEN: - case SSH_CHANNEL_INPUT_DRAINING: - case SSH_CHANNEL_OUTPUT_DRAINING: case SSH_CHANNEL_ABANDONED: case SSH_CHANNEL_MUX_PROXY: return (c); @@ -614,9 +612,6 @@ channel_still_open(void) case SSH_CHANNEL_MUX_CLIENT: case SSH_CHANNEL_MUX_PROXY: return 1; - case SSH_CHANNEL_INPUT_DRAINING: - case SSH_CHANNEL_OUTPUT_DRAINING: - fatal("cannot happen: OUT_DRAIN"); default: fatal("%s: bad channel type %d", __func__, c->type); /* NOTREACHED */ @@ -657,9 +652,6 @@ channel_find_open(void) case SSH_CHANNEL_OPEN: case SSH_CHANNEL_X11_OPEN: return i; - case SSH_CHANNEL_INPUT_DRAINING: - case SSH_CHANNEL_OUTPUT_DRAINING: - fatal("cannot happen: OUT_DRAIN"); default: fatal("%s: bad channel type %d", __func__, c->type); /* NOTREACHED */ @@ -706,8 +698,6 @@ channel_open_message(void) case SSH_CHANNEL_DYNAMIC: case SSH_CHANNEL_OPEN: case SSH_CHANNEL_X11_OPEN: - case SSH_CHANNEL_INPUT_DRAINING: - case SSH_CHANNEL_OUTPUT_DRAINING: case SSH_CHANNEL_MUX_PROXY: case SSH_CHANNEL_MUX_CLIENT: snprintf(buf, sizeof buf, |