X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/48b845698dcf3ec4b9f8b9f1848a157f0245d7cc..9e930d39de569d0aa24eeb7e0603408e89a35c95:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index a210e526..ad20daa7 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
@@ -226,6 +239,8 @@ typedef struct keyset {
 #define KSERR_REGEN -1			/* Regenerate keys */
 #define KSERR_NOKEYS -2			/* No keys left */
 #define KSERR_DECRYPT -3		/* Unable to decrypt message */
+#define KSERR_SEQ -4			/* Incorrect sequence number */
+#define KSERR_MALFORMED -5		/* Input ciphertext is broken */
 
 /* --- Key exchange --- *
  *
@@ -236,6 +251,10 @@ typedef struct keyset {
  * Clive Jones.
  */
 
+typedef struct retry {
+  double t;				/* Current retry time */
+} retry;
+
 #define KX_NCHAL 16u
 
 typedef struct kxchal {
@@ -245,6 +264,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 */
@@ -259,6 +279,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 */
   ge *kpub;				/* Peer's public key */
   time_t texp_kpub;			/* Expiry time for public key */
   mp *alpha;				/* My temporary secret */
@@ -338,7 +359,9 @@ typedef struct peerspec {
   unsigned long t_ka;			/* Keep alive interval */
   addr sa;				/* Socket address to speak to */
   size_t sasz;				/* Socket address size */
-  unsigned kxf;				/* Key exchange flags to set */
+  unsigned f;				/* Flags for the peer */
+#define PSF_KXMASK 255u			/*   Key-exchange flags to set */
+#define PSF_MOBILE 256u			/*   Address may change rapidly */
 } peerspec;
 
 typedef struct peer_byname {
@@ -426,12 +449,6 @@ typedef struct admin_addop {
   peerspec peer;			/* Peer pending creation */
 } admin_addop;
 
-typedef struct admin_greetop {
-  admin_resop r;			/* Name resolution header */
-  void *c;				/* Challenge block */
-  size_t sz;				/* Length of challenge */
-} admin_greetop;
-
 typedef struct admin_pingop {
   admin_bgop bg;			/* Background operation header */
   ping ping;				/* Ping pending response */
@@ -672,15 +689,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
@@ -939,13 +947,15 @@ extern void a_daemon(void);
  * Arguments:	@const char *sock@ = socket name to create
  *		@uid_t u@ = user to own the socket
  *		@gid_t g@ = group to own the socket
+ *		@mode_t m@ = permissions to set on the socket
  *
  * Returns:	---
  *
  * Use:		Creates the admin listening socket.
  */
 
-extern void a_init(const char */*sock*/, uid_t /*u*/, gid_t /*g*/);
+extern void a_init(const char */*sock*/,
+		   uid_t /*u*/, gid_t /*g*/, mode_t /*m*/);
 
 /*----- Mapping with addresses as keys ------------------------------------*/
 
@@ -1312,7 +1322,7 @@ extern void p_destroy(peer */*p*/);
 #define FOREACH_PEER(p, stuff) do {					\
   peer_iter i_;								\
   peer *p;								\
-  for (p_mkiter(&i_); (p = p_next(&i_)) != 0; ) do stuff while (0);	\
+  for (p_mkiter(&i_); (p = p_next(&i_)) != 0; ) stuff			\
 } while (0)
 
 /* --- @p_mkiter@ --- *