server/peer: Use hash tables to find peer records.

[tripe] / server / tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index 9c9653e0379c90ef9ee47484f83dcf34bd51742f..bf59977417ec90085da825d4c8193f5350255c2f 100644 (file)
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -71,6 +71,7 @@
 #include <mLib/env.h>
 #include <mLib/fdflags.h>
 #include <mLib/fwatch.h>
+#include <mLib/hash.h>
 #include <mLib/macros.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
@@ -163,6 +164,18 @@ typedef union addr {
   struct sockaddr_in sin;
 } addr;
 
+/* --- Mapping keyed on addresses --- */
+
+typedef struct addrmap {
+  hash_table t;
+  size_t load;
+} addrmap;
+
+typedef struct addrmap_base {
+  hash_base b;
+  addr a;
+} addrmap_base;
+
 /* --- Sequence number checking --- */
 
 typedef struct seqwin {
@@ -314,8 +327,19 @@ typedef struct peerspec {
   unsigned kxf;                                /* Key exchange flags to set */
 } peerspec;
 
+typedef struct peer_byname {
+  sym_base _b;
+  struct peer *p;
+} peer_byname;
+
+typedef struct peer_byaddr {
+  addrmap_base _b;
+  struct peer *p;
+} peer_byaddr;
+
 typedef struct peer {
-  struct peer *next, *prev;            /* Links to next and previous */
+  peer_byname *byname;                 /* Lookup-by-name block */
+  peer_byaddr *byaddr;                 /* Lookup-by-address block */
   struct ping *pings;                  /* Pings we're waiting for */
   peerspec spec;                       /* Specifications for this peer */
   tunnel *t;                           /* Tunnel for local packets */
@@ -327,6 +351,8 @@ typedef struct peer {
   sel_timer tka;                       /* Timer for keepalives */
 } peer;
 
+typedef struct peer_iter { sym_iter i; } peer_iter;
+
 typedef struct ping {
   struct ping *next, *prev;            /* Links to next and previous */
   peer *p;                             /* Peer so we can free it */
@@ -865,6 +891,60 @@ extern void a_daemon(void);
 
 extern void a_init(const char */*sock*/);
 
+/*----- Mapping with addresses as keys ------------------------------------*/
+
+/* --- @am_create@ --- *
+ *
+ * Arguments:  @addrmap *m@ = pointer to map
+ *
+ * Returns:    ---
+ *
+ * Use:                Create an address map, properly set up.
+ */
+
+extern void am_create(addrmap */*m*/);
+
+/* --- @am_destroy@ --- *
+ *
+ * Arguments:  @addrmap *m@ = pointer to map
+ *
+ * Returns:    ---
+ *
+ * Use:                Destroy an address map, throwing away all the entries.
+ */
+
+extern void am_destroy(addrmap */*m*/);
+
+/* --- @am_find@ --- *
+ *
+ * Arguments:  @addrmap *m@ = pointer to map
+ *             @const addr *a@ = address to look up
+ *             @size_t sz@ = size of block to allocate
+ *             @unsigned *f@ = where to store flags
+ *
+ * Returns:    Pointer to found item, or null.
+ *
+ * Use:                Finds a record with the given IP address, set @*f@ nonzero
+ *             and returns it.  If @sz@ is zero, and no match was found,
+ *             return null; otherwise allocate a new block of @sz@ bytes,
+ *             clear @*f@ to zero and return the block pointer.
+ */
+
+extern void *am_find(addrmap */*m*/, const addr */*a*/,
+                    size_t /*sz*/, unsigned */*f*/);
+
+/* --- @am_remove@ --- *
+ *
+ * Arguments:  @addrmap *m@ = pointer to map
+ *             @void *i@ = pointer to the item
+ *
+ * Returns:    ---
+ *
+ * Use:                Removes an item from the map.
+ */
+
+extern void am_remove(addrmap */*m*/, void */*i*/);
+
 /*----- Peer management ---------------------------------------------------*/
 
 /* --- @p_txstart@ --- *
@@ -1061,6 +1141,17 @@ extern const char *p_name(peer */*p*/);
 
 extern const peerspec *p_spec(peer */*p*/);
 
+/* --- @p_findbyaddr@ --- *
+ *
+ * Arguments:  @const addr *a@ = address to look up
+ *
+ * Returns:    Pointer to the peer block, or null if not found.
+ *
+ * Use:                Finds a peer by address.
+ */
+
+extern peer *p_findbyaddr(const addr */*a*/);
+
 /* --- @p_find@ --- *
  *
  * Arguments:  @const char *name@ = name to look up
@@ -1083,17 +1174,41 @@ extern peer *p_find(const char */*name*/);
 
 extern void p_destroy(peer */*p*/);
 
-/* --- @p_first@, @p_next@ --- *
+/* --- @FOREACH_PEER@ --- *
+ *
+ * Arguments:  @p@ = name to bind to each peer
+ *             @stuff@ = thing to do for each item
+ *
+ * Use:                Does something for each current peer.
+ */
+
+#define FOREACH_PEER(p, stuff) do {                                    \
+  peer_iter i_;                                                                \
+  peer *p;                                                             \
+  for (p_mkiter(&i_); (p = p_next(&i_)) != 0; ) do stuff while (0);    \
+} while (0)
+
+/* --- @p_mkiter@ --- *
+ *
+ * Arguments:  @peer_iter *i@ = pointer to an iterator
+ *
+ * Returns:    ---
+ *
+ * Use:                Initializes the iterator.
+ */
+
+extern void p_mkiter(peer_iter */*i*/);
+
+/* --- @p_next@ --- *
+ *
+ * Arguments:  @peer_iter *i@ = pointer to an iterator
  *
- * Arguments:  @peer *p@ = a peer block
+ * Returns:    Next peer, or null if at the end.
  *
- * Returns:    @peer_first@ returns the first peer in some ordering;
- *             @peer_next@ returns the peer following a given one in the
- *             same ordering.  Null is returned for the end of the list.
+ * Use:                Returns the next peer.
  */
 
-extern peer *p_first(void);
-extern peer *p_next(peer */*p*/);
+extern peer *p_next(peer_iter */*i*/);
 
 /*----- Tunnel drivers ----------------------------------------------------*/