tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/06/24 14:33:27 

[channels.c channels.h clientloop.c serverloop.c]
     move channel counter to u_int
This commit is contained in:
Ben Lindstrom 2002-06-25 23:17:36 +00:00
parent b48057b7dc
commit 4fed2be856
5 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -7,6 +7,9 @@
- markus@cvs.openbsd.org 2002/06/24 13:12:23 - markus@cvs.openbsd.org 2002/06/24 13:12:23
[ssh-agent.1] [ssh-agent.1]
the socket name contains ssh-agent's ppid; via mpech@ from form@ the socket name contains ssh-agent's ppid; via mpech@ from form@
- markus@cvs.openbsd.org 2002/06/24 14:33:27
[channels.c channels.h clientloop.c serverloop.c]
move channel counter to u_int
20020625 20020625
- (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
@ -1106,4 +1109,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2275 2002/06/25 23:16:31 mouring Exp $ $Id: ChangeLog,v 1.2276 2002/06/25 23:17:36 mouring Exp $

16
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.177 2002/06/23 21:34:07 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.178 2002/06/24 14:33:27 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -205,7 +205,7 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd,
Channel * Channel *
channel_new(char *ctype, int type, int rfd, int wfd, int efd, channel_new(char *ctype, int type, int rfd, int wfd, int efd,
int window, int maxpack, int extusage, char *remote_name, int nonblock) u_int window, u_int maxpack, int extusage, char *remote_name, int nonblock)
{ {
int i, found; int i, found;
Channel *c; Channel *c;
@ -1568,8 +1568,9 @@ channel_after_select(fd_set * readset, fd_set * writeset)
void void
channel_output_poll(void) channel_output_poll(void)
{ {
int len, i;
Channel *c; Channel *c;
int i;
u_int len;
for (i = 0; i < channels_alloc; i++) { for (i = 0; i < channels_alloc; i++) {
c = channels[i]; c = channels[i];
@ -1647,7 +1648,7 @@ channel_output_poll(void)
c->remote_window > 0 && c->remote_window > 0 &&
(len = buffer_len(&c->extended)) > 0 && (len = buffer_len(&c->extended)) > 0 &&
c->extended_usage == CHAN_EXTENDED_READ) { c->extended_usage == CHAN_EXTENDED_READ) {
debug2("channel %d: rwin %d elen %d euse %d", debug2("channel %d: rwin %u elen %u euse %d",
c->self, c->remote_window, buffer_len(&c->extended), c->self, c->remote_window, buffer_len(&c->extended),
c->extended_usage); c->extended_usage);
if (len > c->remote_window) if (len > c->remote_window)
@ -1873,7 +1874,7 @@ channel_input_open_confirmation(int type, u_int32_t seq, void *ctxt)
c->confirm(c->self, NULL); c->confirm(c->self, NULL);
debug2("callback done"); debug2("callback done");
} }
debug("channel %d: open confirm rwindow %d rmax %d", c->self, debug("channel %d: open confirm rwindow %u rmax %u", c->self,
c->remote_window, c->remote_maxpacket); c->remote_window, c->remote_maxpacket);
} }
packet_check_eom(); packet_check_eom();
@ -1930,7 +1931,8 @@ void
channel_input_window_adjust(int type, u_int32_t seq, void *ctxt) channel_input_window_adjust(int type, u_int32_t seq, void *ctxt)
{ {
Channel *c; Channel *c;
int id, adjust; int id;
u_int adjust;
if (!compat20) if (!compat20)
return; return;
@ -1946,7 +1948,7 @@ channel_input_window_adjust(int type, u_int32_t seq, void *ctxt)
} }
adjust = packet_get_int(); adjust = packet_get_int();
packet_check_eom(); packet_check_eom();
debug2("channel %d: rcvd adjust %d", id, adjust); debug2("channel %d: rcvd adjust %u", id, adjust);
c->remote_window += adjust; c->remote_window += adjust;
} }

16
channels.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.h,v 1.69 2002/06/23 21:06:41 deraadt Exp $ */ /* $OpenBSD: channels.h,v 1.70 2002/06/24 14:33:27 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -90,12 +90,12 @@ struct Channel {
int host_port; /* remote port to connect for forwards */ int host_port; /* remote port to connect for forwards */
char *remote_name; /* remote hostname */ char *remote_name; /* remote hostname */
int remote_window; u_int remote_window;
int remote_maxpacket; u_int remote_maxpacket;
int local_window; u_int local_window;
int local_window_max; u_int local_window_max;
int local_consumed; u_int local_consumed;
int local_maxpacket; u_int local_maxpacket;
int extended_usage; int extended_usage;
int single_connection; int single_connection;
@ -151,7 +151,7 @@ struct Channel {
/* channel management */ /* channel management */
Channel *channel_lookup(int); Channel *channel_lookup(int);
Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int); Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int);
void channel_set_fds(int, int, int, int, int, int, u_int); void channel_set_fds(int, int, int, int, int, int, u_int);
void channel_free(Channel *); void channel_free(Channel *);
void channel_free_all(void); void channel_free_all(void);

6
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.101 2002/06/09 13:32:01 markus Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.102 2002/06/24 14:33:27 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1208,10 +1208,8 @@ client_input_channel_open(int type, u_int32_t seq, void *ctxt)
{ {
Channel *c = NULL; Channel *c = NULL;
char *ctype; char *ctype;
u_int len;
int rchan; int rchan;
int rmaxpack; u_int rmaxpack, rwindow, len;
int rwindow;
ctype = packet_get_string(&len); ctype = packet_get_string(&len);
rchan = packet_get_int(); rchan = packet_get_int();

6
serverloop.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: serverloop.c,v 1.102 2002/06/11 05:46:20 mpech Exp $"); RCSID("$OpenBSD: serverloop.c,v 1.103 2002/06/24 14:33:27 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
@ -902,10 +902,8 @@ server_input_channel_open(int type, u_int32_t seq, void *ctxt)
{ {
Channel *c = NULL; Channel *c = NULL;
char *ctype; char *ctype;
u_int len;
int rchan; int rchan;
int rmaxpack; u_int rmaxpack, rwindow, len;
int rwindow;
ctype = packet_get_string(&len); ctype = packet_get_string(&len);
rchan = packet_get_int(); rchan = packet_get_int();