* Copyright (C)1998 Ian Jackson.
* This version provided for review and comment only.
*
- * $Id: adns.h,v 1.24 1998/11/10 01:03:54 ian Exp $
+ * $Id: adns.h,v 1.32 1998/11/15 19:11:59 ian Exp $
*/
/*
* This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
adns_if_noserverwarn= 0x0004, /* do not warn to stderr about duff nameservers etc */
adns_if_debug= 0x0008, /* enable all output to stderr plus debug msgs */
adns_if_noautosys= 0x0010, /* do not make syscalls at every opportunity */
+ adns_if_eintr= 0x0020, /* allow _wait and _synchronous to return EINTR */
} 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;
* 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,
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 {
- char *dm;
+ int len;
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in inet;
+ } addr;
+} adns_addr;
+
+typedef struct {
+ char *host;
adns_status astatus;
int naddrs; /* temp fail => -1, perm fail => 0, s_ok => >0 */
- struct in_addr *addrs;
-} adns_rr_dmaddr;
+ adns_addr *addrs;
+} adns_rr_hostaddr;
typedef struct {
char *a, *b;
typedef struct {
int i;
- adns_rr_dmaddr dmaddr;
-} adns_rr_intdmaddr;
+ adns_rr_hostaddr ha;
+} adns_rr_inthostaddr;
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;
union {
void *untyped;
unsigned char *bytes;
- char *(*str); /* ns_raw, cname, ptr, ptr_raw, txt, <any>_mf */
- struct in_addr *inaddr; /* a */
- adns_rr_dmaddr *dmaddr; /* ns */
- adns_rr_strpair *strpair; /* hinfo, rp, rp_raw */
- adns_rr_intdmaddr *intdmaddr; /* mx */
- adns_rr_intstr *intstr; /* mx_raw */
- adns_rr_soa *soa; /* soa, soa_raw */
- /* NULL is empty */
+ 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_hostaddr *hostaddr; /* ns */
+ adns_rr_strpair *strpair; /* hinfo ??fixme, rp, rp_raw */
+ adns_rr_inthostaddr *inthostaddr; /* mx */
+ adns_rr_intstr *intstr; /* mx_raw */
+ adns_rr_soa *soa; /* soa, soa_raw */
} rrs;
} adns_answer;
* If no (appropriate) requests are outstanding adns_query and adns_wait return ESRCH;
*/
+/* fixme: separate parsing from instantiation */
int adns_init(adns_state *newstate_r, adns_initflags flags, FILE *diagfile/*0=>stderr*/);
int adns_synchronous(adns_state ads,
adns_rrtype type,
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
adns_query *query_io,
adns_answer **answer_r,
void **context_r);
-/* Might return EINTR - if so, try again */
void adns_cancel(adns_query query);
~mdw / adns / blobdiff