From 2de0ad0f5c5871d482d778908d08d0dd1b01c821 Mon Sep 17 00:00:00 2001
Message-Id: <2de0ad0f5c5871d482d778908d08d0dd1b01c821.1715280141.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 17 May 2003 11:01:28 +0000
Subject: [PATCH] Handle flags on challenge timers correctly to prevent
 confusing the event list.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 keyexch.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/keyexch.c b/keyexch.c
index 80503b47..f2ea62b1 100644
--- a/keyexch.c
+++ b/keyexch.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: keyexch.c,v 1.6 2003/04/06 10:26:35 mdw Exp $
+ * $Id: keyexch.c,v 1.7 2003/05/17 11:01:28 mdw Exp $
  *
  * Key exchange protocol
  *
@@ -29,6 +29,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: keyexch.c,v $
+ * Revision 1.7  2003/05/17 11:01:28  mdw
+ * Handle flags on challenge timers correctly to prevent confusing the event
+ * list.
+ *
  * Revision 1.6  2003/04/06 10:26:35  mdw
  * Report peer name on decrypt errors.
  *
@@ -56,8 +60,8 @@
 
 /*----- Tunable parameters ------------------------------------------------*/
 
-#define T_VALID MIN(2)
-#define T_RETRY SEC(10)
+#define T_VALID MIN(2)			/* Challenge validity period */
+#define T_RETRY SEC(10)			/* Challenge retransmit interval */
 
 #define ISVALID(kx, now) ((now) < (kx)->t_valid)
 
@@ -197,6 +201,7 @@ static void kxc_stoptimer(kxchal *kxc)
 {
   if (kxc->f & KXF_TIMER)
     sel_rmtimer(&kxc->t);
+  kxc->f &= ~KXF_TIMER;
 }
 
 /* --- @kxc_new@ --- *
-- 
[mdw]