You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/01/09 01:18:42 UTC

[09/10] incubator-mynewt-larva git commit: Unit tests for server-side read blob command.

Unit tests for server-side read blob command.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/26ff7490
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/26ff7490
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/26ff7490

Branch: refs/heads/master
Commit: 26ff74900536757578fc70071a499f36a30eb110
Parents: c97f4f1
Author: Christopher Collins <cc...@gmail.com>
Authored: Fri Jan 8 16:06:10 2016 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Fri Jan 8 16:18:10 2016 -0800

----------------------------------------------------------------------
 net/nimble/host/include/host/ble_att.h      |   1 +
 net/nimble/host/src/ble_att_svr.c           |  49 ++++++----
 net/nimble/host/src/test/ble_att_svr_test.c | 119 ++++++++++++++++++++++-
 3 files changed, 146 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/26ff7490/net/nimble/host/include/host/ble_att.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/include/host/ble_att.h b/net/nimble/host/include/host/ble_att.h
index f090c11..8f1899f 100644
--- a/net/nimble/host/include/host/ble_att.h
+++ b/net/nimble/host/include/host/ble_att.h
@@ -32,6 +32,7 @@
 #define BLE_ATT_ERR_INVALID_OFFSET          0x07
 #define BLE_ATT_ERR_PREPARE_QUEUE_FULL      0x09
 #define BLE_ATT_ERR_ATTR_NOT_FOUND          0x0a
+#define BLE_ATT_ERR_ATTR_NOT_LONG           0x0b
 #define BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN  0x0d
 #define BLE_ATT_ERR_UNLIKELY                0x0e
 #define BLE_ATT_ERR_UNSUPPORTED_GROUP       0x10

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/26ff7490/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 f252469..91ca278 100644
--- a/net/nimble/host/src/ble_att_svr.c
+++ b/net/nimble/host/src/ble_att_svr.c
@@ -933,6 +933,7 @@ ble_att_svr_fill_type_value(struct ble_hs_conn *conn,
              */
             uuid16 = ble_uuid_128_to_16(ha->ha_uuid);
             if (uuid16 == req->bavq_attr_type) {
+                ctxt.offset = 0;
                 rc = ble_att_svr_read(conn, ha, &ctxt, out_att_err);
                 if (rc != 0) {
                     goto done;
@@ -1090,7 +1091,7 @@ ble_att_svr_tx_read_type_rsp(struct ble_hs_conn *conn,
                              uint16_t *err_handle)
 {
     struct ble_att_read_type_rsp rsp;
-    struct ble_att_svr_access_ctxt arg;
+    struct ble_att_svr_access_ctxt ctxt;
     struct ble_att_svr_entry *entry;
     struct os_mbuf *txom;
     uint8_t *dptr;
@@ -1142,16 +1143,17 @@ ble_att_svr_tx_read_type_rsp(struct ble_hs_conn *conn,
         }
 
         if (entry->ha_handle_id >= req->batq_start_handle) {
-            rc = ble_att_svr_read(conn, entry, &arg, att_err);
+            ctxt.offset = 0;
+            rc = ble_att_svr_read(conn, entry, &ctxt, att_err);
             if (rc != 0) {
                 *err_handle = entry->ha_handle_id;
                 goto done;
             }
 
-            if (arg.data_len > ble_l2cap_chan_mtu(chan) - 4) {
+            if (ctxt.data_len > ble_l2cap_chan_mtu(chan) - 4) {
                 attr_len = ble_l2cap_chan_mtu(chan) - 4;
             } else {
-                attr_len = arg.data_len;
+                attr_len = ctxt.data_len;
             }
 
             if (prev_attr_len == 0) {
@@ -1174,7 +1176,7 @@ ble_att_svr_tx_read_type_rsp(struct ble_hs_conn *conn,
             }
 
             htole16(dptr + 0, entry->ha_handle_id);
-            memcpy(dptr + 2, arg.attr_data, attr_len);
+            memcpy(dptr + 2, ctxt.attr_data, attr_len);
             entry_written = 1;
         }
     }
@@ -1428,6 +1430,7 @@ ble_att_svr_rx_read(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
         goto err;
     }
 
+    ctxt.offset = 0;
     rc = ble_att_svr_read(conn, entry, &ctxt, &att_err);
     if (rc != 0) {
         err_handle = req.barq_handle;
@@ -1501,6 +1504,13 @@ ble_att_svr_rx_read_blob(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
         goto err;
     }
 
+    if (ctxt.offset + ctxt.data_len <= ble_l2cap_chan_mtu(chan) - 3) {
+        att_err = BLE_ATT_ERR_ATTR_NOT_LONG;
+        err_handle = req.babq_handle;
+        rc = BLE_HS_ENOTSUP;
+        goto err;
+    }
+
     rc = ble_att_svr_tx_read_blob_rsp(conn, chan, ctxt.attr_data,
                                       ctxt.data_len, &att_err);
     if (rc != 0) {
@@ -1531,22 +1541,23 @@ static int
 ble_att_svr_service_uuid(struct ble_att_svr_entry *entry, uint16_t *uuid16,
                          uint8_t *uuid128)
 {
-    struct ble_att_svr_access_ctxt arg;
+    struct ble_att_svr_access_ctxt ctxt;
     int rc;
 
-    rc = ble_att_svr_read(NULL, entry, &arg, NULL);
+    ctxt.offset = 0;
+    rc = ble_att_svr_read(NULL, entry, &ctxt, NULL);
     if (rc != 0) {
         return rc;
     }
 
-    switch (arg.data_len) {
+    switch (ctxt.data_len) {
     case 16:
         *uuid16 = 0;
-        memcpy(uuid128, arg.attr_data, 16);
+        memcpy(uuid128, ctxt.attr_data, 16);
         return 0;
 
     case 2:
-        *uuid16 = le16toh(arg.attr_data);
+        *uuid16 = le16toh(ctxt.attr_data);
         if (*uuid16 == 0) {
             return BLE_HS_EINVAL;
         }
@@ -1869,7 +1880,7 @@ int
 ble_att_svr_rx_write(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
                      struct os_mbuf **rxom)
 {
-    struct ble_att_svr_access_ctxt arg;
+    struct ble_att_svr_access_ctxt ctxt;
     struct ble_att_svr_entry *entry;
     struct ble_att_write_req req;
     uint16_t err_handle;
@@ -1905,10 +1916,10 @@ ble_att_svr_rx_write(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
         goto err;
     }
 
-    arg.attr_data = ble_att_svr_flat_buf;
-    arg.data_len = OS_MBUF_PKTLEN(*rxom);
-    os_mbuf_copydata(*rxom, 0, arg.data_len, arg.attr_data);
-    rc = ble_att_svr_write(conn, entry, &arg, &att_err);
+    ctxt.attr_data = ble_att_svr_flat_buf;
+    ctxt.data_len = OS_MBUF_PKTLEN(*rxom);
+    os_mbuf_copydata(*rxom, 0, ctxt.data_len, ctxt.attr_data);
+    rc = ble_att_svr_write(conn, entry, &ctxt, &att_err);
     if (rc != 0) {
         err_handle = req.bawq_handle;
         goto err;
@@ -2035,7 +2046,7 @@ ble_att_svr_prep_validate(struct ble_att_svr_conn *basc, uint16_t *err_handle)
 static int
 ble_att_svr_prep_write(struct ble_hs_conn *conn, uint16_t *err_handle)
 {
-    struct ble_att_svr_access_ctxt arg;
+    struct ble_att_svr_access_ctxt ctxt;
     struct ble_att_prep_entry *entry;
     struct ble_att_prep_entry *next;
     struct ble_att_svr_entry *attr;
@@ -2072,9 +2083,9 @@ ble_att_svr_prep_write(struct ble_hs_conn *conn, uint16_t *err_handle)
                 return BLE_ATT_ERR_INVALID_HANDLE;
             }
 
-            arg.attr_data = ble_att_svr_flat_buf;
-            arg.data_len = buf_off;
-            rc = ble_att_svr_write(conn, attr, &arg, &att_err);
+            ctxt.attr_data = ble_att_svr_flat_buf;
+            ctxt.data_len = buf_off;
+            rc = ble_att_svr_write(conn, attr, &ctxt, &att_err);
             if (rc != 0) {
                 *err_handle = entry->bape_handle;
                 return att_err;

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/26ff7490/net/nimble/host/src/test/ble_att_svr_test.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_att_svr_test.c b/net/nimble/host/src/test/ble_att_svr_test.c
index 696d211..677cc96 100644
--- a/net/nimble/host/src/test/ble_att_svr_test.c
+++ b/net/nimble/host/src/test/ble_att_svr_test.c
@@ -67,10 +67,14 @@ ble_att_svr_test_misc_attr_fn_r_1(uint16_t conn_handle, uint16_t attr_handle,
                                   struct ble_att_svr_access_ctxt *ctxt,
                                   void *arg)
 {
+    if (ctxt->offset > ble_att_svr_test_attr_r_1_len) {
+        return BLE_ATT_ERR_INVALID_OFFSET;
+    }
+
     switch (op) {
     case BLE_ATT_ACCESS_OP_READ:
-        ctxt->attr_data = ble_att_svr_test_attr_r_1;
-        ctxt->data_len = ble_att_svr_test_attr_r_1_len;
+        ctxt->attr_data = ble_att_svr_test_attr_r_1 + ctxt->offset;
+        ctxt->data_len = ble_att_svr_test_attr_r_1_len - ctxt->offset;
         return 0;
 
     default:
@@ -84,10 +88,14 @@ ble_att_svr_test_misc_attr_fn_r_2(uint16_t conn_handle, uint16_t attr_handle,
                                   struct ble_att_svr_access_ctxt *ctxt,
                                   void *arg)
 {
+    if (ctxt->offset > ble_att_svr_test_attr_r_2_len) {
+        return BLE_ATT_ERR_INVALID_OFFSET;
+    }
+
     switch (op) {
     case BLE_ATT_ACCESS_OP_READ:
-        ctxt->attr_data = ble_att_svr_test_attr_r_2;
-        ctxt->data_len = ble_att_svr_test_attr_r_2_len;
+        ctxt->attr_data = ble_att_svr_test_attr_r_2 + ctxt->offset;
+        ctxt->data_len = ble_att_svr_test_attr_r_2_len - ctxt->offset;
         return 0;
 
     default:
@@ -327,6 +335,33 @@ ble_att_svr_test_misc_verify_tx_read_rsp(struct ble_l2cap_chan *chan,
 }
 
 static void
+ble_att_svr_test_misc_verify_tx_read_blob_rsp(struct ble_l2cap_chan *chan,
+                                              uint8_t *attr_data, int attr_len)
+{
+    uint8_t u8;
+    int rc;
+    int i;
+
+    ble_hs_test_util_tx_all();
+
+    rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, 0, 1, &u8);
+    TEST_ASSERT(rc == 0);
+    TEST_ASSERT(u8 == BLE_ATT_OP_READ_BLOB_RSP);
+
+    for (i = 0; i < attr_len; i++) {
+        rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, i + 1, 1, &u8);
+        TEST_ASSERT(rc == 0);
+        TEST_ASSERT(u8 == attr_data[i]);
+    }
+
+    rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, i + 1, 1, &u8);
+    TEST_ASSERT(rc != 0);
+
+    /* Remove the read response from the buffer. */
+    os_mbuf_adj(ble_hs_test_util_prev_tx, attr_len + 1);
+}
+
+static void
 ble_att_svr_test_misc_verify_tx_write_rsp(struct ble_l2cap_chan *chan)
 {
     uint8_t u8;
@@ -941,6 +976,81 @@ TEST_CASE(ble_att_svr_test_read)
                                              BLE_ATT_MTU_DFLT - 1);
 }
 
+TEST_CASE(ble_att_svr_test_read_blob)
+{
+    struct ble_att_read_blob_req req;
+    struct ble_l2cap_chan *chan;
+    struct ble_hs_conn *conn;
+    uint8_t buf[BLE_ATT_READ_BLOB_REQ_SZ];
+    uint8_t uuid[16] = {0};
+    int rc;
+
+    ble_att_svr_test_misc_init(&conn, &chan);
+
+    /*** Nonexistent attribute. */
+    req.babq_handle = 0;
+    req.babq_offset = 0;
+    rc = ble_att_read_blob_req_write(buf, sizeof buf, &req);
+    TEST_ASSERT(rc == 0);
+
+    rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf);
+    TEST_ASSERT(rc != 0);
+    ble_att_svr_test_misc_verify_tx_err_rsp(chan, BLE_ATT_OP_READ_BLOB_REQ, 0,
+                                            BLE_ATT_ERR_INVALID_HANDLE);
+
+    /*** Short read failure. */
+    ble_att_svr_test_attr_r_1 =
+        (uint8_t[]){0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,
+                    22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39};
+    ble_att_svr_test_attr_r_1_len = BLE_ATT_MTU_DFLT - 3;
+    rc = ble_att_svr_register(uuid, HA_FLAG_PERM_RW, &req.babq_handle,
+                              ble_att_svr_test_misc_attr_fn_r_1, NULL);
+    TEST_ASSERT(rc == 0);
+
+    rc = ble_att_read_blob_req_write(buf, sizeof buf, &req);
+    TEST_ASSERT(rc == 0);
+
+    rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf);
+    TEST_ASSERT(rc != 0);
+    ble_att_svr_test_misc_verify_tx_err_rsp(chan, BLE_ATT_OP_READ_BLOB_REQ,
+                                            req.babq_handle,
+                                            BLE_ATT_ERR_ATTR_NOT_LONG);
+
+    /*** Successful partial read. */
+    ble_att_svr_test_attr_r_1_len = 40;
+
+    rc = ble_att_read_blob_req_write(buf, sizeof buf, &req);
+    TEST_ASSERT(rc == 0);
+
+    rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf);
+    TEST_ASSERT(rc == 0);
+    ble_att_svr_test_misc_verify_tx_read_blob_rsp(chan,
+                                                  ble_att_svr_test_attr_r_1,
+                                                  BLE_ATT_MTU_DFLT - 1);
+
+    /*** Read remainder of attribute. */
+    req.babq_offset = BLE_ATT_MTU_DFLT - 1;
+    rc = ble_att_read_blob_req_write(buf, sizeof buf, &req);
+    TEST_ASSERT(rc == 0);
+
+    rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf);
+    TEST_ASSERT(rc == 0);
+    ble_att_svr_test_misc_verify_tx_read_blob_rsp(
+        chan, ble_att_svr_test_attr_r_1 + BLE_ATT_MTU_DFLT - 1,
+        40 - (BLE_ATT_MTU_DFLT - 1));
+
+    /*** Zero-length read. */
+    req.babq_offset = ble_att_svr_test_attr_r_1_len;
+    rc = ble_att_read_blob_req_write(buf, sizeof buf, &req);
+    TEST_ASSERT(rc == 0);
+
+    rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf);
+    TEST_ASSERT(rc == 0);
+    ble_att_svr_test_misc_verify_tx_read_blob_rsp(chan,
+                                                  ble_att_svr_test_attr_r_1,
+                                                  0);
+}
+
 TEST_CASE(ble_att_svr_test_write)
 {
     struct ble_att_write_req req;
@@ -1868,6 +1978,7 @@ TEST_SUITE(ble_att_svr_suite)
 {
     ble_att_svr_test_mtu();
     ble_att_svr_test_read();
+    ble_att_svr_test_read_blob();
     ble_att_svr_test_write();
     ble_att_svr_test_find_info();
     ble_att_svr_test_find_type_value();