diff options
author | Damien Miller <djm@mindrot.org> | 2002-02-08 22:04:26 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-02-08 22:04:26 +1100 |
commit | a500cd608eb505c41fca079433721d46a02e8e1a (patch) | |
tree | 8d8b0155a68f04aae97d8438d20465bc584cef51 | |
parent | 8829d3669d154dbd06f9ee2cc779f14e2af8e15f (diff) |
- markus@cvs.openbsd.org 2002/02/05 14:32:55
[channels.c channels.h ssh.c]
merge channel_request() into channel_request_start()
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 16 | ||||
-rw-r--r-- | channels.h | 3 | ||||
-rw-r--r-- | ssh.c | 5 |
4 files changed, 13 insertions, 16 deletions
@@ -10,6 +10,9 @@ | |||
10 | - djm@cvs.openbsd.org 2002/02/05 00:00:46 | 10 | - djm@cvs.openbsd.org 2002/02/05 00:00:46 |
11 | [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c] | 11 | [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c] |
12 | Add "-B" option to specify copy buffer length (default 32k); ok markus@ | 12 | Add "-B" option to specify copy buffer length (default 32k); ok markus@ |
13 | - markus@cvs.openbsd.org 2002/02/05 14:32:55 | ||
14 | [channels.c channels.h ssh.c] | ||
15 | merge channel_request() into channel_request_start() | ||
13 | 16 | ||
14 | 20020205 | 17 | 20020205 |
15 | - (djm) Cleanup after sync: | 18 | - (djm) Cleanup after sync: |
@@ -7516,4 +7519,4 @@ | |||
7516 | - Wrote replacements for strlcpy and mkdtemp | 7519 | - Wrote replacements for strlcpy and mkdtemp |
7517 | - Released 1.0pre1 | 7520 | - Released 1.0pre1 |
7518 | 7521 | ||
7519 | $Id: ChangeLog,v 1.1830 2002/02/08 11:04:05 djm Exp $ | 7522 | $Id: ChangeLog,v 1.1831 2002/02/08 11:04:26 djm Exp $ |
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); |
diff --git a/channels.h b/channels.h index 781c49d47..7cb0c367c 100644 --- a/channels.h +++ b/channels.h | |||
@@ -32,7 +32,7 @@ | |||
32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
34 | */ | 34 | */ |
35 | /* RCSID("$OpenBSD: channels.h,v 1.62 2002/02/03 17:58:21 markus Exp $"); */ | 35 | /* RCSID("$OpenBSD: channels.h,v 1.63 2002/02/05 14:32:55 markus Exp $"); */ |
36 | 36 | ||
37 | #ifndef CHANNEL_H | 37 | #ifndef CHANNEL_H |
38 | #define CHANNEL_H | 38 | #define CHANNEL_H |
@@ -145,7 +145,6 @@ void channel_free_all(void); | |||
145 | void channel_stop_listening(void); | 145 | void channel_stop_listening(void); |
146 | 146 | ||
147 | void channel_send_open(int); | 147 | void channel_send_open(int); |
148 | void channel_request(int, char *, int); | ||
149 | void channel_request_start(int, char *, int); | 148 | void channel_request_start(int, char *, int); |
150 | void channel_register_cleanup(int, channel_callback_fn *); | 149 | void channel_register_cleanup(int, channel_callback_fn *); |
151 | void channel_register_confirm(int, channel_callback_fn *); | 150 | void channel_register_confirm(int, channel_callback_fn *); |
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.160 2002/02/03 17:58:21 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.161 2002/02/05 14:32:55 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -1110,7 +1110,8 @@ ssh_session2_setup(int id, void *arg) | |||
1110 | packet_put_string(buffer_ptr(&command), buffer_len(&command)); | 1110 | packet_put_string(buffer_ptr(&command), buffer_len(&command)); |
1111 | packet_send(); | 1111 | packet_send(); |
1112 | } else { | 1112 | } else { |
1113 | channel_request(id, "shell", 0); | 1113 | channel_request_start(id, "shell", 0); |
1114 | packet_send(); | ||
1114 | } | 1115 | } |
1115 | /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */ | 1116 | /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */ |
1116 | 1117 | ||