src/adns.h, src/types.c: Now adns_rr_addr can hold a sockaddr_in6.

[adns] / src / internal.h

diff --git a/src/internal.h b/src/internal.h
index fed84663626f2eeae1c1709a04b425451a995789..7ad6daa0d8a10612e4448155e4c405be29ae7e6f 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -124,12 +124,18 @@ typedef struct {
   struct timeval now;
 } parseinfo;
 
   struct timeval now;
 } parseinfo;
 

+union checklabel_state {
+  struct { byte ipv[4]; } ptr;
+};
+

 typedef struct {
   void *ext;
   void (*callback)(adns_query parent, adns_query child);
 
   union {
 typedef struct {
   void *ext;
   void (*callback)(adns_query parent, adns_query child);
 
   union {

-    adns_rr_addr ptr_addr;
+    struct {
+      struct in_addr addr;
+    } ptr;

   } tinfo; /* type-specific state for the query itself: zero-init if you
            * don't know better. */
 
   } tinfo; /* type-specific state for the query itself: zero-init if you
            * don't know better. */
 


@@ -142,7 +148,7 @@ typedef struct typeinfo {
   adns_rrtype typekey;
   const char *rrtname;
   const char *fmtname;
   adns_rrtype typekey;
   const char *rrtname;
   const char *fmtname;

-  int rrsz;
+  int fixed_rrsz;

 
   void (*makefinal)(adns_query qu, void *data);
   /* Change memory management of *data.
 
   void (*makefinal)(adns_query qu, void *data);
   /* Change memory management of *data.


@@ -160,7 +166,7 @@ typedef struct typeinfo {
   /* 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.
    *

-   * The RR should be stored at *store_r, of length qu->typei->rrsz.
+   * The RR should be stored at *store_r, of length qu->typei->getrrsz().

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


@@ -173,32 +179,38 @@ typedef struct typeinfo {
    * 0 otherwise.  Must not fail.
    */
 
    * 0 otherwise.  Must not fail.
    */
 

-  adns_status (*qdparselabel)(adns_state ads,
-                             const char **p_io, const char *pe, int labelnum,
-                             char label_r[DNS_MAXDOMAIN], int *ll_io,
-                             adns_queryflags flags,
-                             const struct typeinfo *typei);
-  /* Parses one label from the query domain string.  On entry, *p_io
-   * points to the next character to parse and *ll_io is the size of
-   * the buffer.  pe points just after the end of the query domain
-   * 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 nrrs,
+  adns_status (*checklabel)(adns_state ads, adns_queryflags flags,
+                           union checklabel_state *cls, qcontext *ctx,
+                           int labnum, const char *label, int lablen);
+  /* Check a label from the query domain string.  The label is not
+   * necessarily null-terminated.  The hook can refuse the query's submission
+   * by returning a nonzero status.  State can be stored in *cls between
+   * calls, and useful information can be stashed in ctx->tinfo, to be stored
+   * with the query (e.g., it will be available to the parse hook).  This
+   * hook can detect a first call because labnum is zero, and a final call
+   * because lablen is zero.
+   */
+
+  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
    * stuff.)  May be 0 to mean nothing needs to be done.
    */
                   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
    * stuff.)  May be 0 to mean nothing needs to be done.
    */

+
+  int (*getrrsz)(const struct typeinfo *typei, adns_rrtype type);
+  /* Return the output resource-record element size; if this is null, then
+   * the rrsz member can be used.
+   */

 } typeinfo;
 
 } typeinfo;
 

-adns_status adns__qdpl_normal(adns_state ads,
-                             const char **p_io, const char *pe, int labelnum,
-                             char label_r[], int *ll_io,
-                             adns_queryflags flags,
-                             const typeinfo *typei);
-  /* implemented in transmit.c, used by types.c as default
-   * and as part of implementation for some fancier types */
+adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
+                              union checklabel_state *cls,
+                              qcontext *ctx, int labnum,
+                              const char *label, int lablen);
+  /* implemented in query.c, used by types.c as default
+   * and as part of implementation for some fancier types
+   * doesn't require any state */

 
 typedef struct allocnode {
   struct allocnode *next, *back;
 
 typedef struct allocnode {
   struct allocnode *next, *back;


@@ -398,6 +410,11 @@ const char *adns__diag_domain(adns_state ads, int serv, adns_query qu,
  * vb before using the return value.
  */
 
  * vb before using the return value.
  */
 

+int adns__getrrsz_default(const typeinfo *typei, adns_rrtype type);
+/* Default function for the `getrrsz' type hook; returns the `fixed_rrsz'
+ * value from the typeinfo entry.
+ */
+

 void adns__isort(void *array, int nobjs, int sz, void *tempbuf,
                 int (*needswap)(void *context, const void *a, const void *b),
                 void *context);
 void adns__isort(void *array, int nobjs, int sz, void *tempbuf,
                 int (*needswap)(void *context, const void *a, const void *b),
                 void *context);


@@ -452,10 +469,10 @@ void adns__query_send(adns_query qu, struct timeval now);
 /* From query.c: */
 
 adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
 /* From query.c: */
 
 adns_status adns__internal_submit(adns_state ads, adns_query *query_r,

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

                                  adns_queryflags flags, struct timeval now,
                                  adns_queryflags flags, struct timeval now,

-                                 const qcontext *ctx);
+                                 qcontext *ctx);

 /* Submits a query (for internal use, called during external submits).
  *
  * The new query is returned in *query_r, or we return adns_s_nomemory.
 /* Submits a query (for internal use, called during external submits).
  *
  * The new query is returned in *query_r, or we return adns_s_nomemory.


@@ -464,7 +481,8 @@ adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
  * the memory for it is _taken over_ by this routine whether it
  * succeeds or fails (if it succeeds, the vbuf is reused for qu->vb).
  *
  * the memory for it is _taken over_ by this routine whether it
  * succeeds or fails (if it succeeds, the vbuf is reused for qu->vb).
  *

- * *ctx is copied byte-for-byte into the query.
+ * *ctx is copied byte-for-byte into the query.  Before doing this, its tinfo
+ * field may be modified by type hooks.

  *
  * When the child query is done, ctx->callback will be called.  The
  * child will already have been taken off both the global list of
  *
  * When the child query is done, ctx->callback will be called.  The
  * child will already have been taken off both the global list of