X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/067aa5f013dd6108e81c1df0c2ed19491802bc69..4a3882945f605704ede113a9fe98cd19a92363a7:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index a2907be1..10a03f5f 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -62,10 +62,17 @@
 #include <pwd.h>
 #include <grp.h>
 
+#ifdef HAVE_LIBADNS
+#  define ADNS_FEATURE_MANYAF
+#  include <adns.h>
+#endif
+
 #include <mLib/alloc.h>
 #include <mLib/arena.h>
 #include <mLib/base64.h>
-#include <mLib/bres.h>
+#ifndef HAVE_LIBADNS
+#  include <mLib/bres.h>
+#endif
 #include <mLib/codec.h>
 #include <mLib/daemonize.h>
 #include <mLib/dstr.h>
@@ -428,6 +435,27 @@ extern const bulkops bulktab[];
 
 /*----- Data structures ---------------------------------------------------*/
 
+/* --- The address-family table --- */
+
+#define ADDRFAM(_)							\
+  _(INET,	want_ipv4)						\
+  _(INET6,	want_ipv6)
+
+enum {
+#define ENUM(af, qf) AFIX_##af,
+  ADDRFAM(ENUM)
+#undef ENUM
+  NADDRFAM
+};
+
+extern const struct addrfam {
+  int af;
+  const char *name;
+#ifdef HAVE_LIBADNS
+  adns_queryflags qf;
+#endif
+} aftab[NADDRFAM];
+
 /* --- Socket addresses --- *
  *
  * A magic union of supported socket addresses.
@@ -436,6 +464,7 @@ extern const bulkops bulktab[];
 typedef union addr {
   struct sockaddr sa;
   struct sockaddr_in sin;
+  struct sockaddr_in6 sin6;
 } addr;
 
 /* --- Mapping keyed on addresses --- */
@@ -635,6 +664,7 @@ typedef struct peer {
   peer_byaddr *byaddr;			/* Lookup-by-address block */
   struct ping *pings;			/* Pings we're waiting for */
   peerspec spec;			/* Specifications for this peer */
+  int afix;				/* Index of address family */
   tunnel *t;				/* Tunnel for local packets */
   char *ifname;				/* Interface name for tunnel */
   keyset *ks;				/* List head for keysets */
@@ -691,9 +721,14 @@ typedef struct admin_bgop {
 typedef struct admin_resop {
   admin_bgop bg;			/* Background operation header */
   char *addr;				/* Hostname to be resolved */
+#ifdef HAVE_LIBADNS
+  adns_query q;
+#else
   bres_client r;			/* Background resolver task */
+#endif
   sel_timer t;				/* Timer for resolver */
   addr sa;				/* Socket address */
+  unsigned port;			/* Port number chosen */
   size_t sasz;				/* Socket address size */
   void (*func)(struct admin_resop *, int); /* Handler */
 } admin_resop;
@@ -777,6 +812,7 @@ extern sel_state sel;			/* Global I/O event state */
 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 sel_file udpsock[NADDRFAM];	/* The master UDP sockets */
 extern kdata *master;			/* Default private key */
 extern const char *tag_priv;		/* Default private key tag */
 
@@ -1600,24 +1636,23 @@ extern const addr *p_addr(peer */*p*/);
 
 /* --- @p_init@ --- *
  *
- * Arguments:	@struct in_addr addr@ = address to bind to
- *		@unsigned port@ = port number to listen to
+ * Arguments:	@struct addrinfo *ailist@ = addresses to bind to
  *
  * Returns:	---
  *
  * Use:		Initializes the peer system; creates the socket.
  */
 
-extern void p_init(struct in_addr /*addr*/, unsigned /*port*/);
+extern void p_init(struct addrinfo */*ailist*/);
 
 /* --- @p_port@ --- *
  *
- * Arguments:	---
+ * Arguments:	@int i@ = address family index to retrieve
  *
  * Returns:	Port number used for socket.
  */
 
-unsigned p_port(void);
+extern unsigned p_port(int /*i*/);
 
 /* --- @p_create@ --- *
  *
@@ -1778,6 +1813,15 @@ extern const char *timestr(time_t /*t*/);
 
 extern int mystrieq(const char */*x*/, const char */*y*/);
 
+/* --- @afix@ --- *
+ *
+ * Arguments:	@int af@ = an address family code
+ *
+ * Returns:	The index of the address family's record in @aftab@, or @-1@.
+ */
+
+extern int afix(int af);
+
 /* --- @addrsz@ --- *
  *
  * Arguments:	@const addr *a@ = a network address
@@ -1787,6 +1831,19 @@ extern int mystrieq(const char */*x*/, const char */*y*/);
 
 extern socklen_t addrsz(const addr */*a*/);
 
+/* --- @getport@, @setport@ --- *
+ *
+ * Arguments:	@addr *a@ = a network address
+ *		@unsigned port@ = port number to set
+ *
+ * Returns:	---
+ *
+ * Use:		Retrieves or sets the port number in an address structure.
+ */
+
+extern unsigned getport(addr */*a*/);
+extern void setport(addr */*a*/, unsigned /*port*/);
+
 /* --- @seq_reset@ --- *
  *
  * Arguments:	@seqwin *s@ = sequence-checking window