X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftypes.c;h=66f7f522763efa472ca9f0fb881e30490168169c;hb=ffbda80c54147d112c125f208f6611daf09358b3;hp=45741fa36cee820080a584cfa1bac145194738fa;hpb=e576be5096ae358bebe2e9b6ad07c49f74aef616;p=adns.git diff --git a/src/types.c b/src/types.c index 45741fa..66f7f52 100644 --- a/src/types.c +++ b/src/types.c @@ -20,9 +20,11 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + #include "internal.h" -static adns_status rp_inaddr(adns_state ads, adns_query qu, int serv, +static adns_status pa_inaddr(adns_query qu, int serv, const byte *dgram, int dglen, int cbyte, int max, void *store_r) { struct in_addr *dr= store_r; @@ -32,13 +34,69 @@ static adns_status rp_inaddr(adns_state ads, adns_query qu, int serv, return adns_s_ok; } -static adns_status rmf_null(adns_state ads, adns_query qu, void *data) { } +static adns_status cs_inaddr(vbuf *vb, const void *data) { + const struct in_addr *dp= data; + const char *ia; + + ia= inet_ntoa(*dp); assert(ia); + return adns__vbuf_appendstr(vb,ia) ? adns_s_ok : adns_s_nolocalmem; +} + +static adns_status pa_domain_raw(adns_query qu, int serv, + const byte *dgram, int dglen, int cbyte, int max, + void *store_r) { + char **dpp= store_r; + adns_status st; + vbuf vb; + char *dp; + + adns__vbuf_init(&vb); + st= adns__parse_domain(qu->ads,serv,qu,&vb,qu->flags, + dgram,dglen, &cbyte,max); + if (st) goto x_error; + + dp= adns__alloc_interim(qu,vb.used+1); + if (!dp) { st= adns_s_nolocalmem; goto x_error; } + + dp[vb.used]= 0; + memcpy(dp,vb.buf,vb.used); + + if (cbyte != max) { st= adns_s_invaliddata; goto x_error; } + + st= adns_s_ok; + *dpp= dp; + + x_error: + adns__vbuf_free(&vb); + return st; +} + +static void mf_str(adns_query qu, void *data) { + char **ddp= data; + + adns__makefinal_str(qu,ddp); +} + +static adns_status cs_str(vbuf *vb, const void *data) { + const char *const *ddp= data; + const char *dp= *ddp; + + return (adns__vbuf_append(vb,"\"",1) && + adns__vbuf_appendstr(vb,dp) && + adns__vbuf_append(vb,"\"",1)) + ? adns_s_ok : adns_s_nolocalmem; +} + +static void mf_flat(adns_query qu, void *data) { } -#define TYPE_SF(size,func,free) size, rp_#func, rmf_#free -#define TYPE_SN(size,func) size, rp_#func, rmf_null +#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 #define TYPESZ_M(member) (sizeof(((adns_answer*)0)->rrs.member)) -#define TYPE_MF(member,parse) TYPE_SF(TYPESZ_M(member),parse,member) -#define TYPE_MN(member,parse) TYPE_SN(TYPESZ_M(member),parse) +#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 is M specify member name @@ -49,31 +107,32 @@ static adns_status rmf_null(adns_state ads, adns_query qu, void *data) { } static const typeinfo typeinfos[] = { /* Must be in ascending order of rrtype ! */ - /* rr type code name style member size parser */ + /* rr type code rrt fmt mem.mgmt member parser */ - { adns_r_a, "A", TYPE_MN( inaddr, inaddr ) }, -#if 0 /*fixme*/ - { adns_r_ns_raw, "NS(raw)", TYPE_MF( str, domain_raw ) }, - { adns_r_cname, "CNAME", TYPE_MF( str, domain_raw ) }, - { adns_r_soa_raw, "SOA(raw)", TYPE_MF( soa, soa ) }, - { adns_r_null, "NULL", TYPE_SN( 0, null ) }, - { adns_r_ptr_raw, "PTR(raw)", TYPE_MF( str, domain_raw ) }, - { adns_r_hinfo, "HINFO", TYPE_MF( strpair, hinfo ) }, - { adns_r_mx_raw, "MX(raw)", TYPE_MF( intstr, mx_raw ) }, - { adns_r_txt, "TXT", TYPE_MF( str, txt ) }, - { adns_r_rp_raw, "RP(raw)", TYPE_MF( strpair, rp ) }, - - { adns_r_ns, "NS(+addr)", TYPE_MF( dmaddr, dmaddr ) }, - { adns_r_ptr, "PTR(checked)", TYPE_MF( str, ptr ) }, - { adns_r_mx, "MX(+addr)", TYPE_MF( intdmaddr, mx ) }, - - { adns_r_soa, "SOA(822)", TYPE_MF( soa, soa ) }, - { adns_r_rp, "RP(822)", TYPE_MF( strpair, rp ) }, + { adns_r_a, "A", 0, FLAT_MEMB(inaddr), pa_inaddr }, + { adns_r_ns_raw, "NS", "raw", DEEP_MEMB(str), pa_domain_raw }, + { adns_r_cname, "CNAME", 0, DEEP_MEMB(str), pa_domain_raw }, +#if 0 /*fixme*/ + { adns_r_soa_raw, "SOA", "raw", DEEP_MEMB(soa), pa_soa }, +#endif + { adns_r_ptr_raw, "PTR", "raw", DEEP_MEMB(str), pa_domain_raw }, +#if 0 /*fixme*/ + { adns_r_hinfo, "HINFO", 0, DEEP_MEMB(strpair), pa_hinfo }, + { adns_r_mx_raw, "MX", "raw", DEEP_MEMB(intstr), pa_mx_raw }, + { adns_r_txt, "TXT", 0, DEEP_MEMB(str), pa_txt }, + { adns_r_rp_raw, "RP", "raw", DEEP_MEMB(strpair), pa_rp }, + + { adns_r_ns, "NS", "+addr", DEEP_MEMB(dmaddr), pa_dmaddr }, + { adns_r_ptr, "PTR", "checked", DEEP_MEMB(str), pa_ptr }, + { adns_r_mx, "MX", "+addr", DEEP_MEMB(intdmaddr), pa_mx }, + + { adns_r_soa, "SOA", "822", DEEP_MEMB(soa), pa_soa }, + { adns_r_rp, "RP", "822", DEEP_MEMB(strpair), pa_rp }, #endif }; -const typeinfo adns__findtype(adns_rrtype type) { - const typeinfo *begin, *end; +const typeinfo *adns__findtype(adns_rrtype type) { + const typeinfo *begin, *end, *mid; begin= typeinfos; end= typeinfos+(sizeof(typeinfos)/sizeof(typeinfo));