From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 30 Apr 2025 09:50:15 +0000 (+0200)
Subject: test: add IPv6 simulation tests
X-Git-Tag: 4.7-pre1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81362fa2014197f4c30281f9c15efa440e489653;p=thirdparty%2Fchrony.git

test: add IPv6 simulation tests
---

diff --git a/test/simulation/015-ipv6 b/test/simulation/015-ipv6
new file mode 100755
index 00000000..bca008d8
--- /dev/null
+++ b/test/simulation/015-ipv6
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+. ./test.common
+
+test_start "IPv6 addressing"
+
+ip_family=6
+
+run_test || test_fail
+check_chronyd_exit || test_fail
+check_source_selection || test_fail
+check_packet_interval || test_fail
+check_sync || test_fail
+
+test_pass
diff --git a/test/simulation/108-peer b/test/simulation/108-peer
index 2c914e12..d8137ffc 100755
--- a/test/simulation/108-peer
+++ b/test/simulation/108-peer
@@ -31,6 +31,17 @@ check_chronyd_exit || test_fail
 check_source_selection || test_fail
 check_sync || test_fail
 
+if check_config_h 'FEAT_IPV6 1'; then
+	ip_family=6
+
+	run_test || test_fail
+	check_chronyd_exit || test_fail
+	check_source_selection || test_fail
+	check_sync || test_fail
+
+	ip_family=$default_ip_family
+fi
+
 freq_max_limit=$default_freq_max_limit
 base_delay="(+ 1e-4 (* -1 (equal 0.1 from 3) (equal 0.1 to 1)))"
 client_peer_options=""
diff --git a/test/simulation/133-hwtimestamp b/test/simulation/133-hwtimestamp
index f02a010c..882dbf05 100755
--- a/test/simulation/133-hwtimestamp
+++ b/test/simulation/133-hwtimestamp
@@ -58,6 +58,21 @@ for client_conf in \
 	fi
 done
 
+if check_config_h 'FEAT_IPV6 1'; then
+	server_chronyd_options="-6"
+	client_chronyd_options="-6"
+	ip_family=6
+
+	run_test || test_fail
+	check_chronyd_exit || test_fail
+	check_source_selection || test_fail
+	check_sync || test_fail
+
+	server_chronyd_options=$default_server_chronyd_options
+	client_chronyd_options="-d"
+	ip_family=$default_ip_family
+fi
+
 server_conf+="
 server 192.168.123.2 minpoll 1 maxpoll 1 noselect"
 
diff --git a/test/simulation/139-nts b/test/simulation/139-nts
index 27689b86..773f885a 100755
--- a/test/simulation/139-nts
+++ b/test/simulation/139-nts
@@ -56,6 +56,20 @@ check_file_messages "	2	1	.*	4460	" 260 300 log.packets || test_fail
 check_file_messages "." 6 6 ntskeys || test_fail
 rm -f tmp/measurements.log
 
+if check_config_h 'FEAT_IPV6 1'; then
+	ip_family=6
+
+	run_test || test_fail
+	check_chronyd_exit || test_fail
+	check_source_selection || test_fail
+	check_sync || test_fail
+
+	check_file_messages "	2	1	.*	4460	" 260 300 log.packets || test_fail
+	check_file_messages "." 6 6 ntskeys || test_fail
+
+	ip_family=$default_ip_family
+fi
+
 client_conf+="
 ntsrefresh 120
 ntsdumpdir tmp"
diff --git a/test/simulation/test.common b/test/simulation/test.common
index ec39a7cc..e5ab4a4c 100644
--- a/test/simulation/test.common
+++ b/test/simulation/test.common
@@ -78,6 +78,7 @@ default_max_sync_time=210
 default_client_min_mean_out_interval=0.0
 default_client_max_min_out_interval=inf
 
+default_ip_family=4
 default_cmdmon_unix=1
 default_pcap_dumps=0
 default_dns=0
@@ -190,6 +191,8 @@ get_node_name() {
 
 	if [ $dns -ne 0 ]; then
 		echo "node$index.net1.clk"
+	elif [ $ip_family -eq 6 ]; then
+		printf "fc00::123:%x" $index
 	else
 		echo "192.168.123.$index"
 	fi
@@ -472,6 +475,7 @@ run_test() {
 	nodes=$(get_chronyd_nodes)
 	[ -n "$chronyc_conf" ] && nodes=$[$nodes + $clients]
 
+	export CLKNETSIM_IP_FAMILY=$ip_family
 	export CLKNETSIM_UNIX_SUBNET=$[$cmdmon_unix != 0 ? 2 : 0]
 
 	for i in $(seq 1 $nodes); do