summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2017-05-26 19:34:12 +0000
committerDamien Miller <djm@mindrot.org>2017-05-27 15:35:52 +1000
commit364f0d5edea27767fb0f915ea7fc61aded88d3e8 (patch)
tree22dcfc570d8025b7502f957fe921f8d7007be914
parent8ba0fd40082751dbbc23a830433488bbfb1abdca (diff)
upstream commit
remove channel_input_close_confirmation (ssh1 only); ok djm@ Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1
-rw-r--r--channels.c23
-rw-r--r--channels.h3
2 files changed, 2 insertions, 24 deletions
diff --git a/channels.c b/channels.c
index 4092a671..17dcc195 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.359 2017/04/30 23:28:41 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.360 2017/05/26 19:34:12 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2620,7 +2620,6 @@ channel_input_ieof(int type, u_int32_t seq, void *ctxt)
return 0;
}
-/* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */
/* ARGSUSED */
int
channel_input_oclose(int type, u_int32_t seq, void *ctxt)
@@ -2639,26 +2638,6 @@ channel_input_oclose(int type, u_int32_t seq, void *ctxt)
/* ARGSUSED */
int
-channel_input_close_confirmation(int type, u_int32_t seq, void *ctxt)
-{
- int id = packet_get_int();
- Channel *c = channel_lookup(id);
-
- if (c == NULL)
- packet_disconnect("Received close confirmation for "
- "out-of-range channel %d.", id);
- if (channel_proxy_upstream(c, type, seq, ctxt))
- return 0;
- packet_check_eom();
- if (c->type != SSH_CHANNEL_CLOSED && c->type != SSH_CHANNEL_ABANDONED)
- packet_disconnect("Received close confirmation for "
- "non-closed channel %d (type %d).", id, c->type);
- channel_free(c);
- return 0;
-}
-
-/* ARGSUSED */
-int
channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt)
{
int id, remote_id;
diff --git a/channels.h b/channels.h
index 4e9b77de..cdde3015 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.123 2017/04/30 23:28:41 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.124 2017/05/26 19:34:12 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -238,7 +238,6 @@ int channel_proxy_upstream(Channel *, int, u_int32_t, void *);
/* protocol handler */
-int channel_input_close_confirmation(int, u_int32_t, void *);
int channel_input_data(int, u_int32_t, void *);
int channel_input_extended_data(int, u_int32_t, void *);
int channel_input_ieof(int, u_int32_t, void *);