diff --git a/configure.ac b/configure.ac index 1e8b159e9..79f806a37 100644 --- 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.10], [jool@nic.mx]) +AC_INIT([Jool], [4.1.11], [ydahhrk@gmail.com]) 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 index b1d4565c5..45e11196d 100644 --- 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.10 +latest-version: 4.1.11 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 index 2399b406a..1f25259ee 100644 --- a/docs/en/download.md +++ b/docs/en/download.md @@ -27,11 +27,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.10 is the most mature version of Jool. +Currently, 4.1.11 is the most mature version of Jool. | Release Date | Version | .tar.gz | .tar.gz Signature | Git commit | .deb | |--------------|---------|---------|-------------------|------------|------| -| 2023-06-11 | **4.1.10** | [Download]({{ page.url-dl }}/v4.1.10/jool-4.1.10.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.10/jool-4.1.10.tar.gz.asc) | Link | [Kernel modules]({{ page.url-dl }}/v4.1.10/jool-dkms_4.1.10-1_all.deb)
[Userspace tools]({{ page.url-dl }}/v4.1.10/jool-tools_4.1.10-1_amd64.deb) (amd64 only) | +| 2023-12-22 | **4.1.11** | [Download]({{ page.url-dl }}/v4.1.11/jool-4.1.11.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.11/jool-4.1.11.tar.gz.asc) | Link | [Kernel modules]({{ page.url-dl }}/v4.1.11/jool-dkms_4.1.11-1_all.deb)
[Userspace tools]({{ page.url-dl }}/v4.1.11/jool-tools_4.1.11-1_amd64.deb) (amd64 only) | +| 2023-06-11 | 4.1.10 | [Download]({{ page.url-dl }}/v4.1.10/jool-4.1.10.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.10/jool-4.1.10.tar.gz.asc) | Link | [Kernel modules]({{ page.url-dl }}/v4.1.10/jool-dkms_4.1.10-1_all.deb)
[Userspace tools]({{ page.url-dl }}/v4.1.10/jool-tools_4.1.10-1_amd64.deb) (amd64 only) | | 2023-01-25 | 4.1.9 | [Download]({{ page.url-dl }}/v4.1.9/jool-4.1.9.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.9/jool-4.1.9.tar.gz.asc) | Link | [Kernel modules]({{ page.url-dl }}/v4.1.9/jool-dkms_4.1.9-1_all.deb)
[Userspace tools]({{ page.url-dl }}/v4.1.9/jool-tools_4.1.9-1_amd64.deb) (amd64 only) | | 2022-03-20 | 4.1.8 | [Download]({{ page.url-dl }}/v4.1.8/jool-4.1.8.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.8/jool-4.1.8.tar.gz.asc) | Link | [Kernel modules]({{ page.url-dl }}/v4.1.8/jool-dkms_4.1.8-1_all.deb)
[Userspace tools]({{ page.url-dl }}/v4.1.8/jool-tools_4.1.8-1_amd64.deb) (amd64 only) | | 2022-01-27 | 4.1.7 | [Download]({{ page.url-dl }}/v4.1.7/jool-4.1.7.tar.gz) | [Signature]({{ page.url-dl }}/v4.1.7/jool-4.1.7.tar.gz.asc) | Link | [Kernel modules]({{ page.url-dl }}/v4.1.7/jool-dkms_4.1.7-1_all.deb)
[Userspace tools]({{ page.url-dl }}/v4.1.7/jool-tools_4.1.7-1_amd64.deb) (amd64 only) | diff --git a/docs/en/index.md b/docs/en/index.md index 08a4064ce..70569be71 100644 --- a/docs/en/index.md +++ b/docs/en/index.md @@ -22,7 +22,7 @@ Jool is an Open Source [SIIT and NAT64](intro-xlat.html) for Linux. > ![Warning](../images/warning.svg) The project's development has slowed down to essential maintenance. Bugfixing and support will remain active, but there will be no new features in the foreseeable future. -- The most mature version is [4.1.10](download.html#41x). +- The most mature version is [4.1.11](download.html#41x). - The second release candidate for version [4.2.0](download.html#42x) is also available now. - **jool.mx is no longer maintained. Please use https://nicmx.github.io/Jool instead.** @@ -30,11 +30,15 @@ Jool is an Open Source [SIIT and NAT64](intro-xlat.html) for Linux. ## Latest News -### 2023-06-11 +### 2023-12-22 -Version 4.1.10 has been released. Bugfixes: +Version 4.1.11 has been released. Bugfixes: -- [#382](https://github.com/NICMx/Jool/issues/382), [#400](https://github.com/NICMx/Jool/issues/400): Clean up `skb->tstamp` during translation to prevent dropped packets. -- [#401](https://github.com/NICMx/Jool/issues/401), [#404](https://github.com/NICMx/Jool/issues/404): Improve validations for userspace requests. -- [#405](https://github.com/NICMx/Jool/issues/405): Add support for kernels 6.2 and 6.3. -- [#406](https://github.com/NICMx/Jool/issues/406), [Debian#1029268](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1029268): Modernize references to libxtables shared object functions. +- [#407](https://github.com/NICMx/Jool/issues/407): Patch compilation in some environments. +- [#409](https://github.com/NICMx/Jool/issues/409): Move the Debian systemd service to `After=network-pre.target`, to prevent deadlock during boot in some environments. +- [750909d](https://github.com/NICMx/Jool/commit/750909dd3f0df8771883121b1820f7e10010ff31): When running into an untranslatable address, print it clearly in the logs. +- [#413](https://github.com/NICMx/Jool/issues/413): Enhance validations of pool4, BIB and session userspace requests. +- [#415](https://github.com/NICMx/Jool/pulls?q=is%3Apr+is%3Aclosed): Add support for kernel 6.4, 6.5, 6.6 and 6.7-rc6. +- [#417](https://github.com/NICMx/Jool/issues/413): Add support for RHEL 9.2 and 9.3. + +There have also been several patches [in](https://github.com/NICMx/Jool/commit/4eb5b3e3ec9d671067e571f6eee08d95a4a34091) [the](https://github.com/NICMx/Jool/commit/8c78ed47c51f2ee10cc63058014212887c340122) [joold](https://github.com/NICMx/Jool/commit/07e6fd9a4eb93cc27f271ef1cd526b155edc66a4) [code](https://github.com/NICMx/Jool/commit/4fcfe184d9444ef25d3e5ab5995a06c8bed8b9d2), but this is still an [ongoing effort](https://github.com/NICMx/Jool/issues/410). You might want to abstain from using joold at the moment. diff --git a/docs/en/intro-jool.md b/docs/en/intro-jool.md index d9388dddb..6721dae29 100644 --- a/docs/en/intro-jool.md +++ b/docs/en/intro-jool.md @@ -50,7 +50,8 @@ Please [let us know]({{ site.repository-url }}/issues) if you find additional co | Jool version | Supported Linux kernels (mainline) | Supported Linux kernels (RHEL) | |-------------------------------------|--------------------------------------|--------------------------------| -| [main]({{ site.repository-url }}),
[4.1.10](download.html#41x) | 4.14 - 4.20,
5.0 - 5.19,
6.0 - 6.3 | RHEL 8.6 - 8.7,
RHEL 9.0 - 9.3 | +| [main]({{ site.repository-url }}),
[4.1.11](download.html#41x) | 4.18 - 4.20,
5.0 - 5.19,
6.0 - 6.7 | RHEL 8.6 - 8.9,
RHEL 9.0 - 9.3 | +| [4.1.10](download.html#41x) | 4.14 - 4.20,
5.0 - 5.19,
6.0 - 6.3 | RHEL 8.6 - 8.7,
RHEL 9.0 - 9.3 | | [4.1.9](download.html#41x) | 4.9 - 4.20,
5.0 - 5.19,
6.0 - 6.1 | RHEL 8.6 - 8.7,
RHEL 9.0 - 9.1 | | [4.1.8](download.html#41x) | 4.9 - 4.20,
5.0 - 5.16 | RHEL 8.5 | | [4.1.6](download.html#41x),
[4.1.7](download.html#41x) | 4.4 - 4.20,
5.0 - 5.15 | RHEL 8.5 | diff --git a/src/common/xlat.h b/src/common/xlat.h index 8c3c6b106..a40b3ec0e 100644 --- a/src/common/xlat.h +++ b/src/common/xlat.h @@ -9,7 +9,7 @@ */ #define JOOL_VERSION_MAJOR 4 #define JOOL_VERSION_MINOR 1 -#define JOOL_VERSION_REV 10 +#define JOOL_VERSION_REV 11 #define JOOL_VERSION_DEV 0 /** See http://stackoverflow.com/questions/195975 */ diff --git a/src/usr/argp/wargp.c b/src/usr/argp/wargp.c index 2600ab3c0..b397a0a59 100644 --- a/src/usr/argp/wargp.c +++ b/src/usr/argp/wargp.c @@ -9,7 +9,7 @@ #include "usr/argp/log.h" const char *argp_program_version = JOOL_VERSION_STR; -const char *argp_program_bug_address = "jool@nic.mx"; +const char *argp_program_bug_address = "ydahhrk@gmail.com"; int wargp_parse_bool(void *input, int key, char *str); int wargp_parse_u32(void *field, int key, char *str); diff --git a/src/usr/joold/joold.8 b/src/usr/joold/joold.8 index ec2b6ab92..8ec14e3c5 100644 --- 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 2023-06-11 v4.1.10 "NAT64 Jool's Session Synchronization Daemon" +.TH joold 8 2023-12-22 v4.1.11 "NAT64 Jool's Session Synchronization Daemon" .SH NAME joold - Userspace Session Synchronization (SS) daemon for NAT64 Jool. @@ -147,9 +147,7 @@ Zero on success, non-zero on failure. NIC Mexico & ITESM .SH REPORTING BUGS -Our issue tracker is https://github.com/NICMx/Jool/issues. -.br -If you want to mail us instead, use jool@nic.mx. +https://github.com/NICMx/Jool/issues .SH KNOWN BUGS 1. reuseaddr should probably default to 1... diff --git a/src/usr/nat64/jool.8 b/src/usr/nat64/jool.8 index e629c8a14..2ba03a888 100644 --- a/src/usr/nat64/jool.8 +++ b/src/usr/nat64/jool.8 @@ -1,7 +1,6 @@ .\" Manpage for jool's userspace app. -.\" Report bugs to jool@nic.mx. -.TH jool 8 2023-06-11 v4.1.10 "NAT64 Jool's Userspace Client" +.TH jool 8 2023-12-22 v4.1.11 "NAT64 Jool's Userspace Client" .SH NAME jool - Interact with NAT64 Jool (the kernel module). @@ -411,8 +410,7 @@ Zero on success, non-zero on failure. NIC Mexico & ITESM .SH REPORTING BUGS -Our issue tracker is https://github.com/NICMx/Jool/issues. -If you want to mail us instead, use jool@nic.mx. +https://github.com/NICMx/Jool/issues .SH COPYRIGHT Copyright 2023 NIC Mexico. diff --git a/src/usr/siit/jool_siit.8 b/src/usr/siit/jool_siit.8 index e5eee3c34..06fbed326 100644 --- a/src/usr/siit/jool_siit.8 +++ b/src/usr/siit/jool_siit.8 @@ -1,7 +1,6 @@ .\" Manpage for jool's userspace app. -.\" Report bugs to jool@nic.mx. -.TH jool_siit 8 2023-06-11 v4.1.10 "SIIT Jool's Userspace Client" +.TH jool_siit 8 2023-12-22 v4.1.11 "SIIT Jool's Userspace Client" .SH NAME jool_siit - Interact with SIIT Jool (the kernel module). @@ -317,8 +316,7 @@ Zero on success, non-zero on failure. NIC Mexico & ITESM .SH REPORTING BUGS -Our issue tracker is https://github.com/NICMx/Jool/issues. -If you want to mail us instead, use jool@nic.mx. +https://github.com/NICMx/Jool/issues .SH COPYRIGHT Copyright 2023 NIC Mexico. diff --git a/test/graybox/autogen.sh b/test/graybox/autogen.sh index 1705dac11..d113158f3 100755 --- a/test/graybox/autogen.sh +++ b/test/graybox/autogen.sh @@ -2,7 +2,6 @@ # Hello. # Run this file to generate the configure script. -# You'll need autoconf, automake and libtool installed! +# You'll need autoconf and automake installed! -aclocal --install autoreconf --install diff --git a/test/graybox/configure.ac b/test/graybox/configure.ac index e938e15ce..de4371388 100644 --- a/test/graybox/configure.ac +++ b/test/graybox/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.68]) -AC_INIT([graybox], [1.0.0], [jool@nic.mx]) +AC_INIT([graybox], [1.0.0], [ydahhrk@gmail.com]) AC_CONFIG_SRCDIR([usr/graybox.c]) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/test/graybox/test-suite/nat64/end-jool.sh b/test/graybox/test-suite/nat64/end-jool.sh index 3c3cd07b2..086500569 100755 --- a/test/graybox/test-suite/nat64/end-jool.sh +++ b/test/graybox/test-suite/nat64/end-jool.sh @@ -1,8 +1,5 @@ #!/bin/sh -ip6tables -t mangle -F -iptables -t mangle -F - modprobe -rq jool ip route del 2001:db8:1::/96 via 2001:db8::5 diff --git a/test/graybox/test-suite/nat64/setup-jool.sh b/test/graybox/test-suite/nat64/setup-jool.sh index 53b8f1203..b588813d7 100755 --- a/test/graybox/test-suite/nat64/setup-jool.sh +++ b/test/graybox/test-suite/nat64/setup-jool.sh @@ -14,7 +14,7 @@ ip route add 203.0.113.0/24 via 192.0.2.5 sysctl -w net.ipv4.conf.all.forwarding=1 > /dev/null sysctl -w net.ipv6.conf.all.forwarding=1 > /dev/null modprobe jool -jool instance add -6 64:ff9b::/96 --iptables +jool instance add -6 64:ff9b::/96 --netfilter jool pool4 add 192.0.2.2 1-3000 --tcp jool pool4 add 192.0.2.2 1-3000 --udp jool pool4 add 192.0.2.2 1-3000 --icmp @@ -22,11 +22,6 @@ jool bib add 192.0.2.2#2000 2001:db8::5#2000 --tcp jool bib add 192.0.2.2#2000 2001:db8::5#2000 --udp jool bib add 192.0.2.2#1 2001:db8::5#1 --icmp -ip6tables -t mangle -A PREROUTING -d 64:ff9b::/96 -j JOOL -iptables -t mangle -A PREROUTING -d 192.0.2.2 -p tcp --dport 1:3000 -j JOOL -iptables -t mangle -A PREROUTING -d 192.0.2.2 -p udp --dport 1:3000 -j JOOL -iptables -t mangle -A PREROUTING -d 192.0.2.2 -p icmp -j JOOL - # Relevant whenever the kernel responds an ICMPv6 error on behalf of Jool. sysctl -w net.ipv6.auto_flowlabels=0 > /dev/null diff --git a/test/graybox/test-suite/siit/end-jool.sh b/test/graybox/test-suite/siit/end-jool.sh index 2b8821ca5..a1854161a 100755 --- a/test/graybox/test-suite/siit/end-jool.sh +++ b/test/graybox/test-suite/siit/end-jool.sh @@ -1,8 +1,5 @@ #!/bin/sh -ip6tables -t mangle -F -iptables -t mangle -F - modprobe -rq jool_siit ip addr flush dev to_client_v6 scope global diff --git a/test/graybox/test-suite/siit/setup-jool.sh b/test/graybox/test-suite/siit/setup-jool.sh index e178968f8..24666aefc 100755 --- a/test/graybox/test-suite/siit/setup-jool.sh +++ b/test/graybox/test-suite/siit/setup-jool.sh @@ -15,13 +15,10 @@ sysctl -w net.ipv4.conf.all.forwarding=1 > /dev/null sysctl -w net.ipv6.conf.all.forwarding=1 > /dev/null modprobe jool_siit -jool_siit instance add --iptables -6 2001:db8:100::/40 +jool_siit instance add --netfilter -6 2001:db8:100::/40 jool_siit eamt add 2001:db8:3::/120 1.0.0.0/24 jool_siit eamt add 2001:db8:2::/120 10.0.0.0/24 jool_siit global update rfc6791v4-prefix 203.0.113.8 -ip6tables -t mangle -A PREROUTING -j JOOL_SIIT -iptables -t mangle -A PREROUTING -j JOOL_SIIT - # Relevant whenever the kernel responds an ICMPv6 error on behalf of Jool. -sysctl -w net.ipv6.auto_flowlabels=0 > /dev/null \ No newline at end of file +sysctl -w net.ipv6.auto_flowlabels=0 > /dev/null diff --git a/test/graybox/usr/graybox.7 b/test/graybox/usr/graybox.7 index 820a4c31e..ab58127fe 100644 --- a/test/graybox/usr/graybox.7 +++ b/test/graybox/usr/graybox.7 @@ -1,5 +1,5 @@ .\" Manpage for graybox's userspace app. -.\" Report bugs to jool@nic.mx. +.\" Report bugs to ydahhrk@gmail.com. .TH graybox 7 2016-09-01 v1.0.0 "Graybox kernel module's client" @@ -136,8 +136,7 @@ Kernels 3.2.0 and up. NIC Mexico & ITESM .SH REPORTING BUGS -Our issue tracker is https://github.com/NICMx/Jool/issues. -If you want to mail us instead, use jool@nic.mx. +https://github.com/NICMx/Jool/issues .SH COPYRIGHT Copyright 2016 NIC Mexico. diff --git a/test/unit/bibdb/bibdb_test.c b/test/unit/bibdb/bibdb_test.c index 4a4d47d46..778bf0f8a 100644 --- a/test/unit/bibdb/bibdb_test.c +++ b/test/unit/bibdb/bibdb_test.c @@ -224,7 +224,7 @@ static void clean(void) int init_module(void) { struct test_group test = { - .name = "Filtering and Updating", + .name = "BIB DB", .teardown_fn = bib_teardown, .init_fn = init, .clean_fn = clean,