Re: svn commit: r337736 - in head/sys: netinet netinet6

[Andrey V. Elsukov]

On 16.08.2018 21:34, Alan Somers wrote:
> On Tue, Aug 14, 2018 at 1:54 AM, Andrey V. Elsukov <a...@freebsd.org
> <mailto:a...@freebsd.org>> wrote:
> 
>     Author: ae
>     Date: Tue Aug 14 07:54:14 2018
>     New Revision: 337736
>     URL: https://svnweb.freebsd.org/changeset/base/337736
>     <https://svnweb.freebsd.org/changeset/base/337736>
> 
>     Log:
>       Restore ability to send ICMP and ICMPv6 redirects.
> 
>       It was lost when tryforward appeared. Now ip[6]_tryforward will be
>     enabled
>       only when sending redirects for corresponding IP version is
>     disabled via
>       sysctl. Otherwise will be used default forwarding function.
> 
>       PR:           221137
> 
> This change broke the sys/netipsec/tunnel tests.  I don't know if it's a
> limitation of the tests, or a genuine kernel bug, but I bisected the
> regression down to this change.  Can you please fix it?
> 
> https://ci.freebsd.org/job/FreeBSD-head-amd64-test/8630/testReport/sys.netipsec.tunnel/empty/v4/

I think it is because IPv4 tests use broadcast addresses in some places.
The attached patch fixes the test for me.

-- 
WBR, Andrey V. Elsukov

Index: tests/sys/netipsec/tunnel/utils.subr
===================================================================
--- tests/sys/netipsec/tunnel/utils.subr	(revision 337961)
+++ tests/sys/netipsec/tunnel/utils.subr	(working copy)
@@ -57,8 +57,8 @@ ist_v4_setup ()
 	jexec ipsecA ifconfig ${epair_LAN_A}b 192.0.2.2/30 up
 	jexec ipsecA ifconfig ${epair_PUB_A}a 198.51.100.2/30 up
 	jexec router ifconfig ${epair_PUB_A}b 198.51.100.1/30 up
-	jexec router ifconfig ${epair_PUB_B}b 198.51.100.6/30 up
-	jexec ipsecB ifconfig ${epair_PUB_B}a 198.51.100.7/30 up
+	jexec router ifconfig ${epair_PUB_B}b 198.51.100.5/30 up
+	jexec ipsecB ifconfig ${epair_PUB_B}a 198.51.100.6/30 up
 	jexec ipsecB ifconfig ${epair_LAN_B}b 203.0.113.2/30 up
 	jexec hostB ifconfig ${epair_LAN_B}a 203.0.113.1/30 up
 	jexec ipsecA sysctl net.inet.ip.forwarding=1
@@ -66,7 +66,7 @@ ist_v4_setup ()
 	jexec ipsecB sysctl net.inet.ip.forwarding=1
 	jexec hostA route add default 192.0.2.2
 	jexec ipsecA route add default 198.51.100.1
-	jexec ipsecB route add default 198.51.100.6
+	jexec ipsecB route add default 198.51.100.5
 	jexec hostB route add default 203.0.113.2
 }
 
@@ -109,7 +109,7 @@ ist_setkey()
 			SRC_LAN="192.0.2.0/24"
 			DST_LAN="203.0.113.0/24"
 			SRC_GW="198.51.100.2"
-			DST_GW="198.51.100.7"
+			DST_GW="198.51.100.6"
 		else
 			SRC_LAN="2001:db8:1::/64"
 			DST_LAN="2001:db8:45::/64"

signature.asc
Description: OpenPGP digital signature