diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2017-05-26 21:34:12 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-27 07:35:52 +0200 |
| commit | 364f0d5edea27767fb0f915ea7fc61aded88d3e8 (patch) | |
| tree | 22dcfc570d8025b7502f957fe921f8d7007be914 /channels.c | |
| parent | upstream commit (diff) | |
| download | openssh-364f0d5edea27767fb0f915ea7fc61aded88d3e8.tar.xz openssh-364f0d5edea27767fb0f915ea7fc61aded88d3e8.zip | |
upstream commit
remove channel_input_close_confirmation (ssh1 only); ok
djm@
Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 23 |
1 files changed, 1 insertions, 22 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 <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; |