server/{keyexch.c,keyset.c}: Eliminate `ks_tregen'.

[tripe] / server / tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index b6c1cd5d4fb6da0b17103e1b8b21439e687fe044..d447326ec39837087f2fbcdaf47be63ddc168fee 100644 (file)
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -136,6 +136,14 @@
 #define MIN(n) (n##u * 60u)
 #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_RETRY SEC(10)                        /* Challenge retransmit interval */
+
 /* --- Other things --- */
 
 #define PKBUFSZ 65536
@@ -341,7 +349,8 @@ typedef struct peerspec {
   addr sa;                             /* Socket address to speak to */
   size_t sasz;                         /* Socket address size */
   unsigned f;                          /* Flags for the peer */
-#define PSF_KXMASK 255u                        /*   Key exchange flags to set */
+#define PSF_KXMASK 255u                        /*   Key-exchange flags to set */
+#define PSF_MOBILE 256u                        /*   Address may change rapidly */
 } peerspec;
 
 typedef struct peer_byname {
@@ -669,15 +678,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