Skip to content

manifest: sdk-zephyr: [nrf noup] include: net: add TLS_DTLS_FRAG_EXT to NCS extensions #25842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

manifest: sdk-zephyr: [nrf noup] include: net: add TLS_DTLS_FRAG_EXT to NCS extensions #25842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/nrf_modem_lib/nrf9x_sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ static int z_to_nrf_optname(int z_in_level, int z_in_optname,
case TLS_DTLS_HANDSHAKE_STATUS:
*nrf_out_optname = NRF_SO_SEC_HANDSHAKE_STATUS;
break;
case TLS_DTLS_FRAG_EXT:
*nrf_out_optname = NRF_SO_SEC_DTLS_FRAG_EXT;
break;
default:
retval = -1;
break;
Expand Down
47 changes: 47 additions & 0 deletions tests/lib/nrf_modem_lib/nrf9x_sockets/src/nrf9x_sockets_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,6 +1866,53 @@ void test_nrf9x_socket_offload_sendcb(void)
ret = zsock_sendto(fd, data, data_len, flags, &to, 42);
TEST_ASSERT_EQUAL(8, ret);
TEST_ASSERT_EQUAL(1, sendcb_calls);

__cmock_nrf_close_ExpectAndReturn(nrf_fd, 0);

ret = zsock_close(fd);

TEST_ASSERT_EQUAL(ret, 0);
}

void test_nrf9x_socket_offload_dtls_frag_ext(void)
{
int ret;
int fd;
int nrf_fd = NRF_FD;
int family = AF_INET;
int type = SOCK_STREAM;
int proto = IPPROTO_TCP;
int data = 0;
size_t data_len = sizeof(data);

__cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd);

fd = zsock_socket(family, type, proto);

TEST_ASSERT_EQUAL(fd, 0);

__cmock_nrf_setsockopt_ExpectAndReturn(nrf_fd, NRF_SOL_SECURE, NRF_SO_SEC_DTLS_FRAG_EXT,
NULL, sizeof(int), 0);
__cmock_nrf_setsockopt_IgnoreArg_option_value();

ret = zsock_setsockopt(fd, SOL_TLS, TLS_DTLS_FRAG_EXT, &data, sizeof(data));

TEST_ASSERT_EQUAL(ret, 0);

__cmock_nrf_getsockopt_ExpectAndReturn(nrf_fd, NRF_SOL_SECURE, NRF_SO_SEC_DTLS_FRAG_EXT,
NULL, NULL, 0);
__cmock_nrf_getsockopt_IgnoreArg_option_value();
__cmock_nrf_getsockopt_IgnoreArg_option_len();

ret = zsock_getsockopt(fd, SOL_TLS, TLS_DTLS_FRAG_EXT, &data, &data_len);

TEST_ASSERT_EQUAL(ret, 0);

__cmock_nrf_close_ExpectAndReturn(nrf_fd, 0);

ret = zsock_close(fd);

TEST_ASSERT_EQUAL(ret, 0);
}

/* It is required to be added to each test. That is because unity's
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 71ebd2b14110f5d9fa3cd23873df0d25c276611b
revision: pull/3547/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading