merge of '8849ec659cb45b924158cc3322390a1d3d48daef'

     and 'a46ca9204de0df58d8701df0d79b6b8ec601b9ce'

--HG--
extra : convert_revision : 00e4e5abea55474624e2ea0ea09f6fbc6c9e4c89

1 files changed, 2 insertions, 2 deletions

diff --git a/process-packet.c b/process-packet.c
index fe4a543..b5125ba 100644
--- a/process-packet.c
+++ b/process-packet.c
@@ -52,6 +52,8 @@ void process_packet() {
 
 	ses.lastpacket = type;
 
+    ses.last_packet_time = time(NULL);
+
 	/* These packets we can receive at any time */
 	switch(type) {
 
@@ -70,8 +72,6 @@ void process_packet() {
 			dropbear_close("Disconnect received");
 	}
 
-    ses.last_packet_time = time(NULL);
-
 	/* This applies for KEX, where the spec says the next packet MUST be
 	 * NEWKEYS */
 	if (ses.requirenext != 0) {