From c0b4691f0fab0504618b805a786a001896b50b8c Mon Sep 17 00:00:00 2001
From: Peder Stray <peder.stray@gmail.com>
Date: Fri, 9 Sep 2022 13:45:22 +0200
Subject: [PATCH] Updated ABNF to fix inconsistencies

- LF (not CR) for entry separators
- fix double quotation of futureField
---
 i-d/pdns-qof.xml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/i-d/pdns-qof.xml b/i-d/pdns-qof.xml
index eae1fb2..e884c40 100644
--- a/i-d/pdns-qof.xml
+++ b/i-d/pdns-qof.xml
@@ -178,27 +178,29 @@ The document does not describe the protocol (e.g. <xref target="RFC3912">WHOIS</
         <section title="ABNF grammar">
 			<figure><preamble>Formal grammar as defined in <xref target="RFC2234">ABNF</xref></preamble><artwork><![CDATA[
 answer          = entries
-entries         = * ( entry CR)
-entry           = "{" keyvallist "}"
+entries         = * ( entry newline )
+entry           = ws "{" ws keyvallist ws "}" ws
 keyvallist      = [ member *( value-separator member ) ]
-member          = qm field qm name-separator value
-name-separator  = ws %x3A ws            ; a ":" colon
-value           = value                 ; as defined in the JSON RFC
-value-separator = ws %x2C ws            ; , comma. As defined in JSON
-field           = "rrname" | "rrtype" | "rdata" | "time_first" |
+member          = field name-separator value
+name-separator  = ws %x3A ws            ; : colon
+value-separator = ws %x2C ws            ; , comma
+field           = field-name | futureField
+field-name      = "rrname" | "rrtype" | "rdata" | "time_first" |
                   "time_last" | "count" | "bailiwick" | "sensor_id" |
                   "zone_time_first" | "zone_time_last" | "origin" |
-                  "time_first_ms" | "time_last_ms" | futureField
+                  "time_first_ms" | "time_last_ms"
 futureField     = string
-CR              = %x0D
-qm              = %x22                  ; " a quotation mark
+newline         = [ CR ] LF
+CR              = %x0D                  ; Carrige return
+LF              = %x0A                  ; Line feed or New line
+qm              = %x22                  ; " Quotation mark
 ws              = *(
                     %x20 |              ; Space
                     %x09                ; Horizontal tab
                    )
 
 					]]></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 title="Mandatory Fields">
 			<t>Implementation MUST support all the mandatory fields.</t>