tests: net: socket: SO_TYPE socket option (a6e83eb7) · Commits · Wenxi XU / zephyr

tests/net/socket/socket_helpers.h

+38 −0

Original line number	Diff line number	Diff line
		@@ -120,3 +120,41 @@ static inline void prepare_sock_tcp_v6(const char *addr, uint16_t port,
		rv = zsock_inet_pton(AF_INET6, addr, &sockaddr->sin6_addr);
		zassert_equal(rv, 1, "inet_pton failed");
		}

		static inline void prepare_sock_tls_v4(const char *addr, uint16_t port,
		int sock, struct sockaddr_in sockaddr,
		enum net_ip_protocol_secure proto)
		{
		int rv;

		zassert_not_null(addr, "null addr");
		zassert_not_null(sock, "null sock");
		zassert_not_null(sockaddr, "null sockaddr");

		*sock = zsock_socket(AF_INET, SOCK_STREAM, proto);
		zassert_true(*sock >= 0, "socket open failed");

		sockaddr->sin_family = AF_INET;
		sockaddr->sin_port = htons(port);
		rv = zsock_inet_pton(AF_INET, addr, &sockaddr->sin_addr);
		zassert_equal(rv, 1, "inet_pton failed");
		}

		static inline void prepare_sock_tls_v6(const char *addr, uint16_t port,
		int sock, struct sockaddr_in6 sockaddr,
		enum net_ip_protocol_secure proto)
		{
		int rv;

		zassert_not_null(addr, "null addr");
		zassert_not_null(sock, "null sock");
		zassert_not_null(sockaddr, "null sockaddr");

		*sock = zsock_socket(AF_INET6, SOCK_STREAM, proto);
		zassert_true(*sock >= 0, "socket open failed");

		sockaddr->sin6_family = AF_INET6;
		sockaddr->sin6_port = htons(port);
		rv = zsock_inet_pton(AF_INET6, addr, &sockaddr->sin6_addr);
		zassert_equal(rv, 1, "inet_pton failed");
		}

tests/net/socket/tcp/src/main.c

+29 −0

Original line number	Diff line number	Diff line
		@@ -513,6 +513,34 @@ void test_v4_accept_timeout(void)
		k_sleep(TCP_TEARDOWN_TIMEOUT);
		}

		void test_so_type(void)
		{
		struct sockaddr_in bind_addr4;
		struct sockaddr_in6 bind_addr6;
		int sock1, sock2, rv;
		int optval;
		socklen_t optlen = sizeof(optval);

		prepare_sock_tcp_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, ANY_PORT,
		&sock1, &bind_addr4);
		prepare_sock_tcp_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, ANY_PORT,
		&sock2, &bind_addr6);

		rv = getsockopt(sock1, SOL_SOCKET, SO_TYPE, &optval, &optlen);
		zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
		zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type");
		zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");

		rv = getsockopt(sock2, SOL_SOCKET, SO_TYPE, &optval, &optlen);
		zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
		zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type");
		zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");

		test_close(sock1);
		test_close(sock2);
		k_sleep(TCP_TEARDOWN_TIMEOUT);
		}

		void test_v4_so_rcvtimeo(void)
		{
		int c_sock;
		@@ -737,6 +765,7 @@ void test_main(void)
		ztest_user_unit_test(test_v6_recv_enotconn),
		ztest_unit_test(test_open_close_immediately),
		ztest_user_unit_test(test_v4_accept_timeout),
		ztest_unit_test(test_so_type),
		ztest_unit_test(test_v4_so_rcvtimeo),
		ztest_unit_test(test_v6_so_rcvtimeo),
		ztest_user_unit_test(test_socket_permission)

tests/net/socket/tls/CMakeLists.txt

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: Apache-2.0

		cmake_minimum_required(VERSION 3.13.1)
		find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
		project(socket_tls)

		target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/net/ip)
		FILE(GLOB app_sources src/*.c)
		target_sources(app PRIVATE ${app_sources})

tests/net/socket/tls/prj.conf

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		# Setup for self-contained net testing without requiring a SLIP driver
		CONFIG_NET_TEST=y

		# General config
		CONFIG_NEWLIB_LIBC=y

		# Networking config
		CONFIG_NETWORKING=y
		CONFIG_NET_IPV4=y
		CONFIG_NET_IPV6=y
		CONFIG_NET_TCP=y
		CONFIG_NET_SOCKETS=y
		CONFIG_NET_SOCKETS_POSIX_NAMES=y
		CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
		CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=2
		CONFIG_POSIX_MAX_FDS=20

		# Network driver config
		CONFIG_NET_LOOPBACK=y
		CONFIG_TEST_RANDOM_GENERATOR=y

		# Network address config
		CONFIG_NET_CONFIG_SETTINGS=y
		CONFIG_NET_CONFIG_NEED_IPV4=y
		CONFIG_NET_CONFIG_NEED_IPV6=y
		CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
		CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"

		CONFIG_MAIN_STACK_SIZE=2048
		CONFIG_TEST_USERSPACE=y

		# The test requires lot of bufs
		CONFIG_NET_PKT_TX_COUNT=24

		CONFIG_ZTEST=y
		CONFIG_ZTEST_STACKSIZE=2048

tests/net/socket/tls/src/main.c

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2021 Nordic Semiconductor
		*
		* SPDX-License-Identifier: Apache-2.0
		*/

		#include <logging/log.h>
		LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);

		#include <ztest_assert.h>
		#include <fcntl.h>
		#include <net/socket.h>
		#include <net/tls_credentials.h>

		#include "../../socket_helpers.h"

		#define ANY_PORT 0

		#define TCP_TEARDOWN_TIMEOUT K_SECONDS(1)

		static void test_close(int sock)
		{
		zassert_equal(close(sock),
		0,
		"close failed");
		}

		void test_so_type(void)
		{
		struct sockaddr_in bind_addr4;
		struct sockaddr_in6 bind_addr6;
		int sock1, sock2, rv;
		int optval;
		socklen_t optlen = sizeof(optval);

		prepare_sock_tls_v4(CONFIG_NET_CONFIG_MY_IPV4_ADDR, ANY_PORT,
		&sock1, &bind_addr4, IPPROTO_TLS_1_2);
		prepare_sock_tls_v6(CONFIG_NET_CONFIG_MY_IPV6_ADDR, ANY_PORT,
		&sock2, &bind_addr6, IPPROTO_TLS_1_2);

		rv = getsockopt(sock1, SOL_SOCKET, SO_TYPE, &optval, &optlen);
		zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
		zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type");
		zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");

		rv = getsockopt(sock2, SOL_SOCKET, SO_TYPE, &optval, &optlen);
		zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
		zassert_equal(optval, SOCK_STREAM, "getsockopt got invalid type");
		zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");

		test_close(sock1);
		test_close(sock2);
		k_sleep(TCP_TEARDOWN_TIMEOUT);
		}

		void test_main(void)
		{
		if (IS_ENABLED(CONFIG_NET_TC_THREAD_COOPERATIVE)) {
		k_thread_priority_set(k_current_get(),
		K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1));
		} else {
		k_thread_priority_set(k_current_get(), K_PRIO_PREEMPT(8));
		}

		ztest_test_suite(
		socket_tls,
		ztest_unit_test(test_so_type)
		);

		ztest_run_test_suite(socket_tls);
		}

Admin message