adulau/pdns-qof
1
0
Fork 0
mirror of https://github.com/adulau/pdns-qof.git synced 2024-11-22 01:57:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated ABNF to fix inconsistencies

Browse source 
- LF (not CR) for entry separators
- fix double quotation of futureField
This commit is contained in:
Peder Stray 2022-09-09 13:45:22 +02:00
parent d682161279
commit c0b4691f0f
No known key found for this signature in database
GPG key ID: C569E57790508B84
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
i-d/pdns-qof.xml
View file

@ -178,27 +178,29 @@ The document does not describe the protocol (e.g. <xref target="RFC3912">WHOIS</
<section title="ABNF grammar"> <section title="ABNF grammar">
<figure><preamble>Formal grammar as defined in <xref target="RFC2234">ABNF</xref></preamble><artwork><![CDATA[ <figure><preamble>Formal grammar as defined in <xref target="RFC2234">ABNF</xref></preamble><artwork><![CDATA[
answer = entries answer = entries
entries = * ( entry CR) entries = * ( entry newline )
entry = "{" keyvallist "}" entry = ws "{" ws keyvallist ws "}" ws
keyvallist = [ member *( value-separator member ) ] keyvallist = [ member *( value-separator member ) ]
member = qm field qm name-separator value member = field name-separator value
name-separator = ws %x3A ws ; a ":" colon name-separator = ws %x3A ws ; : colon
value = value ; as defined in the JSON RFC value-separator = ws %x2C ws ; , comma
value-separator = ws %x2C ws ; , comma. As defined in JSON field = field-name | futureField
field = "rrname" | "rrtype" | "rdata" | "time_first" | field-name = "rrname" | "rrtype" | "rdata" | "time_first" |
"time_last" | "count" | "bailiwick" | "sensor_id" | "time_last" | "count" | "bailiwick" | "sensor_id" |
"zone_time_first" | "zone_time_last" | "origin" | "zone_time_first" | "zone_time_last" | "origin" |
"time_first_ms" | "time_last_ms" | futureField "time_first_ms" | "time_last_ms"
futureField = string futureField = string
CR = %x0D newline = [ CR ] LF
qm = %x22 ; " a quotation mark CR = %x0D ; Carrige return
LF = %x0A ; Line feed or New line
qm = %x22 ; " Quotation mark
ws = *( ws = *(
%x20 | ; Space %x20 | ; Space
%x09 ; Horizontal tab %x09 ; Horizontal tab
) )
]]></artwork></figure> ]]></artwork></figure>
<t>Note that value is defined in <xref target="RFC4627">JSON</xref> and has the exact same specification as there. The same goes for the definition of string.</t> <t>Note that value is defined in <xref target="RFC4627">JSON</xref> and has the exact same specification as there. The same goes for the definition of string. Note the changed definition of ws dows not include CR or LF as those are NOT allowed in NDJSON, and thus the definition here MUST be used for other ABNF defitions in <xref target="RFC4627">JSON</xref>.</t>
</section> </section>
<section title="Mandatory Fields"> <section title="Mandatory Fields">
<t>Implementation MUST support all the mandatory fields.</t> <t>Implementation MUST support all the mandatory fields.</t>