Skip to content
Snippets Groups Projects
Commit 74bd0a27 authored by Jan Kadlec's avatar Jan Kadlec
Browse files

Modified descriptors + zparser. Changed way of storing dnames in NSEC and RRSIG records.

Refs #397
parent 463da594
No related branches found
No related tags found
No related merge requests found
......@@ -311,14 +311,14 @@ static dnslib_rrtype_descriptor_t
{ DNSLIB_RDATA_WF_SHORT, DNSLIB_RDATA_WF_BYTE,
DNSLIB_RDATA_WF_BYTE, DNSLIB_RDATA_WF_LONG,
DNSLIB_RDATA_WF_LONG, DNSLIB_RDATA_WF_LONG,
DNSLIB_RDATA_WF_SHORT, DNSLIB_RDATA_WF_BINARY,
DNSLIB_RDATA_WF_SHORT, DNSLIB_RDATA_WF_LITERAL_DNAME,
DNSLIB_RDATA_WF_BINARY },
{ DNSLIB_RDATA_ZF_RRTYPE, DNSLIB_RDATA_ZF_ALGORITHM, DNSLIB_RDATA_ZF_BYTE, DNSLIB_RDATA_ZF_PERIOD,
DNSLIB_RDATA_ZF_TIME, DNSLIB_RDATA_ZF_TIME, DNSLIB_RDATA_ZF_SHORT,
DNSLIB_RDATA_ZF_LITERAL_DNAME, DNSLIB_RDATA_ZF_BASE64 }, true },
/* 47 */
{ DNSLIB_RRTYPE_NSEC, "NSEC", 2,
{ DNSLIB_RDATA_WF_BINARY, DNSLIB_RDATA_WF_BINARY },
{ DNSLIB_RDATA_WF_LITERAL_DNAME, DNSLIB_RDATA_WF_BINARY },
{ DNSLIB_RDATA_ZF_LITERAL_DNAME, DNSLIB_RDATA_ZF_NSEC },
true },
/* 48 */
......
......@@ -1127,9 +1127,12 @@ rdata_rrsig: STR sp STR sp STR sp STR sp STR sp STR
zadd_rdata_wireformat(zparser_conv_time($9.str)); /* sig exp */
zadd_rdata_wireformat(zparser_conv_time($11.str)); /* sig inc */
zadd_rdata_wireformat(zparser_conv_short($13.str)); /* key id */
zadd_rdata_wireformat(zparser_conv_dns_name((const uint8_t*)
/* zadd_rdata_wireformat(zparser_conv_dns_name((const uint8_t*)
$15.str,
$15.len));
$15.len));*/
dnslib_dname_t *dname =
dnslib_dname_new_from_str($15.str, $15.len, NULL);
zadd_rdata_domain(dname);
/* sig name */
zadd_rdata_wireformat(zparser_conv_b64($17.str)); /* sig data */
......@@ -1147,9 +1150,13 @@ rdata_rrsig: STR sp STR sp STR sp STR sp STR sp STR
rdata_nsec: wire_dname nsec_seq
{
zadd_rdata_wireformat(zparser_conv_dns_name((const uint8_t*)
/* zadd_rdata_wireformat(zparser_conv_dns_name((const uint8_t*)
$1.str,
$1.len));
$1.len));*/
dnslib_dname_t *dname =
dnslib_dname_new_from_str($1.str, $1.len, NULL);
zadd_rdata_domain(dname);
/* nsec name */
zadd_rdata_wireformat(zparser_conv_nsec(nsecbits));
/* nsec bitlist */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment