- markus@cvs.openbsd.org 2008/07/10 18:08:11

     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h sshd.c]
     sync v1 and v2 traffic accounting; add it to sshd, too;
     ok djm@, dtucker@

1 files changed, 6 insertions, 4 deletions

diff --git a/monitor_wrap.c b/monitor_wrap.c
index e65fb1279..40463d078 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.62 2008/05/08 12:21:16 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.63 2008/07/10 18:08:11 markus Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -573,7 +573,7 @@ mm_send_keystate(struct monitor *monitor)
         u_char *blob, *p;
         u_int bloblen, plen;
         u_int32_t seqnr, packets;
-        u_int64_t blocks;
+        u_int64_t blocks, bytes;
 
         buffer_init(&m);
 
@@ -622,14 +622,16 @@ mm_send_keystate(struct monitor *monitor)
         buffer_put_string(&m, blob, bloblen);
         xfree(blob);
 
-        packet_get_state(MODE_OUT, &seqnr, &blocks, &packets);
+        packet_get_state(MODE_OUT, &seqnr, &blocks, &packets, &bytes);
         buffer_put_int(&m, seqnr);
         buffer_put_int64(&m, blocks);
         buffer_put_int(&m, packets);
-        packet_get_state(MODE_IN, &seqnr, &blocks, &packets);
+        buffer_put_int64(&m, bytes);
+        packet_get_state(MODE_IN, &seqnr, &blocks, &packets, &bytes);
         buffer_put_int(&m, seqnr);
         buffer_put_int64(&m, blocks);
         buffer_put_int(&m, packets);
+        buffer_put_int64(&m, bytes);
 
         debug3("%s: New keys have been sent", __func__);
  skip: