From 62b5e3ecc77424add00ad4e5dc86e7248751cdf6 Mon Sep 17 00:00:00 2001 Message-Id: <62b5e3ecc77424add00ad4e5dc86e7248751cdf6.1714154316.git.mdw@distorted.org.uk> From: Mark Wooding Date: Wed, 1 Feb 2012 21:04:30 +0000 Subject: [PATCH] server/{keyexch.c,keyset.c}: Eliminate `ks_tregen'. Organization: Straylight/Edgeware From: Mark Wooding Instead, compute the regeneration time directly. --- server/keyexch.c | 2 +- server/keyset.c | 9 --------- server/tripe.h | 9 --------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/server/keyexch.c b/server/keyexch.c index 65dd037f..cd6eae52 100644 --- a/server/keyexch.c +++ b/server/keyexch.c @@ -913,7 +913,7 @@ static void kxfinish(keyexch *kx) { kxchal *kxc = kx->r[0]; ks_activate(kxc->ks); - settimer(kx, ks_tregen(kxc->ks)); + settimer(kx, time(0) + T_REGEN); kx->s = KXS_SWITCH; a_notify("KXDONE", "?PEER", kx->p, A_END); p_stats(kx->p)->t_kx = time(0); diff --git a/server/keyset.c b/server/keyset.c index 3053ca8e..f21a59a9 100644 --- a/server/keyset.c +++ b/server/keyset.c @@ -353,15 +353,6 @@ keyset *ks_gen(const void *k, size_t x, size_t y, size_t z, peer *p) 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 diff --git a/server/tripe.h b/server/tripe.h index 03704b2f..d447326e 100644 --- a/server/tripe.h +++ b/server/tripe.h @@ -678,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 -- [mdw]