Commit 3aa1d147 authored by Niels Möller's avatar Niels Möller
Browse files

*** empty log message ***

Rev: ChangeLog:1.171
Rev: src/tcpforward.c:1.42
Rev: src/tcpforward.h:1.13
Rev: src/tcpforward_commands.c:1.23
Rev: src/unix_user.c:1.4
parent caa63926
2000-03-26 Niels Mller <nisse@cuckoo.localdomain>
* src/server_session.c (server_session): New attribute
initial_window.
* src/client.c (make_client_session): Removed references to
max_window.
* src/channel.c (channel_start_receive): Added argument
initial_window_size. Removed references to max_window.
(format_global_request): New function.
* src/channel.h (ssh_channel): Removed obsolete max_window
attribute.
(channel_open): Added send_window_size argument.
* src/Makefile.am.in (liblsh_a_SOURCES): Added gateway_channel.c.
Removed proxy_channel.c.
* src/gateway_channel.c: New file. More or less copied from
proxy_channel.c.
2000-03-19 Niels Mller <nisse@cuckoo.localdomain>
* src/unix_user.c (do_lookup_user): Honor shadow-style password
......
......@@ -159,7 +159,7 @@ do_tcpip_channel_die(struct ssh_channel *c)
}
struct ssh_channel *
make_tcpip_channel(struct lsh_fd *socket, UINT32 max_window)
make_tcpip_channel(struct lsh_fd *socket, UINT32 initial_window)
{
NEW(tcpip_channel, self);
assert(socket);
......@@ -170,8 +170,7 @@ make_tcpip_channel(struct lsh_fd *socket, UINT32 max_window)
self->super.close = do_tcpip_channel_die;
self->super.max_window = max_window;
self->super.rec_window_size = max_window;
self->super.rec_window_size = initial_window;
/* FIXME: Make maximum packet size configurable. */
self->super.rec_max_packet = SSH_MAX_PACKET;
......@@ -287,7 +286,8 @@ static void
do_channel_open_direct_tcpip(struct channel_open *s,
struct ssh_connection *connection,
UINT32 channel_type UNUSED,
UINT32 max_packet UNUSED,
UINT32 send_window_size UNUSED,
UINT32 send_max_packet UNUSED,
struct simple_buffer *args,
struct command_continuation *c,
struct exception_handler *e)
......@@ -568,7 +568,8 @@ static void
do_channel_open_forwarded_tcpip(struct channel_open *s UNUSED,
struct ssh_connection *connection,
UINT32 channel_type UNUSED,
UINT32 max_packet UNUSED,
UINT32 send_window_size UNUSED,
UINT32 send_max_packet UNUSED,
struct simple_buffer *args,
struct command_continuation *c,
struct exception_handler *e)
......
......@@ -74,7 +74,7 @@ struct remote_port *
make_remote_port(struct address_info *listen,
struct command *callback);
struct ssh_channel *make_tcpip_channel(struct lsh_fd *socket, UINT32 max_window);
struct ssh_channel *make_tcpip_channel(struct lsh_fd *socket, UINT32 initial_window);
void tcpip_channel_start_io(struct ssh_channel *c);
struct channel_open *
......
......@@ -129,7 +129,9 @@ struct command tcpip_start_io =
(vars
; ATOM_FORWARDED_TCPIP or ATOM_DIRECT_TCPIP
(type . int)
(max_window . UINT32)
(initial_window . UINT32)
; For forwarded-tcpip, port is the port listened to.
; For direct-tcpip, port is the port to connect to.
; In both cases, it's a port used on the server end.
......@@ -166,7 +168,7 @@ new_tcpip_channel(struct channel_open_command *c,
}
static struct command *
make_open_tcpip_command(int type, UINT32 max_window,
make_open_tcpip_command(int type, UINT32 initial_window,
struct address_info *port,
struct listen_value *peer)
{
......@@ -178,7 +180,7 @@ make_open_tcpip_command(int type, UINT32 max_window,
self->super.new_channel = new_tcpip_channel;
self->type = type;
self->max_window = max_window;
self->initial_window = initial_window;
self->port = port;
self->peer = peer;
......@@ -325,8 +327,8 @@ do_format_request_tcpip_forward(struct global_request_command *s,
object_queue_add_tail(&connection->table->remote_ports,
&port->super.super);
return ssh_format("%c%a%c%S%i", SSH_MSG_GLOBAL_REQUEST, ATOM_TCPIP_FORWARD,
want_reply, self->port->ip, self->port->port);
return format_global_request(ATOM_TCPIP_FORWARD, want_reply, "%S%i",
self->port->ip, self->port->port);
}
static struct command *
......
......@@ -5,6 +5,25 @@
* $Id$
*/
/* lsh, an implementation of the ssh protocol
*
* Copyright (C) 2000 Niels Mller
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "server_userauth.h"
#include "format.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment