Handle flags on challenge timers correctly to prevent confusing the event

[tripe] / keyexch.c

diff --git a/keyexch.c b/keyexch.c
index 80503b4705d7a113c049579d1f667a729627a096..f2ea62b1c21817936171829ecbcfacbffc9b3955 100644 (file)
--- a/keyexch.c
+++ b/keyexch.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-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
  *
  *
  * Key exchange protocol
  *


@@ -29,6 +29,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: keyexch.c,v $
 /*----- 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.
  *
  * Revision 1.6  2003/04/06 10:26:35  mdw
  * Report peer name on decrypt errors.
  *


@@ -56,8 +60,8 @@
 
 /*----- Tunable parameters ------------------------------------------------*/
 
 
 /*----- 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)
 
 
 #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);
 {
   if (kxc->f & KXF_TIMER)
     sel_rmtimer(&kxc->t);

+  kxc->f &= ~KXF_TIMER;

 }
 
 /* --- @kxc_new@ --- *
 }
 
 /* --- @kxc_new@ --- *