You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ry...@apache.org on 2020/04/17 12:56:52 UTC
[mynewt-nimble] branch master updated (822d6f7 -> bb0fcde)
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git.
from 822d6f7 Fixes for 1.3.0 release
new c6eddb0 nimble/sm: Minor coding style fix
new 77bca6b nimble/l2cap: Minor coding style fix
new ee42c79 nimble/l2cap: Fix return error code
new bb0fcde nimble/socket: Enhance error log with hci dev num
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nimble/host/src/ble_l2cap_coc.c | 6 ++++--
nimble/host/src/ble_sm_alg.c | 2 --
nimble/transport/socket/src/ble_hci_socket.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
[mynewt-nimble] 04/04: nimble/socket: Enhance error log with hci
dev num
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit bb0fcde212146894431732ee87601784cac5d444
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Wed Aug 14 14:44:02 2019 +0200
nimble/socket: Enhance error log with hci dev num
---
nimble/transport/socket/src/ble_hci_socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nimble/transport/socket/src/ble_hci_socket.c b/nimble/transport/socket/src/ble_hci_socket.c
index 863d0fb..8bf56f3 100644
--- a/nimble/transport/socket/src/ble_hci_socket.c
+++ b/nimble/transport/socket/src/ble_hci_socket.c
@@ -540,7 +540,7 @@ ble_hci_sock_config(void)
rc = bind(s, (struct sockaddr *)&shci, sizeof(shci));
if (rc) {
- dprintf(1, "bind() failed %d\n", errno);
+ dprintf(1, "bind() failed %d hci%d\n", errno, shci.hci_dev);
goto err;
}
[mynewt-nimble] 01/04: nimble/sm: Minor coding style fix
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit c6eddb058e38cc8faf45d013dc21d7dd53ef7eb7
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Wed Aug 28 07:42:46 2019 +0200
nimble/sm: Minor coding style fix
---
nimble/host/src/ble_sm_alg.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/nimble/host/src/ble_sm_alg.c b/nimble/host/src/ble_sm_alg.c
index 50fd77e..148995c 100644
--- a/nimble/host/src/ble_sm_alg.c
+++ b/nimble/host/src/ble_sm_alg.c
@@ -68,8 +68,6 @@ ble_sm_alg_encrypt(const uint8_t *key, const uint8_t *plaintext,
swap_buf(tmp, plaintext, 16);
-
-
if (tc_aes_encrypt(enc_data, tmp, &s) == TC_CRYPTO_FAIL) {
return BLE_HS_EUNKNOWN;
}
[mynewt-nimble] 02/04: nimble/l2cap: Minor coding style fix
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 77bca6bc8fcf9e9341c207eff5107b6af625c91d
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Thu Jan 2 12:23:34 2020 +0100
nimble/l2cap: Minor coding style fix
---
nimble/host/src/ble_l2cap_coc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nimble/host/src/ble_l2cap_coc.c b/nimble/host/src/ble_l2cap_coc.c
index 41a8315..54ea321 100644
--- a/nimble/host/src/ble_l2cap_coc.c
+++ b/nimble/host/src/ble_l2cap_coc.c
@@ -73,7 +73,7 @@ ble_l2cap_coc_create_server(uint16_t psm, uint16_t mtu,
srv = ble_l2cap_coc_srv_alloc();
if (!srv) {
- return BLE_HS_ENOMEM;
+ return BLE_HS_ENOMEM;
}
srv->psm = psm;
@@ -453,7 +453,7 @@ ble_l2cap_coc_continue_tx(struct ble_l2cap_chan *chan)
len - sdu_size_offset);
if (rc) {
BLE_HS_LOG(DEBUG, "Could not append data rc=%d", rc);
- goto failed;
+ goto failed;
}
ble_hs_lock();
[mynewt-nimble] 03/04: nimble/l2cap: Fix return error code
Posted by ry...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit ee42c7979eae4f7444ec2678463961521c79fd8a
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Fri Sep 27 10:15:56 2019 +0200
nimble/l2cap: Fix return error code
os_mbuf_foo() returns OS_ERR codes and we want to return BLE_HS_ERR
codes.
This patch fixes it
---
nimble/host/src/ble_l2cap_coc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/nimble/host/src/ble_l2cap_coc.c b/nimble/host/src/ble_l2cap_coc.c
index 54ea321..b15646f 100644
--- a/nimble/host/src/ble_l2cap_coc.c
+++ b/nimble/host/src/ble_l2cap_coc.c
@@ -440,6 +440,7 @@ ble_l2cap_coc_continue_tx(struct ble_l2cap_chan *chan)
BLE_HS_LOG(DEBUG, "Sending SDU len=%d\n", OS_MBUF_PKTLEN(tx->sdu));
rc = os_mbuf_append(txom, &l, sizeof(uint16_t));
if (rc) {
+ rc = BLE_HS_ENOMEM;
BLE_HS_LOG(DEBUG, "Could not append data rc=%d", rc);
goto failed;
}
@@ -452,6 +453,7 @@ ble_l2cap_coc_continue_tx(struct ble_l2cap_chan *chan)
rc = os_mbuf_appendfrom(txom, tx->sdu, tx->data_offset,
len - sdu_size_offset);
if (rc) {
+ rc = BLE_HS_ENOMEM;
BLE_HS_LOG(DEBUG, "Could not append data rc=%d", rc);
goto failed;
}