struct sockaddr sa;
struct sockaddr_in inet;
} addr;
-} adns_addr;
+} adns_rr_addr;
typedef struct {
- char *dm;
+ char *host;
adns_status astatus;
int naddrs; /* temp fail => -1, perm fail => 0, s_ok => >0 */
- adns_addr *addrs;
-} adns_rr_dmaddr;
+ adns_rr_addr *addrs;
+} adns_rr_hostaddr;
typedef struct {
- char *a, *b;
+ char *(array[2]);
} adns_rr_strpair;
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,
} adns_rr_intstr;
typedef struct {
- char *ns0, *rp;
+ adns_rr_intstr array[2];
+} adns_rr_intstrpair;
+
+typedef struct {
+ char *mname, *rname;
unsigned long serial, refresh, retry, expire, minimum;
} adns_rr_soa;
union {
void *untyped;
unsigned char *bytes;
- 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 ??fixme, rp, rp_raw */
- adns_rr_intdmaddr *intdmaddr; /* mx */
- adns_rr_intstr *intstr; /* mx_raw */
- adns_rr_soa *soa; /* soa, soa_raw */
+ char *(*str); /* ns_raw, cname, ptr, ptr_raw */
+ adns_rr_intstr *(*manyistr); /* txt (list of strings ends with i=-1, str=0) */
+ adns_rr_addr *addr; /* addr */
+ struct in_addr *inaddr; /* a */
+ adns_rr_hostaddr *hostaddr; /* ns */
+ adns_rr_intstrpair *intstrpair; /* hinfo */
+ adns_rr_strpair *strpair; /* 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,
void adns_cancel(adns_query query);
-int adns_finish(adns_state);
+void adns_finish(adns_state);
/* You may call this even if you have queries outstanding;
* they will be cancelled.
*/