Skip to content

Commit 5e6d524

Browse files
NordicBuilderkacperradoszewski
authored andcommitted
manifest: Update sdk-zephyr revision (auto-manifest PR)
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3547 lib: nrf_modem_lib: add support for TLS_DTLS_FRAG_EXT This socket option is used to enable and disable the DTLS fragmentation extension. Signed-off-by: Kacper Radoszewski <[email protected]> Signed-off-by: Nordic Builder <[email protected]>
1 parent bc30cfa commit 5e6d524

File tree

3 files changed

+51
-1
lines changed

3 files changed

+51
-1
lines changed

lib/nrf_modem_lib/nrf9x_sockets.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ static int z_to_nrf_optname(int z_in_level, int z_in_optname,
203203
case TLS_DTLS_HANDSHAKE_STATUS:
204204
*nrf_out_optname = NRF_SO_SEC_HANDSHAKE_STATUS;
205205
break;
206+
case TLS_DTLS_FRAG_EXT:
207+
*nrf_out_optname = NRF_SO_SEC_DTLS_FRAG_EXT;
208+
break;
206209
default:
207210
retval = -1;
208211
break;

tests/lib/nrf_modem_lib/nrf9x_sockets/src/nrf9x_sockets_test.c

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,6 +1866,53 @@ void test_nrf9x_socket_offload_sendcb(void)
18661866
ret = zsock_sendto(fd, data, data_len, flags, &to, 42);
18671867
TEST_ASSERT_EQUAL(8, ret);
18681868
TEST_ASSERT_EQUAL(1, sendcb_calls);
1869+
1870+
__cmock_nrf_close_ExpectAndReturn(nrf_fd, 0);
1871+
1872+
ret = zsock_close(fd);
1873+
1874+
TEST_ASSERT_EQUAL(ret, 0);
1875+
}
1876+
1877+
void test_nrf9x_socket_offload_dtls_frag_ext(void)
1878+
{
1879+
int ret;
1880+
int fd;
1881+
int nrf_fd = NRF_FD;
1882+
int family = AF_INET;
1883+
int type = SOCK_STREAM;
1884+
int proto = IPPROTO_TCP;
1885+
int data = 0;
1886+
size_t data_len = sizeof(data);
1887+
1888+
__cmock_nrf_socket_ExpectAndReturn(NRF_AF_INET, NRF_SOCK_STREAM, NRF_IPPROTO_TCP, nrf_fd);
1889+
1890+
fd = zsock_socket(family, type, proto);
1891+
1892+
TEST_ASSERT_EQUAL(fd, 0);
1893+
1894+
__cmock_nrf_setsockopt_ExpectAndReturn(nrf_fd, NRF_SOL_SECURE, NRF_SO_SEC_DTLS_FRAG_EXT,
1895+
NULL, sizeof(int), 0);
1896+
__cmock_nrf_setsockopt_IgnoreArg_option_value();
1897+
1898+
ret = zsock_setsockopt(fd, SOL_TLS, TLS_DTLS_FRAG_EXT, &data, sizeof(data));
1899+
1900+
TEST_ASSERT_EQUAL(ret, 0);
1901+
1902+
__cmock_nrf_getsockopt_ExpectAndReturn(nrf_fd, NRF_SOL_SECURE, NRF_SO_SEC_DTLS_FRAG_EXT,
1903+
NULL, NULL, 0);
1904+
__cmock_nrf_getsockopt_IgnoreArg_option_value();
1905+
__cmock_nrf_getsockopt_IgnoreArg_option_len();
1906+
1907+
ret = zsock_getsockopt(fd, SOL_TLS, TLS_DTLS_FRAG_EXT, &data, &data_len);
1908+
1909+
TEST_ASSERT_EQUAL(ret, 0);
1910+
1911+
__cmock_nrf_close_ExpectAndReturn(nrf_fd, 0);
1912+
1913+
ret = zsock_close(fd);
1914+
1915+
TEST_ASSERT_EQUAL(ret, 0);
18691916
}
18701917

18711918
/* It is required to be added to each test. That is because unity's

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ manifest:
6464
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6565
- name: zephyr
6666
repo-path: sdk-zephyr
67-
revision: 71ebd2b14110f5d9fa3cd23873df0d25c276611b
67+
revision: pull/3547/head
6868
import:
6969
# In addition to the zephyr repository itself, NCS also
7070
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)