summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--packet.c15
2 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d0026c264..f40ba0423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
32 - deraadt@cvs.openbsd.org 2002/06/23 21:06:41 32 - deraadt@cvs.openbsd.org 2002/06/23 21:06:41
33 [channels.c channels.h session.c session.h] 33 [channels.c channels.h session.c session.h]
34 display, screen, row, col, xpixel, ypixel are u_int; markus ok 34 display, screen, row, col, xpixel, ypixel are u_int; markus ok
35 - deraadt@cvs.openbsd.org 2002/06/23 21:10:02
36 [packet.c]
37 packet_get_int() returns unsigned for reason & seqnr
35 - (bal) Also fixed IPADDR_IN_DISPLAY case where display, screen, row, col, 38 - (bal) Also fixed IPADDR_IN_DISPLAY case where display, screen, row, col,
36 xpixel are u_int. 39 xpixel are u_int.
37 40
@@ -1079,4 +1082,4 @@
1079 - (stevesk) entropy.c: typo in debug message 1082 - (stevesk) entropy.c: typo in debug message
1080 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1083 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1081 1084
1082$Id: ChangeLog,v 1.2263 2002/06/23 21:48:28 mouring Exp $ 1085$Id: ChangeLog,v 1.2264 2002/06/23 21:49:25 mouring Exp $
diff --git a/packet.c b/packet.c
index 86511276f..a5b2ab61a 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
37 */ 37 */
38 38
39#include "includes.h" 39#include "includes.h"
40RCSID("$OpenBSD: packet.c,v 1.95 2002/06/19 18:01:00 markus Exp $"); 40RCSID("$OpenBSD: packet.c,v 1.96 2002/06/23 21:10:02 deraadt Exp $");
41 41
42#include "xmalloc.h" 42#include "xmalloc.h"
43#include "buffer.h" 43#include "buffer.h"
@@ -1015,7 +1015,7 @@ packet_read_poll2(u_int32_t *seqnr_p)
1015int 1015int
1016packet_read_poll_seqnr(u_int32_t *seqnr_p) 1016packet_read_poll_seqnr(u_int32_t *seqnr_p)
1017{ 1017{
1018 int reason, seqnr; 1018 u_int reason, seqnr;
1019 u_char type; 1019 u_char type;
1020 char *msg; 1020 char *msg;
1021 1021
@@ -1038,14 +1038,15 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
1038 case SSH2_MSG_DISCONNECT: 1038 case SSH2_MSG_DISCONNECT:
1039 reason = packet_get_int(); 1039 reason = packet_get_int();
1040 msg = packet_get_string(NULL); 1040 msg = packet_get_string(NULL);
1041 log("Received disconnect from %s: %d: %.400s", get_remote_ipaddr(), 1041 log("Received disconnect from %s: %u: %.400s",
1042 reason, msg); 1042 get_remote_ipaddr(), reason, msg);
1043 xfree(msg); 1043 xfree(msg);
1044 fatal_cleanup(); 1044 fatal_cleanup();
1045 break; 1045 break;
1046 case SSH2_MSG_UNIMPLEMENTED: 1046 case SSH2_MSG_UNIMPLEMENTED:
1047 seqnr = packet_get_int(); 1047 seqnr = packet_get_int();
1048 debug("Received SSH2_MSG_UNIMPLEMENTED for %d", seqnr); 1048 debug("Received SSH2_MSG_UNIMPLEMENTED for %u",
1049 seqnr);
1049 break; 1050 break;
1050 default: 1051 default:
1051 return type; 1052 return type;
@@ -1063,8 +1064,8 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
1063 break; 1064 break;
1064 case SSH_MSG_DISCONNECT: 1065 case SSH_MSG_DISCONNECT:
1065 msg = packet_get_string(NULL); 1066 msg = packet_get_string(NULL);
1066 log("Received disconnect from %s: %.400s", get_remote_ipaddr(), 1067 log("Received disconnect from %s: %.400s",
1067 msg); 1068 get_remote_ipaddr(), msg);
1068 fatal_cleanup(); 1069 fatal_cleanup();
1069 xfree(msg); 1070 xfree(msg);
1070 break; 1071 break;