Merge branch 'mdw/multi-priv'

[tripe] / server / keyset.c

diff --git a/server/keyset.c b/server/keyset.c
index 898c55a4ccd9a8de84d42a4e912bfc6d74c85b78..c54febdc73bde4a38c4d1051d3df2547b346a1a5 100644 (file)
--- a/server/keyset.c
+++ b/server/keyset.c
@@ -28,11 +28,6 @@
 
 #include "tripe.h"
 
 
 #include "tripe.h"
 

-/*----- Tunable parameters ------------------------------------------------*/
-
-#define T_EXP MIN(60)                  /* Expiry time for a key */
-#define T_REGEN MIN(45)                        /* Regeneration time for a key */
-

 /*----- Handy macros ------------------------------------------------------*/
 
 #define KEYOK(ks, now) ((ks)->sz_exp > 0 && (ks)->t_exp > now)
 /*----- Handy macros ------------------------------------------------------*/
 
 #define KEYOK(ks, now) ((ks)->sz_exp > 0 && (ks)->t_exp > now)


@@ -359,15 +354,6 @@ keyset *ks_gen(const void *k, size_t x, size_t y, size_t z, peer *p)
   return (ks);
 }
 
   return (ks);
 }
 

-/* --- @ks_tregen@ --- *
- *
- * Arguments:  @keyset *ks@ = pointer to a keyset
- *
- * Returns:    The time at which moves ought to be made to replace this key.
- */
-
-time_t ks_tregen(keyset *ks) { return (ks->t_exp - T_EXP + T_REGEN); }
-

 /* --- @ks_activate@ --- *
  *
  * Arguments:  @keyset *ks@ = pointer to a keyset
 /* --- @ks_activate@ --- *
  *
  * Arguments:  @keyset *ks@ = pointer to a keyset