summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--channels.c12
-rw-r--r--channels.h4
2 files changed, 2 insertions, 14 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,
diff --git a/channels.h b/channels.h
index cdde30155..fa38a4e71 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.h,v 1.124 2017/05/26 19:34:12 markus Exp $ */ 1/* $OpenBSD: channels.h,v 1.125 2017/05/26 19:35:50 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -46,8 +46,6 @@
46#define SSH_CHANNEL_CLOSED 5 /* waiting for close confirmation */ 46#define SSH_CHANNEL_CLOSED 5 /* waiting for close confirmation */
47#define SSH_CHANNEL_AUTH_SOCKET 6 /* authentication socket */ 47#define SSH_CHANNEL_AUTH_SOCKET 6 /* authentication socket */
48#define SSH_CHANNEL_X11_OPEN 7 /* reading first X11 packet */ 48#define SSH_CHANNEL_X11_OPEN 7 /* reading first X11 packet */
49#define SSH_CHANNEL_INPUT_DRAINING 8 /* sending remaining data to conn */
50#define SSH_CHANNEL_OUTPUT_DRAINING 9 /* sending remaining data to app */
51#define SSH_CHANNEL_LARVAL 10 /* larval session */ 49#define SSH_CHANNEL_LARVAL 10 /* larval session */
52#define SSH_CHANNEL_RPORT_LISTENER 11 /* Listening to a R-style port */ 50#define SSH_CHANNEL_RPORT_LISTENER 11 /* Listening to a R-style port */
53#define SSH_CHANNEL_CONNECTING 12 51#define SSH_CHANNEL_CONNECTING 12