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
diff --git a/channels.c b/channels.c index 17dcc195c..5802c162e 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.360 2017/05/26 19:34:12 markus Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.361 2017/05/26 19:35:50 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -242,8 +242,6 @@ channel_lookup(int id) | |||
242 | case SSH_CHANNEL_DYNAMIC: | 242 | case SSH_CHANNEL_DYNAMIC: |
243 | case SSH_CHANNEL_OPENING: | 243 | case SSH_CHANNEL_OPENING: |
244 | case SSH_CHANNEL_OPEN: | 244 | case SSH_CHANNEL_OPEN: |
245 | case SSH_CHANNEL_INPUT_DRAINING: | ||
246 | case SSH_CHANNEL_OUTPUT_DRAINING: | ||
247 | case SSH_CHANNEL_ABANDONED: | 245 | case SSH_CHANNEL_ABANDONED: |
248 | case SSH_CHANNEL_MUX_PROXY: | 246 | case SSH_CHANNEL_MUX_PROXY: |
249 | return (c); | 247 | return (c); |
@@ -614,9 +612,6 @@ channel_still_open(void) | |||
614 | case SSH_CHANNEL_MUX_CLIENT: | 612 | case SSH_CHANNEL_MUX_CLIENT: |
615 | case SSH_CHANNEL_MUX_PROXY: | 613 | case SSH_CHANNEL_MUX_PROXY: |
616 | return 1; | 614 | return 1; |
617 | case SSH_CHANNEL_INPUT_DRAINING: | ||
618 | case SSH_CHANNEL_OUTPUT_DRAINING: | ||
619 | fatal("cannot happen: OUT_DRAIN"); | ||
620 | default: | 615 | default: |
621 | fatal("%s: bad channel type %d", __func__, c->type); | 616 | fatal("%s: bad channel type %d", __func__, c->type); |
622 | /* NOTREACHED */ | 617 | /* NOTREACHED */ |
@@ -657,9 +652,6 @@ channel_find_open(void) | |||
657 | case SSH_CHANNEL_OPEN: | 652 | case SSH_CHANNEL_OPEN: |
658 | case SSH_CHANNEL_X11_OPEN: | 653 | case SSH_CHANNEL_X11_OPEN: |
659 | return i; | 654 | return i; |
660 | case SSH_CHANNEL_INPUT_DRAINING: | ||
661 | case SSH_CHANNEL_OUTPUT_DRAINING: | ||
662 | fatal("cannot happen: OUT_DRAIN"); | ||
663 | default: | 655 | default: |
664 | fatal("%s: bad channel type %d", __func__, c->type); | 656 | fatal("%s: bad channel type %d", __func__, c->type); |
665 | /* NOTREACHED */ | 657 | /* NOTREACHED */ |
@@ -706,8 +698,6 @@ channel_open_message(void) | |||
706 | case SSH_CHANNEL_DYNAMIC: | 698 | case SSH_CHANNEL_DYNAMIC: |
707 | case SSH_CHANNEL_OPEN: | 699 | case SSH_CHANNEL_OPEN: |
708 | case SSH_CHANNEL_X11_OPEN: | 700 | case SSH_CHANNEL_X11_OPEN: |
709 | case SSH_CHANNEL_INPUT_DRAINING: | ||
710 | case SSH_CHANNEL_OUTPUT_DRAINING: | ||
711 | case SSH_CHANNEL_MUX_PROXY: | 701 | case SSH_CHANNEL_MUX_PROXY: |
712 | case SSH_CHANNEL_MUX_CLIENT: | 702 | case SSH_CHANNEL_MUX_CLIENT: |
713 | snprintf(buf, sizeof buf, | 703 | snprintf(buf, sizeof buf, |