Merge pull request #468 from mrdeep1/server_keepalive

feat(coap); Support for server keepalives (IEC-254)
espressif · Jan 15, 2025 · acfcdcf · acfcdcf
2 parents 400a703 + 40dfe30
commit acfcdcf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/coap/examples/coap_server/main/coap_server_example_main.c b/coap/examples/coap_server/main/coap_server_example_main.c
@@ -256,6 +256,7 @@ static void coap_example_server(void *p)
         coap_context_set_block_mode(ctx,
                                     COAP_BLOCK_USE_LIBCOAP | COAP_BLOCK_SINGLE_BODY);
         coap_context_set_max_idle_sessions(ctx, 20);
+        coap_context_set_keepalive(ctx, 30);
 
 #ifdef CONFIG_COAP_MBEDTLS_PSK
         /* Need PSK setup before we set up endpoints */

diff --git a/coap/idf_component.yml b/coap/idf_component.yml
@@ -1,4 +1,4 @@
-version: "4.3.5~2"
+version: "4.3.5~3"
 description: Constrained Application Protocol (CoAP) C Library
 url: https://github.com/espressif/idf-extra-components/tree/master/coap
 dependencies:

diff --git a/coap/libcoap b/coap/libcoap
diff --git a/coap/sbom_libcoap.yml b/coap/sbom_libcoap.yml
@@ -4,7 +4,7 @@ cpe: cpe:2.3:a:libcoap:libcoap:{}:*:*:*:*:*:*:*
 supplier: 'Organization: libcoap <https://libcoap.net/>'
 description: A CoAP (RFC 7252) implementation in C
 url: https://github.com/obgm/libcoap
-hash: 0d240530b4beba90cc86c488e17bd0090437a0dd
+hash: 4d84859620540c8baf06fa094abb9e0ae19da0e7
 cve-exclude-list:
   - cve: CVE-2024-31031
     reason: Resolved in version 4.3.5-rc1
+8 −0		BUILDING
+36 −15		CMakeLists.txt
+1 −1		ChangeLog
+5 −0		cmake_coap_defines.h.in
+9 −4		configure.ac
+2 −1		doc/Makefile.am
+23 −0		doc/docbook.local.css
+5 −0		doc/upgrade_4.3.4_4.3.5.txt
+60 −9		examples/coap-client.c
+1 −0		examples/coap-rd.c
+8 −1		examples/coap-server.c
+2 −1		examples/lwip/Makefile
+18 −1		examples/lwip/config/lwipopts.h
+1 −0		examples/lwip/config/lwippools.h
+31 −0		examples/lwip/server.c
+1 −0		examples/oscore-interop-server.c
+1 −1		examples/riot/pkg_libcoap/Makefile
+2 −0		examples/zephyr/.gitignore
+20 −0		examples/zephyr/Makefile
+12 −0		examples/zephyr/README
+9 −0		examples/zephyr/client-src/CMakeLists.txt
+33 −0		examples/zephyr/client-src/Kconfig
+44 −0		examples/zephyr/client-src/prj.conf
+212 −0		examples/zephyr/client-src/src/main.c
+3 −5		include/coap3/coap_address.h
+7 −4		include/coap3/coap_block_internal.h
+11 −0		include/coap3/coap_debug.h
+87 −0		include/coap3/coap_net.h
+54 −2		include/coap3/coap_net_internal.h
+5 −2		include/coap3/coap_pdu_internal.h
+1 −1		include/coap3/coap_session.h
+29 −0		include/coap3/coap_session_internal.h
+1 −2		include/coap3/coap_subscribe_internal.h
+1 −0		include/oscore/oscore_context.h
+7 −0		libcoap-3.map
+7 −0		libcoap-3.sym
+6 −1		man/Makefile.am
+4 −1		man/coap-client.txt.in
+4 −1		man/coap-server.txt.in
+1 −1		man/coap_block.txt.in
+58 −2		man/coap_io.txt.in
+7 −0		man/coap_keepalive.txt.in
+10 −0		man/coap_logging.txt.in
+1 −1		man/coap_pdu_access.txt.in
+10 −22		man/coap_pdu_setup.txt.in
+358 −0		man/coap_pdu_transmit.txt.in
+2 −0		man/examples-code-check.c
+174 −85		src/coap_block.c
+16 −0		src/coap_debug.c
+4 −5		src/coap_gnutls.c
+212 −20		src/coap_io.c
+6 −0		src/coap_io_contiki.c
+123 −9		src/coap_io_lwip.c
+24 −7		src/coap_mbedtls.c
+2 −1		src/coap_mem.c
+226 −47		src/coap_net.c
+4 −5		src/coap_openssl.c
+21 −5		src/coap_oscore.c
+13 −4		src/coap_pdu.c
+7 −0		src/coap_proxy.c
+3 −0		src/coap_resource.c
+91 −59		src/coap_session.c
+5 −0		src/coap_sha1.c
+4 −4		src/coap_tinydtls.c
+7 −2		src/coap_uri.c
+2 −1		src/coap_wolfssl.c
+1 −0		src/oscore/oscore_context.c
+15 −0		zephyr/CMakeLists.txt
+61 −2		zephyr/Kconfig
+15 −0		zephyr/config-mbedtls-libcoap.h
+16 −0		zephyr/libcoap-mbedtls.conf
+0 −4		zephyr/libcoap.conf