src/: Support IPv6 addresses in `sortlist'.

[adns] / src / internal.h

diff --git a/src/internal.h b/src/internal.h
index 58cd15d2fba69ae80e8f09bf99b71580b8cce07a..4f4f87eb0c4ddebd4f7d5b0efea01fb2cf3d6f8b 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -112,6 +112,22 @@ typedef struct {
   struct timeval now;
 } parseinfo;
 
   struct timeval now;
 } parseinfo;
 

+union gen_addr {
+  struct in_addr v4;
+  struct in6_addr v6;
+};
+
+typedef struct {
+  int af;
+  int width;
+  int delim;
+  void *(*sockaddr_to_inaddr)(struct sockaddr *sa);
+  void (*prefix_mask)(int len, union gen_addr *a);
+  int (*guess_len)(const union gen_addr *a);
+  int (*matchp)(const union gen_addr *addr,
+               const union gen_addr *base, const union gen_addr *mask);
+} afinfo;
+

 typedef struct typeinfo {
   adns_rrtype typekey;
   const char *rrtname;
 typedef struct typeinfo {
   adns_rrtype typekey;
   const char *rrtname;


@@ -333,12 +349,17 @@ struct adns__state {
     struct in_addr addr;
   } servers[MAXSERVERS];
   struct sortlist {
     struct in_addr addr;
   } servers[MAXSERVERS];
   struct sortlist {

-    struct in_addr base, mask;
+    const afinfo *ai;
+    union gen_addr base, mask;

   } sortlist[MAXSORTLIST];
   char **searchlist;
   unsigned short rand48xsubi[3];
 };
 
   } sortlist[MAXSORTLIST];
   char **searchlist;
   unsigned short rand48xsubi[3];
 };
 

+/* From addrfam.c: */
+
+extern const afinfo adns__inet_afinfo, adns__inet6_afinfo;
+

 /* From setup.c: */
 
 int adns__setnonblock(adns_state ads, int fd); /* => errno value */
 /* From setup.c: */
 
 int adns__setnonblock(adns_state ads, int fd); /* => errno value */