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

- deraadt@cvs.openbsd.org 2002/06/23 21:10:02 

[packet.c]
     packet_get_int() returns unsigned for reason & seqnr
This commit is contained in:
Ben Lindstrom 2002-06-23 21:49:25 +00:00
parent a9d2c89fc5
commit 3f58474214
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -32,6 +32,9 @@
- deraadt@cvs.openbsd.org 2002/06/23 21:06:41 - deraadt@cvs.openbsd.org 2002/06/23 21:06:41
[channels.c channels.h session.c session.h] [channels.c channels.h session.c session.h]
display, screen, row, col, xpixel, ypixel are u_int; markus ok display, screen, row, col, xpixel, ypixel are u_int; markus ok
- deraadt@cvs.openbsd.org 2002/06/23 21:10:02
[packet.c]
packet_get_int() returns unsigned for reason & seqnr
- (bal) Also fixed IPADDR_IN_DISPLAY case where display, screen, row, col, - (bal) Also fixed IPADDR_IN_DISPLAY case where display, screen, row, col,
xpixel are u_int. xpixel are u_int.
@ -1079,4 +1082,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.2263 2002/06/23 21:48:28 mouring Exp $ $Id: ChangeLog,v 1.2264 2002/06/23 21:49:25 mouring Exp $

15
packet.c
View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: packet.c,v 1.95 2002/06/19 18:01:00 markus Exp $"); RCSID("$OpenBSD: packet.c,v 1.96 2002/06/23 21:10:02 deraadt Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
@ -1015,7 +1015,7 @@ packet_read_poll2(u_int32_t *seqnr_p)
int int
packet_read_poll_seqnr(u_int32_t *seqnr_p) packet_read_poll_seqnr(u_int32_t *seqnr_p)
{ {
int reason, seqnr; u_int reason, seqnr;
u_char type; u_char type;
char *msg; char *msg;
@ -1038,14 +1038,15 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
case SSH2_MSG_DISCONNECT: case SSH2_MSG_DISCONNECT:
reason = packet_get_int(); reason = packet_get_int();
msg = packet_get_string(NULL); msg = packet_get_string(NULL);
log("Received disconnect from %s: %d: %.400s", get_remote_ipaddr(), log("Received disconnect from %s: %u: %.400s",
reason, msg); get_remote_ipaddr(), reason, msg);
xfree(msg); xfree(msg);
fatal_cleanup(); fatal_cleanup();
break; break;
case SSH2_MSG_UNIMPLEMENTED: case SSH2_MSG_UNIMPLEMENTED:
seqnr = packet_get_int(); seqnr = packet_get_int();
debug("Received SSH2_MSG_UNIMPLEMENTED for %d", seqnr); debug("Received SSH2_MSG_UNIMPLEMENTED for %u",
seqnr);
break; break;
default: default:
return type; return type;
@ -1063,8 +1064,8 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
break; break;
case SSH_MSG_DISCONNECT: case SSH_MSG_DISCONNECT:
msg = packet_get_string(NULL); msg = packet_get_string(NULL);
log("Received disconnect from %s: %.400s", get_remote_ipaddr(), log("Received disconnect from %s: %.400s",
msg); get_remote_ipaddr(), msg);
fatal_cleanup(); fatal_cleanup();
xfree(msg); xfree(msg);
break; break;