Release 2.0.0

DNS-OARC · Feb 12, 2021 · 37a072c · 37a072c
1 parent 63bb8b5
commit 37a072c
Show file tree

Hide file tree

Showing 62 changed files with 225 additions and 65 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,60 @@
+2021-02-12 Jerry Lundström
+
+    Release 2.0.0
+
+    This major release contains three backward incompatible changes, two
+    new command line options and a completely restructured man-page(!),
+    please read the change notes carefully before upgrading!
+
+    The first backward incompatible change has to do with the removal of
+    libbind dependency. This library was causing segfaults on OpenBSD due to
+    shared (and overwritten) symbols with OpenBSD's libc.
+    It was replaced with LDNS and LDNS renders domain names as Fully
+    Qualified Domain Names (FQDN, the trailing dot!) so every output of a
+    domain name has been changed to a FQDN.
+    This also changes `-X`/`-x`, which will now match against FQDNs.
+
+    The second backward incompatible change is that `-6` has been removed.
+    This was used to alter the BPF in order to "fix" it, dnscap adds
+    specific filters to IP and UDP headers which does not work for IPv6
+    traffic.
+    The generated BPF has been changed to allow IPv6 to always pass, making
+    the option obsolete. IPv6 filtering is then done in dnscap.
+
+    The last backward incompatible change has to do with the output format
+    of `-g` related to EDNS0 and is now more consistent with the rest of
+    the parsable output:
+    - No more spaces in the output
+    - Fix incorrect `\` and extra empty new-line
+    - All EDNS0 options are added after `edns0[...]` using comma separation, example: `edns0[],edns0opt[],...`
+    - Client Subnet format: `edns0opt[ECS,family=nn,source=nn,scope=nn,addr=...]`
+    - Unknown/unsupported code: `edns0opt[code=nn,codelen=nn]`
+    - Parsing error messages have changed, they came from libbind, now comes from LDNS
+
+    New options:
+    - Add `-q` and `-Q` to filter on matched/not matched QTYPE
+
+    Bugfixes:
+    - Fix memory leak in EDNS0 ECS address parsing
+    - `network`: Fix sonarcloud issues, potential `memcpy()` of null pointer
+
+    Other changes:
+    - Fix CBOR output inclusion, LDNS is always available now
+    - Add macros for Apple and Windows endian functions
+    - Restructure and correct the man-page
+
+    557e5f5 man-page
+    025529f v6bug, interval
+    37b79e9 FQDN
+    ebcf434 QTYPE match, args, tests
+    0cb5562 v6bug
+    75f6115 Endian
+    aaeb213 Sonarcloud
+    8685946 CBOR output
+    3e26802 Sonarcloud
+    30aa366 libbind
+    3f94d0b Mattermost
+
 2020-10-22 Jerry Lundström
 
     Release 1.12.0

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 DNSCAP
 
-Copyright (c) 2016-2020, OARC, Inc.
+Copyright (c) 2016-2021, OARC, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2020, OARC, Inc.
+# Copyright (c) 2016-2021, OARC, Inc.
 # Copyright (c) 2007, The Measurement Factory, Inc.
 # Copyright (c) 2007, Internet Systems Consortium, Inc.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 AC_PREREQ(2.61)
-AC_INIT([dnscap], [1.12.0], [dnscap-users@dns-oarc.net], [dnscap], [https://github.com/DNS-OARC/dnscap/issues])
+AC_INIT([dnscap], [2.0.0], [dnscap-users@dns-oarc.net], [dnscap], [https://github.com/DNS-OARC/dnscap/issues])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/dnscap.c])
 AC_CONFIG_HEADER([src/config.h])

diff --git a/contrib/cdsdump.py b/contrib/cdsdump.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) 2016-2020, OARC, Inc.
+# Copyright (c) 2016-2021, OARC, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/contrib/cdsidxchk.py b/contrib/cdsidxchk.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) 2016-2020, OARC, Inc.
+# Copyright (c) 2016-2021, OARC, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,62 @@
+dnscap (2.0.0-1~unstable+1) unstable; urgency=low
+
+  * Release 2.0.0
+
+    This major release contains three backward incompatible changes, two
+    new command line options and a completely restructured man-page(!),
+    please read the change notes carefully before upgrading!
+
+    The first backward incompatible change has to do with the removal of
+    libbind dependency. This library was causing segfaults on OpenBSD due to
+    shared (and overwritten) symbols with OpenBSD's libc.
+    It was replaced with LDNS and LDNS renders domain names as Fully
+    Qualified Domain Names (FQDN, the trailing dot!) so every output of a
+    domain name has been changed to a FQDN.
+    This also changes `-X`/`-x`, which will now match against FQDNs.
+
+    The second backward incompatible change is that `-6` has been removed.
+    This was used to alter the BPF in order to "fix" it, dnscap adds
+    specific filters to IP and UDP headers which does not work for IPv6
+    traffic.
+    The generated BPF has been changed to allow IPv6 to always pass, making
+    the option obsolete. IPv6 filtering is then done in dnscap.
+
+    The last backward incompatible change has to do with the output format
+    of `-g` related to EDNS0 and is now more consistent with the rest of
+    the parsable output:
+    - No more spaces in the output
+    - Fix incorrect `\` and extra empty new-line
+    - All EDNS0 options are added after `edns0[...]` using comma separation, example: `edns0[],edns0opt[],...`
+    - Client Subnet format: `edns0opt[ECS,family=nn,source=nn,scope=nn,addr=...]`
+    - Unknown/unsupported code: `edns0opt[code=nn,codelen=nn]`
+    - Parsing error messages have changed, they came from libbind, now comes from LDNS
+
+    New options:
+    - Add `-q` and `-Q` to filter on matched/not matched QTYPE
+
+    Bugfixes:
+    - Fix memory leak in EDNS0 ECS address parsing
+    - `network`: Fix sonarcloud issues, potential `memcpy()` of null pointer
+
+    Other changes:
+    - Fix CBOR output inclusion, LDNS is always available now
+    - Add macros for Apple and Windows endian functions
+    - Restructure and correct the man-page
+
+    557e5f5 man-page
+    025529f v6bug, interval
+    37b79e9 FQDN
+    ebcf434 QTYPE match, args, tests
+    0cb5562 v6bug
+    75f6115 Endian
+    aaeb213 Sonarcloud
+    8685946 CBOR output
+    3e26802 Sonarcloud
+    30aa366 libbind
+    3f94d0b Mattermost
+
+ -- Jerry Lundström <lundstrom.jerry@gmail.com>  Fri, 12 Feb 2021 17:06:34 +0100
+
 dnscap (1.12.0-1~unstable+1) unstable; urgency=low
 
   * Release 1.12.0

diff --git a/debian/copyright b/debian/copyright
@@ -3,17 +3,13 @@ Upstream-Name: dnscap
 Source: https://github.com/DNS-OARC/dnscap
 
 Files: *
-Copyright: 2016-2020 OARC, Inc.
+Copyright: 2016-2021 OARC, Inc.
 License: BSD-3-Clause
 
 Files: isc/*
 Copyright: 2008 Internet Systems Consortium, Inc.
 License: ISC
 
-Files: debian/*
-Copyright: 2020 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/plugins/anonaes128/anonaes128.c b/plugins/anonaes128/anonaes128.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, OARC, Inc.
+ * Copyright (c) 2018-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/anonmask/anonmask.c b/plugins/anonmask/anonmask.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, OARC, Inc.
+ * Copyright (c) 2018-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/cryptopan/cryptopan.c b/plugins/cryptopan/cryptopan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, OARC, Inc.
+ * Copyright (c) 2018-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/cryptopant/cryptopant.c b/plugins/cryptopant/cryptopant.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, OARC, Inc.
+ * Copyright (c) 2018-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/eventlog/eventlog.c b/plugins/eventlog/eventlog.c
@@ -12,7 +12,7 @@
  * Below is the original copyright notice from txtout.c.
  */
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/ipcrypt/ipcrypt.c b/plugins/ipcrypt/ipcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2020, OARC, Inc.
+ * Copyright (c) 2018-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/pcapdump/pcapdump.c b/plugins/pcapdump/pcapdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/royparse/royparse.c b/plugins/royparse/royparse.c
@@ -1,7 +1,7 @@
 /*
  * Author Roy Arends
  *
- * Copyright (c) 2017-2020, OARC, Inc.
+ * Copyright (c) 2017-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/rssm/dnscap-rssm-rssac002 b/plugins/rssm/dnscap-rssm-rssac002
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (c) 2018-2020, OARC, Inc.
+# Copyright (c) 2018-2021, OARC, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/plugins/rssm/dnscap-rssm-rssac002.1.in b/plugins/rssm/dnscap-rssm-rssac002.1.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2017-2020, OARC, Inc.
+.\" Copyright (c) 2017-2021, OARC, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without

diff --git a/plugins/rssm/rssm.c b/plugins/rssm/rssm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/template/template.c b/plugins/template/template.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/plugins/txtout/txtout.c b/plugins/txtout/txtout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/rpm/dnscap.spec b/rpm/dnscap.spec
@@ -1,5 +1,5 @@
 Name:           dnscap
-Version:        1.12.0
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        Network capture utility designed specifically for DNS traffic
 Group:          Productivity/Networking/DNS/Utilities
@@ -60,6 +60,54 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 12 2021 Jerry Lundström <lundstrom.jerry@gmail.com> 2.0.0-1
+- Release 2.0.0
+  * This major release contains three backward incompatible changes, two
+    new command line options and a completely restructured man-page(!),
+    please read the change notes carefully before upgrading!
+  * The first backward incompatible change has to do with the removal of
+    libbind dependency. This library was causing segfaults on OpenBSD due to
+    shared (and overwritten) symbols with OpenBSD's libc.
+    It was replaced with LDNS and LDNS renders domain names as Fully
+    Qualified Domain Names (FQDN, the trailing dot!) so every output of a
+    domain name has been changed to a FQDN.
+    This also changes `-X`/`-x`, which will now match against FQDNs.
+  * The second backward incompatible change is that `-6` has been removed.
+    This was used to alter the BPF in order to "fix" it, dnscap adds
+    specific filters to IP and UDP headers which does not work for IPv6
+    traffic.
+    The generated BPF has been changed to allow IPv6 to always pass, making
+    the option obsolete. IPv6 filtering is then done in dnscap.
+  * The last backward incompatible change has to do with the output format
+    of `-g` related to EDNS0 and is now more consistent with the rest of
+    the parsable output:
+    - No more spaces in the output
+    - Fix incorrect `\` and extra empty new-line
+    - All EDNS0 options are added after `edns0[...]` using comma separation, example: `edns0[],edns0opt[],...`
+    - Client Subnet format: `edns0opt[ECS,family=nn,source=nn,scope=nn,addr=...]`
+    - Unknown/unsupported code: `edns0opt[code=nn,codelen=nn]`
+    - Parsing error messages have changed, they came from libbind, now comes from LDNS
+  * New options:
+    - Add `-q` and `-Q` to filter on matched/not matched QTYPE
+  * Bugfixes:
+    - Fix memory leak in EDNS0 ECS address parsing
+    - `network`: Fix sonarcloud issues, potential `memcpy()` of null pointer
+  * Other changes:
+    - Fix CBOR output inclusion, LDNS is always available now
+    - Add macros for Apple and Windows endian functions
+    - Restructure and correct the man-page
+  * Commits:
+    557e5f5 man-page
+    025529f v6bug, interval
+    37b79e9 FQDN
+    ebcf434 QTYPE match, args, tests
+    0cb5562 v6bug
+    75f6115 Endian
+    aaeb213 Sonarcloud
+    8685946 CBOR output
+    3e26802 Sonarcloud
+    30aa366 libbind
+    3f94d0b Mattermost
 * Thu Oct 22 2020 Jerry Lundström <lundstrom.jerry@gmail.com> 1.12.0-1
 - Release 1.12.0
   * This release fixes the handling of `-?` option for dnscap and all plugins,

diff --git a/src/args.c b/src/args.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

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

diff --git a/src/assert.c b/src/assert.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/bpft.c b/src/bpft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

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

diff --git a/src/daemon.c b/src/daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, OARC, Inc.
+ * Copyright (c) 2016-2021, OARC, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

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

diff --git a/src/dnscap.1.in b/src/dnscap.1.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2016-2020, OARC, Inc.
+.\" Copyright (c) 2016-2021, OARC, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without