From 364f0d5edea27767fb0f915ea7fc61aded88d3e8 Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Fri, 26 May 2017 19:34:12 +0000 Subject: upstream commit remove channel_input_close_confirmation (ssh1 only); ok djm@ Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1 --- channels.c | 23 +---------------------- channels.h | 3 +-- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/channels.c b/channels.c index 4092a6710..17dcc195c 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 * Copyright (c) 1995 Tatu Ylonen , 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) @@ -2637,26 +2636,6 @@ channel_input_oclose(int type, u_int32_t seq, void *ctxt) return 0; } -/* 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) diff --git a/channels.h b/channels.h index 4e9b77de1..cdde30155 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 @@ -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 *); -- cgit v1.2.3