Skip to content

Commit 607e805

Browse files
rasantelhierynomus
andauthored
Fix for issue #910: Bad packet received by server when hearbeat is enabled (#911)
* Fix for issue #910: Bad packet received by server when hearbeat is enabled * Address re-keying case too --------- Co-authored-by: Jeroen van Erp <[email protected]>
1 parent 079cb08 commit 607e805

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/net/schmizz/sshj/transport/TransportImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,9 @@ public long write(SSHPacket payload)
420420
try {
421421

422422
if (kexer.isKexOngoing()) {
423-
// Only transport layer packets (1 to 49) allowed except SERVICE_REQUEST
423+
// Only transport layer packets (1 to 49) allowed except SERVICE_REQUEST and IGNORE
424424
final Message m = Message.fromByte(payload.array()[payload.rpos()]);
425-
if (!m.in(1, 49) || m == Message.SERVICE_REQUEST) {
425+
if (!m.in(1, 49) || m == Message.SERVICE_REQUEST || m == Message.IGNORE) {
426426
assert m != Message.KEXINIT;
427427
kexer.waitForDone();
428428
}

0 commit comments

Comments
 (0)