diff options
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 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.165 2002/02/03 17:58:21 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.166 2002/02/05 14:32:55 markus Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -588,20 +588,14 @@ channel_send_open(int id) | |||
588 | } | 588 | } |
589 | 589 | ||
590 | void | 590 | void |
591 | channel_request(int id, char *service, int wantconfirm) | 591 | channel_request_start(int local_id, char *service, int wantconfirm) |
592 | { | 592 | { |
593 | channel_request_start(id, service, wantconfirm); | 593 | Channel *c = channel_lookup(local_id); |
594 | packet_send(); | ||
595 | debug("channel request %d: %s", id, service) ; | ||
596 | } | ||
597 | void | ||
598 | channel_request_start(int id, char *service, int wantconfirm) | ||
599 | { | ||
600 | Channel *c = channel_lookup(id); | ||
601 | if (c == NULL) { | 594 | if (c == NULL) { |
602 | log("channel_request: %d: bad id", id); | 595 | log("channel_request_start: %d: unknown channel id", local_id); |
603 | return; | 596 | return; |
604 | } | 597 | } |
598 | debug("channel request %d: %s", local_id, service) ; | ||
605 | packet_start(SSH2_MSG_CHANNEL_REQUEST); | 599 | packet_start(SSH2_MSG_CHANNEL_REQUEST); |
606 | packet_put_int(c->remote_id); | 600 | packet_put_int(c->remote_id); |
607 | packet_put_cstring(service); | 601 | packet_put_cstring(service); |