X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/b9537f3be119d9a099c96bbf9329fcd5b51e5312..ff14395237fc702f35be05c0fb895bb8318f7147:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index 2b6f950a..d447326e 100644
--- 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
@@ -226,6 +234,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 --- *
  *
@@ -333,11 +343,14 @@ typedef struct stats {
 
 typedef struct peerspec {
   char *name;				/* Peer's name */
+  char *tag;				/* Public key tag */
   const tunnel_ops *tops;		/* Tunnel operations */
   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 {
@@ -425,12 +438,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 */
@@ -671,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
@@ -938,13 +936,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 ------------------------------------*/
 
@@ -1249,6 +1249,15 @@ extern peer *p_create(peerspec */*spec*/);
 
 extern const char *p_name(peer */*p*/);
 
+/* --- @p_tag@ --- *
+ *
+ * Arguments:	@peer *p@ = pointer to a peer block
+ *
+ * Returns:	A pointer to the peer's public key tag.
+ */
+
+extern const char *p_tag(peer */*p*/);
+
 /* --- @p_spec@ --- *
  *
  * Arguments:	@peer *p@ = pointer to a peer block
@@ -1302,7 +1311,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@ --- *