ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'aad453e0ac69b9de3b3e218c21a423bebd506174' 

* commit 'aad453e0ac69b9de3b3e218c21a423bebd506174':
  Squashed 'connectivity/nanostack/coap-service/' changes from 5aa54b8e62..4a126bd278
pull/14169/head
Arto Kinnunen 2021-01-19 11:52:43 +02:00
parent 6354a1e8dc aad453e0ac
commit a13d6ab0f3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
connectivity/nanostack/coap-service/source/coap_connection_handler.c
View File

@ -66,7 +66,9 @@ static NS_LIST_DEFINE(socket_list, internal_socket_t, link);
static uint8_t max_handshakes = MAX_ONGOING_HANDSHAKES; static uint8_t max_handshakes = MAX_ONGOING_HANDSHAKES;
static uint8_t max_sessions = MAX_SECURE_SESSION_COUNT; static uint8_t max_sessions = MAX_SECURE_SESSION_COUNT;
#ifdef COAP_SECURITY_AVAILABLE
static void timer_cb(void *param); static void timer_cb(void *param);
#endif
static void recv_sckt_msg(void *cb_res); static void recv_sckt_msg(void *cb_res);
#ifdef COAP_SECURITY_AVAILABLE #ifdef COAP_SECURITY_AVAILABLE
@ -122,6 +124,7 @@ static secure_session_t *secure_session_find_by_timer_id(int8_t timer_id)
return this; return this;
} }
#ifdef COAP_SECURITY_AVAILABLE
static bool is_secure_session_valid(secure_session_t *session) static bool is_secure_session_valid(secure_session_t *session)
{ {
ns_list_foreach(secure_session_t, cur_ptr, &secure_session_list) { ns_list_foreach(secure_session_t, cur_ptr, &secure_session_list) {
@ -131,6 +134,7 @@ static bool is_secure_session_valid(secure_session_t *session)
} }
return false; return false;
} }
#endif
static void secure_session_delete(secure_session_t *this) static void secure_session_delete(secure_session_t *this)
{ {
@ -164,6 +168,7 @@ static int8_t virtual_socket_id_allocate()
static secure_session_t *secure_session_create(internal_socket_t *parent, const uint8_t *address_ptr, uint16_t port, SecureConnectionMode secure_mode) static secure_session_t *secure_session_create(internal_socket_t *parent, const uint8_t *address_ptr, uint16_t port, SecureConnectionMode secure_mode)
{ {
(void) secure_mode;
uint8_t handshakes = 0; uint8_t handshakes = 0;
if (!address_ptr) { if (!address_ptr) {
return NULL; return NULL;
@ -493,6 +498,7 @@ static int secure_session_recvfrom(int8_t socket_id, unsigned char *buf, size_t
* TODO - might be better to use an event timer in conjunction with * TODO - might be better to use an event timer in conjunction with
* CoAP tasklet * CoAP tasklet
*/ */
#ifdef COAP_SECURITY_AVAILABLE
static void timer_cb(void *param) static void timer_cb(void *param)
{ {
secure_session_t *sec = param; secure_session_t *sec = param;
@ -524,6 +530,7 @@ static void timer_cb(void *param)
} }
} }
} }
#endif
#ifdef COAP_SECURITY_AVAILABLE #ifdef COAP_SECURITY_AVAILABLE
static void start_timer(int8_t timer_id, uint32_t int_ms, uint32_t fin_ms) static void start_timer(int8_t timer_id, uint32_t int_ms, uint32_t fin_ms)

1
connectivity/nanostack/coap-service/source/include/coap_security_handler.h
View File

@ -23,6 +23,7 @@
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h" #include "mbedtls/config.h"
#else #else
// cppcheck-suppress preprocessorErrorDirective
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif