RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-18 16:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
remove channel_input_close_confirmation (ssh1 only); ok
djm@

Upstream-ID: 8e7c8c38f322d255bb0294a5c0ebef53fdf576f1
This commit is contained in:
markus@openbsd.org 2017-05-26 19:34:12 +00:00 committed by Damien Miller
parent 8ba0fd4008
commit 364f0d5ede
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
channels.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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; return 0;
} }
/* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */
/* ARGSUSED */ /* ARGSUSED */
int int
channel_input_oclose(int type, u_int32_t seq, void *ctxt) 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; 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 */ /* ARGSUSED */
int int
channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt) channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt)

3
channels.h
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -238,7 +238,6 @@ int channel_proxy_upstream(Channel *, int, u_int32_t, void *);
/* protocol handler */ /* protocol handler */
int channel_input_close_confirmation(int, u_int32_t, void *);
int channel_input_data(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_extended_data(int, u_int32_t, void *);
int channel_input_ieof(int, u_int32_t, void *); int channel_input_ieof(int, u_int32_t, void *);