Release 2.13.2

DNS-OARC · Feb 10, 2023 · 7e0c9b4 · 7e0c9b4
1 parent bab0d2d
commit 7e0c9b4
Show file tree

Hide file tree

Showing 106 changed files with 159 additions and 109 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,22 @@
+2023-02-10 Jerry Lundström
+
+ Release 2.13.2
+
+ Updated pcap-thread to v4.0.1:
+
+ Fixed issue with `pcap_dispatch()` during non-threaded timed runs by
+ checking packet timestamp and use `pcap_breakloop()` if the run
+ should end.
+ Based on reports, it looks like `pcap_dispatch()` won't stop
+ processing if load is high enough even if documentation says "only
+ one bufferful of packets is read at a time".
+
+ Many thanks to Klaus Darilion @klaus3000 (NIC.AT) for the report
+ and helping to track down the issue and test fixes!
+
+ e7d92fe Fix COPR
+ 7ecf217 pcap-thread
+
 2022-04-21 Jerry Lundström
 
  Release 2.13.1

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 DNS Statistics Collector (DSC)
 
-Copyright (c) 2008-2022, OARC, Inc.
+Copyright (c) 2008-2023, OARC, Inc.
 Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
 Copyright (c) 2003-2007, The Measurement Factory, Inc.
 All rights reserved.

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2022, OARC, Inc.
+# Copyright (c) 2008-2023, OARC, Inc.
 # Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
 # Copyright (c) 2003-2007, The Measurement Factory, Inc.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 AC_PREREQ(2.61)
-AC_INIT([DSC], [2.13.1], [dsc@dns-oarc.net], [dsc], [https://github.com/DNS-OARC/dsc/issues])
+AC_INIT([DSC], [2.13.2], [dsc@dns-oarc.net], [dsc], [https://github.com/DNS-OARC/dsc/issues])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/md_array.c])
 AC_CONFIG_HEADER([src/config.h])

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,24 @@
+dsc (2.13.2-1~unstable+1) unstable; urgency=low
+
+ * Release 2.13.2
+
+ Updated pcap-thread to v4.0.1:
+
+ Fixed issue with `pcap_dispatch()` during non-threaded timed runs by
+ checking packet timestamp and use `pcap_breakloop()` if the run
+ should end.
+ Based on reports, it looks like `pcap_dispatch()` won't stop
+ processing if load is high enough even if documentation says "only
+ one bufferful of packets is read at a time".
+
+ Many thanks to Klaus Darilion @klaus3000 (NIC.AT) for the report
+ and helping to track down the issue and test fixes!
+
+ e7d92fe Fix COPR
+ 7ecf217 pcap-thread
+
+ -- Jerry Lundström <lundstrom.jerry@gmail.com> Fri, 10 Feb 2023 15:15:54 +0100
+
 dsc (2.13.1-1~unstable+1) unstable; urgency=low
 
  * Release 2.13.1

diff --git a/debian/copyright b/debian/copyright
@@ -3,15 +3,11 @@ Upstream-Name: dsc
 Source: https://github.com/DNS-OARC/dsc
 
 Files: *
-Copyright: 2008-2022 OARC, Inc.
+Copyright: 2008-2023 OARC, Inc.
  2007-2008 Internet Systems Consortium, Inc.
  2003-2007 The Measurement Factory, Inc.
 License: BSD-3-Clause
 
-Files: debian/*
-Copyright: 2022 Jerry Lundström <lundstrom.jerry@gmail.com>
-License: BSD-3-Clause
-
 Files: src/pcap_layers/*
 Copyright: 2016 Duane Wessels
  2016 The Measurement Factory, Inc.

diff --git a/rpm/dsc.spec b/rpm/dsc.spec
@@ -1,5 +1,5 @@
 Name: dsc
-Version: 2.13.1
+Version: 2.13.2
 Release: 1%{?dist}
 Summary: DNS Statistics Collector
 Group: Productivity/Networking/DNS/Utilities
@@ -70,6 +70,20 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 10 2023 Jerry Lundström <lundstrom.jerry@gmail.com> 2.13.2-1
+- Release 2.13.2
+ * Updated pcap-thread to v4.0.1:
+ Fixed issue with `pcap_dispatch()` during non-threaded timed runs by
+ checking packet timestamp and use `pcap_breakloop()` if the run
+ should end.
+ Based on reports, it looks like `pcap_dispatch()` won't stop
+ processing if load is high enough even if documentation says "only
+ one bufferful of packets is read at a time".
+ * Many thanks to Klaus Darilion @klaus3000 (NIC.AT) for the report
+ and helping to track down the issue and test fixes!
+ * Commits:
+ e7d92fe Fix COPR
+ 7ecf217 pcap-thread
 * Thu Apr 21 2022 Jerry Lundström <lundstrom.jerry@gmail.com> 2.13.1-1
 - Release 2.13.1
  * This patch release is mainly for build and packages where MaxMind DB

diff --git a/src/asn_index.c b/src/asn_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/asn_index.h b/src/asn_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/base64.h b/src/base64.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/certain_qnames_index.c b/src/certain_qnames_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/certain_qnames_index.h b/src/certain_qnames_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/client_index.c b/src/client_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/client_index.h b/src/client_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/client_subnet_index.c b/src/client_subnet_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/client_subnet_index.h b/src/client_subnet_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/compat.c b/src/compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/compat.h b/src/compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/config_hooks.c b/src/config_hooks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/config_hooks.h b/src/config_hooks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/country_index.c b/src/country_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/country_index.h b/src/country_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/daemon.c b/src/daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dataset_opt.h b/src/dataset_opt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_ip_version_index.c b/src/dns_ip_version_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_ip_version_index.h b/src/dns_ip_version_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_message.c b/src/dns_message.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_message.h b/src/dns_message.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_protocol.c b/src/dns_protocol.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_protocol.h b/src/dns_protocol.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_source_port_index.c b/src/dns_source_port_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dns_source_port_index.h b/src/dns_source_port_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dnstap.c b/src/dnstap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dnstap.h b/src/dnstap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/do_bit_index.c b/src/do_bit_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/do_bit_index.h b/src/do_bit_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/dsc-psl-convert b/src/dsc-psl-convert
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2008-2022, OARC, Inc.
+# Copyright (c) 2008-2023, OARC, Inc.
 # Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
 # Copyright (c) 2003-2007, The Measurement Factory, Inc.
 # All rights reserved.

diff --git a/src/dsc-psl-convert.1.in b/src/dsc-psl-convert.1.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008-2022, OARC, Inc.
+.\" Copyright (c) 2008-2023, OARC, Inc.
 .\" Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
 .\" Copyright (c) 2003-2007, The Measurement Factory, Inc.
 .\" All rights reserved.

diff --git a/src/dsc.1.in b/src/dsc.1.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008-2022, OARC, Inc.
+.\" Copyright (c) 2008-2023, OARC, Inc.
 .\" Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
 .\" Copyright (c) 2003-2007, The Measurement Factory, Inc.
 .\" All rights reserved.

diff --git a/src/dsc.conf.5.in b/src/dsc.conf.5.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008-2022, OARC, Inc.
+.\" Copyright (c) 2008-2023, OARC, Inc.
 .\" Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
 .\" Copyright (c) 2003-2007, The Measurement Factory, Inc.
 .\" All rights reserved.

diff --git a/src/edns_bufsiz_index.c b/src/edns_bufsiz_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/edns_bufsiz_index.h b/src/edns_bufsiz_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/edns_version_index.c b/src/edns_version_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/edns_version_index.h b/src/edns_version_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/encryption_index.c b/src/encryption_index.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/encryption_index.h b/src/encryption_index.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.

diff --git a/src/geoip.h b/src/geoip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/hashtbl.c b/src/hashtbl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2022, OARC, Inc.
+ * Copyright (c) 2008-2023, OARC, Inc.
  * Copyright (c) 2007-2008, Internet Systems Consortium, Inc.
  * Copyright (c) 2003-2007, The Measurement Factory, Inc.
  * All rights reserved.