Skip to content

Fixes for random failures #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flichtenheld merged 2 commits into from
Aug 28, 2026
Merged

Fixes for random failures #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec44531
t_client.sh: Check whether addresses are in "tentative" state
flichtenheld Aug 5, 2026
7c87d5f
master/t_client.rc: Try to improve reliability
flichtenheld Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions t_server/original/client_vm/bin/t_client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,20 @@ get_ifconfig_route()
esac
}

# ----------------------------------------------------------
# check ifconfig output on whether some address is in "tentative" state
# repeats calling get_ifconfig_route until it does not
# arg1: log file
check_tentative_state()
{
logfile="$1"
while grep -q tentative $logfile; do
output "waiting for tentative state to end"
sleep 1
get_ifconfig_route >$logfile
done
}

# ----------------------------------------------------------
# check ifconfig
# arg1: "4" or "6" -> for message
Expand Down Expand Up @@ -389,6 +403,7 @@ do

output "save pre-openvpn ifconfig + route"
get_ifconfig_route >$LOGDIR/$SUF:ifconfig_route_pre.txt
check_tentative_state $LOGDIR/$SUF:ifconfig_route_pre.txt

output "\nrun pre-openvpn ping tests - targets must not be reachable..."
run_ping_tests 4 want_fail "$ping4_hosts"
Expand Down Expand Up @@ -489,6 +504,7 @@ do
# compare whether anything changed in ifconfig/route setup?
output "save ifconfig+route"
get_ifconfig_route >$LOGDIR/$SUF:ifconfig_route.txt
check_tentative_state $LOGDIR/$SUF:ifconfig_route.txt

if [ "$expect_ifconfig4" = "-" ] ; then
output "skip ifconfig+route check"
Expand Down Expand Up @@ -527,6 +543,7 @@ do

output "\nsave post-openvpn ifconfig + route..."
get_ifconfig_route >$LOGDIR/$SUF:ifconfig_route_post.txt
check_tentative_state $LOGDIR/$SUF:ifconfig_route_post.txt

output -n "compare pre- and post-openvpn ifconfig + route..."
if diff $LOGDIR/$SUF:ifconfig_route_pre.txt \
Expand Down
11 changes: 7 additions & 4 deletions t_server/original/client_vm/t_client.master/t_client.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ FPING_EXTRA_ARGS="-C 5 -p 50"
# For proxy tests
FPING_PROXY_ARGS="-C 5 -p 100"
# For slow tests (4/9)
FPING_SLOW_ARGS="-C 10 -p 200"
FPING_SLOW_ARGS="-C 20 -p 200"

#
# remote host (used as macro below)
Expand Down Expand Up @@ -315,10 +315,13 @@ OPENVPN_CONF_3m="$OPENVPN_CONF_3 --max-packet-size 145"
EXPECT_IFCONFIG4_3m=$EXPECT_IFCONFIG4_3
PING4_HOSTS_3m="$PING4_HOSTS_3"

LLDADDR_4="--lladdr 02:04:02:07:00:$openvpn_version"

Comment thread
flichtenheld marked this conversation as resolved.
# Test 4: UDP / p2mp tap
#
RUN_TITLE_4="udp4 / p2pm / tap"
OPENVPN_CONF_4="$OPENVPN_BASE_P2MP --dev tap --proto ${UDP4} --remote $REMOTE --port 51196 --route-ipv6 fd00:abcd:195::/48 fd00:abcd:204:4::ffff"
BASE_CONF_4="$OPENVPN_BASE_P2MP --dev tap --remote $REMOTE --port 51196 $LLDADDR_4"
OPENVPN_CONF_4="$BASE_CONF_4 --proto ${UDP4} --route-ipv6 fd00:abcd:195::/48 fd00:abcd:204:4::ffff"
if ! needs_openvpn 24; then
OPENVPN_CONF_4="$OPENVPN_CONF_4 --tun-ipv6"
fi
Comment thread
flichtenheld marked this conversation as resolved.
Expand All @@ -331,7 +334,7 @@ PING6_HOSTS_4="fd00:abcd:204:4::1 fd00:abcd:204:0::1 fd00:abcd:204:4::a:200 fd00
#
RUN_TITLE_4a="udp6 / p2pm / tap3 / topo subnet"
CHECK_SKIP_4a="needs_openvpn 24" # subnet
OPENVPN_CONF_4a="$OPENVPN_BASE_P2MP --dev tap3 --proto udp6 --remote $REMOTE --port 51196 --topology subnet"
OPENVPN_CONF_4a="$BASE_CONF_4 --proto udp6 --topology subnet"
EXPECT_IFCONFIG4_4a=$EXPECT_IFCONFIG4_4
EXPECT_IFCONFIG6_4a=$EXPECT_IFCONFIG6_4
FPING_ARGS_4a="$FPING_SLOW_ARGS"
Expand All @@ -342,7 +345,7 @@ PING6_HOSTS_4a="$PING6_HOSTS_4"
#
RUN_TITLE_4b="udp / p2pm / tap / ipv6-only (pull-filter)"
CHECK_SKIP_4b="needs_openvpn 25" # ipv6-only doesn't work
OPENVPN_CONF_4b="$OPENVPN_BASE_P2MP --dev tap --proto udp --remote $REMOTE --port 51196 --pull-filter accept ifconfig- --pull-filter ignore ifconfig"
OPENVPN_CONF_4b="$BASE_CONF_4 --proto udp --pull-filter accept ifconfig- --pull-filter ignore ifconfig"
EXPECT_IFCONFIG4_4b=-
EXPECT_IFCONFIG6_4b=$EXPECT_IFCONFIG6_4
FPING_ARGS_4b="$FPING_SLOW_ARGS"
Expand Down