X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/e576be5096ae358bebe2e9b6ad07c49f74aef616..828d89bd4196ad8ef825cdf2db26afe2eb797b69:/src/adns.h diff --git a/src/adns.h b/src/adns.h index 7268381..afcb6b4 100644 --- a/src/adns.h +++ b/src/adns.h @@ -42,55 +42,47 @@ typedef enum { } adns_initflags; typedef enum { - adns_qf_search= 0x0001, /* use the searchlist */ - adns_qf_usevc= 0x0002, /* use a virtual circuit (TCP connection) */ - adns_qf_anyquote= 0x0004, - adns_qf_loosecname= 0x0008, /* allow refs to CNAMEs - without, get _s_cname */ - adns_qf_nocname= 0x0010, /* don't follow CNAMEs, instead give _s_cname */ + adns_qf_search= 0x000001, /* use the searchlist */ + adns_qf_usevc= 0x000002, /* use a virtual circuit (TCP connection) */ + adns_qf_quoteok_query= 0x000010, /* allow quote-requiring chars in query domain */ + adns_qf_quoteok_cname= 0x000020, /* allow ... in CNAME we go via */ + adns_qf_quoteok_anshost= 0x000040, /* allow ... in answers expected to be hostnames */ + adns_qf_cname_loose= 0x000100, /* allow refs to CNAMEs - without, get _s_cname */ + adns_qf_cname_forbid= 0x000200, /* don't follow CNAMEs, instead give _s_cname */ + adns__qf_internalmask= 0x0ff000 } adns_queryflags; typedef enum { adns__rrt_typemask= 0x0ffff, adns__qtf_deref= 0x10000, /* dereference domains and perhaps produce extra data */ adns__qtf_mail822= 0x20000, /* make mailboxes be in RFC822 rcpt field format */ - adns__qtf_masterfmt= 0x80000, /* convert RRs to master file format, return as str */ adns_r_none= 0, adns_r_a= 1, - adns_r_a_mf= adns_r_a|adns__qtf_masterfmt, adns_r_ns_raw= 2, adns_r_ns= adns_r_ns_raw|adns__qtf_deref, - adns_r_ns_mf= adns_r_ns_raw|adns__qtf_masterfmt, adns_r_cname= 5, - adns_r_cname_mf= adns_r_cname|adns__qtf_masterfmt, adns_r_soa_raw= 6, adns_r_soa= adns_r_soa_raw|adns__qtf_mail822, - adns_r_soa_mf= adns_r_soa_raw|adns__qtf_masterfmt, - - adns_r_null= 10, - adns_r_null_mf= adns_r_null|adns__qtf_masterfmt, adns_r_ptr_raw= 12, adns_r_ptr= adns_r_ptr_raw|adns__qtf_deref, - adns_r_ptr_mf= adns_r_ptr_raw|adns__qtf_masterfmt, adns_r_hinfo= 13, - adns_r_hinfo_mf= adns_r_hinfo|adns__qtf_masterfmt, adns_r_mx_raw= 15, adns_r_mx= adns_r_mx_raw|adns__qtf_deref, - adns_r_mx_mf= adns_r_mx_raw|adns__qtf_masterfmt, adns_r_txt= 16, - adns_r_txt_mf= adns_r_txt|adns__qtf_masterfmt, adns_r_rp_raw= 17, adns_r_rp= adns_r_rp_raw|adns__qtf_mail822, - adns_r_rp_mf= adns_r_rp_raw|adns__qtf_masterfmt + + adns_r_addr= adns_r_a|adns__qtf_deref } adns_rrtype; @@ -104,13 +96,12 @@ typedef enum { * not usually legal in domain names will be quoted as \X * (if the character is 33-126 except \ and ") or \DDD. * - * _qtf_anyquote is ignored for _mf queries. - * * Do not ask for _raw records containing mailboxes without * specifying _qf_anyquote. */ typedef enum { + /* fixme: think about error codes */ adns_s_ok, adns_s_timeout, adns_s_nolocalmem, @@ -126,19 +117,28 @@ typedef enum { adns_s_max_tempfail= 99, adns_s_inconsistent, /* PTR gives domain whose A does not match */ adns_s_cname, /* CNAME found where data eg A expected (not if _qf_loosecname) */ + adns_s_invalidanswerdomain, /* fixme: implement _s_cname */ adns_s_max_remotemisconfig= 199, adns_s_nxdomain, adns_s_nodata, - adns_s_invaliddomain, + adns_s_invalidquerydomain, adns_s_domaintoolong, } adns_status; typedef struct { + int len; + union { + struct sockaddr sa; + struct sockaddr_in inet; + } addr; +} adns_addr; + +typedef struct { char *dm; adns_status astatus; int naddrs; /* temp fail => -1, perm fail => 0, s_ok => >0 */ - struct in_addr *addrs; + adns_addr *addrs; } adns_rr_dmaddr; typedef struct { @@ -151,6 +151,11 @@ typedef struct { } adns_rr_intdmaddr; typedef struct { + /* Used both for mx_raw, in which case i is the preference and str the domain, + * and for txt, in which case each entry has i for the `text' length, + * and str for the data (which will have had an extra nul appended + * so that if it was plain text it is now a null-terminated string). + */ int i; char *str; } adns_rr_intstr; @@ -163,19 +168,20 @@ typedef struct { typedef struct { adns_status status; char *cname; /* always NULL if query was for CNAME records */ - adns_rrtype type; + adns_rrtype type; /* guaranteed to be same as in query */ int nrrs, rrsz; union { void *untyped; unsigned char *bytes; - char *(*str); /* ns_raw, cname, ptr, ptr_raw, txt, _mf */ + char *(*str); /* ns_raw, cname, ptr, ptr_raw */ + adns_rr_intstr *(*manyistr); /* txt (list of strings ends with i=-1, str=0) */ + adns_addr *addr; /* addr */ struct in_addr *inaddr; /* a */ adns_rr_dmaddr *dmaddr; /* ns */ - adns_rr_strpair *strpair; /* hinfo, rp, rp_raw */ + adns_rr_strpair *strpair; /* hinfo ??fixme, rp, rp_raw */ adns_rr_intdmaddr *intdmaddr; /* mx */ adns_rr_intstr *intstr; /* mx_raw */ adns_rr_soa *soa; /* soa, soa_raw */ - /* NULL is empty */ } rrs; } adns_answer; @@ -234,7 +240,7 @@ int adns_wait(adns_state ads, void **context_r); /* Might return EINTR - if so, try again */ -void adns_cancel(adns_state ads, adns_query query); +void adns_cancel(adns_query query); int adns_finish(adns_state); /* You may call this even if you have queries outstanding; @@ -288,6 +294,34 @@ void adns_interest(adns_state, int *maxfd_io, fd_set *readfds_io, * } */ +adns_status adns_rr_info(adns_rrtype type, + const char **rrtname_r, const char **fmtname_r, + int *len_r, + const void *datap, char **data_r); +/* Gets information in human-readable (but non-i18n) form + * for eg debugging purposes. type must be specified, + * and the official name of the corresponding RR type will + * be returned in *rrtname_r, and information about the processing + * style in *fmtname_r. The length of the table entry in an answer + * for that type will be returned in in *len_r. + * Any or all of rrtname_r, fmtname_r and len_r may be 0. + * If fmtname_r is non-null then *fmtname_r may be + * null on return, indicating that no special processing is + * involved. + * + * data_r be must be non-null iff datap is. In this case + * *data_r will be set to point to a human-readable text + * string representing the RR data. The text will have + * been obtained from malloc() and must be freed by the caller. + * + * Usually this routine will succeed. Possible errors include: + * adns_s_nomemory + * adns_s_notimplemented (RR type not known) + * adns_s_invaliddata (*datap contained garbage) + * If an error occurs then no memory has been allocated, + * and *rrtname_r, *fmtname_r, *len_r and *data_r are undefined. + */ + const char *adns_strerror(adns_status st); #endif