From 50e884d12512ddb500c09ac3dbad67094fe93f09 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 5 Feb 2002 12:22:08 +1100
Subject:    - markus@cvs.openbsd.org 2002/02/03 17:55:55      [channels.c
 channels.h]      remove unused channel_input_channel_request

---
 ChangeLog  |  5 ++++-
 channels.c | 27 +--------------------------
 channels.h |  3 +--
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcdce1860..898159d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,9 @@
      	server_input_channel_req does generic request parsing on server side
      	session_input_channel_req handles just session specific things now
      ok djm@
+   - markus@cvs.openbsd.org 2002/02/03 17:55:55
+     [channels.c channels.h]
+     remove unused channel_input_channel_request
 
 20020130
  - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
@@ -7463,4 +7466,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1815 2002/02/05 01:21:42 djm Exp $
+$Id: ChangeLog,v 1.1816 2002/02/05 01:22:08 djm Exp $
diff --git a/channels.c b/channels.c
index f015a049e..568779dff 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.163 2002/01/27 14:57:46 stevesk Exp $");
+RCSID("$OpenBSD: channels.c,v 1.164 2002/02/03 17:55:55 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1940,31 +1940,6 @@ channel_input_open_failure(int type, u_int32_t seq, void *ctxt)
 	channel_free(c);
 }
 
-void
-channel_input_channel_request(int type, u_int32_t seq, void *ctxt)
-{
-	int id;
-	Channel *c;
-
-	id = packet_get_int();
-	c = channel_lookup(id);
-
-	if (c == NULL ||
-	    (c->type != SSH_CHANNEL_OPEN && c->type != SSH_CHANNEL_LARVAL))
-		packet_disconnect("Received request for "
-		    "non-open channel %d.", id);
-	if (c->cb_fn != NULL && c->cb_event == type) {
-		debug2("callback start");
-		c->cb_fn(c->self, c->cb_arg);
-		debug2("callback done");
-	} else {
-		char *service = packet_get_string(NULL);
-		debug("channel %d: rcvd request for %s", c->self, service);
-		debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event);
-		xfree(service);
-	}
-}
-
 void
 channel_input_window_adjust(int type, u_int32_t seq, void *ctxt)
 {
diff --git a/channels.h b/channels.h
index 6c6008f91..fa43b8ea6 100644
--- a/channels.h
+++ b/channels.h
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.60 2002/01/16 13:17:51 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.61 2002/02/03 17:55:55 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -157,7 +157,6 @@ int	 channel_close_fd(int *);
 
 /* protocol handler */
 
-void	 channel_input_channel_request(int, u_int32_t, void *);
 void	 channel_input_close(int, u_int32_t, void *);
 void	 channel_input_close_confirmation(int, u_int32_t, void *);
 void	 channel_input_data(int, u_int32_t, void *);
-- 
cgit v1.2.3