X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/b7e1e18b57c30555f65a2548e0f1f186200c0ea8..6411163d48434575eaf49463e056e971a2fba16a:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index ab15787f..8a0be518 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -75,6 +75,7 @@
 #include <mLib/fwatch.h>
 #include <mLib/hash.h>
 #include <mLib/macros.h>
+#include <mLib/mdup.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>
@@ -225,6 +226,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 --- *
  *
@@ -332,11 +335,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 {
@@ -424,12 +430,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 */
@@ -937,13 +937,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 ------------------------------------*/
 
@@ -1248,6 +1250,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
@@ -1301,7 +1312,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@ --- *