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

Merge pull request #2277 from yogpan01/master 

Fix for https://github.com/ARMmbed/mbed-os-example-client/issues/44
pull/2282/head
Sam Grove 2016-07-27 17:09:49 -05:00 committed by GitHub
parent 5df79393fc f251c0f128
commit c17132ac59
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_CLIENT/mbed-client/module.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mbed-client", "name": "mbed-client",
"version": "1.13.1", "version": "1.13.2",
"description": "mbed Client C++ API", "description": "mbed Client C++ API",
"keywords": [], "keywords": [],
"author": "Yogesh Pande <yogesh.pande@arm.com>", "author": "Yogesh Pande <yogesh.pande@arm.com>",

4
features/FEATURE_CLIENT/mbed-client/source/m2mnsdlinterface.cpp
View File

@ -666,12 +666,10 @@ bool M2MNsdlInterface::process_received_data(uint8_t *data,
sn_nsdl_addr_s *address) sn_nsdl_addr_s *address)
{ {
tr_debug("M2MNsdlInterface::process_received_data( data size %d)", data_size); tr_debug("M2MNsdlInterface::process_received_data( data size %d)", data_size);
__mutex_claim();
return (0 == sn_nsdl_process_coap(_nsdl_handle, return (0 == sn_nsdl_process_coap(_nsdl_handle,
data, data,
data_size, data_size,
address)) ? true : false; address)) ? true : false;
__mutex_release();
} }
void M2MNsdlInterface::stop_timers() void M2MNsdlInterface::stop_timers()
@ -692,9 +690,7 @@ void M2MNsdlInterface::stop_timers()
void M2MNsdlInterface::timer_expired(M2MTimerObserver::Type type) void M2MNsdlInterface::timer_expired(M2MTimerObserver::Type type)
{ {
if(M2MTimerObserver::NsdlExecution == type) { if(M2MTimerObserver::NsdlExecution == type) {
__mutex_claim();
sn_nsdl_exec(_nsdl_handle, _counter_for_nsdl); sn_nsdl_exec(_nsdl_handle, _counter_for_nsdl);
__mutex_release();
_counter_for_nsdl++; _counter_for_nsdl++;
} else if(M2MTimerObserver::Registration == type) { } else if(M2MTimerObserver::Registration == type) {
tr_debug("M2MNsdlInterface::timer_expired - M2MTimerObserver::Registration - Send update registration"); tr_debug("M2MNsdlInterface::timer_expired - M2MTimerObserver::Registration - Send update registration");