emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace get_domain calls in set_rr with H_FIELD

Browse source
This commit is contained in:
Sven M. Hallberg 2013-01-16 16:31:46 +01:00
parent 0083031d6f
commit e54c5236ff
2 changed files with 64 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

74
examples/dns.c
View file

@ -92,83 +92,83 @@ void set_rr(struct dns_rr rr, HCountedArray *rdata) {
}; };
// Parse rdata if possible. // Parse rdata if possible.
const HParseResult *r = NULL; const HParseResult *p = NULL;
if (rr.type < sizeof(parsers)) { if (rr.type < sizeof(parsers)) {
const HParser *p = parsers[rr.type]; const HParser *parser = parsers[rr.type];
if (p) if (parser)
r = h_parse(p, (const uint8_t*)data, rdata->used); p = h_parse(parser, (const uint8_t*)data, rdata->used);
} }
// If the RR doesn't parse, set its type to 0. // If the RR doesn't parse, set its type to 0.
if (!r) if (!p)
rr.type = 0; rr.type = 0;
// Pack the parsed rdata into rr. // Pack the parsed rdata into rr.
switch(rr.type) { switch(rr.type) {
case 1: // A case 1: // A
rr.a = r->ast->seq->elements[0]->uint; rr.a = p->ast->seq->elements[0]->uint;
break; break;
case 2: // NS case 2: // NS
rr.ns = get_domain(r->ast->seq->elements[0]); rr.ns = *H_FIELD(dns_domain, 0);
break; break;
case 3: // MD case 3: // MD
rr.md = get_domain(r->ast->seq->elements[0]); rr.md = *H_FIELD(dns_domain, 0);
break; break;
case 4: // MF case 4: // MF
rr.md = get_domain(r->ast->seq->elements[0]); rr.md = *H_FIELD(dns_domain, 0);
break; break;
case 5: // CNAME case 5: // CNAME
rr.cname = get_domain(r->ast->seq->elements[0]); rr.cname = *H_FIELD(dns_domain, 0);
break; break;
case 6: // SOA case 6: // SOA
rr.soa.mname = get_domain(r->ast->seq->elements[0]); rr.soa.mname = *H_FIELD(dns_domain, 0);
rr.soa.rname = get_domain(r->ast->seq->elements[1]); rr.soa.rname = *H_FIELD(dns_domain, 1);
rr.soa.serial = r->ast->seq->elements[2]->uint; rr.soa.serial = p->ast->seq->elements[2]->uint;
rr.soa.refresh = r->ast->seq->elements[3]->uint; rr.soa.refresh = p->ast->seq->elements[3]->uint;
rr.soa.retry = r->ast->seq->elements[4]->uint; rr.soa.retry = p->ast->seq->elements[4]->uint;
rr.soa.expire = r->ast->seq->elements[5]->uint; rr.soa.expire = p->ast->seq->elements[5]->uint;
rr.soa.minimum = r->ast->seq->elements[6]->uint; rr.soa.minimum = p->ast->seq->elements[6]->uint;
break; break;
case 7: // MB case 7: // MB
rr.mb = get_domain(r->ast->seq->elements[0]); rr.mb = *H_FIELD(dns_domain, 0);
break; break;
case 8: // MG case 8: // MG
rr.mg = get_domain(r->ast->seq->elements[0]); rr.mg = *H_FIELD(dns_domain, 0);
break; break;
case 9: // MR case 9: // MR
rr.mr = get_domain(r->ast->seq->elements[0]); rr.mr = *H_FIELD(dns_domain, 0);
break; break;
case 10: // NULL case 10: // NULL
rr.null = h_arena_malloc(rdata->arena, sizeof(uint8_t)*r->ast->seq->used); rr.null = h_arena_malloc(rdata->arena, sizeof(uint8_t)*p->ast->seq->used);
for (size_t i=0; i<r->ast->seq->used; ++i) for (size_t i=0; i<p->ast->seq->used; ++i)
rr.null[i] = r->ast->seq->elements[i]->uint; rr.null[i] = p->ast->seq->elements[i]->uint;
break; break;
case 11: // WKS case 11: // WKS
rr.wks.address = r->ast->seq->elements[0]->uint; rr.wks.address = p->ast->seq->elements[0]->uint;
rr.wks.protocol = r->ast->seq->elements[1]->uint; rr.wks.protocol = p->ast->seq->elements[1]->uint;
rr.wks.len = r->ast->seq->elements[2]->seq->used; rr.wks.len = p->ast->seq->elements[2]->seq->used;
rr.wks.bit_map = h_arena_malloc(rdata->arena, sizeof(uint8_t)*r->ast->seq->elements[2]->seq->used); rr.wks.bit_map = h_arena_malloc(rdata->arena, sizeof(uint8_t)*p->ast->seq->elements[2]->seq->used);
for (size_t i=0; i<rr.wks.len; ++i) for (size_t i=0; i<rr.wks.len; ++i)
rr.wks.bit_map[i] = r->ast->seq->elements[2]->seq->elements[i]->uint; rr.wks.bit_map[i] = p->ast->seq->elements[2]->seq->elements[i]->uint;
break; break;
case 12: // PTR case 12: // PTR
rr.ptr = get_domain(r->ast->seq->elements[0]); rr.ptr = *H_FIELD(dns_domain, 0);
break; break;
case 13: // HINFO case 13: // HINFO
rr.hinfo.cpu = get_cs(r->ast->seq->elements[0]->seq); rr.hinfo.cpu = get_cs(p->ast->seq->elements[0]->seq);
rr.hinfo.os = get_cs(r->ast->seq->elements[1]->seq); rr.hinfo.os = get_cs(p->ast->seq->elements[1]->seq);
break; break;
case 14: // MINFO case 14: // MINFO
rr.minfo.rmailbx = get_domain(r->ast->seq->elements[0]); rr.minfo.rmailbx = *H_FIELD(dns_domain, 0);
rr.minfo.emailbx = get_domain(r->ast->seq->elements[1]); rr.minfo.emailbx = *H_FIELD(dns_domain, 1);
break; break;
case 15: // MX case 15: // MX
rr.mx.preference = r->ast->seq->elements[0]->uint; rr.mx.preference = p->ast->seq->elements[0]->uint;
rr.mx.exchange = get_domain(r->ast->seq->elements[1]); rr.mx.exchange = *H_FIELD(dns_domain, 1);
break; break;
case 16: // TXT case 16: // TXT
rr.txt.count = r->ast->seq->elements[0]->seq->used; rr.txt.count = p->ast->seq->elements[0]->seq->used;
rr.txt.txt_data = get_txt(r->ast->seq->elements[0]->seq); rr.txt.txt_data = get_txt(p->ast->seq->elements[0]->seq);
break; break;
default: default:
break; break;

29
examples/dns_common.c
View file

@ -15,30 +15,41 @@ bool validate_label(HParseResult *p) {
} }
const HParsedToken* act_domain(const HParseResult *p) { const HParsedToken* act_domain(const HParseResult *p) {
const HParsedToken *ret = NULL;
char *arr = NULL;
switch(p->ast->token_type) { switch(p->ast->token_type) {
case TT_UINT: case TT_UINT:
return H_MAKE_TOKEN(dns_domain, " "); arr = " ";
break;
case TT_SEQUENCE: case TT_SEQUENCE:
{
// Sequence of subdomains separated by "." // Sequence of subdomains separated by "."
// Each subdomain is a label, which can be no more than 63 chars. // Each subdomain is a label, which can be no more than 63 chars.
char *ret = h_arena_malloc(p->arena, 64*p->ast->seq->used); arr = h_arena_malloc(p->arena, 64*p->ast->seq->used);
size_t count = 0; size_t count = 0;
for (size_t i=0; i<p->ast->seq->used; ++i) { for (size_t i=0; i<p->ast->seq->used; ++i) {
HParsedToken *tmp = p->ast->seq->elements[i]; HParsedToken *tmp = p->ast->seq->elements[i];
for (size_t j=0; j<tmp->seq->used; ++j) { for (size_t j=0; j<tmp->seq->used; ++j) {
ret[count] = tmp->seq->elements[i]->uint; arr[count] = tmp->seq->elements[i]->uint;
++count; ++count;
} }
ret[count] = '.'; arr[count] = '.';
++count; ++count;
} }
ret[count-1] = '\x00'; arr[count-1] = '\x00';
return H_MAKE_TOKEN(dns_domain, ret); break;
}
default: default:
return NULL; arr = NULL;
ret = NULL;
} }
if(arr) {
dns_domain_t *val = H_MAKE(dns_domain); // dns_domain_t is char*
*val = arr;
ret = H_MAKE_TOKEN(dns_domain, val);
}
return ret;
} }
const HParser* init_domain() { const HParser* init_domain() {