X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/a49a6d7b1f7da9722082778d6694ccbc077d262a..8837244370251f16e8f41097d4cbe5ef0058038c:/src/internal.h?ds=sidebyside

diff --git a/src/internal.h b/src/internal.h
index a20dd93..09ba2fe 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -82,12 +82,24 @@ typedef union {
 
 typedef struct {
   adns_rrtype type;
-  const char *name;
+  const char *rrtname;
+  const char *fmtname;
   int rrsz;
 
+  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)(adns_query qu, int serv,
 		       const byte *dgram, int dglen, int cbyte, int max,
-		       void *store_r);
+		       int nsstart, int *arstart_io, void *store_r);
   /* Parse one RR, in dgram of length dglen, starting at cbyte and
    * extending until at most max.
    *
@@ -95,11 +107,15 @@ 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.
+   *
+   * nsstart is the offset of the authority section; *arstart_io is
+   * -1 or the offset of the additional section; if it is -1 then
+   * parse may set it to the correct offset.
    */
 
-  void (*makefinal)(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;
 
@@ -127,7 +143,7 @@ struct adns__query {
   void *final_allocspace;
   
   const typeinfo *typei;
-  char *query_dgram;
+  byte *query_dgram;
   int query_dglen;
   
   vbuf vb;
@@ -239,15 +255,15 @@ 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);
-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);
 
-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.
@@ -259,6 +275,14 @@ const char *adns__diag_domain(adns_state ads, int serv, adns_query qu, vbuf *vb,
  * 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: */
 
 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
@@ -266,6 +290,13 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 			  const typeinfo *typei, adns_queryflags flags);
 /* Assembles a query packet in vb, and returns id at *id_r. */
 
+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.
@@ -315,11 +346,11 @@ 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.
  *
- * _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(qu,0) will not return 0, but it will not
- * necessarily return a distinct pointer each time.
+ * 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);
@@ -402,8 +433,12 @@ adns_status adns__findlabel_next(findlabel_state *fls, int *lablen_r, int *labst
  * Do not then call findlabel_next again.
  */
 
+typedef enum {
+  pdf_quoteok= 0x001
+} parsedomain_flags;
+
 adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
-			       vbuf *vb, int flags,
+			       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
@@ -487,16 +522,16 @@ static inline int ctype_alpha(int c) {
 
 #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,)
 
-#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))