- (djm) OpenBSD CVS Sync

   - markus@cvs.openbsd.org 2003/04/02 09:48:07
     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
     [readconf.h serverloop.c sshconnect2.c]
     reapply rekeying chage, tested by henning@, ok djm@

1 files changed, 11 insertions, 3 deletions

diff --git a/monitor.c b/monitor.c
index bcd007e60..4cd10a108 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.36 2003/04/01 10:22:21 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.37 2003/04/02 09:48:07 markus Exp $");
 
 #include <openssl/dh.h>
 
@@ -1497,6 +1497,8 @@ mm_get_keystate(struct monitor *pmonitor)
         Buffer m;
         u_char *blob, *p;
         u_int bloblen, plen;
+        u_int32_t seqnr, packets;
+        u_int64_t blocks;
 
         debug3("%s: Waiting for new keys", __func__);
 
@@ -1526,8 +1528,14 @@ mm_get_keystate(struct monitor *pmonitor)
         xfree(blob);
 
         /* Now get sequence numbers for the packets */
-        packet_set_seqnr(MODE_OUT, buffer_get_int(&m));
-        packet_set_seqnr(MODE_IN, buffer_get_int(&m));
+        seqnr = buffer_get_int(&m);
+        blocks = buffer_get_int64(&m);
+        packets = buffer_get_int(&m);
+        packet_set_state(MODE_OUT, seqnr, blocks, packets);
+        seqnr = buffer_get_int(&m);
+        blocks = buffer_get_int64(&m);
+        packets = buffer_get_int(&m);
+        packet_set_state(MODE_IN, seqnr, blocks, packets);
 
  skip:
         /* Get the key context */