#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>
#include <catacomb/group.h>
#include "protocol.h"
+#include "slip.h"
#include "util.h"
#undef sun
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 {
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 */
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 */
typedef struct admin_svcop {
admin_bgop bg; /* Background operation header */
struct admin *prov; /* Client servicing this job */
- unsigned short index; /* This job's index */
+ unsigned index; /* This job's index */
struct admin_svcop *next, *prev; /* Links for provider's jobs */
} admin_svcop;
extern size_t indexsz; /* Size of exponent for the group */
extern mp *kpriv; /* Our private key */
extern ge *kpub; /* Our public key */
-extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ];
+extern octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ], buf_u[PKBUFSZ];
extern const tunnel_ops *tunnels[]; /* Table of tunnels (0-term) */
extern const tunnel_ops *tun_default; /* Default tunnel to use */
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@ --- *
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
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 ----------------------------------------------------*/
* Returns: A pointer to the integer's textual representation.
*
* Use: Converts a multiprecision integer to a string. Corrupts
- * @buf_t@.
+ * @buf_u@.
*/
extern const char *mpstr(mp */*m*/);
* Returns: A pointer to the element's textual representation.
*
* Use: Converts a group element to a string. Corrupts
- * @buf_t@.
+ * @buf_u@.
*/
extern const char *gestr(group */*g*/, ge */*x*/);
* Returns: A pointer to a textual representation of the time.
*
* Use: Converts a time to a textual representation. Corrupts
- * @buf_t@.
+ * @buf_u@.
*/
extern const char *timestr(time_t /*t*/);
~mdw / tripe / blobdiff