From 06043c78219e817b88dc3d1f74ebc2b7326cc9f6 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 26 May 2021 21:22:13 +0900 Subject: [PATCH] test-network: refuse RA if not necessary --- test/test-network/conf/25-activation-policy.network | 1 + test/test-network/conf/25-nexthop-dummy.network | 1 + test/test-network/conf/25-wireguard-23-peers.network | 1 + test/test-network/conf/25-wireguard.network | 1 + test/test-network/conf/agent-client-peer.network | 3 +++ test/test-network/conf/agent-client.network | 2 ++ test/test-network/conf/agent-server-peer.network | 2 ++ test/test-network/conf/agent-server.network | 2 ++ 8 files changed, 13 insertions(+) diff --git a/test/test-network/conf/25-activation-policy.network b/test/test-network/conf/25-activation-policy.network index c53e0919c41..873e260ebf8 100644 --- a/test/test-network/conf/25-activation-policy.network +++ b/test/test-network/conf/25-activation-policy.network @@ -4,3 +4,4 @@ Name=test1 [Network] Address=192.168.10.30/24 Gateway=192.168.10.1 +IPv6AcceptRA=no diff --git a/test/test-network/conf/25-nexthop-dummy.network b/test/test-network/conf/25-nexthop-dummy.network index e494aca8e34..9d754bf25a3 100644 --- a/test/test-network/conf/25-nexthop-dummy.network +++ b/test/test-network/conf/25-nexthop-dummy.network @@ -3,6 +3,7 @@ Name=dummy98 [Network] Address=192.168.20.20/24 +IPv6AcceptRA=no [NextHop] Id=20 diff --git a/test/test-network/conf/25-wireguard-23-peers.network b/test/test-network/conf/25-wireguard-23-peers.network index 033ffa155da..ee70e3c5e8c 100644 --- a/test/test-network/conf/25-wireguard-23-peers.network +++ b/test/test-network/conf/25-wireguard-23-peers.network @@ -4,6 +4,7 @@ Name=wg98 [Network] Address=192.168.123.123/24 Address=fd8d:4d6d:3ccb:0500::1/64 +IPv6AcceptRA=no # nat64 via 1 [Route] diff --git a/test/test-network/conf/25-wireguard.network b/test/test-network/conf/25-wireguard.network index 163a56ff294..565e85ea8d5 100644 --- a/test/test-network/conf/25-wireguard.network +++ b/test/test-network/conf/25-wireguard.network @@ -3,3 +3,4 @@ Name=wg99 [Network] Address=192.168.124.1/24 +IPv6AcceptRA=no diff --git a/test/test-network/conf/agent-client-peer.network b/test/test-network/conf/agent-client-peer.network index 4142938056f..b053c2c6b46 100644 --- a/test/test-network/conf/agent-client-peer.network +++ b/test/test-network/conf/agent-client-peer.network @@ -1,9 +1,12 @@ [Match] Name=client-peer + [Network] Address=192.168.6.2/24 DHCPServer=yes IPForward=ipv4 +IPv6AcceptRA=no + [DHCPServer] RelayTarget=192.168.5.1 BindToInterface=no diff --git a/test/test-network/conf/agent-client.network b/test/test-network/conf/agent-client.network index 773dc8a4fba..7787bb631ff 100644 --- a/test/test-network/conf/agent-client.network +++ b/test/test-network/conf/agent-client.network @@ -1,5 +1,7 @@ [Match] Name=client + [Network] DHCP=yes IPForward=ipv4 +IPv6AcceptRA=no diff --git a/test/test-network/conf/agent-server-peer.network b/test/test-network/conf/agent-server-peer.network index fdb235e1ffc..6aec2974a87 100644 --- a/test/test-network/conf/agent-server-peer.network +++ b/test/test-network/conf/agent-server-peer.network @@ -1,5 +1,7 @@ [Match] Name=server-peer + [Network] Address=192.168.5.2/24 IPForward=ipv4 +IPv6AcceptRA=no diff --git a/test/test-network/conf/agent-server.network b/test/test-network/conf/agent-server.network index 65bcc54dc18..c8da15c3ec8 100644 --- a/test/test-network/conf/agent-server.network +++ b/test/test-network/conf/agent-server.network @@ -1,9 +1,11 @@ [Match] Name=server + [Network] Address=192.168.5.1/24 IPForward=ipv4 DHCPServer=yes +IPv6AcceptRA=no [DHCPServer] BindToInterface=no -- 2.47.3