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

     [channels.c channels.h clientloop.c serverloop.c]
     move channel counter to u_int

5 files changed, 25 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 70dfe5f7e..ce70a55ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
    - markus@cvs.openbsd.org 2002/06/24 13:12:23
      [ssh-agent.1]
      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
  - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
@@ -1106,4 +1109,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (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 $
diff --git a/channels.c b/channels.c
index fede9eb93..c22e5695c 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #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 "ssh1.h"
@@ -205,7 +205,7 @@ channel_register_fds(Channel *c, int rfd, int wfd, int efd,
 
 Channel *
 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;
         Channel *c;
@@ -1568,8 +1568,9 @@ channel_after_select(fd_set * readset, fd_set * writeset)
 void
 channel_output_poll(void)
 {
-        int len, i;
         Channel *c;
+        int i;
+        u_int len;
 
         for (i = 0; i < channels_alloc; i++) {
                 c = channels[i];
@@ -1647,7 +1648,7 @@ channel_output_poll(void)
                     c->remote_window > 0 &&
                     (len = buffer_len(&c->extended)) > 0 &&
                     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->extended_usage);
                         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);
                         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);
         }
         packet_check_eom();
@@ -1930,7 +1931,8 @@ void
 channel_input_window_adjust(int type, u_int32_t seq, void *ctxt)
 {
         Channel *c;
-        int id, adjust;
+        int id;
+        u_int adjust;
 
         if (!compat20)
                 return;
@@ -1946,7 +1948,7 @@ channel_input_window_adjust(int type, u_int32_t seq, void *ctxt)
         }
         adjust = packet_get_int();
         packet_check_eom();
-        debug2("channel %d: rcvd adjust %d", id, adjust);
+        debug2("channel %d: rcvd adjust %u", id, adjust);
         c->remote_window += adjust;
 }
 
diff --git a/channels.h b/channels.h
index 64f6c41fa..dd54114d6 100644
--- a/channels.h
+++ b/channels.h
@@ -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>
@@ -90,12 +90,12 @@ struct Channel {
         int     host_port;      /* remote port to connect for forwards */
         char   *remote_name;    /* remote hostname */
 
-        int     remote_window;
-        int     remote_maxpacket;
-        int     local_window;
-        int     local_window_max;
-        int     local_consumed;
-        int     local_maxpacket;
+        u_int   remote_window;
+        u_int   remote_maxpacket;
+        u_int   local_window;
+        u_int   local_window_max;
+        u_int   local_consumed;
+        u_int   local_maxpacket;
         int     extended_usage;
         int     single_connection;
 
@@ -151,7 +151,7 @@ struct Channel {
 /* channel management */
 
 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_free(Channel *);
 void     channel_free_all(void);
diff --git a/clientloop.c b/clientloop.c
index 75d24ace2..cd2eab77a 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #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 "ssh1.h"
@@ -1208,10 +1208,8 @@ client_input_channel_open(int type, u_int32_t seq, void *ctxt)
 {
         Channel *c = NULL;
         char *ctype;
-        u_int len;
         int rchan;
-        int rmaxpack;
-        int rwindow;
+        u_int rmaxpack, rwindow, len;
 
         ctype = packet_get_string(&len);
         rchan = packet_get_int();
diff --git a/serverloop.c b/serverloop.c
index 1a148fcbe..134921355 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #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 "packet.h"
@@ -902,10 +902,8 @@ server_input_channel_open(int type, u_int32_t seq, void *ctxt)
 {
         Channel *c = NULL;
         char *ctype;
-        u_int len;
         int rchan;
-        int rmaxpack;
-        int rwindow;
+        u_int rmaxpack, rwindow, len;
 
         ctype = packet_get_string(&len);
         rchan = packet_get_int();