X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/7d6ec3708e83ad0f9fe52360512df995cda06007..0ba8de86535cf6025076f5034b76ab753e4dde08:/tripe.h

diff --git a/tripe.h b/tripe.h
index 9cf7abf3..002b3735 100644
--- a/tripe.h
+++ b/tripe.h
@@ -80,6 +80,7 @@
 #include <mLib/str.h>
 #include <mLib/sub.h>
 #include <mLib/trace.h>
+#include <mLib/tv.h>
 
 #include <catacomb/buf.h>
 
@@ -292,18 +293,45 @@ typedef struct stats {
  * The main structure which glues everything else together.
  */
 
+typedef struct peerspec {
+  char *name;				/* Peer's name */
+  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 */
+} peerspec;
+
 typedef struct peer {
   struct peer *next, *prev;		/* Links to next and previous */
-  char *name;				/* Name of this peer */
+  struct ping *pings;			/* Pings we're waiting for */
+  peerspec spec;			/* Specifications for this peer */
   tunnel *t;				/* Tunnel for local packets */
   keyset *ks;				/* List head for keysets */
   buf b;				/* Buffer for sending packets */
-  addr peer;				/* Peer socket address */
-  size_t sasz;				/* Socket address size */
   stats st;				/* Statistics */
   keyexch kx;				/* Key exchange protocol block */
+  sel_timer tka;			/* Timer for keepalives */
 } peer;
 
+typedef struct ping {
+  struct ping *next, *prev;		/* Links to next and previous */
+  peer *p;				/* Peer so we can free it */
+  unsigned msg;				/* Kind of response expected */
+  uint32 id;				/* Id so we can recognize response */
+  octet magic[32];			/* Some random data */
+  sel_timer t;				/* Timeout for ping */
+  void (*func)(int /*rc*/, void */*arg*/); /* Function to call when done */
+  void *arg;				/* Argument for callback */
+} ping;
+
+enum {
+  PING_NONOTIFY = -1,
+  PING_OK = 0,
+  PING_TIMEOUT,
+  PING_PEERDIED,
+  PING_MAX
+};
+
 /* --- Admin structure --- */
 
 #define OBUFSZ 16384u
@@ -320,16 +348,15 @@ typedef struct admin {
 #ifndef NTRACE
   unsigned seq;				/* Sequence number for tracing */
 #endif
-  char *pname;				/* Peer name to create */
-  char *paddr;				/* Address string to resolve */
   obuf *o_head, *o_tail;		/* Output buffer list */
   selbuf b;				/* Line buffer for commands */
   sel_file w;				/* Selector for write buffering */
+  peerspec peer;			/* Peer pending creation */
+  char *paddr;				/* Hostname to be resolved */
   bres_client r;			/* Background resolver task */
   sel_timer t;				/* Timer for resolver */
-  const tunnel_ops *tops;		/* Tunnel to use */
-  addr peer;				/* Address to set */
-  size_t sasz;				/* Size of the address */
+  ping ping;				/* Ping pending response */
+  struct timeval pingtime;		/* Time last ping was sent */
 } admin;
 
 #define AF_DEAD 1u			/* Destroy this admin block */
@@ -736,6 +763,37 @@ extern buf *p_txstart(peer */*p*/, unsigned /*msg*/);
 
 extern void p_txend(peer */*p*/);
 
+/* --- @p_pingsend@ --- *
+ *
+ * Arguments:	@peer *p@ = destination peer
+ *		@ping *pg@ = structure to fill in
+ *		@unsigned type@ = message type
+ *		@unsigned long timeout@ = how long to wait before giving up
+ *		@void (*func)(int, void *)@ = callback function
+ *		@void *arg@ = argument for callback
+ *
+ * Returns:	Zero if successful, nonzero if it failed.
+ *
+ * Use:		Sends a ping to a peer.  Call @func@ with a nonzero argument
+ *		if we get an answer within the timeout, or zero if no answer.
+ */
+
+extern int p_pingsend(peer */*p*/, ping */*pg*/, unsigned /*type*/,
+		      unsigned long /*timeout*/,
+		      void (*/*func*/)(int, void *), void */*arg*/);
+
+/* --- @p_pingdone@ --- *
+ *
+ * Arguments:	@ping *p@ = ping structure
+ *		@int rc@ = return code to pass on
+ *
+ * Returns:	---
+ *
+ * Use:		Disposes of a ping structure, maybe sending a notification.
+ */
+
+extern void p_pingdone(ping */*p*/, int /*rc*/);
+
 /* --- @p_tun@ --- *
  *
  * Arguments:	@peer *p@ = pointer to peer block
@@ -809,10 +867,7 @@ unsigned p_port(void);
 
 /* --- @p_create@ --- *
  *
- * Arguments:	@const char *name@ = name for this peer
- *		@const tunnel_ops *tops@ = tunnel to use
- *		@struct sockaddr *sa@ = socket address of peer
- *		@size_t sz@ = size of socket address
+ * Arguments:	@peerspec *spec@ = information about this peer
  *
  * Returns:	Pointer to the peer block, or null if it failed.
  *
@@ -820,8 +875,7 @@ unsigned p_port(void);
  *		by this point.
  */
 
-extern peer *p_create(const char */*name*/, const tunnel_ops */*tops*/,
-		      struct sockaddr */*sa*/, size_t /*sz*/);
+extern peer *p_create(peerspec */*spec*/);
 
 /* --- @p_name@ --- *
  *