X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/35c8b547dde529693875087d67fa60bf88319d2b..997353570c896a609b47088606720347ca89b767:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index b22dccce..60256f74 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -89,6 +89,7 @@
 #include <mLib/versioncmp.h>
 
 #include <catacomb/buf.h>
+#include <catacomb/ct.h>
 
 #include <catacomb/gcipher.h>
 #include <catacomb/gmac.h>
@@ -134,8 +135,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 +270,10 @@ typedef struct keyset {
  * Clive Jones.
  */
 
+typedef struct retry {
+  double t;				/* Current retry time */
+} retry;
+
 #define KX_NCHAL 16u
 
 typedef struct kxchal {
@@ -265,6 +283,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 +300,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 */
@@ -353,6 +373,7 @@ typedef struct stats {
 
 typedef struct peerspec {
   char *name;				/* Peer's name */
+  char *privtag;			/* Private key tag */
   char *tag;				/* Public key tag */
   const tunnel_ops *tops;		/* Tunnel operations */
   unsigned long t_ka;			/* Keep alive interval */
@@ -728,15 +749,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
@@ -930,7 +942,7 @@ extern void a_vformat(dstr */*d*/, const char */*fmt*/, va_list /*ap*/);
  *		presentation.
  */
 
-extern void a_format(dstr */*d*/, const char */*fmt*/, ...);
+extern void EXECL_LIKE(0) a_format(dstr */*d*/, const char */*fmt*/, ...);
 
 /* --- @a_warn@ --- *
  *
@@ -942,7 +954,7 @@ extern void a_format(dstr */*d*/, const char */*fmt*/, ...);
  * Use:		Informs all admin connections of a warning.
  */
 
-extern void a_warn(const char */*fmt*/, ...);
+extern void EXECL_LIKE(0) a_warn(const char */*fmt*/, ...);
 
 /* --- @a_notify@ --- *
  *
@@ -954,7 +966,7 @@ extern void a_warn(const char */*fmt*/, ...);
  * Use:		Sends a notification to interested admin connections.
  */
 
-extern void a_notify(const char */*fmt*/, ...);
+extern void EXECL_LIKE(0) a_notify(const char */*fmt*/, ...);
 
 /* --- @a_create@ --- *
  *
@@ -1085,7 +1097,8 @@ extern void am_remove(addrmap */*m*/, void */*i*/);
  * Use:		Writes a trace message.
  */
 
-T( extern void ps_trace(unsigned /*mask*/, const char */*fmt*/, ...); )
+T( extern void PRINTF_LIKE(2, 3)
+     ps_trace(unsigned /*mask*/, const char */*fmt*/, ...); )
 
 /* --- @ps_warn@ --- *
  *
@@ -1097,7 +1110,7 @@ T( extern void ps_trace(unsigned /*mask*/, const char */*fmt*/, ...); )
  * Use:		Writes a warning message.
  */
 
-extern void ps_warn(const char */*fmt*/, ...);
+extern void PRINTF_LIKE(1, 2) ps_warn(const char */*fmt*/, ...);
 
 /* --- @ps_tunfd@ --- *
  *
@@ -1330,6 +1343,15 @@ extern const char *p_name(peer */*p*/);
 
 extern const char *p_tag(peer */*p*/);
 
+/* --- @p_privtag@ --- *
+ *
+ * Arguments:	@peer *p@ = pointer to a peer block
+ *
+ * Returns:	A pointer to the peer's private key tag.
+ */
+
+extern const char *p_privtag(peer */*p*/);
+
 /* --- @p_spec@ --- *
  *
  * Arguments:	@peer *p@ = pointer to a peer block