Protocolary updates for release 4.1.6

NICMx · Dec 10, 2021 · e9e5c58 · e9e5c58
1 parent 8d23b99
commit e9e5c58
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,7 @@ built-in.a
 # Documentation
 docs/_site/
 test/graybox/test-suite/rfc/_site/
+.jekyll-metadata
 
 # git #
 #######

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([Jool], [4.1.5], [[email protected]])
+AC_INIT([Jool], [4.1.6], [[email protected]])
 AC_CONFIG_SRCDIR([src/common/xlat.h])
 AM_INIT_AUTOMAKE([subdir-objects])
 LT_PREREQ([2.4.6])

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,7 +1,7 @@
 markdown: kramdown
 baseurl: /Jool
 repository-url: https://github.com/NICMx/Jool
-latest-version: 4.1.5
+latest-version: 4.1.6
 
 rfc-siit: https://tools.ietf.org/html/rfc7915
 draft-siit-eam: https://tools.ietf.org/html/rfc7757

diff --git a/docs/en/download.md b/docs/en/download.md
@@ -28,11 +28,12 @@ Jool 4.2 is a compliant SIIT, Stateful NAT64 and MAP-T.
 
 Jool 4.1 is a [compliant SIIT and Stateful NAT64](intro-jool.html#compliance).
 
-Currently, 4.1.5 is the most mature version of Jool.
+Currently, 4.1.6 is the most mature version of Jool.
 
 | Release Date | Version | .tar.gz | .tar.gz Signature | Git commit | .deb |
 |--------------|---------|---------|-------------------|------------|------|
-| 2021-02-19   | **4.1.5** | [Download]({{ page.url-dl }}/v4.1.5/jool-4.1.5.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.5/jool-4.1.5.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.5" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.5/jool-dkms_4.1.5-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.5/jool-tools_4.1.5-1_amd64.deb) (amd64 only) |
+| 2021-12-10   | **4.1.6** | [Download]({{ page.url-dl }}/v4.1.6/jool-4.1.6.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.6/jool-4.1.6.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.6" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.6/jool-dkms_4.1.6-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.6/jool-tools_4.1.6-1_amd64.deb) (amd64 only) |
+| 2021-02-19   | 4.1.5 | [Download]({{ page.url-dl }}/v4.1.5/jool-4.1.5.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.5/jool-4.1.5.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.5" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.5/jool-dkms_4.1.5-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.5/jool-tools_4.1.5-1_amd64.deb) (amd64 only) |
 | 2020-10-07   | 4.1.4 | [Download]({{ page.url-dl }}/v4.1.4/jool-4.1.4.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.4/jool-4.1.4.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.4" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.4/jool-dkms_4.1.4-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.4/jool-tools_4.1.4-1_amd64.deb) (amd64 only) |
 | 2020-09-02   | 4.1.3 | [Download]({{ page.url-dl }}/v4.1.3/jool-4.1.3.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.3/jool-4.1.3.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.3" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.3/jool-dkms_4.1.3-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.3/jool-tools_4.1.3-1_amd64.deb) (amd64 only) |
 | 2020-07-22   | <del>4.1.2</del> | [Download]({{ page.url-dl }}/v4.1.2/jool-4.1.2.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.2/jool-4.1.2.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.1.2" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.1.2/jool-dkms_4.1.2-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.1.2/jool-tools_4.1.2-1_amd64.deb) (amd64 only) |
@@ -47,11 +48,11 @@ Jool 4.0 is a generally compliant SIIT and Stateful NAT64.
 
 | Release Date | Version | .tar.gz | .tar.gz Signature | Git commit | .deb |
 |--------------|---------|---------|-------------------|------------|------|
-| 2020-05-05   | 4.0.9 | [Download]({{ page.url-dl }}/v4.0.9/jool-4.0.9.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.9/jool-4.0.9.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.9" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.9/jool-dkms_4.0.9-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.9/jool-tools_4.0.9-1_amd64.deb) (amd64 only) |
-| 2020-03-30   | 4.0.8 | [Download]({{ page.url-dl }}/v4.0.8/jool-4.0.8.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.8/jool-4.0.8.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.8" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.8/jool-dkms_4.0.8-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.8/jool-tools_4.0.8-1_amd64.deb) (amd64 only) |
-| 2019-12-17   | 4.0.7 | [Download]({{ page.url-dl }}/v4.0.7/jool-4.0.7.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.7/jool-4.0.7.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.7" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.7/jool-dkms_4.0.7-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.7/jool-tools_4.0.7-1_amd64.deb) (amd64 only) |
-| 2019-10-24   | 4.0.6 | [Download]({{ page.url-dl }}/v4.0.6/jool-4.0.6.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.6/jool-4.0.6.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.6" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.6/jool-dkms_4.0.6-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.6/jool-tools_4.0.6-1_amd64.deb) (amd64 only) |
-| 2019-08-20   | 4.0.5 | [Download]({{ page.url-dl }}/v4.0.5/jool-4.0.5.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.5/jool-4.0.5.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.5" target="_blank">Link</a> | - |
+| 2020-05-05   | <del>4.0.9</del> | [Download]({{ page.url-dl }}/v4.0.9/jool-4.0.9.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.9/jool-4.0.9.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.9" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.9/jool-dkms_4.0.9-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.9/jool-tools_4.0.9-1_amd64.deb) (amd64 only) |
+| 2020-03-30   | <del>4.0.8</del> | [Download]({{ page.url-dl }}/v4.0.8/jool-4.0.8.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.8/jool-4.0.8.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.8" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.8/jool-dkms_4.0.8-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.8/jool-tools_4.0.8-1_amd64.deb) (amd64 only) |
+| 2019-12-17   | <del>4.0.7</del> | [Download]({{ page.url-dl }}/v4.0.7/jool-4.0.7.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.7/jool-4.0.7.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.7" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.7/jool-dkms_4.0.7-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.7/jool-tools_4.0.7-1_amd64.deb) (amd64 only) |
+| 2019-10-24   | <del>4.0.6</del> | [Download]({{ page.url-dl }}/v4.0.6/jool-4.0.6.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.6/jool-4.0.6.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.6" target="_blank">Link</a> | [Kernel modules]({{ page.url-dl }}/v4.0.6/jool-dkms_4.0.6-1_all.deb)<br />[Userspace tools]({{ page.url-dl }}/v4.0.6/jool-tools_4.0.6-1_amd64.deb) (amd64 only) |
+| 2019-08-20   | <del>4.0.5</del> | [Download]({{ page.url-dl }}/v4.0.5/jool-4.0.5.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.5/jool-4.0.5.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.5" target="_blank">Link</a> | - |
 | 2019-07-31   | <del>4.0.4</del> | [Download]({{ page.url-dl }}/v4.0.4/jool-4.0.4.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.4/jool-4.0.4.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.4" target="_blank">Link</a> | - |
 | 2019-07-19   | <del>4.0.3</del> | [Download]({{ page.url-dl }}/v4.0.3/jool-4.0.3.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.3/jool-4.0.3.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.3" target="_blank">Link</a> | - |
 | 2019-07-11   | <del>4.0.2</del> | [Download]({{ page.url-dl }}/v4.0.2/jool-4.0.2.tar.gz) | [Signature]({{ page.url-dl }}/v4.0.2/jool-4.0.2.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.2" target="_blank">Link</a> | - |

diff --git a/docs/en/index.md b/docs/en/index.md
@@ -20,8 +20,7 @@ Jool is an Open Source [SIIT and NAT64](intro-xlat.html) for Linux.
 
 ## Status
 
-- The most mature version is [4.1.5](download.html#41x).
-- [4.0.9](download.html#40x) is soon going to be deprecated.
+- The most mature version is [4.1.6](download.html#41x).
 - The second release candidate for version [4.2.0](download.html#42x) is also available now.
 
 Due to a temporary resource shortage, the project's development has slowed down to essential maintenance. No new features are expected to be developed during the first half of 2021 (at least), but bugfixing and support will remain active.
@@ -36,13 +35,17 @@ Due to a temporary resource shortage, the project's development has slowed down
 
 ## Latest News
 
-### 2021-02-19
+### 2021-12-10
 
-Version 4.1.5 has been released. Changelog:
+Version 4.1.6 has been released. Changelog:
 
-- [#340](https://github.com/NICMx/Jool/issues/340): Patch several joold bugs.
-- [#345](https://github.com/NICMx/Jool/issues/345), [#354](https://github.com/NICMx/Jool/issues/354): Improve some documentation. (Includes a [Cheat Sheet](cheat-sheet.html).)
-- [#350](https://github.com/NICMx/Jool/issues/350): Remove `CAP_NET_ADMIN` requirement from `stats display`.
+- [#362](https://github.com/NICMx/Jool/issues/362): Fix joold in kernels 5.10+.
+- [#363](https://github.com/NICMx/Jool/issues/363): Improve performance of EAMT table insertions during atomic configuration.
+- [#364](https://github.com/NICMx/Jool/pull/364): Tweak the TCP state machine so [`--handle-rst-during-fin-rcv`](https://www.jool.mx/en/usr-flags-global.html#handle-rst-during-fin-rcv) works in both translation directions (IPv4 -> IPv6, IPv6 -> IPv4).
+- [#368](https://github.com/NICMx/Jool/issues/368): Fix kernel crash during `pool4 flush`.
+- [#369](https://github.com/NICMx/Jool/issues/369): Fix localhost traffic on Netfilter SIIT mode.
+- [#370](https://github.com/NICMx/Jool/issues/370): Fix ICMP errors bounced back as responses from echo requests or echo replies.
+- Update the [kernel support table](intro-jool.html#compatibility).
 
 The second release candidate for version 4.2.0 is also available. Changelog:
 

diff --git a/docs/en/intro-jool.md b/docs/en/intro-jool.md
@@ -46,13 +46,12 @@ Please [let us know]({{ site.repository-url }}/issues) if you find additional co
 
 ## Compatibility
 
-> ![Warning!](../images/warning.svg) As of 2020-12-24, the [lowest longterm mainline kernel is version 4.4](https://www.kernel.org/). Also, [CentOS doesn't seem to be doing very well](https://blog.centos.org/2020/12/future-is-centos-stream/). Jool support for old and RHEL kernels is likely to end soon.
-
 <!-- Remember: The man pages mention the lowest supported kernel. -->
 
 | Jool version                        | Supported Linux kernels (mainline)   | Supported Linux kernels (RHEL) |
 |-------------------------------------|--------------------------------------|--------------------------------|
-| [master]({{ site.repository-url }}),<br />[4.1.5](download.html#41x) | 3.16 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.11 | RHEL 7.6 - RHEL 7.7,<br />RHEL 8.0 |
+| [master]({{ site.repository-url }}),<br />[4.1.6](download.html#41x) | 4.4 - 4.20,<br />5.0 - 5.15 | RHEL 8.5 |
+| [4.1.5](download.html#41x) | 3.16 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.11 | RHEL 7.6 - RHEL 7.7,<br />RHEL 8.0 |
 | [4.1.3](download.html#41x),<br />[4.1.4](download.html#41x) | 3.16 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.9 | RHEL 7.6 - RHEL 7.7,<br />RHEL 8.0 |
 | [4.1.2](download.html#41x) | 3.16 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.7 | RHEL 7.6 - RHEL 7.7,<br />RHEL 8.0 |
 | [4.1.1](download.html#41x),<br />[4.1.0](download.html#41x) | 3.16 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.7 | RHEL 7.6 - RHEL 7.7,<br /><del>[RHEL 8.0](https://github.com/NICMx/Jool/issues/334)</del> |

diff --git a/src/common/xlat.h b/src/common/xlat.h
@@ -9,8 +9,8 @@
  */
 #define JOOL_VERSION_MAJOR 4
 #define JOOL_VERSION_MINOR 1
-#define JOOL_VERSION_REV 5
-#define JOOL_VERSION_DEV 3
+#define JOOL_VERSION_REV 6
+#define JOOL_VERSION_DEV 0
 
 /** See http://stackoverflow.com/questions/195975 */
 #define STR_VALUE(arg) #arg

diff --git a/src/mod/common/stats.c b/src/mod/common/stats.c
@@ -104,7 +104,7 @@ __u64 *jstat_query(struct jool_stats *stats)
 #ifdef UNIT_TESTING
 int jstat_refcount(struct jool_stats *stats)
 {
-#if LINUX_VERSION_AT_LEAST(4, 11, 0, 9999, 0)
+#if LINUX_VERSION_AT_LEAST(4, 11, 0, 8, 4)
 	return kref_read(&stats->refcounter);
 #else
 	return atomic_read(&stats->refcounter.refcount);

diff --git a/src/mod/common/wkmalloc.c b/src/mod/common/wkmalloc.c
@@ -112,14 +112,12 @@ void wkmalloc_print_leaks(void)
 		log_info("None.");
 }
 
-static void destroy_node(struct rb_node *node, void *arg)
-{
-	kfree(kmn_entry(node));
-}
-
 void wkmalloc_teardown(void)
 {
-	rbtree_clear(&tree, destroy_node, NULL);
+	struct kmalloc_entry *entry, *tmp;
+	rbtree_foreach(entry, tmp, &tree, hook)
+		kfree(entry);
+	tree.rb_node = NULL;
 }
 
 #endif /* JKMEMLEAK */
diff --git a/src/usr/joold/joold.8 b/src/usr/joold/joold.8
@@ -1,6 +1,6 @@
 .\" Manpage for jool's session synchronization daemon.
 
-.TH joold 8 2020-02-19 v4.1.5 "NAT64 Jool's Session Synchronization Daemon"
+.TH joold 8 2021-12-10 v4.1.6 "NAT64 Jool's Session Synchronization Daemon"
 
 .SH NAME
 joold - Userspace Session Synchronization (SS) daemon for NAT64 Jool.
@@ -17,7 +17,7 @@ Running the daemons is not enough to have successful session synchronization; SS
 .SH AVAILABILITY
 Linux is the only OS in which this program makes sense.
 .br
-Kernels 3.2.0 and up.
+Kernels 4.4 and up.
 
 .SH SYNTAX
 .RI "joold [" FILE "]"

diff --git a/src/usr/nat64/jool.8 b/src/usr/nat64/jool.8
@@ -1,7 +1,7 @@
 .\" Manpage for jool's userspace app.
 .\" Report bugs to [email protected].
 
-.TH jool 8 2021-02-19 v4.1.5 "NAT64 Jool's Userspace Client"
+.TH jool 8 2021-12-10 v4.1.6 "NAT64 Jool's Userspace Client"
 
 .SH NAME
 jool - Interact with NAT64 Jool (the kernel module).
@@ -14,7 +14,7 @@ NAT64 Jool is a kernel module you load into a Linux kernel. It implements RFC 61
 .SH AVAILABILITY
 Linux is the only OS in which this program makes sense.
 .br
-Kernels 3.13 and up.
+Kernels 4.4 and up.
 
 .SH SYNTAX
 .RI "jool [" <argp1> "] instance ("

diff --git a/src/usr/nl/file.c b/src/usr/nl/file.c
@@ -139,6 +139,7 @@ static struct jool_result handle_array(cJSON *json, int attrtype, char *name,
 		return type_mismatch(name, json, "Array");
 
 	msg = NULL;
+	root = NULL;
 	entries_written = 0;
 	for (json = json->child; json; json = json->next) {
 		if (msg == NULL) {

diff --git a/src/usr/siit/jool_siit.8 b/src/usr/siit/jool_siit.8
@@ -1,7 +1,7 @@
 .\" Manpage for jool's userspace app.
 .\" Report bugs to [email protected].
 
-.TH jool_siit 8 2021-02-19 v4.1.5 "SIIT Jool's Userspace Client"
+.TH jool_siit 8 2021-12-10 v4.1.6 "SIIT Jool's Userspace Client"
 
 .SH NAME
 jool_siit - Interact with SIIT Jool (the kernel module).
@@ -14,7 +14,7 @@ SIIT Jool is a kernel module you load into a Linux kernel. It implements RFC 791
 .SH AVAILABILITY
 Linux is the only OS in which this program makes sense.
 .br
-Kernels 3.13.0 and up.
+Kernels 4.4 and up.
 
 .SH SYNTAX
 .RI "jool_siit [" <argp1> "] instance ("