Sends packet, is apparently OK (tcpdump shows response is OK).

[adns.git] / src / adns.h

diff --git a/src/adns.h b/src/adns.h
index 69425aef7074d099e02b10aaf36255ea62a316cb..87e94e65c3659d33e00f1ebf707c4ae85dfdb48b 100644 (file)
--- a/src/adns.h
+++ b/src/adns.h
@@ -23,25 +23,25 @@ typedef enum {
 } adns_queryflags;
 
 typedef enum {
-  adns__rrttype_mask=  0x0fff,
-  adns__qtf_deref=     0x1000, /* dereference domains and produce extra data */
-  adns__qtf_mailconv=  0x2000, /* put @ between first and second labels */
-  adns_r_none=              0,
-  adns_r_a=                 1,
-  adns_r_ns_raw=            2,
-  adns_r_ns=                   adns_r_ns_raw|adns__qtf_deref,
-  adns_r_cname=             5,
-  adns_r_soa_raw=           6,
-  adns_r_soa=                  adns_r_soa_raw|adns__qtf_mailconv,
-  adns_r_null=             10,
-  adns_r_ptr_raw=          12,
-  adns_r_ptr=                  adns_r_ptr_raw|adns__qtf_deref,
-  adns_r_hinfo=            13,  
-  adns_r_mx_raw=           15,
-  adns_r_mx=                   adns_r_mx_raw|adns__qtf_deref,
-  adns_r_txt=              16,
-  adns_r_rp_raw=           17,
-  adns_r_rp=                   adns_r_rp_raw|adns__qtf_mailconv
+  adns__rrt_typemask=  0x0ffff,
+  adns__qtf_deref=     0x10000, /* dereference domains and produce extra data */
+  adns__qtf_mailconv=  0x20000, /* put @ between first and second labels */
+  adns_r_none=               0,
+  adns_r_a=                  1,
+  adns_r_ns_raw=             2,
+  adns_r_ns=                    adns_r_ns_raw|adns__qtf_deref,
+  adns_r_cname=              5,
+  adns_r_soa_raw=            6,
+  adns_r_soa=                   adns_r_soa_raw|adns__qtf_mailconv,
+  adns_r_null=              10,
+  adns_r_ptr_raw=           12,
+  adns_r_ptr=                   adns_r_ptr_raw|adns__qtf_deref,
+  adns_r_hinfo=             13,  
+  adns_r_mx_raw=            15,
+  adns_r_mx=                    adns_r_mx_raw|adns__qtf_deref,
+  adns_r_txt=               16,
+  adns_r_rp_raw=            17,
+  adns_r_rp=                    adns_r_rp_raw|adns__qtf_mailconv
 } adns_rrtype;
 
 /* In queries without qtf_anyquote, all domains must have standard
@@ -64,16 +64,18 @@ typedef enum {
   adns_s_serverfailure,
   adns_s_unknownqtype,
   adns_s_remoteerror,
+  adns_s_nolocalmem,
   adns_s_max_tempfail= 99,
   adns_s_nxdomain,
   adns_s_norecord,
+  adns_s_inconsistent, /* for bad PTR */
   adns_s_invaliddomain
 } adns_status;
 
 /* In dereferenced answers, multiple addresses show up as multiple
- * answers with all the dm pointers being the same.  If no
- * address is available (permanent failure) then INADDR_NONE is
- * used.
+ * answers with all the dm pointers being the same, with ref= adns_s_ok.
+ * If no address is available then INADDR_NONE is used, and ref indicates
+ * the error.
  */
 
 typedef struct {
@@ -82,16 +84,19 @@ typedef struct {
   adns_rrtype type;
   int nrrs;
   union {
-    struct in_addr inaddr[1];                                          /* a */
-    char (*str)[1];                     /* ns_raw, cname, ptr, ptr_raw, txt */
-    struct { char *dm; struct in_addr addr; } dmaddr;                 /* ns */
-    struct { char *a, *b; } strpair[1];                /* hinfo, rp, rp_raw */
-    struct { int pref; char *dm; struct in_addr addr; } intdmaddr[1]; /* mx */
-    struct { int pref; char *str; } intstr[1]; /* mx_raw */
+    struct in_addr inaddr[1];                                                    /* a */
+    char (*str)[1];                               /* ns_raw, cname, ptr, ptr_raw, txt */
+    struct { char *dm; adns_status ref; struct in_addr addr; } dmaddr;          /* ns */
+    struct { char *a, *b; } strpair[1];                          /* hinfo, rp, rp_raw */
+    struct {
+      int pref; char *dm;
+      adns_status ref; struct in_addr addr;
+    } intdmaddr[1];                                                             /* mx */
+    struct { int pref; char *str; } intstr[1];                              /* mx_raw */
     struct {
       char *ns0, *rp;
       unsigned long serial, refresh, retry, expire, minimum;
-    } soa[1]; /* soa, soa_raw */
+    } soa[1];                                                         /* soa, soa_raw */
     /* NULL is empty */
   } rrs;
 } adns_answer;
@@ -123,8 +128,9 @@ int adns_init(adns_state *newstate_r, adns_initflags flags);
 int adns_synchronous(adns_state ads,
                     const char *owner,
                     adns_rrtype type,
-                    int flags,
-                    adns_answer *answer);
+                    adns_queryflags flags,
+                    adns_answer **answer_r);
+/* Will not return EINTR. */
 
 /* NB: if you set adns_if_noautosys then _submit and _check do not
  * make any system calls; you must use adns_callback (possibly after
@@ -134,19 +140,20 @@ int adns_synchronous(adns_state ads,
 int adns_submit(adns_state ads,
                const char *owner,
                adns_rrtype type,
-               int flags,
+               adns_queryflags flags,
                void *context,
                adns_query *query_r);
 
 int adns_check(adns_state ads,
               adns_query *query_io,
-              adns_answer *answer,
-              void *context_r);
+              adns_answer **answer_r,
+              void **context_r);
 
 int adns_wait(adns_state ads,
              adns_query *query_io,
-             adns_answer *answer,
-             void *context_r);
+             adns_answer **answer_r,
+             void **context_r);
+/* Might return EINTR - if so, try again */
 
 void adns_cancel(adns_state ads, adns_query query);