dns-udp-null: v2 and v3 tests

diff --git a/tests/dns-udp-null/README.md b/tests/dns/dns-udp-null/README.md
similarity index 100%
rename from tests/dns-udp-null/README.md
rename to tests/dns/dns-udp-null/README.md

diff --git a/tests/dns-udp-null/input.pcap b/tests/dns/dns-udp-null/input.pcap
similarity index 100%
rename from tests/dns-udp-null/input.pcap
rename to tests/dns/dns-udp-null/input.pcap

diff --git a/tests/dns-udp-null/suricata.yaml b/tests/dns/dns-udp-null/suricata.yaml
similarity index 100%
rename from tests/dns-udp-null/suricata.yaml
rename to tests/dns/dns-udp-null/suricata.yaml

diff --git a/tests/dns/dns-udp-null/test.yaml b/tests/dns/dns-udp-null/test.yaml
new file mode 100644 (file)
index 0000000..d86af64
--- /dev/null
+++ b/tests/dns/dns-udp-null/test.yaml
@@ -0,0 +1,18 @@
+requires:
+  min-version: 8
+
+checks:
+  - filter:
+      count: 1
+      match:
+        event_type: dns
+        dns.type: request
+        dns.queries[0].rrtype: "NULL"
+  - filter:
+      count: 1
+      match:
+        event_type: dns
+        dns.type: response
+        dns.rcode: NOERROR
+        dns.queries[0].rrtype: "NULL"
+        dns.answers[0].rdata: "VACKD\u0003\\xc5\\xe9\u0001"

diff --git a/tests/dns/v2/dns-udp-null/README.md b/tests/dns/v2/dns-udp-null/README.md
new file mode 100644 (file)
index 0000000..7d14453
--- /dev/null
+++ b/tests/dns/v2/dns-udp-null/README.md
@@ -0,0 +1,4 @@
+Verify the eve output for a DNS response with a NULL record type.
+
+The pcap contains the first two packets of
+https://redmine.openinfosecfoundation.org/attachments/2062.

diff --git a/tests/dns/v2/dns-udp-null/input.pcap b/tests/dns/v2/dns-udp-null/input.pcap
new file mode 100644 (file)
index 0000000..a399ce6
Binary files /dev/null and b/tests/dns/v2/dns-udp-null/input.pcap differ

diff --git a/tests/dns/v2/dns-udp-null/suricata.yaml b/tests/dns/v2/dns-udp-null/suricata.yaml
new file mode 100644 (file)
index 0000000..4db348a
--- /dev/null
+++ b/tests/dns/v2/dns-udp-null/suricata.yaml
@@ -0,0 +1,10 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 2

diff --git a/tests/dns-udp-null/test.yaml b/tests/dns/v2/dns-udp-null/test.yaml
similarity index 100%
rename from tests/dns-udp-null/test.yaml
rename to tests/dns/v2/dns-udp-null/test.yaml