Protocolary updates for release 4.0.7

NICMx · Dec 17, 2019 · 4ff45fc · 4ff45fc
1 parent 78d5424
commit 4ff45fc
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 491 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,7 +54,7 @@ test/graybox/test-suite/rfc/_site/
 *.zip
 
 # Package signature
-*.asc
+/*.asc
 
 # Logs #
 ########

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.0.6], [[email protected]])
+AC_INIT([Jool], [4.0.7], [[email protected]])
 AC_CONFIG_SRCDIR([src/common/xlat.h])
 AM_INIT_AUTOMAKE([subdir-objects])
 

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -3,7 +3,7 @@ baseurl: /Jool
 repository-url: https://github.com/NICMx/Jool
 downloads-url: https://github.com/NICMx/releases/raw/master/Jool
 downloads-url-2: https://github.com/NICMx/Jool/releases/download
-latest-version: 4.0.6
+latest-version: 4.0.7
 
 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
@@ -7,6 +7,8 @@ title: Download
 
 ## Survey
 
+You don't need to answer the survey to download the software; this section is here only as a reminder. Scroll down to find the links.
+
 <iframe src="https://docs.google.com/forms/d/e/1FAIpQLSe_9_wBttFGd9aJ7lKXiJvIN7wWZm_C6yy3gU0Ttepha275nQ/viewform?embedded=true" width="640" height="867" frameborder="0" marginheight="0" marginwidth="0">Loading…</iframe>
 
 -------------------
@@ -21,11 +23,12 @@ title: Download
 
 Jool 4.0 is a [compliant SIIT and Stateful NAT64](intro-jool.html#compliance).
 
-4.0.6 is the latest and most mature version of Jool.
+4.0.7 is the latest and most mature version of Jool.
 
 | Release Date | Version | .tar.gz | .tar.gz Signature | Git commit | .deb |
 |--------------|---------|---------|-------------------|------------|------|
-| 2019-10-24   | **4.0.6** | [Download]({{ site.downloads-url-2 }}/v4.0.6/jool-4.0.6.tar.gz) | [Signature]({{ site.downloads-url-2 }}/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]({{ site.downloads-url-2 }}/v{{ site.latest-version }}/jool-dkms_{{ site.latest-version }}-1_all.deb)<br />[Userspace tools]({{ site.downloads-url-2 }}/v{{ site.latest-version }}/jool-tools_{{ site.latest-version }}-1_amd64.deb) (amd64 only) |
+| 2019-12-17   | **4.0.7** | [Download]({{ site.downloads-url-2 }}/v4.0.7/jool-4.0.7.tar.gz) | [Signature]({{ site.downloads-url-2 }}/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]({{ site.downloads-url-2 }}/v4.0.7/jool-dkms_4.0.7-1_all.deb)<br />[Userspace tools]({{ site.downloads-url-2 }}/v4.0.7/jool-tools_4.0.7-1_amd64.deb) (amd64 only) |
+| 2019-10-24   | 4.0.6 | [Download]({{ site.downloads-url-2 }}/v4.0.6/jool-4.0.6.tar.gz) | [Signature]({{ site.downloads-url-2 }}/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]({{ site.downloads-url-2 }}/v4.0.6/jool-dkms_4.0.6-1_all.deb)<br />[Userspace tools]({{ site.downloads-url-2 }}/v4.0.6/jool-tools_4.0.6-1_amd64.deb) (amd64 only) |
 | 2019-08-20   | 4.0.5 | [Download]({{ site.downloads-url-2 }}/v4.0.5/jool-4.0.5.tar.gz) | [Signature]({{ site.downloads-url-2 }}/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]({{ site.downloads-url-2 }}/v4.0.4/jool-4.0.4.tar.gz) | [Signature]({{ site.downloads-url-2 }}/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]({{ site.downloads-url-2 }}/v4.0.3/jool-4.0.3.tar.gz) | [Signature]({{ site.downloads-url-2 }}/v4.0.3/jool-4.0.3.tar.gz.asc) | <a href="{{ site.repository-url }}/tree/v4.0.3" target="_blank">Link</a> | - |

diff --git a/docs/en/index.md b/docs/en/index.md
diff --git a/docs/en/intro-jool.md b/docs/en/intro-jool.md
@@ -31,7 +31,7 @@ As far as we know, this is the compliance status of Jool 4:
 |-----------|---------|--------|
 | [RFC 6052](https://tools.ietf.org/html/rfc6052) | IP address translation | Fully compliant. |
 | [RFC 6144](https://tools.ietf.org/html/rfc6144) | IPv4/IPv6 Translation Framework | Fully compliant. |
-| [RFC 7915](https://tools.ietf.org/html/rfc7915) | SIIT | Fully compliant. |
+| [RFC 7915](https://tools.ietf.org/html/rfc7915) | SIIT | Compliant, except for [`lowest-ipv6-mtu`](https://github.com/NICMx/Jool/issues/136). |
 | [RFC 6146](https://tools.ietf.org/html/rfc6146) | Stateful NAT64 | Fully compliant. |
 | [RFC 6384](http://tools.ietf.org/html/rfc6384) | FTP over NAT64 | [Not yet compliant]({{ site.repository-url }}/issues/114). |
 | [RFC 6791](https://tools.ietf.org/html/rfc6791) | ICMP quirks | In short, this RFC wants two things: A pool of IPv4 addresses and an ICMP header extension. Jool implements the former but not the latter. |
@@ -40,7 +40,7 @@ As far as we know, this is the compliance status of Jool 4:
 | [RFC 7756]({{ site.draft-siit-dc-2xlat }}) | SIIT-DC: Dual Translation Mode | Fully compliant. |
 | [RFC 8021]({{ site.draft-deprecate-atomfrag-generation }}) | Atomic Fragment Deprecation | Fully compliant. |
 | [RFC 7757]({{ site.draft-siit-eam }}) | EAM | Fully compliant. |
-| [RFC 7422](https://tools.ietf.org/html/rfc7422) | Deterministic port allocations | Deterministic port allocations (sequential algorithm only) can be obtained using the pool4's `--mark` argument ([mark-src-range](https://github.com/NICMx/mark-src-range) ip6tables plugin suggested). |
+| [RFC 7422](https://tools.ietf.org/html/rfc7422) | Deterministic port allocations | Deterministic port allocations (sequential algorithm only) can be achieved using the pool4's `--mark` argument ([mark-src-range](https://github.com/NICMx/mark-src-range) ip6tables plugin suggested). |
 
 Please [let us know]({{ site.repository-url }}/issues) if you find additional compliance issues or RFCs/drafts we've missed.
 
@@ -49,8 +49,7 @@ Please [let us know]({{ site.repository-url }}/issues) if you find additional co
 | Jool version                        | Supported Linux kernels (mainline)   | Supported Linux kernels (RHEL) |
 |-------------------------------------|--------------------------------------|--------------------------------|
 | [master]({{ site.repository-url }}) | 3.13 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.4 | RHEL 7.0 - RHEL 7.7,<br />RHEL 8.0 |
-| [4.0.6](download.html#40x)          | 3.13 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.4 | RHEL 7.0 - RHEL 7.7,<br />RHEL 8.0 |
-| [4.0.1](download.html#40x)          | 3.13 - 3.19,<br />4.0 - 4.20,<br />5.0 | RHEL 7.0 - RHEL 7.5            |
+| [4.0.7](download.html#40x)          | 3.13 - 3.19,<br />4.0 - 4.20,<br />5.0 - 5.4 | RHEL 7.0 - RHEL 7.7,<br />RHEL 8.0 |
 | [3.5.8](download.html#35x)          | 3.2 - 3.19,<br />4.0 - 4.18           | RHEL 7.0 - RHEL 7.4            |
 
 If you're using a non-RHEL distribution (eg. Debian derivatives), execute `uname -r` to print the kernel version you're running. Suffixes rarely matter. Here's an example from my running machine, which states that my running kernel is 4.15:

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

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 2019-10-24 v4.0.6 "NAT64 Jool's Userspace Client"
+.TH jool 8 2019-12-17 v4.0.7 "NAT64 Jool's Userspace Client"
 
 .SH NAME
 jool - Interact with NAT64 Jool (the kernel module).

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 2019-10-24 v4.0.6 "SIIT Jool's Userspace Client"
+.TH jool_siit 8 2019-12-17 v4.0.7 "SIIT Jool's Userspace Client"
 
 .SH NAME
 jool_siit - Interact with SIIT Jool (the kernel module).

diff --git a/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-expected.pkt b/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-expected.pkt
diff --git a/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-ping-expected.pkt b/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-ping-expected.pkt
diff --git a/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-ping-test.pkt b/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-ping-test.pkt
diff --git a/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-test.pkt b/test/graybox/test-suite/client/nat64/manual/icmp-error/bibless-test.pkt
diff --git a/test/graybox/test-suite/client/nat64/pktgen/receiver/4-icmp4err-csumok-df-nofrag.pkt b/test/graybox/test-suite/client/nat64/pktgen/receiver/4-icmp4err-csumok-df-nofrag.pkt
diff --git a/test/graybox/test-suite/client/nat64/send.sh b/test/graybox/test-suite/client/nat64/send.sh
@@ -137,6 +137,9 @@ fi
 
 # Miscellaneous tests
 if [[ -z $1 || $1 = *misc* ]]; then
+	# TODO graybox should report sending and queued packet names.
+	# Also "..." for additional differing bytes.
+
 	# Issue #132 tests explanation: We're sending a packet from N6 in hopes that
 	# N4 will bounce back an ICMP error due to nonexistant route 203.0.113.
 	# We're mainly testing the address Jool uses to source the translated ICMP
@@ -177,9 +180,9 @@ fi
 
 # ICMP errors (Generated by Jool rather than being translated)
 if [[ -z $1 || $1 = *errors* ]]; then
-	# Try sending an ICMP error for which there is no state.
+	# Try sending a ping for which there is no state.
 	# (1 = TOS, 4,5 = ID, 6 = DF, 10,11 = Checksum)
-	test-manual icmp-error/bibless-ping-test icmp-error/bibless-ping-expected 1,4,5,6,10,11
+	test-manual icmp-error/bibless-test icmp-error/bibless-expected 1,4,5,10,11
 
 	# Try sending large packets.
 	sudo ip netns exec joolns ip link set to_world_v4 mtu 1000

diff --git a/test/unit/impersonator/siit.c b/test/unit/impersonator/siit.c
@@ -173,7 +173,8 @@ struct addrxlat_result addrxlat_siit64(struct xlator *instance,
 }
 
 struct addrxlat_result addrxlat_siit46(struct xlator *instance,
-		bool enable_eam, __be32 in, struct result_addrxlat46 *out)
+		__be32 in, struct result_addrxlat46 *out,
+		bool enable_eam, bool enable_blacklists)
 {
 	return fail_addr();
 }

diff --git a/test/unit/translate/translate_packet_test.c b/test/unit/translate/translate_packet_test.c
@@ -225,6 +225,7 @@ static bool test_function_generate_df_flag(void)
 	if (!skb)
 		return false;
 	pkt.skb = skb;
+	pkt.is_inner = false;
 
 	skb_put(skb, 1000);
 	success &= ASSERT_UINT(0, generate_df_flag(&pkt), "Len < 1260");
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ test/graybox/test-suite/rfc/_site/ @@
     *.zip
     # Package signature
-    *.asc
+    /*.asc
     # Logs #
     ########
@@ Expand Down @@