You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2017/04/10 11:47:14 UTC
[22/50] incubator-mynewt-core git commit: nimble/att: Use packed
struct for receiving Find Information Request
nimble/att: Use packed struct for receiving Find Information Request
Use packed structure to map it to received mbuf instead of using
dedicated parsing function. Modern compilers generate effective code
in such case anyway.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/fefbc819
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/fefbc819
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/fefbc819
Branch: refs/heads/master
Commit: fefbc8198c5ef807c19c732939ee63aa91a7c869
Parents: 1a6ebaa
Author: Szymon Janc <sz...@codecoup.pl>
Authored: Fri Mar 24 15:48:26 2017 +0100
Committer: Szymon Janc <sz...@codecoup.pl>
Committed: Mon Apr 10 11:31:32 2017 +0200
----------------------------------------------------------------------
net/nimble/host/src/ble_att_svr.c | 55 ++++++++++++++++++----------------
1 file changed, 30 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/fefbc819/net/nimble/host/src/ble_att_svr.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_att_svr.c b/net/nimble/host/src/ble_att_svr.c
index cf6160c..52d54b6 100644
--- a/net/nimble/host/src/ble_att_svr.c
+++ b/net/nimble/host/src/ble_att_svr.c
@@ -797,8 +797,8 @@ done:
* @return 0 on success; nonzero on failure.
*/
static int
-ble_att_svr_fill_info(struct ble_att_find_info_req *req, struct os_mbuf *om,
- uint16_t mtu, uint8_t *format)
+ble_att_svr_fill_info(uint16_t start_handle, uint16_t end_handle,
+ struct os_mbuf *om, uint16_t mtu, uint8_t *format)
{
struct ble_att_svr_entry *ha;
uint8_t *buf;
@@ -811,11 +811,11 @@ ble_att_svr_fill_info(struct ble_att_find_info_req *req, struct os_mbuf *om,
rc = 0;
STAILQ_FOREACH(ha, &ble_att_svr_list, ha_next) {
- if (ha->ha_handle_id > req->bafq_end_handle) {
+ if (ha->ha_handle_id > end_handle) {
rc = 0;
goto done;
}
- if (ha->ha_handle_id >= req->bafq_start_handle) {
+ if (ha->ha_handle_id >= start_handle) {
if (ha->ha_uuid->type == BLE_UUID_TYPE_16) {
if (*format == 0) {
*format = BLE_ATT_FIND_INFO_RSP_FORMAT_16BIT;
@@ -864,15 +864,14 @@ done:
static int
ble_att_svr_build_find_info_rsp(uint16_t conn_handle,
- struct ble_att_find_info_req *req,
+ uint16_t start_handle, uint16_t end_handle,
struct os_mbuf **rxom,
struct os_mbuf **out_txom,
uint8_t *att_err)
{
- struct ble_att_find_info_rsp rsp;
+ struct ble_att_find_info_rsp *rsp;
struct os_mbuf *txom;
uint16_t mtu;
- void *buf;
int rc;
/* Just reuse the request buffer for the response. */
@@ -883,20 +882,19 @@ ble_att_svr_build_find_info_rsp(uint16_t conn_handle,
/* Write the response base at the start of the buffer. The format field is
* unknown at this point; it will be filled in later.
*/
- buf = os_mbuf_extend(txom, BLE_ATT_FIND_INFO_RSP_BASE_SZ);
- if (buf == NULL) {
+ rsp = ble_att_cmd_prepare(BLE_ATT_OP_FIND_INFO_RSP, sizeof(*rsp), txom);
+ if (rsp == NULL) {
*att_err = BLE_ATT_ERR_INSUFFICIENT_RES;
rc = BLE_HS_ENOMEM;
goto done;
}
- ble_att_find_info_rsp_write(buf, BLE_ATT_FIND_INFO_RSP_BASE_SZ, &rsp);
-
/* Write the variable length Information Data field, populating the format
* field as appropriate.
*/
mtu = ble_att_mtu(conn_handle);
- rc = ble_att_svr_fill_info(req, txom, mtu, txom->om_data + 1);
+ rc = ble_att_svr_fill_info(start_handle, end_handle, txom, mtu,
+ &rsp->bafp_format);
if (rc != 0) {
*att_err = BLE_ATT_ERR_ATTR_NOT_FOUND;
rc = BLE_HS_ENOENT;
@@ -904,7 +902,7 @@ ble_att_svr_build_find_info_rsp(uint16_t conn_handle,
}
BLE_ATT_LOG_CMD(1, "find info rsp", conn_handle, ble_att_find_info_rsp_log,
- &rsp);
+ rsp);
rc = 0;
@@ -920,43 +918,50 @@ ble_att_svr_rx_find_info(uint16_t conn_handle, struct os_mbuf **rxom)
return BLE_HS_ENOTSUP;
#endif
- struct ble_att_find_info_req req;
+ struct ble_att_find_info_req *req;
struct os_mbuf *txom;
- uint16_t err_handle;
+ uint16_t err_handle, start_handle, end_handle;
uint8_t att_err;
int rc;
+ /* TODO move this to common part
+ * Strip L2CAP ATT header from the front of the mbuf.
+ */
+ os_mbuf_adj(*rxom, 1);
+
/* Initialize some values in case of early error. */
txom = NULL;
att_err = 0;
err_handle = 0;
- rc = ble_att_svr_pullup_req_base(rxom, BLE_ATT_FIND_INFO_REQ_SZ, &att_err);
+ rc = ble_att_svr_pullup_req_base(rxom, sizeof(*req), &att_err);
if (rc != 0) {
err_handle = 0;
goto done;
}
- ble_att_find_info_req_parse((*rxom)->om_data, (*rxom)->om_len, &req);
+ req = (struct ble_att_find_info_req *)(*rxom)->om_data;
+ start_handle = le16toh(req->bafq_start_handle);
+ end_handle = le16toh(req->bafq_end_handle);
+
BLE_ATT_LOG_CMD(0, "find info req", conn_handle, ble_att_find_info_req_log,
- &req);
+ req);
/* Tx error response if start handle is greater than end handle or is equal
* to 0 (Vol. 3, Part F, 3.4.3.1).
*/
- if (req.bafq_start_handle > req.bafq_end_handle ||
- req.bafq_start_handle == 0) {
-
+ if (start_handle > end_handle || start_handle == 0) {
att_err = BLE_ATT_ERR_INVALID_HANDLE;
- err_handle = req.bafq_start_handle;
+ err_handle = start_handle;
rc = BLE_HS_EBADDATA;
goto done;
}
- rc = ble_att_svr_build_find_info_rsp(conn_handle, &req, rxom, &txom,
- &att_err);
+ rc = ble_att_svr_build_find_info_rsp(conn_handle,
+ start_handle, end_handle,
+ rxom, &txom, &att_err);
if (rc != 0) {
- err_handle = req.bafq_start_handle;
+ err_handle = start_handle;
goto done;
}