X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Ftypes.c;h=d62bbb5cd49b487b55df857412fc1e2eae251390;hp=53b40e2ecc4464bda59a6d10505dd3fe66f9337b;hb=609133ee3365572c56ffa2ffb14d274ff47eb94b;hpb=b365d68ae5de07ef9dc4a3b92058a13edba5ad6f diff --git a/src/types.c b/src/types.c index 53b40e2..d62bbb5 100644 --- a/src/types.c +++ b/src/types.c @@ -3,7 +3,12 @@ * - RR-type-specific code, and the machinery to call it */ /* - * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson + * This file is + * Copyright (C) 1997-1999 Ian Jackson + * + * It is part of adns, which is + * Copyright (C) 1997-2000 Ian Jackson + * Copyright (C) 1999-2000 Tony Finch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,8 +34,10 @@ #include "internal.h" -#define R_NOMEM return adns_s_nomemory -#define CSP_ADDSTR(s) do { if (!adns__vbuf_appendstr(vb,(s))) R_NOMEM; } while (0) +#define R_NOMEM return adns_s_nomemory +#define CSP_ADDSTR(s) do { \ + if (!adns__vbuf_appendstr(vb,(s))) R_NOMEM; \ + } while (0) /* * order of sections: @@ -167,7 +174,8 @@ static void mf_manyistr(adns_query qu, void *datap) { * _txt (pa,cs) */ -static adns_status pa_txt(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_txt(const parseinfo *pai, int cbyte, + int max, void *datap) { adns_rr_intstr **rrp= datap, *table, *te; const byte *dgram= pai->dgram; int ti, tc, l, startbyte; @@ -230,7 +238,8 @@ static adns_status cs_hinfo(vbuf *vb, const void *datap) { * _inaddr (pa,dip,di) */ -static adns_status pa_inaddr(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_inaddr(const parseinfo *pai, int cbyte, + int max, void *datap) { struct in_addr *storeto= datap; if (max-cbyte != 4) return adns_s_invaliddata; @@ -243,7 +252,8 @@ static int search_sortlist(adns_state ads, struct in_addr ad) { int i; for (i=0, slp=ads->sortlist; - insortlist && !((ad.s_addr & slp->mask.s_addr) == slp->base.s_addr); + insortlist && + !((ad.s_addr & slp->mask.s_addr) == slp->base.s_addr); i++, slp++); return i; } @@ -258,7 +268,8 @@ static int dip_inaddr(adns_state ads, struct in_addr a, struct in_addr b) { return bidgram; @@ -362,7 +374,8 @@ static adns_status cs_domain(vbuf *vb, const void *datap) { return csp_domain(vb,*domainp); } -static adns_status pa_dom_raw(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_dom_raw(const parseinfo *pai, int cbyte, + int max, void *datap) { char **rrp= datap; adns_status st; @@ -377,7 +390,8 @@ static adns_status pa_dom_raw(const parseinfo *pai, int cbyte, int max, void *da * _host_raw (pa) */ -static adns_status pa_host_raw(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_host_raw(const parseinfo *pai, int cbyte, + int max, void *datap) { char **rrp= datap; adns_status st; @@ -401,7 +415,8 @@ static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha, adns_status st; for (rri=0, naddrs=-1; rriqu, pai->serv, pai->dgram, pai->dglen, cbyte_io, + st= adns__findrr_anychk(pai->qu, pai->serv, pai->dgram, + pai->dglen, cbyte_io, &type, &class, &ttl, &rdlen, &rdstart, pai->dgram, pai->dglen, dmstart, &ownermatched); if (st) return st; @@ -411,7 +426,8 @@ static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha, if (naddrs == -1) { naddrs= 0; } - if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_rr_addr))) R_NOMEM; + if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_rr_addr))) + R_NOMEM; adns__update_expires(pai->qu,ttl,pai->now); st= pa_addr(pai, rdstart,rdstart+rdlen, pai->qu->vb.buf + naddrs*sizeof(adns_rr_addr)); @@ -441,7 +457,8 @@ static void icb_hostaddr(adns_query parent, adns_query child) { rrp->astatus= st; rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : cans->nrrs; rrp->addrs= cans->rrs.addr; - adns__transfer_interim(child, parent, rrp->addrs, rrp->naddrs*sizeof(adns_rr_addr)); + adns__transfer_interim(child, parent, rrp->addrs, + rrp->naddrs*sizeof(adns_rr_addr)); if (parent->children.head) { LIST_LINK_TAIL(ads->childw,parent); @@ -501,7 +518,8 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, return adns_s_ok; } -static adns_status pa_hostaddr(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_hostaddr(const parseinfo *pai, int cbyte, + int max, void *datap) { adns_rr_hostaddr *rrp= datap; adns_status st; @@ -512,7 +530,8 @@ static adns_status pa_hostaddr(const parseinfo *pai, int cbyte, int max, void *d return adns_s_ok; } -static int dip_hostaddr(adns_state ads, const adns_rr_hostaddr *ap, const adns_rr_hostaddr *bp) { +static int dip_hostaddr(adns_state ads, + const adns_rr_hostaddr *ap, const adns_rr_hostaddr *bp) { if (ap->astatus != bp->astatus) return ap->astatus; if (ap->astatus) return 0; @@ -523,7 +542,8 @@ static int dip_hostaddr(adns_state ads, const adns_rr_hostaddr *ap, const adns_r bp->addrs[0].addr.inet.sin_addr); } -static int di_hostaddr(adns_state ads, const void *datap_a, const void *datap_b) { +static int di_hostaddr(adns_state ads, + const void *datap_a, const void *datap_b) { const adns_rr_hostaddr *ap= datap_a, *bp= datap_b; return dip_hostaddr(ads, ap,bp); @@ -545,13 +565,24 @@ static void mf_hostaddr(adns_query qu, void *datap) { } static adns_status csp_hostaddr(vbuf *vb, const adns_rr_hostaddr *rrp) { + const char *errstr; adns_status st; + char buf[20]; int i; - st= csp_domain(vb,rrp->host); if (st) return st; + st= csp_domain(vb,rrp->host); if (st) return st; CSP_ADDSTR(" "); + CSP_ADDSTR(adns_errtypeabbrev(rrp->astatus)); + + sprintf(buf," %d ",rrp->astatus); + CSP_ADDSTR(buf); + CSP_ADDSTR(adns_errabbrev(rrp->astatus)); + CSP_ADDSTR(" "); + + errstr= adns_strerror(rrp->astatus); + st= csp_qstring(vb,errstr,strlen(errstr)); if (st) return st; if (rrp->naddrs >= 0) { CSP_ADDSTR(" ("); @@ -576,7 +607,8 @@ static adns_status cs_hostaddr(vbuf *vb, const void *datap) { * _mx_raw (pa,di) */ -static adns_status pa_mx_raw(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_mx_raw(const parseinfo *pai, int cbyte, + int max, void *datap) { const byte *dgram= pai->dgram; adns_rr_intstr *rrp= datap; adns_status st; @@ -605,7 +637,8 @@ static int di_mx_raw(adns_state ads, const void *datap_a, const void *datap_b) { * _mx (pa,di) */ -static adns_status pa_mx(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_mx(const parseinfo *pai, int cbyte, + int max, void *datap) { const byte *dgram= pai->dgram; adns_rr_inthostaddr *rrp= datap; adns_status st; @@ -697,7 +730,8 @@ static void icb_ptr(adns_query parent, adns_query child) { adns__query_fail(parent,adns_s_inconsistent); } -static adns_status pa_ptr(const parseinfo *pai, int dmstart, int max, void *datap) { +static adns_status pa_ptr(const parseinfo *pai, int dmstart, + int max, void *datap) { static const char *(expectdomain[])= { DNS_INADDR_ARPA }; char **rrp= datap; @@ -725,15 +759,18 @@ static adns_status pa_ptr(const parseinfo *pai, int dmstart, int max, void *data for (i=0; i<4; i++) { st= adns__findlabel_next(&fls,&lablen,&labstart); assert(!st); if (lablen<=0 || lablen>3) return adns_s_querydomainwrong; - memcpy(labbuf, pai->qu->query_dgram + labstart, lablen); labbuf[lablen]= 0; - ipv[3-i]= strtoul(labbuf,&ep,10); if (*ep) return adns_s_querydomainwrong; + memcpy(labbuf, pai->qu->query_dgram + labstart, lablen); + labbuf[lablen]= 0; + ipv[3-i]= strtoul(labbuf,&ep,10); + if (*ep) return adns_s_querydomainwrong; if (lablen>1 && pai->qu->query_dgram[labstart]=='0') return adns_s_querydomainwrong; } for (i=0; iqu->query_dgram + labstart, expectdomain[i], l)) + if (lablen != l || + memcmp(pai->qu->query_dgram + labstart, expectdomain[i], l)) return adns_s_querydomainwrong; } st= adns__findlabel_next(&fls,&lablen,0); assert(!st); @@ -790,7 +827,8 @@ static void mf_intstrpair(adns_query qu, void *datap) { * _hinfo (pa) */ -static adns_status pa_hinfo(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_hinfo(const parseinfo *pai, int cbyte, + int max, void *datap) { adns_rr_intstrpair *rrp= datap; adns_status st; int i; @@ -809,8 +847,8 @@ static adns_status pa_hinfo(const parseinfo *pai, int cbyte, int max, void *data * _mailbox (pap,cs) */ -static adns_status pap_mailbox822(const parseinfo *pai, int *cbyte_io, int max, - char **mb_r) { +static adns_status pap_mailbox822(const parseinfo *pai, + int *cbyte_io, int max, char **mb_r) { int lablen, labstart, i, needquote, c, r, neednorm; const unsigned char *p; char *str; @@ -835,7 +873,7 @@ static adns_status pap_mailbox822(const parseinfo *pai, int *cbyte_io, int max, c= *p++; if ((c&~128) < 32 || (c&~128) == 127) return adns_s_invaliddata; if (c == '.' && !neednorm) neednorm= 1; - else if (c==' ' || ctype_822special(c)) needquote++; + else if (c==' ' || c>=127 || ctype_822special(c)) needquote++; else neednorm= 0; } @@ -882,7 +920,8 @@ static adns_status csp_mailbox(vbuf *vb, const char *mailbox) { * _rp (pa,cs) */ -static adns_status pa_rp(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_rp(const parseinfo *pai, int cbyte, + int max, void *datap) { adns_rr_strpair *rrp= datap; adns_status st; @@ -911,7 +950,8 @@ static adns_status cs_rp(vbuf *vb, const void *datap) { * _soa (pa,mf,cs) */ -static adns_status pa_soa(const parseinfo *pai, int cbyte, int max, void *datap) { +static adns_status pa_soa(const parseinfo *pai, int cbyte, + int max, void *datap) { adns_rr_soa *rrp= datap; const byte *dgram= pai->dgram; adns_status st; @@ -976,31 +1016,31 @@ static void mf_flat(adns_query qu, void *data) { } #define FLAT_MEMB(memb) TYPESZ_M(memb), mf_flat, cs_##memb #define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,printer) \ - { adns_r_##code, rrt, fmt, TYPESZ_M(memb), mf_##memb, printer, parser, comparer } + { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb, printer,parser,comparer } #define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,printer) \ - { adns_r_##code, rrt, fmt, TYPESZ_M(memb), mf_flat, printer, parser, comparer } + { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_flat, printer,parser,comparer } static const typeinfo typeinfos[] = { /* Must be in ascending order of rrtype ! */ -/* mem-mgmt code rrt fmt member parser comparer printer */ - -FLAT_TYPE(a, "A", 0, inaddr, pa_inaddr, di_inaddr, cs_inaddr ), -DEEP_TYPE(ns_raw, "NS", "raw", str, pa_host_raw,0, cs_domain ), -DEEP_TYPE(cname, "CNAME", 0, str, pa_dom_raw, 0, cs_domain ), -DEEP_TYPE(soa_raw,"SOA", "raw", soa, pa_soa, 0, cs_soa ), -DEEP_TYPE(ptr_raw,"PTR", "raw", str, pa_host_raw,0, cs_domain ), -DEEP_TYPE(hinfo, "HINFO", 0, intstrpair, pa_hinfo, 0, cs_hinfo ), -DEEP_TYPE(mx_raw, "MX", "raw", intstr, pa_mx_raw, di_mx_raw, cs_inthost ), -DEEP_TYPE(txt, "TXT", 0, manyistr, pa_txt, 0, cs_txt ), -DEEP_TYPE(rp_raw, "RP", "raw", strpair, pa_rp, 0, cs_rp ), - -FLAT_TYPE(addr, "A", "addr", addr, pa_addr, di_addr, cs_addr ), -DEEP_TYPE(ns, "NS", "+addr", hostaddr, pa_hostaddr,di_hostaddr,cs_hostaddr ), -DEEP_TYPE(ptr, "PTR","checked",str, pa_ptr, 0, cs_domain ), -DEEP_TYPE(mx, "MX", "+addr", inthostaddr,pa_mx, di_mx, cs_inthostaddr), - -DEEP_TYPE(soa, "SOA","822", soa, pa_soa, 0, cs_soa ), -DEEP_TYPE(rp, "RP", "822", strpair, pa_rp, 0, cs_rp ), +/* mem-mgmt code rrt fmt member parser comparer printer */ + +FLAT_TYPE(a, "A", 0, inaddr, pa_inaddr, di_inaddr,cs_inaddr ), +DEEP_TYPE(ns_raw, "NS", "raw",str, pa_host_raw,0, cs_domain ), +DEEP_TYPE(cname, "CNAME", 0, str, pa_dom_raw, 0, cs_domain ), +DEEP_TYPE(soa_raw,"SOA", "raw",soa, pa_soa, 0, cs_soa ), +DEEP_TYPE(ptr_raw,"PTR", "raw",str, pa_host_raw,0, cs_domain ), +DEEP_TYPE(hinfo, "HINFO", 0, intstrpair,pa_hinfo, 0, cs_hinfo ), +DEEP_TYPE(mx_raw, "MX", "raw",intstr, pa_mx_raw, di_mx_raw,cs_inthost ), +DEEP_TYPE(txt, "TXT", 0, manyistr,pa_txt, 0, cs_txt ), +DEEP_TYPE(rp_raw, "RP", "raw",strpair, pa_rp, 0, cs_rp ), + +FLAT_TYPE(addr, "A", "addr", addr, pa_addr, di_addr, cs_addr ), +DEEP_TYPE(ns, "NS", "+addr",hostaddr,pa_hostaddr,di_hostaddr,cs_hostaddr ), +DEEP_TYPE(ptr, "PTR","checked",str, pa_ptr, 0, cs_domain ), +DEEP_TYPE(mx, "MX", "+addr",inthostaddr,pa_mx, di_mx, cs_inthostaddr), + +DEEP_TYPE(soa, "SOA","822", soa, pa_soa, 0, cs_soa ), +DEEP_TYPE(rp, "RP", "822", strpair, pa_rp, 0, cs_rp ), }; const typeinfo *adns__findtype(adns_rrtype type) {