From: "mattock (Code Review)" Date: Mon, 23 Jun 2025 09:35:18 +0000 In-Reply-To: References: Reply-To: sasepp@...2783..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <76b99dbb2be7f3bfd86662ba4d45e620701abe54-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="lx8zUhNlPdU="; 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: plaisthos , flichtenheld Cc: openvpn-devel --lx8zUhNlPdU= 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/+/919?usp=3Demail to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld 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 --- M tests/t_server_null_default.rc 1 file changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/19/919/6 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: 6 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 --lx8zUhNlPdU= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

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

mattock uploaded patch set #6 to this change.

View Change<= /a>

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

t_server_null: add multi-socket testing
This adds a new multi-socket server that listens on IPv4 and IPv6
loca= lhost addresses for TCP and UDP connections respectively. It also
adds t= wo 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...>
---
M= tests/t_server_null_default.rc
1 file changed, 27 insertions(+), 4 dele= tions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/cha=
nges/19/919/6
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/open= vpn/openvpn"
-SERV= ER_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 t= un --topology subnet --max-clients $MAX_CLIENTS --persist-tun --verb 3 --du= plicate-cn"
+SER= VER_BIND_OPTS=3D"--local 127.0.0.1"
SERVER_CIPHE= R_OPTS=3D""
SERVER_CERT_OPTS=3D"--ca ${CA} = --cert ${SERVER_CERT} --key ${SERVER_KEY} --tls-auth ${TA} 0"-SERVER_CONF_BASE=3D"${SER= VER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS}"
+SERVER_CONF_BASE=3D"${SERVE= R_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS} ${SERVER_BIND_OPTS}&= quot;
+SERVER_CONF_BA= SE_MULTISOCKET=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_C= ERT_OPTS}"

-TEST_SERVER_LIST=3D"1 2 3"
+TEST_SERVER_LIST=3D"1 2 3 4"<= br>
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 --proto udp --manageme= nt 127.0.0.1 ${SERVER_MGMT_PORT_3} --dh none --cipher AES-192-CBC --data-ci= phers DEFAULT:AES-192-CBC"

+SERVER_NAME_4=3D"t_server_null_server-11= 97_multisocket_ipv4_ipv6"
+SERVER_SERVER_4=3D"--server 10.29.44.0 255.255.255.0"<= /span>
+SERVER_MGMT_PORT_4= =3D"11197"
= +SERVER_EXEC_4=3D"${SERVER_EXEC}"
+SERVER_CONF_4=3D"${SERVER_CONF_BASE_MULTISOCKE= T} ${SERVER_SERVER_4} --local 127.0.0.1 1197 tcp --local ::1 1197 udp --man= agement 127.0.0.1 ${SERVER_MGMT_PORT_4}"
+
# Test client configurations

CLIENT_EXEC=3D"${top_builddir}/src/openvpn/openvpn"= ;
CLIENT_BASE_OPTS=3D"--client --nobind --remote-cert= -tls server --persist-tun --verb 3 --resolv-retry infinite --connect-retry-= max 3 --server-poll-timeout 5 --explicit-exit-notify 3 --script-security 2&= quot;
@@ -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&q= uot;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_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
CLIENT_CO= NF_BASE_LWIP=3D"${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHE= R_OPTS} ${CLIENT_CERT_OPTS}"

@@ -121= ,3 +129,18 @@
SHOULD_PASS_4c=3D"no"
CLIENT_EXEC_4c=3D"${CLIENT_EXEC}"
CLIENT_CO= NF_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_tcp"
+SHOULD_PASS_5a=3D"yes"
+CLIENT_EXEC_5a=3D"${CLIENT_EXEC}"
= +CLIENT_CONF_5a=3D"${CLIEN= T_CONF_BASE} --remote 127.0.0.1 1197 tcp"
+
+TEST_NAME_5b=3D"t_server_null_client.sh-openvpn_current_multis= ocket_ipv6_udp"
= +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_tc= p_fail"
+SHOULD_= PASS_5c=3D"no"
+CLIENT_EXEC_5c=3D"${CLIENT_EXEC}"
+CLIENT_CONF_5c=3D"${CLIENT_CONF_BASE} --r= emote ::1 1197 tcp"

To view, visit= change 9= 19. To unsubscribe, 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: 6
Gerrit-Owner: mattock <sasepp@...2783...>= ;
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 <sasepp@...2867...= .>
Gerrit-MessageType: newpatchset
--lx8zUhNlPdU=--