summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-04-09 20:51:24 +1000
committerDamien Miller <djm@mindrot.org>2003-04-09 20:51:24 +1000
commitb1ecd9cd9761e021c912375149c28084bace43ef (patch)
treedf36d31c83cf2931de5600d9dd8c134cbc234ce3
parent3bed191ca2539025761dd366859ea7d6c6443d1d (diff)
- markus@cvs.openbsd.org 2003/04/07 08:29:57
[monitor_wrap.c] typo: get correct counters; introduced during rekeying change.
-rw-r--r--ChangeLog5
-rw-r--r--monitor_wrap.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 942d7a313..5d94ea480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 - itojun@cvs.openbsd.org 2003/04/03 10:17:35 16 - itojun@cvs.openbsd.org 2003/04/03 10:17:35
17 [progressmeter.c] 17 [progressmeter.c]
18 remove $OpenBSD$, as other *.c does not have it. 18 remove $OpenBSD$, as other *.c does not have it.
19 - markus@cvs.openbsd.org 2003/04/07 08:29:57
20 [monitor_wrap.c]
21 typo: get correct counters; introduced during rekeying change.
19 22
2020030402 2320030402
21 - (bal) if IP_TOS is not found or broken don't try to compile in 24 - (bal) if IP_TOS is not found or broken don't try to compile in
@@ -1318,4 +1321,4 @@
1318 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1321 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1319 ok provos@ 1322 ok provos@
1320 1323
1321$Id: ChangeLog,v 1.2654 2003/04/09 10:50:59 djm Exp $ 1324$Id: ChangeLog,v 1.2655 2003/04/09 10:51:24 djm Exp $
diff --git a/monitor_wrap.c b/monitor_wrap.c
index f674ef78d..183ae8d0e 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor_wrap.c,v 1.25 2003/04/02 09:48:07 markus Exp $"); 28RCSID("$OpenBSD: monitor_wrap.c,v 1.26 2003/04/07 08:29:57 markus Exp $");
29 29
30#include <openssl/bn.h> 30#include <openssl/bn.h>
31#include <openssl/dh.h> 31#include <openssl/dh.h>
@@ -574,7 +574,7 @@ mm_send_keystate(struct monitor *pmonitor)
574 buffer_put_int(&m, seqnr); 574 buffer_put_int(&m, seqnr);
575 buffer_put_int64(&m, blocks); 575 buffer_put_int64(&m, blocks);
576 buffer_put_int(&m, packets); 576 buffer_put_int(&m, packets);
577 packet_get_state(MODE_OUT, &seqnr, &blocks, &packets); 577 packet_get_state(MODE_IN, &seqnr, &blocks, &packets);
578 buffer_put_int(&m, seqnr); 578 buffer_put_int(&m, seqnr);
579 buffer_put_int64(&m, blocks); 579 buffer_put_int64(&m, blocks);
580 buffer_put_int(&m, packets); 580 buffer_put_int(&m, packets);