dns-tcp-multirequest-buffer: versions for v1 and v2 DNS logging

diff --git a/tests/dns-tcp-multirequest-buffer-1/README b/tests/dns-tcp-multirequest-buffer-v1/README
similarity index 100%
rename from tests/dns-tcp-multirequest-buffer-1/README
rename to tests/dns-tcp-multirequest-buffer-v1/README

diff --git a/tests/dns-tcp-multirequest-buffer-1/check.sh b/tests/dns-tcp-multirequest-buffer-v1/check.sh
similarity index 100%
rename from tests/dns-tcp-multirequest-buffer-1/check.sh
rename to tests/dns-tcp-multirequest-buffer-v1/check.sh

diff --git a/tests/dns-tcp-multirequest-buffer-1/dns-tcp-multirequest-buffer.pcap b/tests/dns-tcp-multirequest-buffer-v1/dns-tcp-multirequest-buffer.pcap
similarity index 100%
rename from tests/dns-tcp-multirequest-buffer-1/dns-tcp-multirequest-buffer.pcap
rename to tests/dns-tcp-multirequest-buffer-v1/dns-tcp-multirequest-buffer.pcap

diff --git a/tests/dns-tcp-multirequest-buffer-1/suricata.yaml b/tests/dns-tcp-multirequest-buffer-v1/suricata.yaml
similarity index 100%
rename from tests/dns-tcp-multirequest-buffer-1/suricata.yaml
rename to tests/dns-tcp-multirequest-buffer-v1/suricata.yaml

diff --git a/tests/dns-tcp-multirequest-buffer-1/test.yaml b/tests/dns-tcp-multirequest-buffer-v1/test.yaml
similarity index 68%
rename from tests/dns-tcp-multirequest-buffer-1/test.yaml
rename to tests/dns-tcp-multirequest-buffer-v1/test.yaml
index 695f2f882f4ca65660e79aff15f931fe504120c4..8dafa433a18b29692205f76ee1c723bec685b12b 100644 (file)
--- a/tests/dns-tcp-multirequest-buffer-1/test.yaml
+++ b/tests/dns-tcp-multirequest-buffer-v1/test.yaml
@@ -1,4 +1,4 @@
 requires:
   features:
     - HAVE_LIBJANSSON
-    
+  lt-version: 7    

diff --git a/tests/dns-tcp-multirequest-buffer/README b/tests/dns-tcp-multirequest-buffer/README
new file mode 100644 (file)
index 0000000..6ce66e4
--- /dev/null
+++ b/tests/dns-tcp-multirequest-buffer/README
@@ -0,0 +1,5 @@
+Test a TCP DNS request that contains multiple DNS requests in a single
+buffer.
+
+This test includes its own verification script instead of using the
+default file compare.

diff --git a/tests/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap b/tests/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap
new file mode 100644 (file)
index 0000000..f46aefb
Binary files /dev/null and b/tests/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap differ

diff --git a/tests/dns-tcp-multirequest-buffer/suricata.yaml b/tests/dns-tcp-multirequest-buffer/suricata.yaml
new file mode 100644 (file)
index 0000000..81343fa
--- /dev/null
+++ b/tests/dns-tcp-multirequest-buffer/suricata.yaml
@@ -0,0 +1,8 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      types:
+        - dns:

diff --git a/tests/dns-tcp-multirequest-buffer/test.yaml b/tests/dns-tcp-multirequest-buffer/test.yaml
new file mode 100644 (file)
index 0000000..9bdb3c8
--- /dev/null
+++ b/tests/dns-tcp-multirequest-buffer/test.yaml
@@ -0,0 +1,13 @@
+requires:
+  features:
+    - HAVE_LIBJANSSON
+    
+checks:
+  - filter:
+      count: 20
+      match:
+        dns.type: query
+  - filter:
+      count: 20
+      match:
+        dns.type: answer