Merge pull request #101 from jelu/release/1.6.0

Release 1.6.0
DNS-OARC · Mar 10, 2022 · d24fa3f · d24fa3f
2 parents 91d915a + c99518c
commit d24fa3f
Show file tree

Hide file tree

Showing 40 changed files with 92 additions and 40 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,21 @@
+2022-03-10 Jerry Lundström
+
+    Release 1.6.0
+
+    This release adds a new SQL function for masking addresses and adds
+    support for Pcap's LINUX_SLL link layer.
+
+    The new `netmask()` function (added by Ken Renard @kdrenard) is used
+    as follows: `NETMASK(address [, v4_mask_length [, v6_mask_length]])`
+
+    Other fixes:
+    - `packet_handler`: Clean up header parsing, size checks etc
+    - Remove own defines of ether/proto types and don't overlap `struct in6_addr`
+
+    ae211e6 LINUX_SLL, netmask(), ether types
+    d847c97 Adding Netmask description to FUNCTIONS.md
+    4be804d Adding Netmask function.  Usage "netmask (<address_field>[, <IPv4-mask-length>[, <IPv6-mask-length>]])"
+
 2021-11-05 Jerry Lundström
 
     Release 1.5.0

diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/README.md b/README.md
@@ -104,12 +104,13 @@ packetq -d -p8080 -w html/ -r pcap/
 - Roger Murray [@romu42](https://github.com/romu42)
 - Henrik Levkowetz [@levkowetz](https://github.com/levkowetz)
 - Petr Špaček [@pspacek](https://github.com/pspacek)
+- Ken Renard [@kdrenard](https://github.com/kdrenard)
 
 See also the [full list of contributors](https://github.com/DNS-OARC/PacketQ/graphs/contributors).
 
 ## Copyright
 
-Copyright (c) 2017-2021, OARC, Inc.
+Copyright (c) 2017-2022, OARC, Inc.
 
 Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 

diff --git a/autogen.sh b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #
@@ -18,7 +18,7 @@
 # along with PacketQ.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([packetq], [1.5.0], [admin@dns-oarc.net], [packetq], [https://github.com/DNS-OARC/packetq/issues])
+AC_INIT([packetq], [1.6.0], [admin@dns-oarc.net], [packetq], [https://github.com/DNS-OARC/packetq/issues])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/packetq.cpp])
 AC_CONFIG_HEADER([src/config.h])

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,23 @@
+packetq (1.6.0-1~unstable+1) unstable; urgency=low
+
+  * Release 1.6.0
+
+    This release adds a new SQL function for masking addresses and adds
+    support for Pcap's LINUX_SLL link layer.
+
+    The new `netmask()` function (added by Ken Renard @kdrenard) is used
+    as follows: `NETMASK(address [, v4_mask_length [, v6_mask_length]])`
+
+    Other fixes:
+    - `packet_handler`: Clean up header parsing, size checks etc
+    - Remove own defines of ether/proto types and don't overlap `struct in6_addr`
+
+    ae211e6 LINUX_SLL, netmask(), ether types
+    d847c97 Adding Netmask description to FUNCTIONS.md
+    4be804d Adding Netmask function.  Usage "netmask (<address_field>[, <IPv4-mask-length>[, <IPv6-mask-length>]])"
+
+ -- Jerry Lundström <lundstrom.jerry@gmail.com>  Thu, 10 Mar 2022 14:09:20 +0100
+
 packetq (1.5.0-1~unstable+1) unstable; urgency=low
 
   * Release 1.5.0

diff --git a/debian/copyright b/debian/copyright
@@ -3,12 +3,12 @@ Upstream-Name: drool
 Source: https://github.com/DNS-OARC/drool
 
 Files: *
-Copyright: 2017-2021, OARC, Inc.
+Copyright: 2017-2022, OARC, Inc.
            2011-2017, IIS - The Internet Foundation in Sweden
 License: GPLv3
 
 Files: debian/*
-Copyright: 2021 Jerry Lundström <lundstrom.jerry@gmail.com>
+Copyright: 2022 Jerry Lundström <lundstrom.jerry@gmail.com>
 License: GPLv3
 
 Files: src/Murmur/MurmurHash3.*

diff --git a/rpm/packetq.spec b/rpm/packetq.spec
@@ -1,5 +1,5 @@
 Name:           packetq
-Version:        1.5.0
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        A tool that provides a basic SQL-frontend to PCAP-files
 Group:          Productivity/Networking/DNS/Utilities
@@ -54,6 +54,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 10 2022 Jerry Lundström <lundstrom.jerry@gmail.com> 1.6.0-1
+- Release 1.6.0
+  * This release adds a new SQL function for masking addresses and adds
+    support for Pcap's LINUX_SLL link layer.
+  * The new `netmask()` function (added by Ken Renard @kdrenard) is used
+    as follows: `NETMASK(address [, v4_mask_length [, v6_mask_length]])`
+  * Other fixes:
+    - `packet_handler`: Clean up header parsing, size checks etc
+    - Remove own defines of ether/proto types and don't overlap `struct in6_addr`
+  * Commits:
+    ae211e6 LINUX_SLL, netmask(), ether types
+    d847c97 Adding Netmask description to FUNCTIONS.md
+    4be804d Adding Netmask function.  Usage "netmask (<address_field>[, <IPv4-mask-length>[, <IPv6-mask-length>]])"
 * Fri Nov 05 2021 Jerry Lundström <lundstrom.jerry@gmail.com> 1.5.0-1
 - Release 1.5.0
   * This release fixes issues with CSV and JSON w.r.t. quoted strings. CSV

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/dns.cpp b/src/dns.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/dns.h b/src/dns.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/icmp.cpp b/src/icmp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/icmp.h b/src/icmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/output.h b/src/output.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/packet_handler.cpp b/src/packet_handler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/packet_handler.h b/src/packet_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/packetq.cpp b/src/packetq.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/packetq.h b/src/packetq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/pcap.cpp b/src/pcap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/pcap.h b/src/pcap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/reader.cpp b/src/reader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/reader.h b/src/reader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/refcountstring.h b/src/refcountstring.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/regression-test.sh b/src/regression-test.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/segzip.h b/src/segzip.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/server.cpp b/src/server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/server.h b/src/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/sql.cpp b/src/sql.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/sql.h b/src/sql.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/tcp.cpp b/src/tcp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/tcp.h b/src/tcp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/test/test1.sh b/src/test/test1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/test/test2.sh b/src/test/test2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/test/test3.sh b/src/test/test3.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/test/test4.sh b/src/test/test4.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/test/test5.sh b/src/test/test5.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/test/test6.sh b/src/test/test6.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/test/test7.sh b/src/test/test7.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright (c) 2017-2021, OARC, Inc.
+# Copyright (c) 2017-2022, OARC, Inc.
 # Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
 # All rights reserved.
 #

diff --git a/src/variant.h b/src/variant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, OARC, Inc.
+ * Copyright (c) 2017-2022, OARC, Inc.
  * Copyright (c) 2011-2017, IIS - The Internet Foundation in Sweden
  * All rights reserved.
  *