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

move get_txt into an action building the whole dns_rr_txt structure

Browse source
This commit is contained in:
Sven M. Hallberg 2013-01-17 19:13:06 +01:00
parent 954a762fc0
commit b953b9a763
3 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
examples/dns.c
View file

@ -53,16 +53,6 @@ uint8_t* get_cs(const HCountedArray *arr) {
return ret; return ret;
} }
uint8_t** get_txt(const HCountedArray *arr) {
uint8_t **ret = h_arena_malloc(arr->arena, sizeof(uint8_t*)*arr->used);
for (size_t i=0; i<arr->used; ++i) {
uint8_t *tmp = h_arena_malloc(arr->arena, sizeof(uint8_t)*arr->elements[i]->seq->used);
for (size_t j=0; j<arr->elements[i]->seq->used; ++j)
tmp[j] = arr->elements[i]->seq->elements[j]->uint;
}
return ret;
}
void set_rdata(struct dns_rr rr, HCountedArray *rdata) { void set_rdata(struct dns_rr rr, HCountedArray *rdata) {
uint8_t *data = h_arena_malloc(rdata->arena, sizeof(uint8_t)*rdata->used); uint8_t *data = h_arena_malloc(rdata->arena, sizeof(uint8_t)*rdata->used);
for (size_t i=0; i<rdata->used; ++i) for (size_t i=0; i<rdata->used; ++i)
@ -142,8 +132,7 @@ void set_rdata(struct dns_rr rr, HCountedArray *rdata) {
rr.mx.exchange = *H_FIELD(dns_domain_t, 1); rr.mx.exchange = *H_FIELD(dns_domain_t, 1);
break; break;
case 16: // TXT case 16: // TXT
rr.txt.count = p->ast->seq->elements[0]->seq->used; rr.txt = *(dns_rr_txt_t *)p->ast;
rr.txt.txt_data = get_txt(p->ast->seq->elements[0]->seq);
break; break;
default: default:
break; break;
@ -348,7 +337,7 @@ int start_listening() {
const int TYPE_MAX = 16; const int TYPE_MAX = 16;
typedef const char* cstr; typedef const char* cstr;
const char* TYPE_STR[17] = { static const char* TYPE_STR[17] = {
"nil", "A", "NS", "MD", "nil", "A", "NS", "MD",
"MF", "CNAME", "SOA", "MB", "MF", "CNAME", "SOA", "MB",
"MG", "MR", "NULL", "WKS", "MG", "MR", "NULL", "WKS",

6
examples/dns.h
View file

@ -7,6 +7,12 @@ enum DNSTokenType_ {
TT_dns_qname_t, TT_dns_qname_t,
TT_dns_question_t, TT_dns_question_t,
TT_dns_rr_t, TT_dns_rr_t,
TT_dns_rr_txt_t,
TT_dns_rr_hinfo_t,
TT_dns_rr_minfo_t,
TT_dns_rr_mx_t,
TT_dns_rr_soa_t,
TT_dns_rr_wks_t,
TT_dns_domain_t TT_dns_domain_t
}; };

21
examples/rr.c
View file

@ -1,5 +1,6 @@
#include "../src/hammer.h" #include "../src/hammer.h"
#include "dns_common.h" #include "dns_common.h"
#include "dns.h"
#include "rr.h" #include "rr.h"
#define false 0 #define false 0
@ -11,6 +12,24 @@ bool validate_null(HParseResult *p) {
return (65536 > p->ast->seq->used); return (65536 > p->ast->seq->used);
} }
const HParsedToken *act_txt(const HParseResult *p) {
dns_rr_txt_t *txt = H_MAKE(dns_rr_txt_t);
const HCountedArray *arr = p->ast->seq->elements[0]->seq;
uint8_t **ret = h_arena_malloc(arr->arena, sizeof(uint8_t*)*arr->used);
for (size_t i=0; i<arr->used; ++i) {
uint8_t *tmp = h_arena_malloc(arr->arena, sizeof(uint8_t)*arr->elements[i]->seq->used);
for (size_t j=0; j<arr->elements[i]->seq->used; ++j)
tmp[j] = arr->elements[i]->seq->elements[j]->uint;
ret[i] = tmp;
}
txt->count = p->ast->seq->elements[0]->seq->used;
txt->txt_data = ret;
return H_MAKE_TOKEN(dns_rr_txt_t, txt);
}
#define RDATA_TYPE_MAX 16 #define RDATA_TYPE_MAX 16
const HParser* init_rdata(uint16_t type) { const HParser* init_rdata(uint16_t type) {
static const HParser *parsers[RDATA_TYPE_MAX+1]; static const HParser *parsers[RDATA_TYPE_MAX+1];
@ -51,7 +70,7 @@ const HParser* init_rdata(uint16_t type) {
H_RULE (hinfo, h_sequence(cstr, cstr, NULL)); H_RULE (hinfo, h_sequence(cstr, cstr, NULL));
H_RULE (minfo, h_sequence(domain, domain, NULL)); H_RULE (minfo, h_sequence(domain, domain, NULL));
H_RULE (mx, h_sequence(h_uint16(), domain, NULL)); H_RULE (mx, h_sequence(h_uint16(), domain, NULL));
H_RULE (txt, h_many1(cstr)); H_ARULE(txt, h_many1(cstr));
parsers[ 0] = NULL; // there is no type 0 parsers[ 0] = NULL; // there is no type 0