#include "internal.h"
-static int dip_inaddr(struct in_addr a, struct in_addr b) {
- /* fixme implement sortlist */
- return 0;
+#define R_NOMEM return adns_s_nolocalmem
+#define CSP_ADDSTR(s) if (!adns__vbuf_appendstr(vb,(s))) R_NOMEM; else;
+
+/*
+ * order of sections:
+ *
+ * _textdata, _qstring (csp)
+ * _str (mf,cs)
+ * _intstr (mf,cs)
+ * _manyistr (mf,cs)
+ * _txt (pa)
+ * _inaddr (pa,dip,di)
+ * _addr (pa,di,csp,cs)
+ * _domain (pap)
+ * _host_raw (pa)
+ * _hostaddr (pap,pa,dip,di,mfp,mf,csp,cs +pap_findaddrs)
+ * _mx_raw (pa,di)
+ * _mx (pa,di)
+ * _inthostaddr (mf,cs)
+ * _flat (mf)
+ *
+ * within each section:
+ * pap_*
+ * pa_*
+ * dip_*
+ * di_*
+ * mfp_*
+ * mf_*
+ * csp_*
+ * cs_*
+ */
+
+/*
+ * _textdata, _qstring (csp)
+ */
+
+static adns_status csp_textdata(vbuf *vb, const char *dp, int len) {
+ unsigned char ch;
+ char buf[10];
+ int cn;
+
+ CSP_ADDSTR("\"");
+ for (cn=0; cn<len; cn++) {
+ ch= *dp++;
+ if (ch >= 32 && ch <= 126 && ch != '"' && ch != '\\') {
+ if (!adns__vbuf_append(vb,&ch,1)) R_NOMEM;
+ } else {
+ sprintf(buf,"\\%02x",ch);
+ CSP_ADDSTR(buf);
+ }
+ }
+ CSP_ADDSTR("\"");
+
+ return adns_s_ok;
+}
+
+static adns_status csp_qstring(vbuf *vb, const char *dp) {
+ return csp_textdata(vb, dp, strlen(dp));
+}
+
+/*
+ * _str (mf,cs)
+ */
+
+static void mf_str(adns_query qu, void *datap) {
+ char **rrp= datap;
+
+ adns__makefinal_str(qu,rrp);
+}
+
+static adns_status cs_str(vbuf *vb, const void *datap) {
+ const char *const *rrp= datap;
+
+ return csp_qstring(vb,*rrp);
+}
+
+/*
+ * _intstr (mf,cs)
+ */
+
+static void mf_intstr(adns_query qu, void *datap) {
+ adns_rr_intstr *rrp= datap;
+
+ adns__makefinal_str(qu,&rrp->str);
+}
+
+static adns_status cs_intstr(vbuf *vb, const void *datap) {
+ const adns_rr_intstr *rrp= datap;
+ char buf[10];
+
+ sprintf(buf,"%u ",rrp->i);
+ CSP_ADDSTR(buf);
+ return csp_qstring(vb,rrp->str);
}
-static adns_status pa_inaddr(adns_query qu, int serv,
- const byte *dgram, int dglen, int cbyte, int max,
- int nsstart, int *arstart_io, void *datap) {
+/*
+ * _manyistr (mf,cs)
+ */
+
+static void mf_manyistr(adns_query qu, void *datap) {
+ adns_rr_intstr **rrp= datap;
+ adns_rr_intstr *te, *table;
+ void *tablev;
+ int tc;
+
+ for (tc=0, te= *rrp; te->i >= 0; te++, tc++);
+ tablev= *rrp;
+ adns__makefinal_block(qu,&tablev,sizeof(*te)*(tc+1));
+ *rrp= table= tablev;
+ for (te= *rrp; te->i >= 0; te++)
+ adns__makefinal_str(qu,&te->str);
+}
+
+static adns_status cs_manyistr(vbuf *vb, const void *datap) {
+ const adns_rr_intstr *const *rrp= datap;
+ const adns_rr_intstr *current;
+ adns_status st;
+ int spc;
+
+ for (spc=0, current= *rrp; current->i >= 0; current++) {
+ if (spc) CSP_ADDSTR(" ");
+ st= csp_textdata(vb,current->str,current->i); if (st) return st;
+ }
+ return adns_s_ok;
+}
+
+/*
+ * _txt (pa)
+ */
+
+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;
+
+ startbyte= cbyte;
+ if (cbyte >= max) return adns_s_invaliddata;
+ tc= 0;
+ while (cbyte < max) {
+ GET_B(cbyte,l);
+ cbyte+= l;
+ }
+ if (cbyte != max) return adns_s_invaliddata;
+
+ table= adns__alloc_interim(pai->qu,sizeof(*table)*(tc+1));
+ if (!table) R_NOMEM;
+
+ for (cbyte=startbyte, ti=0, te=table; ti<tc; ti++, te++) {
+ GET_B(cbyte,l);
+ te->str= adns__alloc_interim(pai->qu, l+1);
+ if (!te->str) R_NOMEM;
+ te->str[l]= 0;
+ memcpy(te->str,dgram+cbyte,l);
+ te->i= l;
+ }
+ assert(cbyte == max);
+
+ te->i= -1;
+ te->str= 0;
+
+ *rrp= table;
+ return adns_s_ok;
+}
+
+/*
+ * _inaddr (pa,dip,di)
+ */
+
+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;
- memcpy(storeto,dgram+cbyte,4);
+ memcpy(storeto, pai->dgram + cbyte, 4);
return adns_s_ok;
}
+static int dip_inaddr(struct in_addr a, struct in_addr b) {
+ /* fixme implement sortlist */
+ return 0;
+}
+
static int di_inaddr(const void *datap_a, const void *datap_b) {
const struct in_addr *ap= datap_a, *bp= datap_b;
const char *ia;
ia= inet_ntoa(rr); assert(ia);
- return adns__vbuf_appendstr(vb,ia) ? adns_s_ok : adns_s_nolocalmem;
+ CSP_ADDSTR(ia);
+ return adns_s_ok;
}
-static adns_status pa_addr(adns_query qu, int serv,
- const byte *dgram, int dglen, int cbyte, int max,
- void *datap) {
+/*
+ * _addr (pa,di,csp,cs)
+ */
+
+static adns_status pa_addr(const parseinfo *pai, int cbyte, int max, void *datap) {
adns_addr *storeto= datap;
+ const byte *dgram= pai->dgram;
if (max-cbyte != 4) return adns_s_invaliddata;
storeto->len= sizeof(storeto->addr.inet);
static int di_addr(const void *datap_a, const void *datap_b) {
const adns_addr *ap= datap_a, *bp= datap_b;
+ assert(ap->addr.sa.sa_family == AF_INET);
return dip_inaddr(ap->addr.inet.sin_addr,bp->addr.inet.sin_addr);
}
-static adns_status cs_addr(vbuf *vb, const void *datap) {
- const adns_addr *rrp= datap;
+static adns_status csp_addr(vbuf *vb, const adns_addr *rrp) {
const char *ia;
static char buf[30];
switch (rrp->addr.inet.sin_family) {
case AF_INET:
- if (!adns__vbuf_appendstr(vb,"AF_INET ")) return adns_s_nolocalmem;
+ CSP_ADDSTR("AF_INET ");
ia= inet_ntoa(rrp->addr.inet.sin_addr); assert(ia);
- if (!adns__vbuf_appendstr(vb,ia)) return adns_s_nolocalmem;
+ CSP_ADDSTR(ia);
break;
default:
sprintf(buf,"AF=%u",rrp->addr.sa.sa_family);
- if (!adns__vbuf_appendstr(vb,buf)) return adns_s_nolocalmem;
+ CSP_ADDSTR(buf);
break;
}
return adns_s_ok;
}
-static adns_status pap_domain(adns_query qu, int serv, parsedomain_flags flags,
- const byte *dgram, int dglen, int *cbyte_io, int max,
- char **domain_r) {
+static adns_status cs_addr(vbuf *vb, const void *datap) {
+ const adns_addr *rrp= datap;
+
+ return csp_addr(vb,rrp);
+}
+
+/*
+ * _domain (pap)
+ */
+
+static adns_status pap_domain(const parseinfo *pai, int *cbyte_io, int max,
+ char **domain_r, parsedomain_flags flags) {
adns_status st;
char *dm;
- st= adns__parse_domain(qu->ads,serv,qu,&qu->vb,flags, dgram,dglen, cbyte_io,max);
+ st= adns__parse_domain(pai->qu->ads, pai->serv, pai->qu, &pai->qu->vb, flags,
+ pai->dgram,pai->dglen, cbyte_io, max);
if (st) return st;
- if (!qu->vb.used) return adns_s_invaliddata;
+ if (!pai->qu->vb.used) return adns_s_invaliddata;
- dm= adns__alloc_interim(qu,qu->vb.used+1);
- if (!dm) return adns_s_nolocalmem;
+ dm= adns__alloc_interim(pai->qu, pai->qu->vb.used+1);
+ if (!dm) R_NOMEM;
- dm[qu->vb.used]= 0;
- memcpy(dm,qu->vb.buf,qu->vb.used);
+ dm[pai->qu->vb.used]= 0;
+ memcpy(dm,pai->qu->vb.buf,pai->qu->vb.used);
*domain_r= dm;
return adns_s_ok;
}
-static adns_status pa_host_raw(adns_query qu, int serv,
- const byte *dgram, int dglen, int cbyte, int max,
- int nsstart, int *arstart_io, void *datap) {
+/*
+ * _host_raw (pa)
+ */
+
+static adns_status pa_host_raw(const parseinfo *pai, int cbyte, int max, void *datap) {
char **rrp= datap;
adns_status st;
- st= pap_domain(qu,serv,
- qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0,
- dgram,dglen,&cbyte,max,rrp);
- if (st) return st;
-
- if (cbyte != max) return adns_s_invaliddata;
- return adns_s_ok;
-}
-
-static adns_status pa_mx_raw(adns_query qu, int serv,
- const byte *dgram, int dglen, int cbyte, int max,
- int nsstart, int *arstart_io, void *datap) {
- adns_rr_intstr *rrp= datap;
- adns_status st;
- int pref;
-
- if (cbyte+2 > max) return adns_s_invaliddata;
- GET_W(cbyte,pref);
- rrp->i= pref;
- st= pap_domain(qu,serv,
- qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0,
- dgram,dglen,&cbyte,max,&rrp->str);
+ st= pap_domain(pai, &cbyte, max, rrp,
+ pai->qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0);
if (st) return st;
if (cbyte != max) return adns_s_invaliddata;
return adns_s_ok;
}
+/*
+ * _hostaddr (pap,pa,dip,di,mfp,mf,csp,cs +pap_findaddrs)
+ */
-static adns_status pap_findaddrs(adns_query qu, int serv, adns_rr_hostaddr *ha,
- const byte *dgram, int dglen, int *cbyte_io,
- int dmstart, int count) {
- int rri, nrrs;
+static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha,
+ int *cbyte_io, int count, int dmstart) {
+ int rri, naddrs;
int type, class, rdlen, rdstart, ownermatched;
+ adns_status st;
- for (rri=0, nrrs=-1; rri<count; rri++) {
- st= adns__findrr_anychk(qu,serv,dgram,dglen,cbyte_io,
- &type,&class,&rdlen,&rdstart,
- dgram,dglen,dmstart,
- &ownermatched);
+ for (rri=0, naddrs=-1; rri<count; rri++) {
+ st= adns__findrr_anychk(pai->qu, pai->serv, pai->dgram, pai->dglen, cbyte_io,
+ &type, &class, &rdlen, &rdstart,
+ pai->dgram, pai->dglen, dmstart, &ownermatched);
if (st) return st;
- if (class != DNS_CLASS_IN) continue;
- if (type != adns_r_a) continue;
- if (nrrs == -1) {
- qu->vb.used= 0;
- nrrs= 0;
+ if (!ownermatched || class != DNS_CLASS_IN || type != adns_r_a) {
+ if (naddrs>0) break; else continue;
+ }
+ if (naddrs == -1) {
+ naddrs= 0;
}
- if (!adns__vbuf_ensure(&qu->vb,qu->vb.used+sizeof(adns_addr)))
- return adns_s_nolocalmem;
- st= pa_addr(qu,serv, dgram,dglen, rdstart,rdstart+rdlen,
- qu->vb.buf + qu->vb.used);
+ if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_addr))) R_NOMEM;
+ st= pa_addr(pai, rdstart,rdstart+rdlen, pai->qu->vb.buf + naddrs*sizeof(adns_addr));
if (st) return st;
- qu->vb.used += sizeof(adns_addr);
- nrrs++;
+ naddrs++;
}
- if (nrrs >= 0) {
- ha->rrs= adns__alloc_interim(qu,qu->vb.used);
- if (!ha->rrs) return adns_s_nolocalmem;
- ha->nrrs= nrrs;
+ if (naddrs >= 0) {
+ ha->addrs= adns__alloc_interim(pai->qu, naddrs*sizeof(adns_addr));
+ if (!ha->addrs) R_NOMEM;
+ memcpy(ha->addrs, pai->qu->vb.buf, naddrs*sizeof(adns_addr));
+ ha->naddrs= naddrs;
ha->astatus= adns_s_ok;
+
+ adns__isort(ha->addrs, naddrs, sizeof(adns_addr), pai->qu->vb.buf, di_addr);
}
return adns_s_ok;
}
-static adns_status pap_hostaddr(adns_query qu, int serv,
- const byte *dgram, int dglen, int *cbyte_io, int max,
- int nsstart, int nscount, int arcount, void *datap) {
- adns_rr_hostaddr **rrp= datap;
+static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io,
+ int max, adns_rr_hostaddr *rrp) {
adns_status st;
int dmstart, cbyte;
+ qcontext ctx;
+ int id;
+ adns_query nqu;
dmstart= cbyte= *cbyte_io;
- st= pap_domain(qu,serv,
- qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0,
- dgram,dglen,&cbyte,max,&rrp->dm);
+ st= pap_domain(pai, &cbyte, max, &rrp->host,
+ pai->qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0);
if (st) return st;
*cbyte_io= cbyte;
rrp->naddrs= -1;
rrp->addrs= 0;
- cbyte= nsstart;
+ cbyte= pai->nsstart;
- st= pap_findaddrs(qu, rrp, dgram,dglen,&cbyte, dmstart);
+ st= pap_findaddrs(pai, rrp, &cbyte, pai->nscount, dmstart);
if (st) return st;
if (rrp->naddrs != -1) return adns_s_ok;
- st= pap_findaddrs(qu, rrp, dgram,dglen,&cbyte, dmstart);
+ st= pap_findaddrs(pai, rrp, &cbyte, pai->arcount, dmstart);
if (st) return st;
if (rrp->naddrs != -1) return adns_s_ok;
-}
-static adns_status pa_hostaddr(adns_query qu, int serv,
- const byte *dgram, int dglen, int cbyte, int max,
- int nsstart, void *datap) {
- adns_rr_hostaddr **rrp= datap;
- adns_status st;
- int dmstart;
-
- dmstart= cbyte;
- st= pap_domain(qu,serv,
- qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0,
- dgram,dglen,&cbyte,max,&rrp->dm);
+ st= adns__mkquery_frdgram(pai->ads, &pai->qu->vb, &id,
+ pai->dgram, pai->dglen, dmstart,
+ adns_r_addr, adns_qf_quoteok_query);
+ if (st) return st;
+
+ ctx.hostaddr= rrp;
+ st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_addr),
+ &pai->qu->vb, id,
+ adns_qf_quoteok_query, pai->now, 0, &ctx);
if (st) return st;
- if (cbyte != max) return adns_s_invaliddata;
- rrp->astatus= adns_s_ok;
- rrp->naddrs= -1;
- rrp->addrs= 0;
+ nqu->parent= pai->qu;
+ LIST_LINK_TAIL_PART(pai->qu->children,nqu,siblings.);
- cbyte= nsstart;
+ return adns_s_ok;
+}
- st= pap_findaddrs(qu, rrp, dgram,dglen, dmstart,&cbyte);
- if (st) return st;
- if (rrp->naddrs != -1) return adns_s_ok;
+static adns_status pa_hostaddr(const parseinfo *pai, int cbyte, int max, void *datap) {
+ adns_rr_hostaddr *rrp= datap;
+ adns_status st;
- st= pap_findaddrs(qu, rrp, dgram,dglen, dmstart,&cbyte);
+ st= pap_hostaddr(pai, &cbyte, max, rrp);
if (st) return st;
- if (rrp->naddrs != -1) return adns_s_ok;
+ if (cbyte != max) return adns_s_invaliddata;
- assert(!"additional section didn't have required data");
+ return adns_s_ok;
}
-static int di_mx_raw(const void *datap_a, const void *datap_b) {
- const adns_rr_intstr *ap= datap_a, *bp= datap_b;
+static int dip_hostaddr(const adns_rr_hostaddr *ap, const adns_rr_hostaddr *bp) {
+ if (ap->astatus != bp->astatus) return ap->astatus;
+ if (ap->astatus) return 0;
- if (ap->i < bp->i) return 0;
- if (ap->i > bp->i) return 1;
- return 0;
+ assert(ap->addrs[0].addr.sa.sa_family == AF_INET);
+ assert(bp->addrs[0].addr.sa.sa_family == AF_INET);
+ return dip_inaddr(ap->addrs[0].addr.inet.sin_addr, bp->addrs[0].addr.inet.sin_addr);
}
-static adns_status pa_txt(adns_query qu, int serv,
- const byte *dgram, int dglen, int startbyte, int max,
- int nsstart, int *arstart_io, void *datap) {
- adns_rr_intstr **rrp= datap, *table, *te;
- int ti, tc, cbyte, l;
+static int di_hostaddr(const void *datap_a, const void *datap_b) {
+ const adns_rr_hostaddr *ap= datap_a, *bp= datap_b;
- cbyte= startbyte;
- if (cbyte >= max) return adns_s_invaliddata;
- tc= 0;
- while (cbyte < max) {
- GET_B(cbyte,l);
- cbyte+= l;
- }
- if (cbyte != max) return adns_s_invaliddata;
-
- table= adns__alloc_interim(qu,sizeof(*table)*(tc+1));
- if (!table) return adns_s_nolocalmem;
+ return dip_hostaddr(ap,bp);
+}
- for (cbyte=startbyte, ti=0, te=table; ti<tc; ti++, te++) {
- GET_B(cbyte,l);
- te->str= adns__alloc_interim(qu,l+1);
- if (!te->str) return adns_s_nolocalmem;
- te->str[l]= 0;
- memcpy(te->str,dgram+cbyte,l);
- te->i= l;
- }
- assert(cbyte == max);
+static void mfp_hostaddr(adns_query qu, adns_rr_hostaddr *rrp) {
+ void *tablev;
- te->i= -1;
- te->str= 0;
-
- *rrp= table;
- return adns_s_ok;
+ adns__makefinal_str(qu,&rrp->host);
+ tablev= rrp->addrs;
+ adns__makefinal_block(qu, &tablev, rrp->naddrs*sizeof(*rrp->addrs));
+ rrp->addrs= tablev;
}
-static int csp_textdata(vbuf *vb, const char *dp, int len) {
- unsigned char ch;
- char buf[10];
- int cn;
+static void mf_hostaddr(adns_query qu, void *datap) {
+ adns_rr_hostaddr *rrp= datap;
- if (!adns__vbuf_append(vb,"\"",1)) return 0;
+ mfp_hostaddr(qu,rrp);
+}
- for (cn=0; cn<len; cn++) {
- ch= *dp++;
- if (ch >= 32 && ch <= 126 && ch != '"' && ch != '\\') {
- if (!adns__vbuf_append(vb,&ch,1)) return 0;
- } else {
- sprintf(buf,"\\%02x",ch);
- if (!adns__vbuf_appendstr(vb,buf)) return 0;
+static adns_status csp_hostaddr(vbuf *vb, const adns_rr_hostaddr *rrp) {
+ const char *to_add;
+ adns_status st;
+ int i;
+
+ st= csp_qstring(vb,rrp->host); if (st) return st;
+
+ if (rrp->astatus) {
+ CSP_ADDSTR(" - ");
+ CSP_ADDSTR(adns_strerror(rrp->astatus));
+ } else {
+ assert(rrp->naddrs > 0);
+ for (i=0, to_add= ": "; i<rrp->naddrs; i++, to_add= ", ") {
+ CSP_ADDSTR(to_add);
+ st= csp_addr(vb,&rrp->addrs[i]);
}
}
-
- if (!adns__vbuf_append(vb,"\"",1)) return 0;
- return 1;
+ return adns_s_ok;
}
-static int csp_qstring(vbuf *vb, const char *dp) {
- return csp_textdata(vb, dp, strlen(dp));
+static adns_status cs_hostaddr(vbuf *vb, const void *datap) {
+ const adns_rr_hostaddr *rrp= datap;
+
+ return csp_hostaddr(vb,rrp);
}
-static adns_status cs_str(vbuf *vb, const void *datap) {
- const char *const *rrp= datap;
+/*
+ * _mx_raw (pa,di)
+ */
+
+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;
+ int pref;
- return csp_qstring(vb,*rrp) ? adns_s_ok : adns_s_nolocalmem;
+ if (cbyte+2 > max) return adns_s_invaliddata;
+ GET_W(cbyte,pref);
+ rrp->i= pref;
+ st= pap_domain(pai, &cbyte, max, &rrp->str,
+ pai->qu->flags & adns_qf_quoteok_anshost ? pdf_quoteok : 0);
+ if (st) return st;
+
+ if (cbyte != max) return adns_s_invaliddata;
+ return adns_s_ok;
}
-static adns_status cs_intstr(vbuf *vb, const void *datap) {
- const adns_rr_intstr *rrp= datap;
- char buf[10];
+static int di_mx_raw(const void *datap_a, const void *datap_b) {
+ const adns_rr_intstr *ap= datap_a, *bp= datap_b;
- sprintf(buf,"%u ",rrp->i);
- return (adns__vbuf_appendstr(vb,buf) &&
- csp_qstring(vb,rrp->str)) ? adns_s_ok : adns_s_nolocalmem;
+ if (ap->i < bp->i) return 0;
+ if (ap->i > bp->i) return 1;
+ return 0;
}
-static adns_status cs_manyistr(vbuf *vb, const void *datap) {
- const adns_rr_intstr *const *rrp= datap;
- const adns_rr_intstr *current;
- int spc;
+/*
+ * _mx (pa,di)
+ */
- for (spc=0, current= *rrp; current->i >= 0; current++) {
- if (spc)
- if (!adns__vbuf_append(vb," ",1)) goto x_nomem;
- if (!csp_textdata(vb,current->str,current->i)) goto x_nomem;
- }
- return adns_s_ok;
+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;
+ int pref;
- x_nomem:
- return adns_s_nolocalmem;
+ if (cbyte+2 > max) return adns_s_invaliddata;
+ GET_W(cbyte,pref);
+ rrp->i= pref;
+ st= pap_hostaddr(pai, &cbyte, max, &rrp->ha);
+ if (st) return st;
+
+ if (cbyte != max) return adns_s_invaliddata;
+ return adns_s_ok;
}
-static void mf_str(adns_query qu, void *datap) {
- char **rrp= datap;
+static int di_mx(const void *datap_a, const void *datap_b) {
+ const adns_rr_inthostaddr *ap= datap_a, *bp= datap_b;
- adns__makefinal_str(qu,rrp);
+ if (ap->i < bp->i) return 0;
+ if (ap->i > bp->i) return 1;
+ return dip_hostaddr(&ap->ha,&bp->ha);
}
-static void mf_intstr(adns_query qu, void *datap) {
- adns_rr_intstr *rrp= datap;
+/*
+ * _inthostaddr (mf,cs)
+ */
- adns__makefinal_str(qu,&rrp->str);
+static void mf_inthostaddr(adns_query qu, void *datap) {
+ adns_rr_inthostaddr *rrp= datap;
+
+ mfp_hostaddr(qu,&rrp->ha);
}
-static void mf_manyistr(adns_query qu, void *datap) {
- adns_rr_intstr **rrp= datap;
- adns_rr_intstr *te, *table;
- void *tablev;
- int tc;
+static adns_status cs_inthostaddr(vbuf *vb, const void *datap) {
+ const adns_rr_inthostaddr *rrp= datap;
+ char buf[10];
- for (tc=0, te= *rrp; te->i >= 0; te++, tc++);
- tablev= *rrp;
- adns__makefinal_block(qu,&tablev,sizeof(*te)*(tc+1));
- *rrp= table= tablev;
- for (te= *rrp; te->i >= 0; te++)
- adns__makefinal_str(qu,&te->str);
+ sprintf(buf,"%u ",rrp->i);
+ CSP_ADDSTR(buf);
+
+ return csp_hostaddr(vb,&rrp->ha);
}
+/*
+ * _flat (mf)
+ */
+
static void mf_flat(adns_query qu, void *data) { }
-#define TYPE_SF(size,func,cp,free) size, pa_##func, mf_##free, cs_##cp
-#define TYPE_SN(size,func,cp) size, pa_##func, mf_flat, cs_##cp
+/*
+ * Now the table.
+ */
+
#define TYPESZ_M(member) (sizeof(*((adns_answer*)0)->rrs.member))
-#define TYPE_MF(memb,parse) TYPE_SF(TYPESZ_M(memb),parse,memb,memb)
-#define TYPE_MN(memb,parse) TYPE_SN(TYPESZ_M(memb),parse,memb)
#define DEEP_MEMB(memb) TYPESZ_M(memb), mf_##memb, cs_##memb
#define FLAT_MEMB(memb) TYPESZ_M(memb), mf_flat, cs_##memb
-/* TYPE_<ms><nf>
- * ms is M specify member name
- * or S specify size explicitly
- * nf is F full memory management, dependent on member name or specified func
- * N no memory management required
- */
+#define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer) \
+ { adns_r_##code, rrt, fmt, TYPESZ_M(memb), mf_##memb, cs_##memb, parser, comparer }
+#define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer) \
+ { adns_r_##code, rrt, fmt, TYPESZ_M(memb), mf_flat, cs_##memb, parser, comparer }
static const typeinfo typeinfos[] = {
- /* Must be in ascending order of rrtype ! */
- /* rr type code rrt fmt mem.mgmt member parser comparer */
-
- { adns_r_a, "A", 0, FLAT_MEMB(inaddr), pa_inaddr, di_inaddr },
- { adns_r_ns_raw, "NS", "raw", DEEP_MEMB(str), pa_host_raw, 0 },
- { adns_r_cname, "CNAME", 0, DEEP_MEMB(str), pa_host_raw, 0 },
-#if 0 /*fixme*/
- { adns_r_soa_raw, "SOA", "raw", DEEP_MEMB(soa), pa_soa, 0 },
-#endif
- { adns_r_ptr_raw, "PTR", "raw", DEEP_MEMB(str), pa_host_raw, 0 },
-#if 0 /*fixme*/
- { adns_r_hinfo, "HINFO", 0, DEEP_MEMB(strpair), pa_hinfo, 0 },
-#endif
- { adns_r_mx_raw, "MX", "raw", DEEP_MEMB(intstr), pa_mx_raw, di_mx_raw },
- { adns_r_txt, "TXT", 0, DEEP_MEMB(manyistr), pa_txt, 0 },
-#if 0 /*fixme*/
- { adns_r_rp_raw, "RP", "raw", DEEP_MEMB(strpair), pa_rp, 0 },
-#endif
-
- { adns_r_addr, "A", "addr", FLAT_MEMB(addr), pa_addr, di_addr },
- { adns_r_ns, "NS", "+addr", DEEP_MEMB(dmaddr), pa_hostaddr, di_hostaddr },
-#if 0 /*fixme*/
- { adns_r_ptr, "PTR","checked", DEEP_MEMB(str), pa_ptr, 0 },
- { adns_r_mx, "MX", "+addr", DEEP_MEMB(intdmaddr), pa_mx, di_mx },
-
-#endif
-#if 0 /*fixme*/
- { adns_r_soa, "SOA","822", DEEP_MEMB(soa), pa_soa, 0 },
- { adns_r_rp, "RP", "822", DEEP_MEMB(strpair), pa_rp, 0 },
+/* Must be in ascending order of rrtype ! */
+/* mem-mgmt code rrt fmt member parser comparer */
+
+ FLAT_TYPE(a, "A", 0, inaddr, pa_inaddr, di_inaddr ),
+ DEEP_TYPE(ns_raw, "NS", "raw", str, pa_host_raw, 0 ),
+ DEEP_TYPE(cname, "CNAME", 0, str, pa_host_raw, 0 ),
+#if 0
+ DEEP_TYPE(soa_raw, "SOA", "raw", soa, pa_soa, 0 ),
+#endif
+ DEEP_TYPE(ptr_raw, "PTR", "raw", str, pa_host_raw, 0 ),
+#if 0
+ DEEP_TYPE(hinfo, "HINFO", 0, strpair, pa_hinfo, 0 ),
+#endif
+ DEEP_TYPE(mx_raw, "MX", "raw", intstr, pa_mx_raw, di_mx_raw ),
+ DEEP_TYPE(txt, "TXT", 0, manyistr, pa_txt, 0 ),
+#if 0
+ DEEP_TYPE(rp_raw, "RP", "raw", strpair, pa_rp, 0 ),
+#endif
+
+ FLAT_TYPE(addr, "A", "addr", addr, pa_addr, di_addr ),
+ DEEP_TYPE(ns, "NS", "+addr", hostaddr, pa_hostaddr, di_hostaddr ),
+#if 0
+ DEEP_TYPE(ptr, "PTR","checked", str, pa_ptr, 0 ),
#endif
+ DEEP_TYPE(mx, "MX", "+addr", inthostaddr, pa_mx, di_mx ),
+
+#if 0
+ DEEP_TYPE(soa, "SOA","822", soa, pa_soa, 0 ),
+ DEEP_TYPE(rp, "RP", "822", strpair, pa_rp, 0 ),
+#endif /* fixme - implement all types */
};
const typeinfo *adns__findtype(adns_rrtype type) {
~ianmdlvl / adns.git / blobdiff