Skip to content

Commit 3e6cf78

Browse files
author
Abbas Bracken Ziad
committed
Remove call to function-like macro with no effect
1 parent 877436c commit 3e6cf78

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

connectivity/nanostack/coap-service/source/coap_connection_handler.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,13 @@ typedef struct secure_session {
102102
} secure_session_t;
103103

104104
static NS_LIST_DEFINE(secure_session_list, secure_session_t, link);
105+
106+
#ifdef COAP_SECURITY_AVAILABLE
105107
static int secure_session_sendto(int8_t socket_id, void *handle, const void *buf, size_t len);
106108
static int secure_session_recvfrom(int8_t socket_id, unsigned char *buf, size_t len);
107109
static void start_timer(int8_t timer_id, uint32_t int_ms, uint32_t fin_ms);
108110
static int timer_status(int8_t timer_id);
111+
#endif //COAP_SECURITY_AVAILABLE
109112

110113
static secure_session_t *secure_session_find_by_timer_id(int8_t timer_id)
111114
{
@@ -237,7 +240,9 @@ static void clear_secure_sessions(internal_socket_t *this)
237240
if (this) {
238241
ns_list_foreach_safe(secure_session_t, cur_ptr, &secure_session_list) {
239242
if (cur_ptr->parent == this) {
243+
#ifdef COAP_SECURITY_AVAILABLE
240244
coap_security_send_close_alert(cur_ptr->sec_handler);
245+
#endif //COAP_SECURITY_AVAILABLE
241246
secure_session_delete(cur_ptr);
242247
}
243248
}
@@ -430,6 +435,7 @@ static int send_to_real_socket(int8_t socket_id, const ns_address_t *address, co
430435
return socket_sendmsg(socket_id, &msghdr, 0);
431436
}
432437

438+
#ifdef COAP_SECURITY_AVAILABLE
433439
static int secure_session_sendto(int8_t socket_id, void *handle, const void *buf, size_t len)
434440
{
435441
secure_session_t *session = handle;
@@ -462,7 +468,9 @@ static int secure_session_sendto(int8_t socket_id, void *handle, const void *buf
462468
}
463469
return len;
464470
}
471+
#endif //COAP_SECURITY_AVAILABLE
465472

473+
#ifdef COAP_SECURITY_AVAILABLE
466474
static int secure_session_recvfrom(int8_t socket_id, unsigned char *buf, size_t len)
467475
{
468476
(void)len;
@@ -477,6 +485,7 @@ static int secure_session_recvfrom(int8_t socket_id, unsigned char *buf, size_t
477485
}
478486
return MBEDTLS_ERR_SSL_WANT_READ;
479487
}
488+
#endif //COAP_SECURITY_AVAILABLE
480489

481490
/**
482491
* Callback timer. Maybe called in interrupt context
@@ -516,6 +525,7 @@ static void timer_cb(void *param)
516525
}
517526
}
518527

528+
#ifdef COAP_SECURITY_AVAILABLE
519529
static void start_timer(int8_t timer_id, uint32_t int_ms, uint32_t fin_ms)
520530
{
521531
secure_session_t *sec = secure_session_find_by_timer_id(timer_id);
@@ -538,7 +548,9 @@ static void start_timer(int8_t timer_id, uint32_t int_ms, uint32_t fin_ms)
538548
}
539549
}
540550
}
551+
#endif //COAP_SECURITY_AVAILABLE
541552

553+
#ifdef COAP_SECURITY_AVAILABLE
542554
static int timer_status(int8_t timer_id)
543555
{
544556
secure_session_t *sec = secure_session_find_by_timer_id(timer_id);
@@ -547,6 +559,7 @@ static int timer_status(int8_t timer_id)
547559
}
548560
return TIMER_STATE_CANCELLED;
549561
}
562+
#endif //COAP_SECURITY_AVAILABLE
550563

551564
static int read_data(socket_callback_t *sckt_data, internal_socket_t *sock, ns_address_t *src_address, uint8_t dst_address[static 16])
552565
{
@@ -872,7 +885,9 @@ void connection_handler_close_secure_connection(coap_conn_handler_t *handler, ui
872885
if (handler->socket && handler->socket->is_secure) {
873886
secure_session_t *session = secure_session_find(handler->socket, destination_addr_ptr, port);
874887
if (session) {
888+
#ifdef COAP_SECURITY_AVAILABLE
875889
coap_security_send_close_alert(session->sec_handler);
890+
#endif //COAP_SECURITY_AVAILABLE
876891
session->session_state = SECURE_SESSION_CLOSED;
877892
session->last_contact_time = coap_service_get_internal_timer_ticks();
878893
}

0 commit comments

Comments
 (0)