- markus@cvs.openbsd.org 2002/02/05 14:32:55

     [channels.c channels.h ssh.c]
     merge channel_request() into channel_request_start()

diff --git a/ChangeLog b/ChangeLog
index d16e369d88dd66f4471377b8aafb26a062ca62b9..161acc8efea64b7746ee9ba50fb68a06d9b4777f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
    - djm@cvs.openbsd.org 2002/02/05 00:00:46
      [sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
      Add "-B" option to specify copy buffer length (default 32k); ok markus@
+   - markus@cvs.openbsd.org 2002/02/05 14:32:55
+     [channels.c channels.h ssh.c]
+     merge channel_request() into channel_request_start()
 
 20020205
  - (djm) Cleanup after sync:

diff --git a/channels.c b/channels.c
index e5f910ed77b6dff4efade4781ec9ee27289e70ad..26741270a5cb69bce96198d8b21c8034ee585ed8 100644 (file)
--- 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);

diff --git a/channels.h b/channels.h
index 781c49d479ad9f3bdb012e4b6572cb3330d5bfaf..7cb0c367cbb3e8f892df9397728686eb9bf32004 100644 (file)
--- 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.62 2002/02/03 17:58:21 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.63 2002/02/05 14:32:55 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -145,7 +145,6 @@ void         channel_free_all(void);
 void    channel_stop_listening(void);
 
 void    channel_send_open(int);
-void    channel_request(int, char *, int);
 void    channel_request_start(int, char *, int);
 void    channel_register_cleanup(int, channel_callback_fn *);
 void    channel_register_confirm(int, channel_callback_fn *);

diff --git a/ssh.c b/ssh.c
index 5ec27219e8f3763df11d8b631de81f027f96dbf3..6415d27f91dd18e3ab3b27fd5c30ddc57ffe013f 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.160 2002/02/03 17:58:21 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.161 2002/02/05 14:32:55 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -1110,7 +1110,8 @@ ssh_session2_setup(int id, void *arg)
                packet_put_string(buffer_ptr(&command), buffer_len(&command));
                packet_send();
        } else {
-               channel_request(id, "shell", 0);
+               channel_request_start(id, "shell", 0);
+               packet_send();
        }
        /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */