Halfway through A lookups; need to restructure pa_... argument passing.

[adns] / src / internal.h

diff --git a/src/internal.h b/src/internal.h
index 61f2ff73ddc4681427975c72c72dfdc86cdbdd3f..7b12237f3d5bbb066bdb701064c931c6dd984555 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -80,14 +80,30 @@ typedef union {
   int dmaddr_index;
 } qcontext;
 
   int dmaddr_index;
 } qcontext;
 

+typedef struct {
+  adns_query qu;
+  const byte *dgram;
+  int serv, dglen, max, nsstart;
+} parseinfo;
+

 typedef struct {
   adns_rrtype type;
 typedef struct {
   adns_rrtype type;

-  const char *name;
+  const char *rrtname;
+  const char *fmtname;

   int rrsz;
 
   int rrsz;
 

-  adns_status (*parse)(adns_state ads, adns_query qu, int serv,
-                      const byte *dgram, int dglen, int cbyte, int max,
-                      void *store_r);
+  void (*makefinal)(adns_query qu, void *data);
+  /* Change memory management of *data.
+   * Previously, used alloc_interim, now use alloc_final.
+   */
+
+  adns_status (*convstring)(vbuf *vb, const void *data);
+  /* Converts the RR data to a string representation in vbuf.
+   * vbuf will be appended to (it must have been initialised),
+   * and will not be null-terminated by convstring.
+   */
+
+  adns_status (*parse)(const struct parseinfo *pai, int cbyte, void *store_r);

   /* Parse one RR, in dgram of length dglen, starting at cbyte and
    * extending until at most max.
    *
   /* Parse one RR, in dgram of length dglen, starting at cbyte and
    * extending until at most max.
    *


@@ -95,11 +111,13 @@ typedef struct {
    *
    * If there is an overrun which might indicate truncation, it should set
    * *rdstart to -1; otherwise it may set it to anything else positive.
    *
    * If there is an overrun which might indicate truncation, it should set
    * *rdstart to -1; otherwise it may set it to anything else positive.

+   *
+   * nsstart is the offset of the authority section.

    */
 
    */
 

-  void (*makefinal)(adns_state ads, adns_query qu, void *data);
-  /* Change memory management of *data.
-   * Previously, used alloc_interim, now use alloc_final.
+  int (*diff_needswap)(const void *datap_a, const void *datap_b);
+  /* Returns !0 if RR a should be strictly after RR b in the sort order,
+   * 0 otherwise.  Must not fail.

    */
 } typeinfo;
 
    */
 } typeinfo;
 


@@ -117,6 +135,7 @@ union maxalign {
 } data;
 
 struct adns__query {
 } data;
 
 struct adns__query {

+  adns_state ads;

   enum { query_udp, query_tcpwait, query_tcpsent, query_child, query_done } state;
   adns_query back, next, parent;
   struct { adns_query head, tail; } children;
   enum { query_udp, query_tcpwait, query_tcpsent, query_child, query_done } state;
   adns_query back, next, parent;
   struct { adns_query head, tail; } children;


@@ -126,7 +145,7 @@ struct adns__query {
   void *final_allocspace;
   
   const typeinfo *typei;
   void *final_allocspace;
   
   const typeinfo *typei;

-  char *query_dgram;
+  byte *query_dgram;

   int query_dglen;
   
   vbuf vb;
   int query_dglen;
   
   vbuf vb;


@@ -146,6 +165,7 @@ struct adns__query {
   
   byte *cname_dgram;
   int cname_dglen, cname_begin;
   
   byte *cname_dgram;
   int cname_dglen, cname_begin;

+  /* If non-0, has been allocated using . */

   
   int id, flags, udpretries;
   int udpnextserver;
   
   int id, flags, udpretries;
   int udpnextserver;


@@ -237,34 +257,49 @@ void adns__diag(adns_state ads, int serv, adns_query qu,
                const char *fmt, ...) PRINTFFORMAT(4,5);
 
 int adns__vbuf_ensure(vbuf *vb, int want);
                const char *fmt, ...) PRINTFFORMAT(4,5);
 
 int adns__vbuf_ensure(vbuf *vb, int want);

-int adns__vbuf_appendstr(vbuf *vb, const char *data);
+int adns__vbuf_appendstr(vbuf *vb, const char *data); /* does not include nul */

 int adns__vbuf_append(vbuf *vb, const byte *data, int len);
 /* 1=>success, 0=>realloc failed */
 void adns__vbuf_appendq(vbuf *vb, const byte *data, int len);
 void adns__vbuf_init(vbuf *vb);
 void adns__vbuf_free(vbuf *vb);
 
 int adns__vbuf_append(vbuf *vb, const byte *data, int len);
 /* 1=>success, 0=>realloc failed */
 void adns__vbuf_appendq(vbuf *vb, const byte *data, int len);
 void adns__vbuf_init(vbuf *vb);
 void adns__vbuf_free(vbuf *vb);
 

-const char *adns__diag_domain(adns_state ads, int serv, adns_query qu, vbuf *vb,
-                             int flags, const byte *dgram, int dglen, int cbyte);
+const char *adns__diag_domain(adns_state ads, int serv, adns_query qu,
+                             vbuf *vb, const byte *dgram, int dglen, int cbyte);

 /* Unpicks a domain in a datagram and returns a string suitable for
  * printing it as.  Never fails - if an error occurs, it will
  * return some kind of string describing the error.
  *
 /* Unpicks a domain in a datagram and returns a string suitable for
  * printing it as.  Never fails - if an error occurs, it will
  * return some kind of string describing the error.
  *

- * serv may be -1, qu may be 0.  vb must have been initialised,
+ * serv may be -1 and qu may be 0.  vb must have been initialised,

  * and will be left in an arbitrary consistent state.
  *
  * Returns either vb->buf, or a pointer to a string literal.  Do not modify
  * vb before using the return value.
  */
   
  * and will be left in an arbitrary consistent state.
  *
  * Returns either vb->buf, or a pointer to a string literal.  Do not modify
  * vb before using the return value.
  */
   

+void adns__isort(void *array, int nobjs, int sz, void *tempbuf,
+                int (*needswap)(const void *a, const void *b));
+/* Does an insertion sort of array which must contain nobjs objects
+ * each sz bytes long.  tempbuf must point to a buffer at least
+ * sz bytes long.  needswap should return !0 if a>b (strictly, ie
+ * wrong order) 0 if a<=b (ie, order is fine).
+ */
+  

 /* From transmit.c: */
 
 /* From transmit.c: */
 

-adns_status adns__mkquery(adns_state ads, vbuf *vb,
-                         const char *owner, int ol, int *id_r,
+adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
+                         const char *owner, int ol,

                          const typeinfo *typei, adns_queryflags flags);
 /* Assembles a query packet in vb, and returns id at *id_r. */
 
                          const typeinfo *typei, adns_queryflags flags);
 /* Assembles a query packet in vb, and returns id at *id_r. */
 

-void adns__query_tcp(adns_state ads, adns_query qu, struct timeval now);
+adns_status adns__mkquery_frdgram(adns_state ads, vbuf *vb, int *id_r,
+                                 const byte *qd_dgram, int qd_dglen, int qd_begin,
+                                 adns_rrtype type, adns_queryflags flags);
+/* Same as adns__mkquery, but takes the owner domain from an existing datagram.
+ * That domain must be correct and untruncated.
+ */
+
+void adns__query_tcp(adns_query qu, struct timeval now);

 /* Query must be in state tcpwait/timew; it will be moved to a new state
  * if possible and no further processing can be done on it for now.
  * (Resulting state is one of tcpwait/timew (if server not connected),
 /* Query must be in state tcpwait/timew; it will be moved to a new state
  * if possible and no further processing can be done on it for now.
  * (Resulting state is one of tcpwait/timew (if server not connected),


@@ -276,7 +311,7 @@ void adns__query_tcp(adns_state ads, adns_query qu, struct timeval now);
  * reestablishment and retry.
  */
 
  * reestablishment and retry.
  */
 

-void adns__query_udp(adns_state ads, adns_query qu, struct timeval now);
+void adns__query_udp(adns_query qu, struct timeval now);

 /* Query must be in state udp/NONE; it will be moved to a new state,
  * and no further processing can be done on it for now.
  * (Resulting state is one of udp/timew, tcpwait/timew (if server not connected),
 /* Query must be in state udp/NONE; it will be moved to a new state,
  * and no further processing can be done on it for now.
  * (Resulting state is one of udp/timew, tcpwait/timew (if server not connected),


@@ -286,7 +321,7 @@ void adns__query_udp(adns_state ads, adns_query qu, struct timeval now);
 /* From query.c: */
 
 int adns__internal_submit(adns_state ads, adns_query *query_r,
 /* From query.c: */
 
 int adns__internal_submit(adns_state ads, adns_query *query_r,

-                         adns_rrtype type, vbuf *qumsg_vb, int id,
+                         const typeinfo *typei, vbuf *qumsg_vb, int id,

                          adns_queryflags flags, struct timeval now,
                          adns_status failstat, const qcontext *ctx);
 /* Submits a query (for internal use, called during external submits).
                          adns_queryflags flags, struct timeval now,
                          adns_status failstat, const qcontext *ctx);
 /* Submits a query (for internal use, called during external submits).


@@ -313,18 +348,27 @@ void *adns__alloc_interim(adns_query qu, size_t sz);
  * big enough for all these allocations, and then adns__alloc_final
  * will get memory from this buffer.
  *
  * big enough for all these allocations, and then adns__alloc_final
  * will get memory from this buffer.
  *

- * _alloc_interim can fail, in which case it will fail the query too,
- * so nothing more need be done with it.
+ * _alloc_interim can fail (and return 0).
+ * The caller must ensure that the query is failed.
+ *
+ * adns__alloc_interim_{only,fail}(qu,0) will not return 0,
+ * but it will not necessarily return a distinct pointer each time.
+ */
+
+void *adns__alloc_mine(adns_query qu, size_t sz);
+/* Like _interim, but does not record the length for later
+ * copying into the answer.  This just ensures that the memory
+ * will be freed when we're done with the query.

  */
 
 void *adns__alloc_final(adns_query qu, size_t sz);
  */
 
 void *adns__alloc_final(adns_query qu, size_t sz);

-/* Cannot fail.
+/* Cannot fail, and cannot return 0.

  */
 
 void adns__makefinal_block(adns_query qu, void **blpp, size_t sz);
 void adns__makefinal_str(adns_query qu, char **strp);
 
  */
 
 void adns__makefinal_block(adns_query qu, void **blpp, size_t sz);
 void adns__makefinal_str(adns_query qu, char **strp);
 

-void adns__reset_cnameonly(adns_state ads, adns_query qu);
+void adns__reset_cnameonly(adns_query qu);

 /* Resets all of the memory management stuff etc. to
  * take account of only the CNAME.  Used when we find an error somewhere
  * and want to just report the error (with perhaps CNAME info), and also
 /* Resets all of the memory management stuff etc. to
  * take account of only the CNAME.  Used when we find an error somewhere
  * and want to just report the error (with perhaps CNAME info), and also


@@ -332,8 +376,8 @@ void adns__reset_cnameonly(adns_state ads, adns_query qu);
  * need to retry the query.
  */
 
  * need to retry the query.
  */
 

-void adns__query_done(adns_state ads, adns_query qu);
-void adns__query_fail(adns_state ads, adns_query qu, adns_status stat);
+void adns__query_done(adns_query qu);
+void adns__query_fail(adns_query qu, adns_status stat);

    
 /* From reply.c: */
 
    
 /* From reply.c: */
 


@@ -348,24 +392,25 @@ const typeinfo *adns__findtype(adns_rrtype type);
 
 typedef struct {
   adns_state ads;
 
 typedef struct {
   adns_state ads;

+  adns_query qu;

   int serv;
   const byte *dgram;
   int dglen, max, cbyte, namelen;
   int serv;
   const byte *dgram;
   int dglen, max, cbyte, namelen;

-  int *dmend_rlater, *namelen_rlater;
+  int *dmend_r;

 } findlabel_state;
 
 } findlabel_state;
 

-void adns__findlabel_start(findlabel_state *fls,
-                          adns_state ads, int serv,
+void adns__findlabel_start(findlabel_state *fls, adns_state ads,
+                          int serv, adns_query qu,

                           const byte *dgram, int dglen, int max,
                           int dmbegin, int *dmend_rlater);
 /* Finds labels in a domain in a datagram.
  *
  * Call this routine first.
                           const byte *dgram, int dglen, int max,
                           int dmbegin, int *dmend_rlater);
 /* Finds labels in a domain in a datagram.
  *
  * Call this routine first.

- * endpoint_rlater may be null.
+ * dmend_rlater may be null.  ads (and of course fls) may not be.
+ * serv may be -1, qu may be null - they are for error reporting.

  */
 
  */
 

-adns_status adns__findlabel_next(findlabel_state *fls,
-                                int *lablen_r, int *labstart_r);
+adns_status adns__findlabel_next(findlabel_state *fls, int *lablen_r, int *labstart_r);

 /* Then, call this one repeatedly.
  *
  * It will return adns_s_ok if all is well, and tell you the length
 /* Then, call this one repeatedly.
  *
  * It will return adns_s_ok if all is well, and tell you the length


@@ -390,45 +435,67 @@ adns_status adns__findlabel_next(findlabel_state *fls,
  * Do not then call findlabel_next again.
  */
 
  * Do not then call findlabel_next again.
  */
 

-adns_status adns__parse_domain(adns_state ads, int serv, vbuf *vb,
-                              const byte *dgram, int dglen,
-                              int *cbyte_io, int max);
+typedef enum {
+  pdf_quoteok= 0x001
+} parsedomain_flags;
+
+adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
+                              vbuf *vb, parsedomain_flags flags,
+                              const byte *dgram, int dglen, int *cbyte_io, int max);

 /* vb must already have been initialised; it will be reset if necessary.
  * If there is truncation, vb->used will be set to 0; otherwise
  * (if there is no error) vb will be null-terminated.
  * If there is an error vb and *cbyte_io may be left indeterminate.
 /* vb must already have been initialised; it will be reset if necessary.
  * If there is truncation, vb->used will be set to 0; otherwise
  * (if there is no error) vb will be null-terminated.
  * If there is an error vb and *cbyte_io may be left indeterminate.

+ *
+ * serv may be -1 and qu may be 0 - they are used for error reporting only.

  */
 
  */
 

-adns_status adns__findrr(adns_state ads, int serv,
+adns_status adns__findrr(adns_query qu, int serv,

                         const byte *dgram, int dglen, int *cbyte_io,
                         int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,
                         const byte *dgram, int dglen, int *cbyte_io,
                         int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,

-                        const byte *eo_dgram, int eo_dglen, int eo_cbyte,
-                        int *eo_matched_r);
-  /* Finds the extent and some of the contents of an RR in a datagram
-   * and does some checks.  The datagram is *dgram, length dglen, and
-   * the RR starts at *cbyte_io (which is updated afterwards to point
-   * to the end of the RR).
-   *
-   * The type, class and RRdata length and start are returned iff
-   * the corresponding pointer variables are not null.  type_r and
-   * class_r may not be null.
-   *
-   * If the caller thinks they know what the owner of the RR ought to
-   * be they can pass in details in eo_*: this is another (or perhaps
-   * the same datagram), and a pointer to where the putative owner
-   * starts in that datagram.  In this case *eo_matched_r will be set
-   * to 1 if the datagram matched or 0 if it did not.  Either
-   * both eo_dgram and eo_matched_r must both be non-null, or they
-   * must both be null (in which case eo_dglen and eo_cbyte will be ignored).
-   * The eo datagram and contained owner domain MUST be valid and
-   * untruncated.
-   *
-   * If there is truncation then *type_r will be set to -1 and
-   * *cbyte_io, *class_r, *rdlen_r, *rdstart_r and *eo_matched_r will be
-   * undefined.
-   *
-   * If an error is returned then *type_r will be undefined too.
-   */
+                        int *ownermatchedquery_r);
+/* Finds the extent and some of the contents of an RR in a datagram
+ * and does some checks.  The datagram is *dgram, length dglen, and
+ * the RR starts at *cbyte_io (which is updated afterwards to point
+ * to the end of the RR).
+ *
+ * The type, class and RRdata length and start are returned iff
+ * the corresponding pointer variables are not null.  type_r and
+ * class_r may not be null.
+ *
+ * If ownermatchedquery_r != 0 then the owner domain of this
+ * RR will be compared with that in the query (or, if the query
+ * has gone to a CNAME lookup, with the canonical name).
+ * In this case, *ownermatchedquery_r will be set to 0 or 1.
+ * The query datagram (or CNAME datagram) MUST be valid and not truncated.
+ *
+ * If there is truncation then *type_r will be set to -1 and
+ * *cbyte_io, *class_r, *rdlen_r, *rdstart_r and *eo_matched_r will be
+ * undefined.
+ *
+ * qu must obviously be non-null.
+ *
+ * If an error is returned then *type_r will be undefined too.
+ */
+
+static adns_status findrr_anychk(adns_query qu, int serv,
+                                const byte *dgram, int dglen, int *cbyte_io,
+                                int *type_r, int *class_r, int *rdlen_r, int *rdstart_r,
+                                const byte *eo_dgram, int eo_dglen, int eo_cbyte,
+                                int *eo_matched_r);
+/* Like adns__findrr_checked, except that the datagram and
+ * owner to compare with can be specified explicitly.
+ *
+ * If the caller thinks they know what the owner of the RR ought to
+ * be they can pass in details in eo_*: this is another (or perhaps
+ * the same datagram), and a pointer to where the putative owner
+ * starts in that datagram.  In this case *eo_matched_r will be set
+ * to 1 if the datagram matched or 0 if it did not.  Either
+ * both eo_dgram and eo_matched_r must both be non-null, or they
+ * must both be null (in which case eo_dglen and eo_cbyte will be ignored).
+ * The eo datagram and contained owner domain MUST be valid and
+ * untruncated.
+ */

 
 int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len);
 
 
 int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len);
 


@@ -476,16 +543,16 @@ static inline int ctype_alpha(int c) {
 
 #define LIST_LINK_TAIL_PART(list,node,part) \
   do { \
 
 #define LIST_LINK_TAIL_PART(list,node,part) \
   do { \

-    (node)->part back= 0; \
-    (node)->part next= (list).tail; \
-    if ((list).tail) (list).tail->part back= (node); else (list).part head= (node); \
+    (node)->part next= 0; \
+    (node)->part back= (list).tail; \
+    if ((list).tail) (list).tail->part next= (node); else (list).part head= (node); \

     (list).tail= (node); \
   } while(0)
 
 #define LIST_UNLINK(list,node) LIST_UNLINK_PART(list,node,)
 #define LIST_LINK_TAIL(list,node) LIST_LINK_TAIL_PART(list,node,)
 
     (list).tail= (node); \
   } while(0)
 
 #define LIST_UNLINK(list,node) LIST_UNLINK_PART(list,node,)
 #define LIST_LINK_TAIL(list,node) LIST_LINK_TAIL_PART(list,node,)
 

-#define GETIL_B(cb) (dgram[(cb)++])
+#define GETIL_B(cb) (((dgram)[(cb)++]) & 0x0ff)

 #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_B(cb,tv) ((tv)= GETIL_B((cb)))
 #define GET_W(cb,tv) ((tv)=0, (tv)|=(GETIL_B((cb))<<8), (tv)|=GETIL_B(cb), (tv))