From: "mattock (Code Review)" Date: Thu, 27 Mar 2025 13:43:45 +0000 In-Reply-To: References: Reply-To: sasepp@...2783..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="hnseTag8yiI="; 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 --hnseTag8yiI= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, 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 (#2). 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/2 diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_default.rc index e7bf5bc..d1abad2 100755 --- a/tests/t_server_null_default.rc +++ b/tests/t_server_null_default.rc @@ -37,12 +37,14 @@ 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 --duplicate-cn" +SERVER_BASE_OPTS=3D"--daemon --dev tun --topology subnet --max-clients $MA= X_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} --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}" +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" +TEST_SERVER_LIST=3D"1 2 4" SERVER_NAME_1=3D"t_server_null_server-1194_udp" SERVER_SERVER_1=3D"--server 10.29.41.0 255.255.255.0" @@ -56,6 +58,12 @@ SERVER_EXEC_2=3D"${SERVER_EXEC}" SERVER_CONF_2=3D"${SERVER_CONF_BASE} ${SERVER_SERVER_2} --lport 1195 --pro= to tcp --management 127.0.0.1 ${SERVER_MGMT_PORT_2}" +SERVER_NAME_4=3D"t_server_null_server-1197_multisocket_ipv4_ipv6" +SERVER_SERVER_4=3D"--server 10.29.43.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" @@ -65,7 +73,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" +TEST_RUN_LIST=3D"1 1L 2 2L 3 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}" @@ -93,3 +101,18 @@ SHOULD_PASS_3=3D"no" CLIENT_EXEC_3=3D"${CLIENT_EXEC}" CLIENT_CONF_3=3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto = udp" + +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: 2 Gerrit-Owner: mattock Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --hnseTag8yiI= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

mattock uploaded patch set #2 to this change.

View Change<= /a>

t_server_null: add multi-socket testing

This adds a new multi-so= cket server that listens on IPv4 and IPv6
localhost addresses for TCP an= d UDP connections respectively. It also
adds two success tests and one f= ailure test with wrong protocol defined
at the client side.

Chang= e-Id: I4ebe1158c36a641888131e824f59004a0f8fb4c5
Signed-off-by: Samuli Se= pp=C3=A4nen <samuli.seppanen@...277...>
---
M tests/t_server_nu= ll_default.rc
1 file changed, 27 insertions(+), 4 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/19/919/2
diff --git a/tests/t_server_null_default.rc b/tests/t_server_null_defau=
lt.rc
index e7bf5bc..d1abad2 100755
--- a/t= ests/t_server_null_default.rc
+++ b/tests/t_server_null_def= ault.rc
@@ -37,12 +37,14 @@
MAX_CLIENTS=3D= "10"
CLIENT_MATCH=3D"Test-Client"
SERVER_EXEC=3D"${top_builddir}/src/openvpn/openvpn"<= /span>
-SERVER_BASE_OPTS=3D&qu= ot;--daemon --local 127.0.0.1 --dev tun --topology subnet --max-clients $MA= X_CLIENTS --persist-tun --verb 3 --duplicate-cn"
+SERVER_BASE_OPTS=3D"--daemon --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} = --dh ${DH} --cert ${SERVER_CERT} --key ${SERVER_KEY} --tls-auth ${TA} 0&quo= t;
-SERVER_CONF_BASE=3D= "${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS}"
+SERVER_CONF_BASE=3D&q= uot;${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS} ${SERVER_CERT_OPTS} ${SERVER_= BIND_OPTS}"
+SER= VER_CONF_BASE_MULTISOCKET=3D"${SERVER_BASE_OPTS} ${SERVER_CIPHER_OPTS}= ${SERVER_CERT_OPTS}"

-TEST_SERVER_LIST=3D"1 2"
+TEST_SERVER_LIST=3D"1 2 4"<= /span>

SERVER_NAME_1=3D"t_server_null_serv= er-1194_udp"
SERVER_SERVER_1=3D"--server 10.29.4= 1.0 255.255.255.0"
@@ -56,6 +58,12 @@
= SERVER_EXEC_2=3D"${SERVER_EXEC}"
SERVER_CONF_2= =3D"${SERVER_CONF_BASE} ${SERVER_SERVER_2} --lport 1195 --proto tcp --= management 127.0.0.1 ${SERVER_MGMT_PORT_2}"
+SERVER_NAME_4=3D"t_serv= er_null_server-1197_multisocket_ipv4_ipv6"
+SERVER_SERVER_4=3D"--server 10.29.43.0 255= .255.255.0"
+SER= VER_MGMT_PORT_4=3D"11197"
+SERVER_EXEC_4=3D"${SERVER_EXEC}"
+SERVER_CONF_4=3D"${SERVER_CONF_= BASE_MULTISOCKET} ${SERVER_SERVER_4} --local 127.0.0.1 1197 tcp --local ::1= 1197 udp --management 127.0.0.1 ${SERVER_MGMT_PORT_4}"
+

# Test client co= nfigurations
CLIENT_EXEC=3D"${top_builddir}/src/openv= pn/openvpn"
CLIENT_BASE_OPTS=3D"--client --nobin= d --remote-cert-tls server --persist-tun --verb 3 --resolv-retry infinite -= -connect-retry-max 3 --server-poll-timeout 5 --explicit-exit-notify 3 --scr= ipt-security 2"
@@ -65,7 +73,7 @@
CLI= ENT_CIPHER_OPTS=3D""
CLIENT_CERT_OPTS=3D"--= ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${TA} 1"=

-TES= T_RUN_LIST=3D"1 1L 2 2L 3"
+TEST_RUN_LIST=3D"1 1L 2 2L 3 5a 5b 5c" CLIENT_CONF_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_O= PTS} ${CLIENT_CERT_OPTS}"

@@ -93,3 += 101,18 @@
SHOULD_PASS_3=3D"no"
= CLIENT_EXEC_3=3D"${CLIENT_EXEC}"
CLIENT_CONF_3= =3D"${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"=
+
+TEST_NAME_5a=3D"t_server_null_cli= ent.sh-openvpn_current_multisocket_ipv4_tcp"
+SHOULD_PASS_5a=3D"yes"
+CLIENT_EXEC_5a=3D"${CLIENT_= EXEC}"

+CLIENT_C= ONF_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_udp"
+SHOULD_PASS_5b=3D"yes"
+CLIENT_EXEC_5b=3D"${CLIENT_EXEC}&q= uot;
+CLIENT_CONF_5b= =3D"${CLIENT_CONF_BASE} --remote ::1 1197 udp"
+
+TEST_NAME_5c=3D"t_server_null_client.sh-openvpn_curr= ent_multisocket_ipv6_tcp_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 change 919. To unsubscribe, or for help writing mail fil= ters, visit settings.

<= meta itemprop=3D"name" content=3D"View Change"/>
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4ebe1158c36a641888131e824f5= 9004a0f8fb4c5
Gerrit-Change-Number: 919
Gerrit-PatchSet: 2
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-MessageType: newpatchset
--hnseTag8yiI=--