- (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_wrap.c b/monitor_wrap.c
index c9714138a..f674ef78d 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.24 2003/04/01 10:22:21 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.25 2003/04/02 09:48:07 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -520,6 +520,8 @@ mm_send_keystate(struct monitor *pmonitor)
         Buffer m;
         u_char *blob, *p;
         u_int bloblen, plen;
+        u_int32_t seqnr, packets;
+        u_int64_t blocks;
 
         buffer_init(&m);
 
@@ -568,8 +570,14 @@ mm_send_keystate(struct monitor *pmonitor)
         buffer_put_string(&m, blob, bloblen);
         xfree(blob);
 
-        buffer_put_int(&m, packet_get_seqnr(MODE_OUT));
-        buffer_put_int(&m, packet_get_seqnr(MODE_IN));
+        packet_get_state(MODE_OUT, &seqnr, &blocks, &packets);
+        buffer_put_int(&m, seqnr);
+        buffer_put_int64(&m, blocks);
+        buffer_put_int(&m, packets);
+        packet_get_state(MODE_OUT, &seqnr, &blocks, &packets);
+        buffer_put_int(&m, seqnr);
+        buffer_put_int64(&m, blocks);
+        buffer_put_int(&m, packets);
 
         debug3("%s: New keys have been sent", __func__);
  skip: