diff options
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.149 2007/12/28 15:32:24 dtucker Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.150 2008/01/23 01:56:54 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -968,10 +968,9 @@ packet_read_expect(int expected_type) | |||
968 | * packet_process_incoming. If so, reads the packet; otherwise returns | 968 | * packet_process_incoming. If so, reads the packet; otherwise returns |
969 | * SSH_MSG_NONE. This does not wait for data from the connection. | 969 | * SSH_MSG_NONE. This does not wait for data from the connection. |
970 | * | 970 | * |
971 | * SSH_MSG_DISCONNECT is handled specially here. Also, SSH_MSG_IGNORE | 971 | * SSH_MSG_DISCONNECT is handled specially here. Also, |
972 | * messages are skipped by this function and are never returned | 972 | * SSH_MSG_IGNORE messages are skipped by this function and are never returned |
973 | * to higher levels, although SSH2_MSG_IGNORE are since they are needed | 973 | * to higher levels. |
974 | * for keepalives. | ||
975 | */ | 974 | */ |
976 | 975 | ||
977 | static int | 976 | static int |
@@ -1196,6 +1195,8 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p) | |||
1196 | if (type) | 1195 | if (type) |
1197 | DBG(debug("received packet type %d", type)); | 1196 | DBG(debug("received packet type %d", type)); |
1198 | switch (type) { | 1197 | switch (type) { |
1198 | case SSH2_MSG_IGNORE: | ||
1199 | break; | ||
1199 | case SSH2_MSG_DEBUG: | 1200 | case SSH2_MSG_DEBUG: |
1200 | packet_get_char(); | 1201 | packet_get_char(); |
1201 | msg = packet_get_string(NULL); | 1202 | msg = packet_get_string(NULL); |
@@ -1216,7 +1217,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p) | |||
1216 | seqnr = packet_get_int(); | 1217 | seqnr = packet_get_int(); |
1217 | debug("Received SSH2_MSG_UNIMPLEMENTED for %u", | 1218 | debug("Received SSH2_MSG_UNIMPLEMENTED for %u", |
1218 | seqnr); | 1219 | seqnr); |
1219 | /* FALLTHROUGH */ | 1220 | break; |
1220 | default: | 1221 | default: |
1221 | return type; | 1222 | return type; |
1222 | } | 1223 | } |