X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Finternal.h;h=43f6d4359848fda3eba8fd0ebbf482b10f25c4b2;hb=0457b397418afbeed72d627cda199071a633aa30;hp=226c4429f98f36df2d4533c342beacad63bc6764;hpb=6b7c4ef06f1268321f02f6915538b2bfd1dd9dd5;p=adns.git

diff --git a/src/internal.h b/src/internal.h
index 226c442..43f6d43 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -6,14 +6,15 @@
  */
 /*
  *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014-2016  Ian Jackson
+ *    Copyright (C) 2014  Mark Wooding
  *    Copyright (C) 1999-2000,2003,2006  Tony Finch
  *    Copyright (C) 1991 Massachusetts Institute of Technology
  *  (See the file INSTALL for full details.)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
+ *  the Free Software Foundation; either version 3, or (at your option)
  *  any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -22,8 +23,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  along with this program; if not, write to the Free Software Foundation.
  */
 
 #ifndef ADNS_INTERNAL_H_INCLUDED
@@ -207,7 +207,7 @@ typedef struct typeinfo {
    * because lablen is zero.
    */
 
-  void (*postsort)(adns_state ads, void *array, int nrrs,int rrsz,
+  void (*postsort)(adns_state ads, void *array, int nrrs, int rrsz,
 		   const struct typeinfo *typei);
   /* Called immediately after the RRs have been sorted, and may rearrange
    * them.  (This is really for the benefit of SRV's bizarre weighting
@@ -372,8 +372,8 @@ struct adns__state {
   struct query_queue udpw, tcpw, childw, output, intdone;
   adns_query forallnext;
   int nextid, tcpsocket;
-  struct udpsocket { int af; int fd; } udpsocket[MAXUDP];
-  int nudp;
+  struct udpsocket { int af; int fd; } udpsockets[MAXUDP];
+  int nudpsockets;
   vbuf tcpsend, tcprecv;
   int nservers, nsortlist, nsearchlist, searchndots, tcpserver, tcprecv_skip;
   enum adns__tcpstate {
@@ -394,6 +394,7 @@ struct adns__state {
     adns_sockaddr base, mask;
   } sortlist[MAXSORTLIST];
   char **searchlist;
+  unsigned config_report_unknown:1;
   unsigned short rand48xsubi[3];
 };
 
@@ -450,8 +451,9 @@ extern const void *adns__sockaddr_addr(const struct sockaddr *sa);
  */
 
 char *adns__sockaddr_ntoa(const struct sockaddr *sa, char *buf);
-/* Convert sa to a string, and write it to buf, which must be at least
- * ADNS_ADDR2TEXT_BUFLEN bytes long (unchecked).  Return buf; can't fail.
+/* Converts sa to a string, and writes it to buf, which must be at
+ * least ADNS_ADDR2TEXT_BUFLEN bytes long (unchecked).  Returns buf;
+ * can't fail.
  */
 
 extern int adns__make_reverse_domain(const struct sockaddr *sa,
@@ -864,8 +866,6 @@ void adns__update_expires(adns_query qu, unsigned long ttl,
  * now + ttl.
  */
 
-int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len);
-
 bool adns__labels_equal(const byte *a, int al, const byte *b, int bl);
 
 /* From event.c: */
@@ -934,7 +934,7 @@ static inline int errno_resources(int e) { return e==ENOMEM || e==ENOBUFS; }
   (( ((sz)+sizeof(union maxalign)-1) / sizeof(union maxalign) )	\
    * sizeof(union maxalign) )
 
-#define GETIL_B(cb) (((dgram)[(cb)++]) & 0x0ff)
+#define GETIL_B(cb) (((dgram)[(cb)++]) & 0x0ffu)
 #define GET_B(cb,tv) ((tv)= GETIL_B((cb)))
 #define GET_W(cb,tv) ((tv)=0,(tv)|=(GETIL_B((cb))<<8), (tv)|=GETIL_B(cb), (tv))
 #define GET_L(cb,tv) ( (tv)=0,				\