mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-24 02:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2002/10/23 10:32:13

Browse Source 
[packet.c]
     use %u for u_int
This commit is contained in:
Ben Lindstrom 2002-11-09 15:41:39 +00:00
parent 0851381bf7
commit 0cc2a47674
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,9 @@
- itojun@cvs.openbsd.org 2002/10/16 14:31:48 - itojun@cvs.openbsd.org 2002/10/16 14:31:48
[sftp-common.c] [sftp-common.c]
64bit pedant. %llu is "unsigned long long". markus ok 64bit pedant. %llu is "unsigned long long". markus ok
- markus@cvs.openbsd.org 2002/10/23 10:32:13
[packet.c]
use %u for u_int
20021021 20021021
- (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
@ -780,4 +783,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2500 2002/11/09 15:40:34 mouring Exp $ $Id: ChangeLog,v 1.2501 2002/11/09 15:41:39 mouring Exp $

8
packet.c
View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: packet.c,v 1.97 2002/07/04 08:12:15 deraadt Exp $"); RCSID("$OpenBSD: packet.c,v 1.98 2002/10/23 10:32:13 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
@ -840,7 +840,7 @@ packet_read_poll1(void)
cp = buffer_ptr(&input); cp = buffer_ptr(&input);
len = GET_32BIT(cp); len = GET_32BIT(cp);
if (len < 1 + 2 + 2 || len > 256 * 1024) if (len < 1 + 2 + 2 || len > 256 * 1024)
packet_disconnect("Bad packet length %d.", len); packet_disconnect("Bad packet length %u.", len);
padded_len = (len + 8) & ~7; padded_len = (len + 8) & ~7;
/* Check if the packet has been entirely received. */ /* Check if the packet has been entirely received. */
@ -936,9 +936,9 @@ packet_read_poll2(u_int32_t *seqnr_p)
packet_length = GET_32BIT(cp); packet_length = GET_32BIT(cp);
if (packet_length < 1 + 4 || packet_length > 256 * 1024) { if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
buffer_dump(&incoming_packet); buffer_dump(&incoming_packet);
packet_disconnect("Bad packet length %d.", packet_length); packet_disconnect("Bad packet length %u.", packet_length);
} }
DBG(debug("input: packet len %d", packet_length+4)); DBG(debug("input: packet len %u", packet_length+4));
buffer_consume(&input, block_size); buffer_consume(&input, block_size);
} }
/* we have a partial packet of block_size bytes */ /* we have a partial packet of block_size bytes */