Merge pull request #77 from dns-stats/develop

Merge for 1.2.1-rc1

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "dnstap"]
 	path = dnstap
 	url = https://github.com/dnstap/dnstap.pb
+[submodule "contrib/dns-stats-docker"]
+	path = contrib/dns-stats-docker
+	url = https://github.com/SeanBurford/dns-stats-docker.git

ChangeLog.txt

@@ -6,6 +6,20 @@
 # file, you can obtain one at https://mozilla.org/MPL/2.0/.
 #
 
+
+Version 1.2.1-rc1 - 2022-01-18
+--------------------------
+
+* Modify the format output by the debug option `--debug-qr` to be more human
+  readable (`--debug-dns` output is left unchanged).
+* Fix 2 minor bugs where an incorrect start time could be written to the CDNS
+  file, resulting in a negative file duration.
+* Documentation: correct the dependency list.
+* Fix build issue when using `configure --disable-pseudo-anonymisation`. Thanks
+  Sean Burford for reporting this.
+* Add example docker image as a submodule in `contrib/dns-stats-docker`. Thanks 
+  to Sean Burford for providing this.
+
 Version 1.2.1-beta2 - 2021-09-23
 --------------------------
 * Bump the private version because schema extended with new stats.

Makefile.am

@@ -268,6 +268,7 @@ libcdns_a_SOURCES = \
         src/ipaddress.cpp \
         src/log.cpp \
         src/pseudoanonymise.cpp \
+        src/queryresponse.cpp \
         src/rotatingfilename.cpp \
         src/streamwriter.cpp \
         src/util.cpp

doc/user-guide/installation.adoc.in

@@ -86,6 +86,8 @@ source, see the documentation for those items.
   {cpp}. Building them requires a {cpp} compiler and tool chain compatible
   with the 2011 ISO standard, otherwise {cpp}11.
 
+| pkg-config | Used for dependency management.
+
 | `boost-log`
 .5+| Several libraries from http://www.boost.org[Boost
   {cpp}] are required. Depending on your system, it may be possible to
@@ -101,6 +103,8 @@ source, see the documentation for those items.
 
 | `boost-iostreams`
 
+| `boost-filesystem`
+
 | `liblzma`| The compression library from http://tukaani.org/xz/[XZ utils].
 
 | `libpcap`| Library for capturing network traffic http://www.tcpdump.org/.

src/blockcbordata.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 Internet Corporation for Assigned Names and Numbers.
+ * Copyright 2016-2022 Internet Corporation for Assigned Names and Numbers.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1726,7 +1726,11 @@ namespace block_cbor {
             Timestamp end_ts(*end_time, ticks_per_second);
             end_ts.writeCbor(enc);
         }
-        if ( start_time )
+        // There is a rare case where a 'live' capture is fed old data (e.g.
+        // via a DNSTAP socket) and in this case the start time can be later
+        // than the earliest data. Don't write the start time if this is the
+        // case
+        if ( start_time  && start_time <= earliest_time )
         {
             enc.write(start_time_index);
             Timestamp start_ts(*start_time, ticks_per_second);