From: "mattock (Code Review)" Date: Tue, 10 Dec 2024 07:14:03 +0000 In-Reply-To: References: Reply-To: samuli@...515..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <004ecf4f290f87b9fba82417e4d4f5be1e6c691b-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ph0Ad3nuXdw="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Add lwip support to t_server_null List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --ph0Ad3nuXdw= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, mattock, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/811?usp=3Demail to look at the new patch set (#4). Change subject: Add lwip support to t_server_null ...................................................................... Add lwip support to t_server_null Change-Id: Ie63f302402f469c3aa48ac146ca6b8c029f0d250 Signed-off-by: Samuli Sepp=C3=A4nen --- M doc/t_server_null.rst A tests/lwip_client_up.sh M tests/t_server_null_client.sh M tests/t_server_null_default.rc 4 files changed, 145 insertions(+), 13 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/11/811/4 diff --git a/doc/t_server_null.rst b/doc/t_server_null.rst index 5fe9080..022793a 100644 --- a/doc/t_server_null.rst +++ b/doc/t_server_null.rst @@ -16,7 +16,7 @@ * Parallelized for fairly high performance * Mostly operating-system agnostic -* Tested on Fedora Linux 38/39/40 and FreeBSD 14 +* Tested on Fedora Linux 38/39/40, FreeBSD 14, NetBSD 10.0 and OpenBSD 7.5 * POSIX-compliant * Tested and known to work with Bash, Dash, Ksh, Yash and FreeBSD's defaul= t /bin/sh * Uses the sample certificates and keys @@ -31,6 +31,7 @@ * Test cases (client configurations) and server setups (server configurati= ons) are stored in a configuration file, i.e. data and code have been separ= ated * Configuration file format is nearly identical to t_client.rc configurati= on * Supports a set of default tests, overriding default test settings and ad= ding local tests +* Supports client ping tests if ovpnlwip is available =20 Prerequisites ------------- @@ -60,8 +61,9 @@ #. Server instances start #. Brief wait #. Client instances start -#. Tests run +#. ovpnlwip ping tests run #. Client instances stop +#. Test results are collected #. Brief wait #. Server instances stop @@ -77,7 +79,8 @@ * t_server_null_client.sh - * Waits until servers have launched. Then launch all clients, wait f= or them to exit and then check test results by parsing the client log files= . Each client kills itself after some delay using an "--up" script. + * Waits until servers have launched. Then launch all clients, run ov= pnlwip ping tests (if any), wait for clients to exit and then check test re= sults by parsing the client log files. Each client kills itself after some = delay using an "--up" script. + Configuration ------------- @@ -116,6 +119,19 @@ TEST_RUN_LIST=3D"1 2 5 9" +Client ping tests that use ovpnlwip can be added similarly: + + TEST_NAME_9L=3D"t_server_null_client.sh-openvpn_current_udp_custom_lwip" + SHOULD_PASS_9L=3D"yes" + CLIENT_EXEC_9L=3D"${CLIENT_EXEC}" + CLIENT_CONF_9L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp -= -proto udp" + +Note that all ovpnlwip test names need to include a "_lwip" suffix: withou= t if +ping tests won't get activated. Also note that the *tests* directory needs= to +have the lwipovpn executable or ovpnlwip tests will get skipped. The ovpnl= wip +ping tests get the IP addresses to ping from the \*.ips files created by t= he +lwip_client_up.sh script --up script. + Stress-testing the --dev null test suite ---------------------------------------- diff --git a/tests/lwip_client_up.sh b/tests/lwip_client_up.sh new file mode 100755 index 0000000..a07c4b7 --- /dev/null +++ b/tests/lwip_client_up.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Add this client's IP to a file +if ! grep "$ifconfig_local" ./$test_name.ips; then + echo -n "$ifconfig_local " >> ./$test_name.ips +fi + +# Determine the OpenVPN PID from its pid file. This works reliably even wh= en +# the OpenVPN process is backgrounded for parallel tests. +MY_PPID=3D`cat $pid` + +# Allow OpenVPN to finish initializing while waiting in the background and= then +# killing the process gracefully. Also wait for fping tests to finish. +(sleep 5 + +count=3D0 +maxcount=3D15 +while [ $count -le $maxcount ]; do + if pgrep fping > /dev/null 2>&1; then + echo "Waiting for fping to exit ($count/$maxcount)" + count=3D$(( count + 1)) + sleep 1 + else + echo "fping not running anymore" + break + fi +done + +kill -15 $MY_PPID +) & diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh index 2210e63..77e1cc5 100755 --- a/tests/t_server_null_client.sh +++ b/tests/t_server_null_client.sh @@ -1,5 +1,17 @@ #!/bin/sh +should_run_test() { + test_name=3D"$1" + + if echo "$test_name"|grep -q _lwip; then + if [ "$has_lwipovpn" =3D "no" ]; then + return 1 + fi + fi + + return 0 +} + launch_client() { test_name=3D$1 log=3D"${test_name}.log" @@ -13,10 +25,45 @@ "${client_exec}" \ $client_conf \ --writepid "${pid}" \ - --setenv pid $pid \ + --setenv pid "$pid" \ + --setenv test_name "$test_name" \ --log "${t_server_null_logdir}/${log}" & } +ping_lwip_clients() { + if [ "$has_lwipovpn" =3D "yes" ]; then + lwip_client_count=3D$(echo "$lwip_test_names"|wc -w|tr -d " ") + else + lwip_client_count=3D0 + fi + + if [ $lwip_client_count -eq 0 ]; then + return 0 + fi + + count=3D0 + maxcount=3D10 + while [ $count -le $maxcount ]; do + lwip_client_ips=3D$(cat ./*.ips 2>/dev/null|wc -w|tr -d " ") + if [ $lwip_client_ips -lt $lwip_client_count ]; then + echo "Waiting for LWIP clients to start up ($count/$maxcount)" + count=3D$(( count + 1)) + sleep 1 + else + echo "$lwip_client_ips/$lwip_client_count LWIP clients up" + break + fi + done + + LWIP_CLIENTS=3D$(cat ./*.ips 2>/dev/null) + if [ "$LWIP_CLIENTS" ]; then + if ! fping -c 5 $LWIP_CLIENTS; then + echo "ERROR: pinging one or more openvpnlwip client IP address= es failed!" + retval=3D1 + fi + fi +} + wait_for_results() { tests_running=3D"yes" @@ -77,7 +124,7 @@ server_max_wait=3D15 while [ $count -lt $server_max_wait ]; do servers_up=3D0 - server_count=3D$(echo $TEST_SERVER_LIST|wc -w) + server_count=3D$(echo "$TEST_SERVER_LIST"|wc -w|tr -d " ") # We need to trim single-quotes because some shells return quoted valu= es # and some don't. Using "set -o posix" which would resolve this proble= m is @@ -85,8 +132,8 @@ # # While inactive server configurations may get checked they won't incr= ease # the active server count as the processes won't be running. - for i in `set|grep 'SERVER_NAME_'|cut -d "=3D" -f 2|tr -d "[\']"`; do - server_pid=3D$(cat $i.pid 2> /dev/null) + for i in $(set|grep 'SERVER_NAME_'|cut -d "=3D" -f 2|tr -d "[\']"); do + server_pid=3D$(cat "$i.pid" 2> /dev/null) if [ -z "$server_pid" ] ; then continue fi @@ -111,6 +158,18 @@ fi done +# Check for presence of the lwipovpn executable +if test -r "$LWIPOVPN_PATH"; then + has_lwipovpn=3D"yes" +else + has_lwipovpn=3D"no" + echo "WARNING: lwipovpn executable is missing: lwip tests will be skip= ped" +fi + +# Remove existing LWIP client IP files. This is to avoid pinging non-exist= ent +# IP addresses when tests are disabled. +$RUN_SUDO rm -f ./*.ips + # Wait a while to let server processes to settle down sleep 1 @@ -118,6 +177,7 @@ # is used later to determine when all OpenVPN clients have exited and it is # safe to check the test results. test_names=3D"" +lwip_test_names=3D"" for SUF in $TEST_RUN_LIST do eval test_name=3D\"\$TEST_NAME_$SUF\" @@ -125,9 +185,18 @@ eval client_conf=3D\"\$CLIENT_CONF_$SUF\" test_names=3D"${test_names} ${test_name}" - (launch_client "${test_name}" "${client_exec}" "${client_conf}") + + if echo "$test_name"|grep -q _lwip; then + lwip_test_names=3D"${lwip_test_names} ${test_name}" + fi + + if should_run_test "$test_name"; then + (launch_client "${test_name}" "${client_exec}" "${client_conf}") + fi done +ping_lwip_clients + # Wait until all OpenVPN clients have exited (wait_for_results) @@ -137,7 +206,9 @@ eval test_name=3D\"\$TEST_NAME_$SUF\" eval should_pass=3D\"\$SHOULD_PASS_$SUF\" - get_client_test_result "${test_name}" "${should_pass}" + if should_run_test "$test_name"; then + get_client_test_result "${test_name}" "${should_pass}" + fi done exit $retval diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_default.rc index cbf4877..fc77c53 100755 --- a/tests/t_server_null_default.rc +++ b/tests/t_server_null_default.rc @@ -19,6 +19,7 @@ SERVER_CERT=3D"${sample_keys}/server.crt" SERVER_KEY=3D"${sample_keys}/server.key" TA=3D"${sample_keys}/ta.key" +LWIPOVPN_PATH=3D"${LWIPOVPN_PATH:-lwipovpn}" # Used to detect if graceful kill of any server instance failed during the= test # run @@ -28,7 +29,7 @@ MAX_CLIENTS=3D"10" CLIENT_MATCH=3D"Test-Client" SERVER_EXEC=3D"${top_builddir}/src/openvpn/openvpn" -SERVER_BASE_OPTS=3D"--daemon --local 127.0.0.1 --dev tun --topology subnet= --max-clients $MAX_CLIENTS --persist-tun --verb 3" +SERVER_BASE_OPTS=3D"--daemon --local 127.0.0.1 --dev tun --topology subnet= --max-clients $MAX_CLIENTS --persist-tun --verb 3 --duplicate-cn" SERVER_CIPHER_OPTS=3D"" SERVER_CERT_OPTS=3D"--ca ${CA} --dh ${DH} --cert ${SERVER_CERT} --key ${SE= RVER_KEY} --tls-auth ${TA} 0" SERVER_CONF_BASE=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CER= T_OPTS}" @@ -49,23 +50,37 @@ # Test client configurations CLIENT_EXEC=3D"${top_builddir}/src/openvpn/openvpn" -CLIENT_BASE_OPTS=3D"--client --dev null --ifconfig-noexec --nobind --remot= e-cert-tls server --persist-tun --verb 3 --resolv-retry infinite --connect-= retry-max 3 --server-poll-timeout 5 --explicit-exit-notify 3 --script-secur= ity 2 --up ${srcdir}/null_client_up.sh" +CLIENT_BASE_OPTS=3D"--client --nobind --remote-cert-tls server --persist-t= un --verb 3 --resolv-retry infinite --connect-retry-max 3 --server-poll-tim= eout 5 --explicit-exit-notify 3 --script-security 2" +CLIENT_NULL_OPTS=3D"--dev null --ifconfig-noexec --up ${srcdir}/null_clien= t_up.sh" +CLIENT_LWIP_OPTS=3D"--dev null --dev-node unix:${LWIPOVPN_PATH} --up ${src= dir}/lwip_client_up.sh" + CLIENT_CIPHER_OPTS=3D"" CLIENT_CERT_OPTS=3D"--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} -= -tls-auth ${TA} 1" -TEST_RUN_LIST=3D"1 2 3" -CLIENT_CONF_BASE=3D"${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CER= T_OPTS}" +TEST_RUN_LIST=3D"1 1L 2 2L 3" +CLIENT_CONF_BASE=3D"${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHE= R_OPTS} ${CLIENT_CERT_OPTS}" +CLIENT_CONF_BASE_LWIP=3D"${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_= CIPHER_OPTS} ${CLIENT_CERT_OPTS}" TEST_NAME_1=3D"t_server_null_client.sh-openvpn_current_udp" SHOULD_PASS_1=3D"yes" CLIENT_EXEC_1=3D"${CLIENT_EXEC}" CLIENT_CONF_1=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto u= dp" +TEST_NAME_1L=3D"t_server_null_client.sh-openvpn_current_udp_lwip" +SHOULD_PASS_1L=3D"yes" +CLIENT_EXEC_1L=3D"${CLIENT_EXEC}" +CLIENT_CONF_1L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --p= roto udp" + TEST_NAME_2=3D"t_server_null_client.sh-openvpn_current_tcp" SHOULD_PASS_2=3D"yes" CLIENT_EXEC_2=3D"${CLIENT_EXEC}" CLIENT_CONF_2=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto t= cp" +TEST_NAME_2L=3D"t_server_null_client.sh-openvpn_current_tcp_lwip" +SHOULD_PASS_2L=3D"yes" +CLIENT_EXEC_2L=3D"${CLIENT_EXEC}" +CLIENT_CONF_2L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --p= roto tcp" + TEST_NAME_3=3D"t_server_null_client.sh-openvpn_current_udp_fail" SHOULD_PASS_3=3D"no" CLIENT_EXEC_3=3D"${CLIENT_EXEC}" -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/811?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ie63f302402f469c3aa48ac146ca6b8c029f0d250 Gerrit-Change-Number: 811 Gerrit-PatchSet: 4 Gerrit-Owner: mattock Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-Attention: mattock Gerrit-MessageType: newpatchset --ph0Ad3nuXdw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, mattock, plaisthos.=

mattock uploaded patch set #4 to this change.

View Change<= /a>

Add lwip support to t_server_null

Change-Id: Ie63f302402f469c3aa= 48ac146ca6b8c029f0d250
Signed-off-by: Samuli Sepp=C3=A4nen <samuli.se= ppanen@...277...>
---
M doc/t_server_null.rst
A tests/lwip_clie= nt_up.sh
M tests/t_server_null_client.sh
M tests/t_server_null_defaul= t.rc
4 files changed, 145 insertions(+), 13 deletions(-)

git p= ull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/11/811/4
di=
ff --git a/doc/t_server_null.rst b/doc/t_server_null.rst
in= dex 5fe9080..022793a 100644
--- a/doc/t_server_null.rst
+++ b/doc/t_server_null.rst
@@ -16,7 +16,7 @@<= /span>

* Parallelized for fairly high performan= ce
* Mostly operating-system agnostic
-* Tested on Fedora Linux 38/39/40 and Free= BSD 14
+* Tested on F= edora Linux 38/39/40, FreeBSD 14, NetBSD 10.0 and OpenBSD 7.5
* POSIX-compliant

* Tested and known to work with Bash= , Dash, Ksh, Yash and FreeBSD's default /bin/sh
* Uses= the sample certificates and keys
@@ -31,6 +31,7 @@<= br> * Test cases (client configurations) and server setups (server co= nfigurations) are stored in a configuration file, i.e. data and code have b= een separated
* Configuration file format is nearly identi= cal to t_client.rc configuration
* Supports a set of defau= lt tests, overriding default test settings and adding local tests+* Supports client ping tests = if ovpnlwip is available

Prerequisites
-------------
@@ -60,8 +61,9 @@
<= span> #. Server instances start

#. Brief wait
#. Client instances start

-#. Tests run
+#. ovpnlwip ping tests run
#. Client instances stop
+#. Test results are coll= ected
#. Brief wait
#. Server instances s= top

@@ -77,7 +79,8 @@

* t_server_null_client.sh

<= span style=3D"color: hsl(0, 100%, 40%);">- * Waits until servers have = launched. Then launch all clients, wait for them to exit and then check tes= t results by parsing the client log files. Each client kills itself after s= ome delay using an "--up" script.

+ * Waits until servers have launched. Then lau= nch all clients, run ovpnlwip ping tests (if any), wait for clients to exit= and then check test results by parsing the client log files. Each client k= ills itself after some delay using an "--up" script.
+


Configuration
-------------
@@ -116,6 = +119,19 @@

TEST_RUN_LIST=3D"1 2 5= 9"

+Client ping tests that use ovpnlwip can be added similarly:+
+ TEST_NAME_9L=3D"t_server_null_client.sh-= openvpn_current_udp_custom_lwip"
+ SHOULD_PASS_9L=3D"yes"
+ CLIENT_EXEC_9L=3D"${CLIENT_EXEC}&q= uot;
+ CLIENT_CONF_9= L=3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --proto udp&= quot;
+
+Note that all ovpnlwip test names= need to include a "_lwip" suffix: without if
+ping tests won't get activated. Als= o note that the *tests* directory needs to
+have the lwipovpn executable or ovpnlwip tests will = get skipped. The ovpnlwip
+ping tests get the IP addresses to ping from the \*.ips files created= by the
+lwip_client_= up.sh script --up script.
+
Stress-testing the --dev null test suite
= ----------------------------------------
diff --git a/tests/lwip_client_up.sh b/tests/lwip_client_up.sh
new file mode 100755
index 0000000..a07c4b7
--- /dev/null
+++ b/tests/lwip_client_up.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+= #
+# Add this client&= #39;s IP to a file
+i= f ! grep "$ifconfig_local" ./$test_name.ips; then
+ echo -n "$ifconfig_local &= quot; >> ./$test_name.ips
+fi
+
+# Determine the OpenVPN = PID from its pid file. This works reliably even when
+# the OpenVPN process is backgrounded for= parallel tests.
+MY_= PPID=3D`cat $pid`
+
+# Allow OpenVPN to fi= nish initializing while waiting in the background and then
+# killing the process gracefully. Al= so wait for fping tests to finish.
+(sleep 5
+
+count=3D0

+maxcount=3D15
<= span style=3D"color: hsl(120, 100%, 40%);">+while [ $count -le $maxcount ];= do
+ if pgrep fpi= ng > /dev/null 2>&1; then
+ echo "Waiting for fping to exit ($count/$maxco= unt)"
+ c= ount=3D$(( count + 1))
+ = else
+ echo= "fping not running anymore"
+ break
+ fi
+= done
+
+kill -15 $MY_PPID
+) &
diff --git a= /tests/t_server_null_client.sh b/tests/t_server_null_client.sh
index 2210e63..77e1cc5 100755
--- a/tests/t_server_null= _client.sh
+++ b/tests/t_server_null_client.sh
@@ -1,5 +1,17 @@
#!/bin/sh
+should_run_test() {+ test_name=3D"$1"= ;
+
+ if echo "$test_name"|gr= ep -q _lwip; then
+ = if [ "$has_lwipovpn" =3D "no" ]; then
<= span style=3D"color: hsl(120, 100%, 40%);">+ return 1
= + fi
+ fi
+
+ return 0
+}
+
lau= nch_client() {
test_name=3D$1
log= =3D"${test_name}.log"
@@ -13,10 +25,45 @@<= br> "${client_exec}" \
$client= _conf \
--writepid "${pid}" \
= - --setenv pid $pid \

+ --setenv pid &qu= ot;$pid" \
+ = --setenv test_name "$test_name" \
--= log "${t_server_null_logdir}/${log}" &
}


+ping_= lwip_clients() {
+ = if [ "$has_lwipovpn" =3D "yes" ]; then
+ lwip_client_count=3D$(echo = "$lwip_test_names"|wc -w|tr -d " ")
+ else
+ lwip_client_count=3D0
+ fi
+
+ return 0
+ fi
+
+ count= =3D0
+ maxcount=3D= 10
+ while [ $coun= t -le $maxcount ]; do
+ lwip_client_ips=3D$(cat ./*.ips 2>/dev/null|wc -w|tr -d "= ")
+ if = [ $lwip_client_ips -lt $lwip_client_count ]; then
+ echo "Waiting for LWIP clien= ts to start up ($count/$maxcount)"
+ count=3D$(( count + 1))
+ sleep 1
+ else
+ echo "$lwip_client_ips/$lwip_= client_count LWIP clients up"
+ break
+ fi
+ done
+=
+ LWIP_CLIENTS=3D$(cat .= /*.ips 2>/dev/null)
+ if ! fping -c 5 $LWIP_CLIENTS; then

+ echo "ER= ROR: pinging one or more openvpnlwip client IP addresses failed!"
+ retval=3D1
+ fi
= + fi
+}
+
wait_for_results() {
= tests_running=3D"yes"

@@ -77,7= +124,7 @@
server_max_wait=3D15
while [ $= count -lt $server_max_wait ]; do
servers_up=3D0=
- server_count=3D$(echo $T= EST_SERVER_LIST|wc -w)
- for i in `set|grep 'SERVER_NAME_'|cut -d "=3D" -= f 2|tr -d "[\']"`; do
- server_pid=3D$(cat $i.pid 2> /dev/null)
= + for i in $(set|grep 'S= ERVER_NAME_'|cut -d "=3D" -f 2|tr -d "[\']"); d= o
+ server_pid= =3D$(cat "$i.pid" 2> /dev/null)
if [ = -z "$server_pid" ] ; then
continue
fi
@@ -111,6 +158,18 @@
<= span> fi

done

+# Check for presence of the lwipovpn exec= utable
+if test -r &q= uot;$LWIPOVPN_PATH"; then
+ has_lwipovpn=3D"yes"
+else
+ has_lwipovpn=3D"no"
+ echo "WARNING: lwipovpn executable is mis= sing: lwip tests will be skipped"
+fi
+
+# Remove existing= LWIP client IP files. This is to avoid pinging non-existent
+# IP addresses when tests are disa= bled.

+$RUN_SUDO rm -= f ./*.ips
+ # Wait a while to let server processes to settle down
sleep 1


@@ -118,6 +177,7 @@ # is used later to determine when all OpenVPN clients have exited a= nd it is
# safe to check the test results.
test_names=3D""
+lwip_test_names=3D""
for SUF in $TEST_RU= N_LIST
do
eval test_name=3D\"\$T= EST_NAME_$SUF\"
@@ -125,9 +185,18 @@
= eval client_conf=3D\"\$CLIENT_CONF_$SUF\"

test_names=3D"${test_names} ${test_name}"
- (launch_client "= ${test_name}" "${client_exec}" "${client_conf}")
+
+ if echo "$test_name"|grep = -q _lwip; then
+ = lwip_test_names=3D"${lwip_test_names} ${test_name}"
= + fi
+
+ if should_run_test "$test_name"; then+ (launch_client "= ;${test_name}" "${client_exec}" "${client_conf}")<= /span>
+ fi
done


+ping_lwip_clients
+
# Wait until all OpenVPN clients have exited<= br> (wait_for_results)

@@ -137,7 +2= 06,9 @@
eval test_name=3D\"\$TEST_NAME_$SUF\"= ;
eval should_pass=3D\"\$SHOULD_PASS_$SUF\"<= /span>

- = get_client_test_result "${test_name}" "${should_pass}"<= /span>
+ if should_run_te= st "$test_name"; then
+ get_client_test_result "${test_name}" "$= {should_pass}"
+= fi
done

exit $retva= l
diff --git a/tests/t_server_null_default.rc b/tests/t_ser= ver_null_default.rc
index cbf4877..fc77c53 100755--- a/tests/t_server_null_default.rc
+++ b/tests/t_s= erver_null_default.rc
@@ -19,6 +19,7 @@
SE= RVER_CERT=3D"${sample_keys}/server.crt"
SERVER_K= EY=3D"${sample_keys}/server.key"
TA=3D"${sa= mple_keys}/ta.key"
+LWIPOVPN_PATH=3D"${LWIPOVPN_PATH:-lwipovpn}"
=
# Used to detect if graceful kill of any server instance= failed during the test
# run
@@ -28,7 +29= ,7 @@
MAX_CLIENTS=3D"10"
CLIENT= _MATCH=3D"Test-Client"
SERVER_EXEC=3D"${top= _builddir}/src/openvpn/openvpn"
-SERVER_BASE_OPTS=3D"--daemon --local 127.0.0.1 --dev tu= n --topology subnet --max-clients $MAX_CLIENTS --persist-tun --verb 3"=
+SERVER_BASE_OPTS=3D= "--daemon --local 127.0.0.1 --dev tun --topology subnet --max-clients = $MAX_CLIENTS --persist-tun --verb 3 --duplicate-cn"
S= ERVER_CIPHER_OPTS=3D""
SERVER_CERT_OPTS=3D"= --ca ${CA} --dh ${DH} --cert ${SERVER_CERT} --key ${SERVER_KEY} --tls-auth = ${TA} 0"
SERVER_CONF_BASE=3D"${SERVER_BASE_OPTS}= ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS}"
@@ -49,23 = +50,37 @@

# Test client configurations
CLIENT_EXEC=3D"${top_builddir}/src/openvpn/openvpn&quo= t;
-CLIENT_BASE_OPTS=3D= "--client --dev null --ifconfig-noexec --nobind --remote-cert-tls serv= er --persist-tun --verb 3 --resolv-retry infinite --connect-retry-max 3 --s= erver-poll-timeout 5 --explicit-exit-notify 3 --script-security 2 --up ${sr= cdir}/null_client_up.sh"
+CLIENT_BASE_OPTS=3D"--client --nobind --remote-cert-tls serv= er --persist-tun --verb 3 --resolv-retry infinite --connect-retry-max 3 --s= erver-poll-timeout 5 --explicit-exit-notify 3 --script-security 2"
+CLIENT_NULL_OPTS=3D&quo= t;--dev null --ifconfig-noexec --up ${srcdir}/null_client_up.sh"

+CLIENT_LWIP_OPTS=3D"= --dev null --dev-node unix:${LWIPOVPN_PATH} --up ${srcdir}/lwip_client_up.s= h"
+
<= span> CLIENT_CIPHER_OPTS=3D""
CLIENT_CERT_OPTS= =3D"--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${= TA} 1"

-TEST_RUN_LIST=3D"1 2 3"
-CLIENT_CONF_BASE=3D"${CLIENT_BASE_OPTS} ${CLIENT_C= IPHER_OPTS} ${CLIENT_CERT_OPTS}"
+TEST_RUN_LIST=3D"1 1L 2 2L 3"
+CLIENT_CONF_BASE=3D"${CLIENT_NUL= L_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"=
+CLIENT_CONF_BASE_LW= IP=3D"${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${= CLIENT_CERT_OPTS}"

TEST_NAME_1=3D&q= uot;t_server_null_client.sh-openvpn_current_udp"
SHOU= LD_PASS_1=3D"yes"
CLIENT_EXEC_1=3D"${CLIENT= _EXEC}"
CLIENT_CONF_1=3D"${CLIENT_CONF_BASE} --r= emote 127.0.0.1 1194 udp --proto udp"

+TEST_NAME_1L=3D"t_server_null= _client.sh-openvpn_current_udp_lwip"
+SHOULD_PASS_1L=3D"yes"
+CLIENT_EXEC_1L=3D"${CLIENT_EXEC}&qu= ot;
+CLIENT_CONF_1L= =3D"${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --proto udp&q= uot;
+
TEST_NAME_2=3D"t_server_null_client.sh-openvpn_current_tcp"
SHOULD_PASS_2=3D"yes"
CLIENT_EXEC= _2=3D"${CLIENT_EXEC}"
CLIENT_CONF_2=3D"${CL= IENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"

+TEST_NAME_2L=3D= "t_server_null_client.sh-openvpn_current_tcp_lwip"
+SHOULD_PASS_2L=3D"yes"
+CLIENT_EXEC_2L=3D&quo= t;${CLIENT_EXEC}"
+
TEST_NAME_3=3D"t_server_null_client.sh-openvpn_cur= rent_udp_fail"
SHOULD_PASS_3=3D"no"<= br> CLIENT_EXEC_3=3D"${CLIENT_EXEC}"

To view, visit change 811. To unsubscribe, or for help writing mai= l filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie63f302402f469c3aa48ac146ca= 6b8c029f0d250
Gerrit-Change-Number: 811
Gerrit-PatchSet: 4
Gerrit-Owner: mattock <samuli@...515...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: mattock <samuli@...515...= >
Gerrit-MessageType: newpatchset
--ph0Ad3nuXdw=--