Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mesh fix for mbed os 5.7 oob #5688

Merged
merged 3 commits into from Dec 13, 2017
Merged

Mesh fix for mbed os 5.7 oob #5688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c0b324
Squashed 'features/nanostack/FEATURE_NANOSTACK/coap-service/' changes…
Dec 12, 2017
efc7f60
Merge commit '6c0b324e3a5a9a5c22dc4c3a66b6c892b9ed1644' into coap-ser…
Dec 12, 2017
e78db9e
Update Thread PSKd default value
Dec 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_message_handler.c
View file
Open in desktop
Expand Up @@ -337,6 +337,7 @@ uint16_t coap_message_handler_request_send(coap_msg_handler_t *handle, int8_t se
transaction_ptr->options = options;
memcpy(transaction_ptr->remote_address, destination_addr, 16);
transaction_ptr->remote_port = destination_port;
transaction_ptr->req_msg_type = msg_type;
memset(&request, 0, sizeof(request));
dst_addr.addr_ptr = (uint8_t *) destination_addr; // Cast away const and trust that nsdl doesn't modify...
dst_addr.addr_len = 16;
Expand Down
4 changes: 2 additions & 2 deletions features/nanostack/FEATURE_NANOSTACK/coap-service/source/coap_service_api.c
View file
Open in desktop
Expand Up @@ -188,7 +188,7 @@ static uint8_t coap_tx_function(uint8_t *data_ptr, uint16_t data_len, sn_nsdl_ad
memcpy(transaction_ptr->data_ptr, data_ptr, data_len);
transaction_ptr->data_len = data_len;
}
} else if ((ret_val == -1) || (transaction_ptr->resp_cb == NULL)) {
} else if ((ret_val == -1) || (!transaction_ptr->resp_cb && transaction_ptr->req_msg_type == COAP_MSG_TYPE_NON_CONFIRMABLE)) {
transaction_delete(transaction_ptr);
}

Expand Down Expand Up @@ -300,7 +300,7 @@ static void sec_done_cb(int8_t socket_id, uint8_t address[static 16], uint16_t p
ns_dyn_mem_free(transaction_ptr->data_ptr);
transaction_ptr->data_ptr = NULL;
transaction_ptr->data_len = 0;
if (transaction_ptr->resp_cb == NULL) {
if (!transaction_ptr->resp_cb && transaction_ptr->req_msg_type == COAP_MSG_TYPE_NON_CONFIRMABLE) {
transaction_delete(transaction_ptr);
}
}
Expand Down
11 changes: 9 additions & 2 deletions features/nanostack/FEATURE_NANOSTACK/coap-service/source/include/coap_security_handler.h
View file
Open in desktop
Expand Up @@ -20,11 +20,18 @@
#include "ns_types.h"

#ifdef NS_USE_EXTERNAL_MBED_TLS
#if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h"
#else
#include MBEDTLS_CONFIG_FILE
#endif

#if defined(MBEDTLS_SSL_TLS_C)
#include "mbedtls/ssl.h"
#ifdef MBEDTLS_SSL_TLS_C
#define COAP_SECURITY_AVAILABLE
#endif
#endif

#endif /* NS_USE_EXTERNAL_MBED_TLS */

#define COOKIE_SIMPLE_LEN 8
typedef struct simple_cookie {
Expand Down
2 changes: 1 addition & 1 deletion features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed_lib.json
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
"6lowpan-nd-psk-key": "{0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf}",
"6lowpan-nd-sec-level": 5,
"6lowpan-nd-device-type": "NET_6LOWPAN_ROUTER",
"thread-pskd": "\"abcdefghijklmno\"",
"thread-pskd": "\"ABCDEFGH\"",
"thread-use-static-link-config": true,
"thread-config-channel-mask": "0x7fff800",
"thread-config-channel-page": 0,
Expand Down