From: "flichtenheld (Code Review)" Date: Fri, 29 Aug 2025 14:59:47 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="iUqn1q7v0Vg="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Add new unit test module test_socket List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --iUqn1q7v0Vg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1160?usp=3Demail to look at the new patch set (#4). Change subject: Add new unit test module test_socket ...................................................................... Add new unit test module test_socket With a first UT that tests add_in6_addr() (and print_in6_addr implicitly). Change-Id: If546f64a4554b292623bfcfe9ee53bac17dfa803 Signed-off-by: Frank Lichtenheld --- M CMakeLists.txt M tests/unit_tests/openvpn/Makefile.am M tests/unit_tests/openvpn/mock_management.c A tests/unit_tests/openvpn/test_socket.c 4 files changed, 177 insertions(+), 12 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/60/1160/4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 45044af..35513e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -628,9 +628,11 @@ target_compile_options(openvpn PRIVATE -DPLUGIN_LIBDIR=3D\"${PLUGIN_DI= R}\") find_library(resolv resolv) - # some platform like BSDs already include resolver functionality in th= e libc and not have an extra resolv library + # some platform like BSDs already include resolver functionality in th= e libc + # and do not have an extra resolv library if (${resolv} OR APPLE) - target_link_libraries(openvpn PUBLIC -lresolv) + set(RESOLV_LIBRARIES resolv) + target_link_libraries(openvpn PUBLIC ${RESOLV_LIBRARIES}) endif () endif () @@ -653,6 +655,7 @@ "test_packet_id" "test_pkt" "test_provider" + "test_socket" "test_ssl" "test_user_pass" "test_push_update_msg" @@ -849,6 +852,16 @@ src/openvpn/base64.c ) + target_link_libraries(test_socket PUBLIC ${RESOLV_LIBRARIES}) + target_sources(test_socket PRIVATE + tests/unit_tests/openvpn/mock_get_random.c + tests/unit_tests/openvpn/mock_management.c + tests/unit_tests/openvpn/mock_win32_execve.c + src/openvpn/env_set.c + src/openvpn/run_command.c + src/openvpn/socket_util.c + ) + target_sources(test_user_pass PRIVATE tests/unit_tests/openvpn/mock_get_random.c tests/unit_tests/openvpn/mock_win32_execve.c diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvp= n/Makefile.am index b24e03c..d030185 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -4,23 +4,17 @@ AM_TESTSUITE_SUMMARY_HEADER =3D ' for $(PACKAGE_STRING) Unit-Tests' -test_binaries=3D +test_binaries =3D crypto_testdriver packet_id_testdriver auth_token_testdr= iver \ + ncp_testdriver misc_testdriver pkt_testdriver ssl_testdriver \ + user_pass_testdriver push_update_msg_testdriver provider_testdriver socke= t_testdriver if HAVE_LD_WRAP_SUPPORT test_binaries +=3D argv_testdriver buffer_testdriver -endif - -test_binaries +=3D crypto_testdriver packet_id_testdriver auth_token_testd= river ncp_testdriver misc_testdriver \ - pkt_testdriver ssl_testdriver user_pass_testdriver push_update_msg_testdr= iver - -if HAVE_LD_WRAP_SUPPORT if !WIN32 test_binaries +=3D tls_crypt_testdriver endif endif -test_binaries +=3D provider_testdriver - if WIN32 test_binaries +=3D cryptoapi_testdriver LDADD =3D -lws2_32 @@ -343,4 +337,22 @@ $(top_srcdir)/src/openvpn/platform.c \ $(top_srcdir)/src/openvpn/push_util.c \ $(top_srcdir)/src/openvpn/options_util.c \ - $(top_srcdir)/src/openvpn/otime.c \ No newline at end of file + $(top_srcdir)/src/openvpn/otime.c + +socket_testdriver_CFLAGS =3D \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/op= envpn \ + -DSOURCEDIR=3D\"$(top_srcdir)\" @TEST_CFLAGS@ + +socket_testdriver_LDFLAGS =3D @TEST_LDFLAGS@ $(SOCKETS_LIBS) + +socket_testdriver_SOURCES =3D test_socket.c \ + mock_msg.c test_common.h \ + mock_get_random.c \ + mock_management.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/env_set.c \ + $(top_srcdir)/src/openvpn/run_command.c \ + $(top_srcdir)/src/openvpn/socket_util.c + diff --git a/tests/unit_tests/openvpn/mock_management.c b/tests/unit_tests/= openvpn/mock_management.c index b24e4c4..28e541c 100644 --- a/tests/unit_tests/openvpn/mock_management.c +++ b/tests/unit_tests/openvpn/mock_management.c @@ -46,4 +46,18 @@ { return NULL; } + +void +management_set_state(struct management *man, const int state, const char *= detail, + const in_addr_t *tun_local_ip, const struct in6_addr = *tun_local_ip6, + const struct openvpn_sockaddr *local_addr, + const struct openvpn_sockaddr *remote_addr) +{ +} + #endif + +void +management_sleep(const int n) +{ +} diff --git a/tests/unit_tests/openvpn/test_socket.c b/tests/unit_tests/open= vpn/test_socket.c new file mode 100644 index 0000000..2da2529 --- /dev/null +++ b/tests/unit_tests/openvpn/test_socket.c @@ -0,0 +1,126 @@ +/* + * OpenVPN -- An application to securely tunnel IP networks + * over a single UDP port, with support for SSL/TLS-based + * session authentication and key exchange, + * packet encryption, packet authentication, and + * packet compression. + * + * Copyright (C) 2021-2025 Arne Schwabe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "syshead.h" + +#include +#include +#include +#include +#include +#include + +#include "socket.h" +#include "win32.h" + +/* stubs for some unused functions instead of pulling in too many dependen= cies */ +struct signal_info siginfo_static; /* GLOBAL */ + +int +signal_reset(struct signal_info *si, int signum) +{ + assert_true(0); + return 0; +} + +#ifdef _WIN32 +struct win32_signal win32_signal; /* GLOBAL */ + +int +win32_signal_get(struct win32_signal *ws) +{ + assert_true(0); + return 0; +} +#endif + +int +parse_line(const char *line, char **p, const int n, const char *file, cons= t int line_num, + int msglevel, struct gc_arena *gc) +{ + assert_true(0); + return 0; +} + +static void +test_add_in6_addr_tc(const char *orig_str, uint32_t add, const char *expec= t_str) +{ + struct in6_addr orig, result, expected; + struct gc_arena gc =3D gc_new(); + assert_int_equal(inet_pton(AF_INET6, orig_str, &orig), 1); + assert_int_equal(inet_pton(AF_INET6, expect_str, &expected), 1); + result =3D add_in6_addr(orig, add); + const char *result_str =3D print_in6_addr(result, 0, &gc); + assert_string_equal(result_str, expect_str); + assert_memory_equal(&result, &expected, sizeof(struct in6_addr)); + gc_free(&gc); +} + +static bool +check_mapped_ipv4_address(void) +{ + struct gc_arena gc =3D gc_new(); + const char *ipv4_output =3D "::255.255.255.255"; + struct in6_addr addr; + assert_int_equal(inet_pton(AF_INET6, ipv4_output, &addr), 1); + const char *test_output =3D print_in6_addr(addr, 0, &gc); + bool ret =3D strcmp(test_output, ipv4_output) =3D=3D 0; + gc_free(&gc); + return ret; +} + +static void +test_add_in6_addr(void **state) +{ + /* Note that some of the result strings need to account for + print_in6_addr formatting the addresses potentially as IPv4 */ + bool mapped_ipv4 =3D check_mapped_ipv4_address(); + test_add_in6_addr_tc("::", 1, "::1"); + test_add_in6_addr_tc("::ff", 1, "::100"); + test_add_in6_addr_tc("::ffff", 1, mapped_ipv4 ? "::0.1.0.0" : "::1:0"); + test_add_in6_addr_tc("ffff::ffff", 1, "ffff::1:0"); + test_add_in6_addr_tc("::ffff:ffff", 1, "::1:0:0"); + test_add_in6_addr_tc("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 1, "::= "); + test_add_in6_addr_tc("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 2, "::= 1"); + + test_add_in6_addr_tc("::", UINT32_MAX, mapped_ipv4 ? "::255.255.255.25= 5" : "::ffff:ffff"); + test_add_in6_addr_tc("::1", UINT32_MAX, "::1:0:0"); + test_add_in6_addr_tc("::ffff", UINT32_MAX, "::1:0:fffe"); + test_add_in6_addr_tc("ffff::ffff", UINT32_MAX, "ffff::1:0:fffe"); + test_add_in6_addr_tc("::ffff:ffff", UINT32_MAX, "::1:ffff:fffe"); + test_add_in6_addr_tc("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", UINT32= _MAX, + mapped_ipv4 ? "::255.255.255.254" : "::ffff:fffe"= ); +} + +const struct CMUnitTest socket_tests[] =3D { + cmocka_unit_test(test_add_in6_addr) +}; + +int +main(void) +{ + return cmocka_run_group_tests(socket_tests, NULL, NULL); +} -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1160?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: If546f64a4554b292623bfcfe9ee53bac17dfa803 Gerrit-Change-Number: 1160 Gerrit-PatchSet: 4 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newpatchset --iUqn1q7v0Vg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld uploaded patch set #4 to this change.

<= p>View C= hange

Add new unit test module test_socket

With a first UT that = tests add_in6_addr() (and
print_in6_addr implicitly).

Change-Id: = If546f64a4554b292623bfcfe9ee53bac17dfa803
Signed-off-by: Frank Lichtenhe= ld <frank@...2641...>
---
M CMakeLists.txt
M tests/unit_test= s/openvpn/Makefile.am
M tests/unit_tests/openvpn/mock_management.c
A = tests/unit_tests/openvpn/test_socket.c
4 files changed, 177 insertions(+= ), 12 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvp=
n refs/changes/60/1160/4
diff --git a/CMakeLists.txt b/CMakeLists.t=
xt
index 45044af..35513e9 100644
--- a/CMak= eLists.txt
+++ b/CMakeLists.txt
@@ -628,9 += 628,11 @@
target_compile_options(openvpn PRIVATE -DPLU= GIN_LIBDIR=3D\"${PLUGIN_DIR}\")

find_library(resolv resolv)
- # some platform like BSDs already include resolver function= ality in the libc and not have an extra resolv library
+ # some platform like BSDs already in= clude resolver functionality in the libc
+ # and do not have an extra resolv library if (${resolv} OR APPLE)
- target_link_libraries(openvpn PUBLIC -lresolv)

+ set(RESOLV_LIBRAR= IES resolv)
+ = target_link_libraries(openvpn PUBLIC ${RESOLV_LIBRARIES})
= endif ()
endif ()

@@= -653,6 +655,7 @@
"test_packet_id"
"test_pkt"
"tes= t_provider"
+ = "test_socket"
"test_ssl"<= /span>
"test_user_pass"
= "test_push_update_msg"
@@ -849,6 +852,16 @@
src/openvpn/base64.c
)

+ tar= get_link_libraries(test_socket PUBLIC ${RESOLV_LIBRARIES})
+ target_sources(test_socket PRIVA= TE
+ tests/uni= t_tests/openvpn/mock_get_random.c
+ tests/unit_tests/openvpn/mock_management.c
= + tests/unit_tests/openv= pn/mock_win32_execve.c
+ src/openvpn/run_command.c
+ src/openvpn/socket_util.c
+ )

+
target_sources(test_us= er_pass PRIVATE
tests/unit_tests/openvpn/mock_get_= random.c
tests/unit_tests/openvpn/mock_win32_execv= e.c
diff --git a/tests/unit_tests/openvpn/Makefile.am b/tes= ts/unit_tests/openvpn/Makefile.am
index b24e03c..d030185 10= 0644
--- a/tests/unit_tests/openvpn/Makefile.am
<= span>+++ b/tests/unit_tests/openvpn/Makefile.am

@@ -4,23 +4= ,17 @@

AM_TESTSUITE_SUMMARY_HEADER =3D &= #39; for $(PACKAGE_STRING) Unit-Tests'

-test_binaries=3D

+test_binaries =3D crypto_testdriver pac= ket_id_testdriver auth_token_testdriver \
+ ncp_testdriver misc_testdriver pkt_testdriver ssl_te= stdriver \
+ user_pas= s_testdriver push_update_msg_testdriver provider_testdriver socket_testdriv= er

if HAVE_LD_WRAP_SUPPORT
test_binaries +=3D argv_testdriver buffer_testdriver

-endif
-
-te= st_binaries +=3D crypto_testdriver packet_id_testdriver auth_token_testdriv= er ncp_testdriver misc_testdriver \
- pkt_testdriver ssl_testdriver user_pass_testdriver push_upda= te_msg_testdriver
-
-if HAVE_LD_WRAP_SUPPORT
if !WIN32
test_binaries +=3D tls_crypt_tes= tdriver
endif
endif

-test_binaries +=3D provid= er_testdriver
-<= br> if WIN32
test_binaries +=3D cryptoapi_testdriver=
LDADD =3D -lws2_32
@@ -343,4 +337,22 @@
$(top_srcdir)/src/openvpn/platform.c \
$= (top_srcdir)/src/openvpn/push_util.c \
$(top_srcdir)/src/= openvpn/options_util.c \
+ $(top_srcdir= )/src/openvpn/otime.c
+
+socket_testdriver= _CFLAGS =3D \
+ -I$(= top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn = \
+ -DSOURCEDIR=3D\&q= uot;$(top_srcdir)\" @TEST_CFLAGS@
+
+= socket_testdriver_LDFLAGS =3D @TEST_LDFLAGS@ $(SOCKETS_LIBS)
+

+socket_testdriver_SOURCES =3D test_socket.c \<= br>+ mock_msg.c test_common.h = \
+ mock_get_random.c= \
+ mock_management.= c \
+ $(top_srcdir)/s= rc/openvpn/buffer.c \
+ $(top_srcdir)/src/openvpn/win32-util.c \
+ $(top_srcdir)/src/openvpn/platform.c \
<= span style=3D"color: hsl(120, 100%, 40%);">+ $(top_srcdir)/src/openvpn/env_= set.c \

+ $(top_srcdi= r)/src/openvpn/run_command.c \
+ $(top_srcdir)/src/openvpn/socket_util.c
+
diff --git a/tests/unit_= tests/openvpn/mock_management.c b/tests/unit_tests/openvpn/mock_management.= c
index b24e4c4..28e541c 100644
--- a/tests= /unit_tests/openvpn/mock_management.c
+++ b/tests/unit_test= s/openvpn/mock_management.c
@@ -46,4 +46,18 @@
{

return NULL;
}
+

+void
+management_set_state(struct management *man, const int state, const c= har *detail,
+ = const in_addr_t *tun_local_ip, const struct in6_addr *tun_loc= al_ip6,
+ = const struct openvpn_sockaddr *local_addr,
+ const struct openvpn= _sockaddr *remote_addr)
+{
+}
+
#endif<= br>+
+void
+management_sleep(const int n)
+{
+}
diff --git a/tests/unit_tests/openvpn/test_socket.c= b/tests/unit_tests/openvpn/test_socket.c
new file mode 100= 644
index 0000000..2da2529
--- /dev/null

+++ b/tests/unit_tests/openvpn/test_socket.c
= @@ -0,0 +1,126 @@
+/*=
+ * OpenVPN -- An a= pplication to securely tunnel IP networks
+ * over a single UDP port, with support f= or SSL/TLS-based
+ * = session authentication and key exchange,
+ * packet encryption, packet = authentication, and
+= * packet compression.
+ *
+ *= Copyright (C) 2021-2025 Arne Schwabe <arne@...1227...>
+ *
+ * This program is free software; you can redist= ribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the = Free Software Foundation.
+ *
+ * This pr= ogram is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without = even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<= /span>
+ * GNU General Publ= ic License for more details.
+ *
+ * You = should have received a copy of the GNU General Public License along<= br>+ * with this program; if n= ot, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifdef H= AVE_CONFIG_H
+#includ= e "config.h"
++#include "syshead.h"= ;
+
+#include <stdio.h>
+#include <stdlib.h>
=
+#include <stdarg.h><= /span>
+#include <string.= h>
+#include <s= etjmp.h>
+#include= <cmocka.h>
+
+#include "socket= .h"
+#include &q= uot;win32.h"
+
+/* stubs for some unu= sed functions instead of pulling in too many dependencies */
+struct signal_info siginfo_static;= /* GLOBAL */

+
+int
+signal_reset(struct signal_info *si, int = signum)
+{
= + assert_true(0);
= + return 0;
+}
+
+#ifdef _WIN32
+stru= ct win32_signal win32_signal; /* GLOBAL */
+
+int
+win32_signal= _get(struct win32_signal *ws)
+{
+ asse= rt_true(0);
+ retu= rn 0;
+}
+#endif

+
+int
+parse= _line(const char *line, char **p, const int n, const char *file, const int = line_num,
+ = int msglevel, struct gc_arena *gc)
+{
+ = assert_true(0);
+ = return 0;
+}=
+
+static void
+test_add_in6_addr_tc(const char *orig_str, uint32_t a= dd, const char *expect_str)
+{
+ struct= in6_addr orig, result, expected;
+ struct gc_arena gc =3D gc_new();
+ assert_int_equal(inet_pton(AF_INET6, ori= g_str, &orig), 1);
+ result =3D add_= in6_addr(orig, add);
= + const char *result_str =3D print_in6_addr(result, 0, &gc);<= br>+ assert_string_equal(res= ult_str, expect_str);
+ assert_memory_equal(&result, &expected, sizeof(struct in6_add= r));
+ gc_free(&am= p;gc);
+}
<= span style=3D"color: hsl(120, 100%, 40%);">+

+static bool
+check_mapped_ipv4_address(void)
+{
+ struct gc_arena gc =3D gc_new();
+ const char *ipv4_output =3D "::255.255= .255.255";
+ = struct in6_addr addr;
+ assert_int_equal(inet_pton(AF_INET6, ipv4_output, &addr), 1);
+ const char *test_ou= tput =3D print_in6_addr(addr, 0, &gc);
+ bool ret =3D strcmp(test_output, ipv4_output) = =3D=3D 0;
+ gc_fre= e(&gc);
+ retu= rn ret;
+}
= +
+static void
+test_add_in6_addr(void **state)
+{
+ /* Note that some of the result strings need to account for=
+ print_in6_ad= dr formatting the addresses potentially as IPv4 */
+ bool mapped_ipv4 =3D check_mapped_ipv4_a= ddress();
+ test_a= dd_in6_addr_tc("::", 1, "::1");
+ test_add_in6_addr_tc("::ff"= , 1, "::100");
+ test_add_in6_addr_tc("::ffff", 1, mapped_ipv4 ? "::= 0.1.0.0" : "::1:0");
+ test_add_in6_addr_tc("ffff::ffff", 1, "f= fff::1:0");
+ = test_add_in6_addr_tc("::ffff:ffff", 1, "::1:0:0");
+ test_add_in6_addr_t= c("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 1, "::");<= /span>
+ test_add_in6_add= r_tc("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", 2, "::1"= ;);
+
+ test_add_in6_addr_tc("::&q= uot;, UINT32_MAX, mapped_ipv4 ? "::255.255.255.255" : "::fff= f:ffff");

+ t= est_add_in6_addr_tc("::1", UINT32_MAX, "::1:0:0");
+ test_add_in6_addr_tc= ("::ffff", UINT32_MAX, "::1:0:fffe");
+ test_add_in6_addr_tc("ffff::= ffff", UINT32_MAX, "ffff::1:0:fffe");
+ test_add_in6_addr_tc("::ffff:fff= f", UINT32_MAX, "::1:ffff:fffe");
+ test_add_in6_addr_tc("ffff:ffff:ffff:= ffff:ffff:ffff:ffff:ffff", UINT32_MAX,
+ mapped_ipv4 ? "::255.= 255.255.254" : "::ffff:fffe");
+}
+
+const struc= t CMUnitTest socket_tests[] =3D {
+ cmocka_unit_test(test_add_in6_addr)
+};
+
+in= t
+main(void)<= br>+{
+ return cmocka_run_group_tests(socket_test= s, NULL, NULL);
+}


To view, visit change 1160. To unsubscribe, o= r for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If546f64a4554b292623bfcfe9ee= 53bac17dfa803
Gerrit-Change-Number: 1160
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <frank@...2723...= .>
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-MessageType: newpatchset
--iUqn1q7v0Vg=--