From c99518caa61b03ecdc7e6145efcb2a7207426f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= Date: Thu, 10 Mar 2022 14:12:29 +0100 Subject: [PATCH] Release 1.6.0 --- CHANGES | 18 ++++++++++++++++++ Makefile.am | 2 +- README.md | 3 ++- autogen.sh | 2 +- configure.ac | 4 ++-- debian/changelog | 20 ++++++++++++++++++++ debian/copyright | 4 ++-- rpm/packetq.spec | 15 ++++++++++++++- src/Makefile.am | 2 +- src/dns.cpp | 2 +- src/dns.h | 2 +- src/icmp.cpp | 2 +- src/icmp.h | 2 +- src/output.h | 2 +- src/packet_handler.cpp | 2 +- src/packet_handler.h | 2 +- src/packetq.cpp | 2 +- src/packetq.h | 2 +- src/pcap.cpp | 2 +- src/pcap.h | 2 +- src/reader.cpp | 2 +- src/reader.h | 2 +- src/refcountstring.h | 2 +- src/regression-test.sh | 2 +- src/segzip.h | 2 +- src/server.cpp | 2 +- src/server.h | 2 +- src/sql.cpp | 2 +- src/sql.h | 2 +- src/tcp.cpp | 2 +- src/tcp.h | 2 +- src/test/Makefile.am | 2 +- src/test/test1.sh | 2 +- src/test/test2.sh | 2 +- src/test/test3.sh | 2 +- src/test/test4.sh | 2 +- src/test/test5.sh | 2 +- src/test/test6.sh | 2 +- src/test/test7.sh | 2 +- src/variant.h | 2 +- 40 files changed, 92 insertions(+), 40 deletions(-) diff --git a/CHANGES b/CHANGES index b3ef435..7e2b7e5 100644 --- 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 ([, [, ]])" + 2021-11-05 Jerry Lundström Release 1.5.0 diff --git a/Makefile.am b/Makefile.am index edbf242..fd03ad5 100644 --- 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 index 944e975..71a2dbf 100644 --- 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 index f2c6359..f1f0091 100755 --- 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 index f8463f8..1d8d7b3 100644 --- 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 . 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 index 067254e..1914662 100644 --- 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 ([, [, ]])" + + -- Jerry Lundström 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 index e2c24b6..cec0dc9 100644 --- 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 +Copyright: 2022 Jerry Lundström License: GPLv3 Files: src/Murmur/MurmurHash3.* diff --git a/rpm/packetq.spec b/rpm/packetq.spec index ba279f2..bada842 100644 --- 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 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 ([, [, ]])" * Fri Nov 05 2021 Jerry Lundström 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 index b738f71..24030af 100644 --- 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 index ed39b9e..a879ca7 100644 --- 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 index 9794610..a5d0715 100644 --- 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 index 0a0cab4..06cccfa 100644 --- 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 index c6ffa19..dfe076f 100644 --- 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 index 821362c..bc63e65 100644 --- 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 index 23c2e4a..11c3726 100644 --- 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 index eb52fb7..da708c5 100644 --- 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 index 3042691..2da72cd 100644 --- 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 index 017662d..2c68339 100644 --- 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 index 3c1ac25..4e4bbc3 100644 --- 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 index 4a61d14..a5b346c 100644 --- 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 index 79cd40c..c3e73fd 100644 --- 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 index 2eb9e66..9581bb1 100644 --- 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 index a5f32bf..2a80024 100644 --- 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 index e159579..51187d0 100755 --- 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 index e0b256e..653d9fc 100644 --- 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 index 9fe1132..ca05d0b 100644 --- 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 index 0979430..f3e8498 100644 --- 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 index b78e306..42c1b10 100644 --- 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 index db5908f..11afe03 100644 --- 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 index 5a04c98..bee8693 100644 --- 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 index 0169408..25ac77a 100644 --- 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 index 74c90aa..40a87b4 100644 --- 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 index 7484855..305e3ae 100755 --- 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 index 7ce7f60..84210e0 100755 --- 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 index c91180b..f1f0562 100755 --- 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 index 16fc866..84b458f 100755 --- 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 index 131625c..979b6dc 100755 --- 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 index a082aa2..96b41f1 100755 --- 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 index ee7124d..79ef965 100755 --- 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 index a0512a6..6142392 100644 --- 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. *