"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "zparser.y" between
nsd-4.3.6.tar.gz and nsd-4.3.7.tar.gz

About: NSD is an authoritative only, high performance, simple name server daemon.

zparser.y  (nsd-4.3.6):zparser.y  (nsd-4.3.7)
skipping to change at line 71 skipping to change at line 71
* Tokens to represent the known RR types of DNS. * Tokens to represent the known RR types of DNS.
*/ */
%token <type> T_A T_NS T_MX T_TXT T_CNAME T_AAAA T_PTR T_NXT T_KEY T_SOA T_SIG %token <type> T_A T_NS T_MX T_TXT T_CNAME T_AAAA T_PTR T_NXT T_KEY T_SOA T_SIG
%token <type> T_SRV T_CERT T_LOC T_MD T_MF T_MB T_MG T_MR T_NULL T_WKS T_HINFO %token <type> T_SRV T_CERT T_LOC T_MD T_MF T_MB T_MG T_MR T_NULL T_WKS T_HINFO
%token <type> T_MINFO T_RP T_AFSDB T_X25 T_ISDN T_RT T_NSAP T_NSAP_PTR T_PX %token <type> T_MINFO T_RP T_AFSDB T_X25 T_ISDN T_RT T_NSAP T_NSAP_PTR T_PX
%token <type> T_GPOS T_EID T_NIMLOC T_ATMA T_NAPTR T_KX T_A6 T_DNAME T_SINK %token <type> T_GPOS T_EID T_NIMLOC T_ATMA T_NAPTR T_KX T_A6 T_DNAME T_SINK
%token <type> T_OPT T_APL T_UINFO T_UID T_GID T_UNSPEC T_TKEY T_TSIG T_IXFR %token <type> T_OPT T_APL T_UINFO T_UID T_GID T_UNSPEC T_TKEY T_TSIG T_IXFR
%token <type> T_AXFR T_MAILB T_MAILA T_DS T_DLV T_SSHFP T_RRSIG T_NSEC T_DNSKEY %token <type> T_AXFR T_MAILB T_MAILA T_DS T_DLV T_SSHFP T_RRSIG T_NSEC T_DNSKEY
%token <type> T_SPF T_NSEC3 T_IPSECKEY T_DHCID T_NSEC3PARAM T_TLSA T_URI %token <type> T_SPF T_NSEC3 T_IPSECKEY T_DHCID T_NSEC3PARAM T_TLSA T_URI
%token <type> T_NID T_L32 T_L64 T_LP T_EUI48 T_EUI64 T_CAA T_CDS T_CDNSKEY %token <type> T_NID T_L32 T_L64 T_LP T_EUI48 T_EUI64 T_CAA T_CDS T_CDNSKEY
%token <type> T_OPENPGPKEY T_CSYNC T_ZONEMD T_AVC T_SMIMEA %token <type> T_OPENPGPKEY T_CSYNC T_ZONEMD T_AVC T_SMIMEA T_SVCB T_HTTPS
/* other tokens */ /* other tokens */
%token DOLLAR_TTL DOLLAR_ORIGIN NL SP %token DOLLAR_TTL DOLLAR_ORIGIN NL SP
%token <data> QSTR STR PREV BITLAB %token <data> QSTR STR PREV BITLAB
%token <ttl> T_TTL %token <ttl> T_TTL
%token <klass> T_RRCLASS %token <klass> T_RRCLASS
/* unknown RRs */ /* unknown RRs */
%token URR %token URR
%token <type> T_UTYPE %token <type> T_UTYPE
%type <type> type_and_rdata %type <type> type_and_rdata
%type <domain> owner dname abs_dname %type <domain> owner dname abs_dname
%type <dname> rel_dname label %type <dname> rel_dname label
%type <data> wire_dname wire_abs_dname wire_rel_dname wire_label %type <data> wire_dname wire_abs_dname wire_rel_dname wire_label
%type <data> str concatenated_str_seq str_sp_seq str_dot_seq %type <data> str concatenated_str_seq str_sp_seq str_dot_seq
%type <data> unquoted_dotted_str dotted_str %type <data> unquoted_dotted_str dotted_str svcparam svcparams
%type <data> nxt_seq nsec_more %type <data> nxt_seq nsec_more
%type <unknown> rdata_unknown %type <unknown> rdata_unknown
%% %%
lines: /* empty file */ lines: /* empty file */
| lines line | lines line
; ;
line: NL line: NL
| sp NL | sp NL
skipping to change at line 710 skipping to change at line 710
| T_CDS sp rdata_ds | T_CDS sp rdata_ds
| T_CDS sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_CDS sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_CDNSKEY sp rdata_dnskey | T_CDNSKEY sp rdata_dnskey
| T_CDNSKEY sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_CDNSKEY sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_OPENPGPKEY sp rdata_openpgpkey | T_OPENPGPKEY sp rdata_openpgpkey
| T_OPENPGPKEY sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_OPENPGPKEY sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_CSYNC sp rdata_csync | T_CSYNC sp rdata_csync
| T_CSYNC sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_CSYNC sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_ZONEMD sp rdata_zonemd | T_ZONEMD sp rdata_zonemd
| T_ZONEMD sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_ZONEMD sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_SVCB sp rdata_svcb
| T_SVCB sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_HTTPS sp rdata_svcb
| T_HTTPS sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_URI sp rdata_uri | T_URI sp rdata_uri
| T_URI sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_URI sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| T_UTYPE sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_UTYPE sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); }
| str error NL | str error NL
{ {
zc_error_prev_line("unrecognized RR type '%s'", $1.str); zc_error_prev_line("unrecognized RR type '%s'", $1.str);
} }
; ;
/* /*
skipping to change at line 1172 skipping to change at line 1176
/* draft-ietf-dnsop-dns-zone-digest */ /* draft-ietf-dnsop-dns-zone-digest */
rdata_zonemd: str sp str sp str sp str_sp_seq trail rdata_zonemd: str sp str sp str sp str_sp_seq trail
{ {
zadd_rdata_wireformat(zparser_conv_serial(parser->region, $1.str)); / * serial */ zadd_rdata_wireformat(zparser_conv_serial(parser->region, $1.str)); / * serial */
zadd_rdata_wireformat(zparser_conv_byte(parser->region, $3.str)); /* scheme */ zadd_rdata_wireformat(zparser_conv_byte(parser->region, $3.str)); /* scheme */
zadd_rdata_wireformat(zparser_conv_byte(parser->region, $5.str)); /* hash algorithm */ zadd_rdata_wireformat(zparser_conv_byte(parser->region, $5.str)); /* hash algorithm */
zadd_rdata_wireformat(zparser_conv_hex(parser->region, $7.str, $7.len )); /* digest */ zadd_rdata_wireformat(zparser_conv_hex(parser->region, $7.str, $7.len )); /* digest */
} }
; ;
svcparam: dotted_str QSTR
{
zadd_rdata_wireformat(zparser_conv_svcbparam(
parser->region, $1.str, $1.len, $2.str, $2.len));
}
| dotted_str
{
zadd_rdata_wireformat(zparser_conv_svcbparam(
parser->region, $1.str, $1.len, NULL, 0));
}
;
svcparams: svcparam
| svcparams sp svcparam
;
/* draft-ietf-dnsop-svcb-https */
rdata_svcb_base: str sp dname
{
/* SvcFieldPriority */
zadd_rdata_wireformat(zparser_conv_short(parser->region, $1.str));
/* SvcDomainName */
zadd_rdata_domain($3);
};
rdata_svcb: rdata_svcb_base sp svcparams trail
{
zadd_rdata_svcb_check_wireformat();
}
| rdata_svcb_base trail
;
rdata_unknown: URR sp str sp str_sp_seq trail rdata_unknown: URR sp str sp str_sp_seq trail
{ {
/* $2 is the number of octets, currently ignored */ /* $2 is the number of octets, currently ignored */
$$ = zparser_conv_hex(parser->rr_region, $5.str, $5.len); $$ = zparser_conv_hex(parser->rr_region, $5.str, $5.len);
} }
| URR sp str trail | URR sp str trail
{ {
$$ = zparser_conv_hex(parser->rr_region, "", 0); $$ = zparser_conv_hex(parser->rr_region, "", 0);
} }
 End of changes. 4 change blocks. 
2 lines changed or deleted 35 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)