upstream commit

remove SSH_CHANNEL_XXX_DRAINING (ssh1 only); ok djm@

Upstream-ID: e2e225b6ac67b84dd024f38819afff2554fafe42

diff --git a/channels.c b/channels.c
index 17dcc195c460169621226a21326f3f4db80324f5..5802c162e69b8506f7f1873fabbb20a4cb8583d8 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -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,

diff --git a/channels.h b/channels.h
index cdde30155f1f8cd6a948cc0e70f535e1967f4446..fa38a4e71486911844f00859ef8cd3e9690d7c9c 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.124 2017/05/26 19:34:12 markus Exp $ */
+/* $OpenBSD: channels.h,v 1.125 2017/05/26 19:35:50 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -46,8 +46,6 @@
 #define SSH_CHANNEL_CLOSED             5       /* waiting for close confirmation */
 #define SSH_CHANNEL_AUTH_SOCKET                6       /* authentication socket */
 #define SSH_CHANNEL_X11_OPEN           7       /* reading first X11 packet */
-#define SSH_CHANNEL_INPUT_DRAINING     8       /* sending remaining data to conn */
-#define SSH_CHANNEL_OUTPUT_DRAINING    9       /* sending remaining data to app */
 #define SSH_CHANNEL_LARVAL             10      /* larval session */
 #define SSH_CHANNEL_RPORT_LISTENER     11      /* Listening to a R-style port  */
 #define SSH_CHANNEL_CONNECTING         12