From: "cron2 (Code Review)" Date: Tue, 8 Jul 2025 07:54:56 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., sasepp@...2783... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="bPeLWhNXtHg="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: t_server_null: add multi-socket testing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mattock Cc: flichtenheld , plaisthos , openvpn-devel --bPeLWhNXtHg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/91= 9?usp=3Demail ) Change subject: t_server_null: add multi-socket testing ...................................................................... t_server_null: add multi-socket testing This adds a new multi-socket server that listens on IPv4 and IPv6 localhost addresses for TCP and UDP connections respectively. It also adds two success tests and one failure test with wrong protocol defined at the client side. Change-Id: I4ebe1158c36a641888131e824f59004a0f8fb4c5 Signed-off-by: Samuli Sepp=C3=A4nen Acked-by: Gert Doering Message-Id: <20250708073359.32549-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 061.html Signed-off-by: Gert Doering --- M tests/t_server_null_default.rc 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_default.rc index 41ec591..a1c68cd 100755 --- a/tests/t_server_null_default.rc +++ b/tests/t_server_null_default.rc @@ -38,12 +38,14 @@ MAX_CLIENTS=3D"10" CLIENT_MATCH=3D"Test-Client" SERVER_EXEC=3D"${top_builddir}/src/openvpn/openvpn" -SERVER_BASE_OPTS=3D"--local 127.0.0.1 --dev tun --topology subnet --max-cl= ients $MAX_CLIENTS --persist-tun --verb 3 --duplicate-cn" +SERVER_BASE_OPTS=3D"--dev tun --topology subnet --max-clients $MAX_CLIENTS= --persist-tun --verb 3 --duplicate-cn" +SERVER_BIND_OPTS=3D"--local 127.0.0.1" SERVER_CIPHER_OPTS=3D"" SERVER_CERT_OPTS=3D"--ca ${CA} --cert ${SERVER_CERT} --key ${SERVER_KEY} -= -tls-auth ${TA} 0" -SERVER_CONF_BASE=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CER= T_OPTS}" +SERVER_CONF_BASE=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CER= T_OPTS} ${SERVER_BIND_OPTS}" +SERVER_CONF_BASE_MULTISOCKET=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} = ${SERVER_CERT_OPTS}" -TEST_SERVER_LIST=3D"1 2 3" +TEST_SERVER_LIST=3D"1 2 3 4" SERVER_NAME_1=3D"t_server_null_server-1194_udp" SERVER_SERVER_1=3D"--server 10.29.41.0 255.255.255.0" @@ -63,6 +65,12 @@ SERVER_EXEC_3=3D"${SERVER_EXEC}" SERVER_CONF_3=3D"${SERVER_CONF_BASE} ${SERVER_SERVER_3} --lport 1196 --pro= to udp --management 127.0.0.1 ${SERVER_MGMT_PORT_3} --dh none --cipher AES-= 192-CBC --data-ciphers DEFAULT:AES-192-CBC" +SERVER_NAME_4=3D"t_server_null_server-1197_multisocket_ipv4_ipv6" +SERVER_SERVER_4=3D"--server 10.29.44.0 255.255.255.0" +SERVER_MGMT_PORT_4=3D"11197" +SERVER_EXEC_4=3D"${SERVER_EXEC}" +SERVER_CONF_4=3D"${SERVER_CONF_BASE_MULTISOCKET} ${SERVER_SERVER_4} --loca= l 127.0.0.1 1197 tcp --local ::1 1197 udp --management 127.0.0.1 ${SERVER_M= GMT_PORT_4}" + # Test client configurations CLIENT_EXEC=3D"${top_builddir}/src/openvpn/openvpn" 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" @@ -72,7 +80,7 @@ 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 1L 2 2L 3 4a 4b 4c" +TEST_RUN_LIST=3D"1 1L 2 2L 3 4a 4b 4c 5a 5b 5c" 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}" @@ -121,3 +129,18 @@ SHOULD_PASS_4c=3D"no" CLIENT_EXEC_4c=3D"${CLIENT_EXEC}" CLIENT_CONF_4c=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto = udp --cipher AES-192-CBC --data-ciphers AES-128-CBC" + +TEST_NAME_5a=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv4_t= cp" +SHOULD_PASS_5a=3D"yes" +CLIENT_EXEC_5a=3D"${CLIENT_EXEC}" +CLIENT_CONF_5a=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp" + +TEST_NAME_5b=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_u= dp" +SHOULD_PASS_5b=3D"yes" +CLIENT_EXEC_5b=3D"${CLIENT_EXEC}" +CLIENT_CONF_5b=3D"${CLIENT_CONF_BASE} --remote ::1 1197 udp" + +TEST_NAME_5c=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_t= cp_fail" +SHOULD_PASS_5c=3D"no" +CLIENT_EXEC_5c=3D"${CLIENT_EXEC}" +CLIENT_CONF_5c=3D"${CLIENT_CONF_BASE} --remote ::1 1197 tcp" -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/919?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: I4ebe1158c36a641888131e824f59004a0f8fb4c5 Gerrit-Change-Number: 919 Gerrit-PatchSet: 7 Gerrit-Owner: mattock Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --bPeLWhNXtHg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

t_server_null: add multi-socket testing
This adds a new multi-socket server that listens on IPv4 and IPv6
local= host addresses for TCP and UDP connections respectively. It also
adds tw= o success tests and one failure test with wrong protocol defined
at the = client side.

Change-Id: I4ebe1158c36a641888131e824f59004a0f8fb4c5Signed-off-by: Samuli Sepp=C3=A4nen <sasepp@...2705...>
Acked-by:= Gert Doering <gert@...1296...>
Message-Id: <20250708073359.325= 49-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel= @lists.sourceforge.net/msg32061.html
Signed-off-by: Gert Doering <ger= t@...1296...>
---
M tests/t_server_null_default.rc
1 file chang= ed, 27 insertions(+), 4 deletions(-)

diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_defaul=
t.rc
index 41ec591..a1c68cd 100755
--- a/te= sts/t_server_null_default.rc
+++ b/tests/t_server_null_defa= ult.rc
@@ -38,12 +38,14 @@
MAX_CLIENTS=3D&= quot;10"
CLIENT_MATCH=3D"Test-Client"
SERVER_EXEC=3D"${top_builddir}/src/openvpn/openvpn"
-SERVER_BASE_OPTS=3D&quo= t;--local 127.0.0.1 --dev tun --topology subnet --max-clients $MAX_CLIENTS = --persist-tun --verb 3 --duplicate-cn"
+SERVER_BASE_OPTS=3D"--dev tun --topology subne= t --max-clients $MAX_CLIENTS --persist-tun --verb 3 --duplicate-cn"
+SERVER_BIND_OPTS=3D&qu= ot;--local 127.0.0.1"
SERVER_CIPHER_OPTS=3D"&quo= t;
SERVER_CERT_OPTS=3D"--ca ${CA} --cert ${SERVER_CER= T} --key ${SERVER_KEY} --tls-auth ${TA} 0"
-SERVER_CONF_BASE=3D"${SERVER_BASE_OPTS} ${SE= RVER_CIPHER_OPTS} ${SERVER_CERT_OPTS}"
+SERVER_CONF_BASE=3D"${SERVER_BASE_OPTS} ${SERV= ER_CIPHER_OPTS} ${SERVER_CERT_OPTS} ${SERVER_BIND_OPTS}"
+SERVER_CONF_BASE_MULTISOCKET=3D&q= uot;${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS}"

-TEST_SE= RVER_LIST=3D"1 2 3"
+TEST_SERVER_LIST=3D"1 2 3 4"
SERVER_NAME_1=3D"t_server_null_server-1194_udp" SERVER_SERVER_1=3D"--server 10.29.41.0 255.255.255.0"
@@ -63,6 +65,12 @@
SERVER_EXEC_3=3D"${S= ERVER_EXEC}"
SERVER_CONF_3=3D"${SERVER_CONF_BASE= } ${SERVER_SERVER_3} --lport 1196 --proto udp --management 127.0.0.1 ${SERV= ER_MGMT_PORT_3} --dh none --cipher AES-192-CBC --data-ciphers DEFAULT:AES-1= 92-CBC"

+SERVER_NAME_4=3D"t_server_null_server-1197_multisocket_ipv4= _ipv6"
+SERVER_S= ERVER_4=3D"--server 10.29.44.0 255.255.255.0"
+SERVER_MGMT_PORT_4=3D"11197"<= /span>
+SERVER_EXEC_4=3D&quo= t;${SERVER_EXEC}"
+
# Test client configurations
CLIENT= _EXEC=3D"${top_builddir}/src/openvpn/openvpn"
CL= IENT_BASE_OPTS=3D"--client --nobind --remote-cert-tls server --persist= -tun --verb 3 --resolv-retry infinite --connect-retry-max 3 --server-poll-t= imeout 5 --explicit-exit-notify 3 --script-security 2"
@@ -72,7 +80,7 @@

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 1L 2 2L 3 4a 4b= 4c"
+TEST_RUN_L= IST=3D"1 1L 2 2L 3 4a 4b 4c 5a 5b 5c"
CLIENT_CON= F_BASE=3D"${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS= } ${CLIENT_CERT_OPTS}"
CLIENT_CONF_BASE_LWIP=3D"= ${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT= _OPTS}"

@@ -121,3 +129,18 @@<= br> SHOULD_PASS_4c=3D"no"
CLIENT_EXEC_4c= =3D"${CLIENT_EXEC}"
CLIENT_CONF_4c=3D"${CLI= ENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC= --data-ciphers AES-128-CBC"
+
+TEST_= NAME_5a=3D"t_server_null_client.sh-openvpn_current_multisocket_ipv4_tc= p"
+SHOULD_PASS_= 5a=3D"yes"
= +CLIENT_EXEC_5a=3D"${CLIENT_EXEC}"
+CLIENT_CONF_5a=3D"${CLIENT_CONF_BASE} --remot= e 127.0.0.1 1197 tcp"
+
+TEST_NAME_5b= =3D"t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"=
+SHOULD_PASS_5b=3D&q= uot;yes"
+CLIENT= _EXEC_5b=3D"${CLIENT_EXEC}"
+CLIENT_CONF_5b=3D"${CLIENT_CONF_BASE} --remote ::1 1= 197 udp"
+
+TEST_NAME_5c=3D"t_se= rver_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"<= br>+SHOULD_PASS_5c=3D"no&q= uot;
+CLIENT_EXEC_5c= =3D"${CLIENT_EXEC}"
+CLIENT_CONF_5c=3D"${CLIENT_CONF_BASE} --remote ::1 1197 tcp&= quot;

To view, visit change 919. To unsubscr= ibe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4ebe1158c36a641888131e824f5= 9004a0f8fb4c5
Gerrit-Change-Number: 919
Gerrit-PatchSet: 7
Gerrit-Owner: mattock <sasepp@...2783...>= ;
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--bPeLWhNXtHg=--