X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/fe2a5dcf9de1f124ed3cfa2c6327860bd5aca820..2d4998c45fa47fbc8084dcc4471a2e71e3eeb635:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index b4eee1b3..72a47a10 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -134,8 +134,21 @@
 
 #define SEC(n) (n##u)
 #define MIN(n) (n##u * 60u)
+#define F_2P32 (65536.0*65536.0)
 #define MEG(n) (n##ul * 1024ul * 1024ul)
 
+/* --- Timing parameters --- */
+
+#define T_EXP MIN(60)			/* Expiry time for a key */
+#define T_REGEN MIN(40)			/* Regeneration time for a key */
+
+#define T_VALID SEC(20)			/* Challenge validity period */
+#define T_RETRYMIN SEC(2)		/* Minimum retry interval */
+#define T_RETRYMAX MIN(5)		/* Maximum retry interval */
+#define T_RETRYGROW (5.0/4.0)		/* Retry interval growth factor */
+
+#define T_WOBBLE (1.0/3.0)		/* Relative timer randomness */
+
 /* --- Other things --- */
 
 #define PKBUFSZ 65536
@@ -256,6 +269,10 @@ typedef struct keyset {
  * Clive Jones.
  */
 
+typedef struct retry {
+  double t;				/* Current retry time */
+} retry;
+
 #define KX_NCHAL 16u
 
 typedef struct kxchal {
@@ -265,6 +282,7 @@ typedef struct kxchal {
   keyset *ks;				/* Pointer to temporary keyset */
   unsigned f;				/* Various useful flags */
   sel_timer t;				/* Response timer for challenge */
+  retry rs;				/* Retry state */
   octet hc[MAXHASHSZ];			/* Hash of his challenge */
   octet ck[MAXHASHSZ];			/* His magical check value */
   octet hswrq_in[MAXHASHSZ];		/* Inbound switch request message */
@@ -281,6 +299,7 @@ typedef struct keyexch {
   unsigned f;				/* Various useful flags */
   unsigned s;				/* Current state in exchange */
   sel_timer t;				/* Timer for next exchange */
+  retry rs;				/* Retry state */
   mp *alpha;				/* My temporary secret */
   ge *c;				/* My challenge */
   ge *rx;				/* The expected response */
@@ -729,15 +748,6 @@ extern keyset *ks_gen(const void */*k*/,
 		      size_t /*x*/, size_t /*y*/, size_t /*z*/,
 		      peer */*p*/);
 
-/* --- @ks_tregen@ --- *
- *
- * Arguments:	@keyset *ks@ = pointer to a keyset
- *
- * Returns:	The time at which moves ought to be made to replace this key.
- */
-
-extern time_t ks_tregen(keyset */*ks*/);
-
 /* --- @ks_activate@ --- *
  *
  * Arguments:	@keyset *ks@ = pointer to a keyset