update copyright dates and ADNS_VERSION_STRING

[adns] / src / internal.h

diff --git a/src/internal.h b/src/internal.h
index 555922934df56f055d4d676ffed711b66317bc36..eebf2a00e2c03597af6b1417feb001db12ba5f34 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -114,7 +114,7 @@ typedef struct {
 } parseinfo;
 
 typedef struct typeinfo {
 } parseinfo;
 
 typedef struct typeinfo {

-  adns_rrtype type;
+  adns_rrtype typekey;

   const char *rrtname;
   const char *fmtname;
   int rrsz;
   const char *rrtname;
   const char *fmtname;
   int rrsz;


@@ -159,7 +159,7 @@ typedef struct typeinfo {
    * string.  On successful return, label_r[] and *ll_io are filled in
    * and *p_io points to *pe or just after the label-ending `.'.  */
 
    * string.  On successful return, label_r[] and *ll_io are filled in
    * and *p_io points to *pe or just after the label-ending `.'.  */
 

-  void (*postsort)(adns_state ads, void *array, int nobjs,
+  void (*postsort)(adns_state ads, void *array, int nrrs,

                   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
                   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


@@ -337,6 +337,7 @@ struct adns__state {
     struct in_addr base, mask;
   } sortlist[MAXSORTLIST];
   char **searchlist;
     struct in_addr base, mask;
   } sortlist[MAXSORTLIST];
   char **searchlist;

+  unsigned short rand48xsubi[3];

 };
 
 /* From setup.c: */
 };
 
 /* From setup.c: */


@@ -403,7 +404,8 @@ void adns__sigpipe_unprotect(adns_state);
 
 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
                          const char *owner, int ol,
 
 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
                          const char *owner, int ol,

-                         const typeinfo *typei, adns_queryflags flags);
+                         const typeinfo *typei, adns_rrtype type,
+                         adns_queryflags flags);

 /* Assembles a query packet in vb.  A new id is allocated and returned.
  */
 
 /* Assembles a query packet in vb.  A new id is allocated and returned.
  */