diff options
author | Damien Miller <djm@mindrot.org> | 2002-02-08 12:04:26 +0100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-02-08 12:04:26 +0100 |
commit | a500cd608eb505c41fca079433721d46a02e8e1a (patch) | |
tree | 8d8b0155a68f04aae97d8438d20465bc584cef51 /channels.c | |
parent | - djm@cvs.openbsd.org 2002/02/05 00:00:46 (diff) | |
download | openssh-a500cd608eb505c41fca079433721d46a02e8e1a.tar.xz openssh-a500cd608eb505c41fca079433721d46a02e8e1a.zip |
- markus@cvs.openbsd.org 2002/02/05 14:32:55
[channels.c channels.h ssh.c]
merge channel_request() into channel_request_start()
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/channels.c b/channels.c index e5f910ed7..26741270a 100644 --- a/channels.c +++ b/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.165 2002/02/03 17:58:21 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.166 2002/02/05 14:32:55 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -588,20 +588,14 @@ channel_send_open(int id) } void -channel_request(int id, char *service, int wantconfirm) +channel_request_start(int local_id, char *service, int wantconfirm) { - channel_request_start(id, service, wantconfirm); - packet_send(); - debug("channel request %d: %s", id, service) ; -} -void -channel_request_start(int id, char *service, int wantconfirm) -{ - Channel *c = channel_lookup(id); + Channel *c = channel_lookup(local_id); if (c == NULL) { - log("channel_request: %d: bad id", id); + log("channel_request_start: %d: unknown channel id", local_id); return; } + debug("channel request %d: %s", local_id, service) ; packet_start(SSH2_MSG_CHANNEL_REQUEST); packet_put_int(c->remote_id); packet_put_cstring(service); |