Repository: incubator-mynewt-larva Updated Branches: refs/heads/master 8598e84fb -> 31f0c10b6
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/31f0c10b/net/nimble/host/src/test/ble_hs_att_svr_test.c ---------------------------------------------------------------------- diff --git a/net/nimble/host/src/test/ble_hs_att_svr_test.c b/net/nimble/host/src/test/ble_hs_att_svr_test.c index 4cd7045..c7fff45 100644 --- a/net/nimble/host/src/test/ble_hs_att_svr_test.c +++ b/net/nimble/host/src/test/ble_hs_att_svr_test.c @@ -24,19 +24,19 @@ #include "ble_l2cap.h" #include "ble_hs_test_util.h" #include "ble_hs_conn.h" -#include "ble_hs_att.h" -#include "ble_hs_att_cmd.h" +#include "ble_att.h" +#include "ble_att_cmd.h" -static uint8_t *ble_hs_att_svr_test_attr_r_1; -static int ble_hs_att_svr_test_attr_r_1_len; -static uint8_t *ble_hs_att_svr_test_attr_r_2; -static int ble_hs_att_svr_test_attr_r_2_len; +static uint8_t *ble_att_svr_test_attr_r_1; +static int ble_att_svr_test_attr_r_1_len; +static uint8_t *ble_att_svr_test_attr_r_2; +static int ble_att_svr_test_attr_r_2_len; -static uint8_t ble_hs_att_svr_test_attr_w_1[1024]; -static int ble_hs_att_svr_test_attr_w_1_len; +static uint8_t ble_att_svr_test_attr_w_1[1024]; +static int ble_att_svr_test_attr_w_1_len; static void -ble_hs_att_svr_test_misc_init(struct ble_hs_conn **conn, +ble_att_svr_test_misc_init(struct ble_hs_conn **conn, struct ble_l2cap_chan **att_chan) { ble_hs_test_util_init(); @@ -50,14 +50,14 @@ ble_hs_att_svr_test_misc_init(struct ble_hs_conn **conn, } static int -ble_hs_att_svr_test_misc_attr_fn_r_1(struct ble_hs_att_svr_entry *entry, +ble_att_svr_test_misc_attr_fn_r_1(struct ble_att_svr_entry *entry, uint8_t op, - union ble_hs_att_svr_handle_arg *arg) + union ble_att_svr_handle_arg *arg) { switch (op) { - case BLE_HS_ATT_OP_READ_REQ: - arg->aha_read.attr_data = ble_hs_att_svr_test_attr_r_1; - arg->aha_read.attr_len = ble_hs_att_svr_test_attr_r_1_len; + case BLE_ATT_OP_READ_REQ: + arg->aha_read.attr_data = ble_att_svr_test_attr_r_1; + arg->aha_read.attr_len = ble_att_svr_test_attr_r_1_len; return 0; default: @@ -66,14 +66,14 @@ ble_hs_att_svr_test_misc_attr_fn_r_1(struct ble_hs_att_svr_entry *entry, } static int -ble_hs_att_svr_test_misc_attr_fn_r_2(struct ble_hs_att_svr_entry *entry, +ble_att_svr_test_misc_attr_fn_r_2(struct ble_att_svr_entry *entry, uint8_t op, - union ble_hs_att_svr_handle_arg *arg) + union ble_att_svr_handle_arg *arg) { switch (op) { - case BLE_HS_ATT_OP_READ_REQ: - arg->aha_read.attr_data = ble_hs_att_svr_test_attr_r_2; - arg->aha_read.attr_len = ble_hs_att_svr_test_attr_r_2_len; + case BLE_ATT_OP_READ_REQ: + arg->aha_read.attr_data = ble_att_svr_test_attr_r_2; + arg->aha_read.attr_len = ble_att_svr_test_attr_r_2_len; return 0; default: @@ -82,20 +82,20 @@ ble_hs_att_svr_test_misc_attr_fn_r_2(struct ble_hs_att_svr_entry *entry, } static int -ble_hs_att_svr_test_misc_attr_fn_w_1(struct ble_hs_att_svr_entry *entry, +ble_att_svr_test_misc_attr_fn_w_1(struct ble_att_svr_entry *entry, uint8_t op, - union ble_hs_att_svr_handle_arg *arg) + union ble_att_svr_handle_arg *arg) { struct os_mbuf_pkthdr *omp; int rc; switch (op) { - case BLE_HS_ATT_OP_WRITE_REQ: + case BLE_ATT_OP_WRITE_REQ: omp = OS_MBUF_PKTHDR(arg->aha_write.om); rc = os_mbuf_copydata(arg->aha_write.om, 0, arg->aha_write.attr_len, - ble_hs_att_svr_test_attr_w_1); + ble_att_svr_test_attr_w_1); TEST_ASSERT(rc == 0); - ble_hs_att_svr_test_attr_w_1_len = arg->aha_write.attr_len; + ble_att_svr_test_attr_w_1_len = arg->aha_write.attr_len; return 0; default: @@ -106,18 +106,18 @@ ble_hs_att_svr_test_misc_attr_fn_w_1(struct ble_hs_att_svr_entry *entry, } static void -ble_hs_att_svr_test_misc_verify_tx_err_rsp(struct ble_l2cap_chan *chan, +ble_att_svr_test_misc_verify_tx_err_rsp(struct ble_l2cap_chan *chan, uint8_t req_op, uint16_t handle, uint8_t error_code) { - struct ble_hs_att_error_rsp rsp; - uint8_t buf[BLE_HS_ATT_ERROR_RSP_SZ]; + struct ble_att_error_rsp rsp; + uint8_t buf[BLE_ATT_ERROR_RSP_SZ]; int rc; rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, 0, sizeof buf, buf); TEST_ASSERT(rc == 0); - rc = ble_hs_att_error_rsp_parse(buf, sizeof buf, &rsp); + rc = ble_att_error_rsp_parse(buf, sizeof buf, &rsp); TEST_ASSERT(rc == 0); TEST_ASSERT(rsp.bhaep_req_op == req_op); @@ -126,11 +126,11 @@ ble_hs_att_svr_test_misc_verify_tx_err_rsp(struct ble_l2cap_chan *chan, /* Remove the error response from the buffer. */ os_mbuf_adj(ble_hs_test_util_prev_tx, - BLE_HS_ATT_ERROR_RSP_SZ); + BLE_ATT_ERROR_RSP_SZ); } static void -ble_hs_att_svr_test_misc_verify_tx_read_rsp(struct ble_l2cap_chan *chan, +ble_att_svr_test_misc_verify_tx_read_rsp(struct ble_l2cap_chan *chan, uint8_t *attr_data, int attr_len) { uint8_t u8; @@ -139,7 +139,7 @@ ble_hs_att_svr_test_misc_verify_tx_read_rsp(struct ble_l2cap_chan *chan, rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, 0, 1, &u8); TEST_ASSERT(rc == 0); - TEST_ASSERT(u8 == BLE_HS_ATT_OP_READ_RSP); + TEST_ASSERT(u8 == BLE_ATT_OP_READ_RSP); for (i = 0; i < attr_len; i++) { rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, i + 1, 1, &u8); @@ -155,56 +155,56 @@ ble_hs_att_svr_test_misc_verify_tx_read_rsp(struct ble_l2cap_chan *chan, } static void -ble_hs_att_svr_test_misc_verify_tx_write_rsp(struct ble_l2cap_chan *chan) +ble_att_svr_test_misc_verify_tx_write_rsp(struct ble_l2cap_chan *chan) { uint8_t u8; int rc; rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, 0, 1, &u8); TEST_ASSERT(rc == 0); - TEST_ASSERT(u8 == BLE_HS_ATT_OP_WRITE_RSP); + TEST_ASSERT(u8 == BLE_ATT_OP_WRITE_RSP); /* Remove the write response from the buffer. */ os_mbuf_adj(ble_hs_test_util_prev_tx, - BLE_HS_ATT_WRITE_RSP_SZ); + BLE_ATT_WRITE_RSP_SZ); } static void -ble_hs_att_svr_test_misc_verify_tx_mtu_rsp(struct ble_l2cap_chan *chan) +ble_att_svr_test_misc_verify_tx_mtu_rsp(struct ble_l2cap_chan *chan) { - struct ble_hs_att_mtu_cmd rsp; - uint8_t buf[BLE_HS_ATT_MTU_CMD_SZ]; + struct ble_att_mtu_cmd rsp; + uint8_t buf[BLE_ATT_MTU_CMD_SZ]; int rc; rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, 0, sizeof buf, buf); TEST_ASSERT(rc == 0); - rc = ble_hs_att_mtu_cmd_parse(buf, sizeof buf, &rsp); + rc = ble_att_mtu_cmd_parse(buf, sizeof buf, &rsp); TEST_ASSERT(rc == 0); TEST_ASSERT(rsp.bhamc_mtu == chan->blc_my_mtu); /* Remove the write response from the buffer. */ os_mbuf_adj(ble_hs_test_util_prev_tx, - BLE_HS_ATT_MTU_CMD_SZ); + BLE_ATT_MTU_CMD_SZ); } -struct ble_hs_att_svr_test_info_entry { +struct ble_att_svr_test_info_entry { uint16_t handle; /* 0 on last entry */ uint16_t uuid16; /* 0 if not present. */ uint8_t uuid128[16]; }; static void -ble_hs_att_svr_test_misc_verify_tx_find_info_rsp( +ble_att_svr_test_misc_verify_tx_find_info_rsp( struct ble_l2cap_chan *chan, - struct ble_hs_att_svr_test_info_entry *entries) + struct ble_att_svr_test_info_entry *entries) { - struct ble_hs_att_svr_test_info_entry *entry; - struct ble_hs_att_find_info_rsp rsp; + struct ble_att_svr_test_info_entry *entry; + struct ble_att_find_info_rsp rsp; uint16_t handle; uint16_t uuid16; - uint8_t buf[BLE_HS_ATT_FIND_INFO_RSP_MIN_SZ]; + uint8_t buf[BLE_ATT_FIND_INFO_RSP_MIN_SZ]; uint8_t uuid128[16]; int off; int rc; @@ -215,7 +215,7 @@ ble_hs_att_svr_test_misc_verify_tx_find_info_rsp( TEST_ASSERT(rc == 0); off += sizeof buf; - rc = ble_hs_att_find_info_rsp_parse(buf, sizeof buf, &rsp); + rc = ble_att_find_info_rsp_parse(buf, sizeof buf, &rsp); TEST_ASSERT(rc == 0); for (entry = entries; entry->handle != 0; entry++) { @@ -228,7 +228,7 @@ ble_hs_att_svr_test_misc_verify_tx_find_info_rsp( if (entry->uuid16 != 0) { TEST_ASSERT(rsp.bhafp_format == - BLE_HS_ATT_FIND_INFO_RSP_FORMAT_16BIT); + BLE_ATT_FIND_INFO_RSP_FORMAT_16BIT); rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, off, 2, &uuid16); TEST_ASSERT(rc == 0); off += 2; @@ -237,7 +237,7 @@ ble_hs_att_svr_test_misc_verify_tx_find_info_rsp( TEST_ASSERT(uuid16 == entry->uuid16); } else { TEST_ASSERT(rsp.bhafp_format == - BLE_HS_ATT_FIND_INFO_RSP_FORMAT_128BIT); + BLE_ATT_FIND_INFO_RSP_FORMAT_128BIT); rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, off, 16, uuid128); TEST_ASSERT(rc == 0); off += 16; @@ -253,17 +253,17 @@ ble_hs_att_svr_test_misc_verify_tx_find_info_rsp( os_mbuf_adj(ble_hs_test_util_prev_tx, off); } -struct ble_hs_att_svr_test_type_value_entry { +struct ble_att_svr_test_type_value_entry { uint16_t first; /* 0 on last entry */ uint16_t last; }; static void -ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp( +ble_att_svr_test_misc_verify_tx_find_type_value_rsp( struct ble_l2cap_chan *chan, - struct ble_hs_att_svr_test_type_value_entry *entries) + struct ble_att_svr_test_type_value_entry *entries) { - struct ble_hs_att_svr_test_type_value_entry *entry; + struct ble_att_svr_test_type_value_entry *entry; uint16_t u16; uint8_t op; int off; @@ -275,7 +275,7 @@ ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp( TEST_ASSERT(rc == 0); off += 1; - TEST_ASSERT(op == BLE_HS_ATT_OP_FIND_TYPE_VALUE_RSP); + TEST_ASSERT(op == BLE_ATT_OP_FIND_TYPE_VALUE_RSP); for (entry = entries; entry->first != 0; entry++) { rc = os_mbuf_copydata(ble_hs_test_util_prev_tx, off, 2, &u16); @@ -299,21 +299,21 @@ ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp( } static void -ble_hs_att_svr_test_misc_mtu_exchange(uint16_t my_mtu, uint16_t peer_sent, +ble_att_svr_test_misc_mtu_exchange(uint16_t my_mtu, uint16_t peer_sent, uint16_t peer_actual, uint16_t chan_mtu) { - struct ble_hs_att_mtu_cmd req; + struct ble_att_mtu_cmd req; struct ble_l2cap_chan *chan; struct ble_hs_conn *conn; - uint8_t buf[BLE_HS_ATT_MTU_CMD_SZ]; + uint8_t buf[BLE_ATT_MTU_CMD_SZ]; int rc; - ble_hs_att_svr_test_misc_init(&conn, &chan); + ble_att_svr_test_misc_init(&conn, &chan); chan->blc_my_mtu = my_mtu; req.bhamc_mtu = peer_sent; - rc = ble_hs_att_mtu_req_write(buf, sizeof buf, &req); + rc = ble_att_mtu_req_write(buf, sizeof buf, &req); TEST_ASSERT(rc == 0); rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf); @@ -322,134 +322,134 @@ ble_hs_att_svr_test_misc_mtu_exchange(uint16_t my_mtu, uint16_t peer_sent, TEST_ASSERT(chan->blc_peer_mtu == peer_actual); - ble_hs_att_svr_test_misc_verify_tx_mtu_rsp(chan); + ble_att_svr_test_misc_verify_tx_mtu_rsp(chan); TEST_ASSERT(ble_l2cap_chan_mtu(chan) == chan_mtu); } -TEST_CASE(ble_hs_att_svr_test_mtu) +TEST_CASE(ble_att_svr_test_mtu) { /*** MTU too low; should pretend peer sent default value instead. */ - ble_hs_att_svr_test_misc_mtu_exchange(BLE_HS_ATT_MTU_DFLT, 5, - BLE_HS_ATT_MTU_DFLT, - BLE_HS_ATT_MTU_DFLT); + ble_att_svr_test_misc_mtu_exchange(BLE_ATT_MTU_DFLT, 5, + BLE_ATT_MTU_DFLT, + BLE_ATT_MTU_DFLT); /*** MTUs equal. */ - ble_hs_att_svr_test_misc_mtu_exchange(50, 50, 50, 50); + ble_att_svr_test_misc_mtu_exchange(50, 50, 50, 50); /*** Peer's higher than mine. */ - ble_hs_att_svr_test_misc_mtu_exchange(50, 100, 100, 50); + ble_att_svr_test_misc_mtu_exchange(50, 100, 100, 50); /*** Mine higher than peer's. */ - ble_hs_att_svr_test_misc_mtu_exchange(100, 50, 50, 50); + ble_att_svr_test_misc_mtu_exchange(100, 50, 50, 50); } -TEST_CASE(ble_hs_att_svr_test_read) +TEST_CASE(ble_att_svr_test_read) { - struct ble_hs_att_read_req req; + struct ble_att_read_req req; struct ble_l2cap_chan *chan; struct ble_hs_conn *conn; - uint8_t buf[BLE_HS_ATT_READ_REQ_SZ]; + uint8_t buf[BLE_ATT_READ_REQ_SZ]; uint8_t uuid[16] = {0}; int rc; - ble_hs_att_svr_test_misc_init(&conn, &chan); + ble_att_svr_test_misc_init(&conn, &chan); /*** Nonexistent attribute. */ req.bharq_handle = 0; - rc = ble_hs_att_read_req_write(buf, sizeof buf, &req); + rc = ble_att_read_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp(chan, BLE_HS_ATT_OP_READ_REQ, 0, - BLE_HS_ATT_ERR_INVALID_HANDLE); + ble_att_svr_test_misc_verify_tx_err_rsp(chan, BLE_ATT_OP_READ_REQ, 0, + BLE_ATT_ERR_INVALID_HANDLE); /*** Successful read. */ - ble_hs_att_svr_test_attr_r_1 = (uint8_t[]){0,1,2,3,4,5,6,7}; - ble_hs_att_svr_test_attr_r_1_len = 8; - rc = ble_hs_att_svr_register(uuid, 0, &req.bharq_handle, - ble_hs_att_svr_test_misc_attr_fn_r_1); + ble_att_svr_test_attr_r_1 = (uint8_t[]){0,1,2,3,4,5,6,7}; + ble_att_svr_test_attr_r_1_len = 8; + rc = ble_att_svr_register(uuid, 0, &req.bharq_handle, + ble_att_svr_test_misc_attr_fn_r_1); TEST_ASSERT(rc == 0); - rc = ble_hs_att_read_req_write(buf, sizeof buf, &req); + rc = ble_att_read_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_read_rsp( - chan, ble_hs_att_svr_test_attr_r_1, ble_hs_att_svr_test_attr_r_1_len); + ble_att_svr_test_misc_verify_tx_read_rsp( + chan, ble_att_svr_test_attr_r_1, ble_att_svr_test_attr_r_1_len); /*** Partial read. */ - ble_hs_att_svr_test_attr_r_1 = + 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_hs_att_svr_test_attr_r_1_len = 40; + ble_att_svr_test_attr_r_1_len = 40; - rc = ble_hs_att_read_req_write(buf, sizeof buf, &req); + rc = ble_att_read_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_read_rsp(chan, - ble_hs_att_svr_test_attr_r_1, - BLE_HS_ATT_MTU_DFLT - 1); + ble_att_svr_test_misc_verify_tx_read_rsp(chan, + ble_att_svr_test_attr_r_1, + BLE_ATT_MTU_DFLT - 1); } -TEST_CASE(ble_hs_att_svr_test_write) +TEST_CASE(ble_att_svr_test_write) { - struct ble_hs_att_write_req req; + struct ble_att_write_req req; struct ble_l2cap_chan *chan; struct ble_hs_conn *conn; - uint8_t buf[BLE_HS_ATT_READ_REQ_SZ + 8]; + uint8_t buf[BLE_ATT_READ_REQ_SZ + 8]; uint8_t uuid[16] = {0}; int rc; - ble_hs_att_svr_test_misc_init(&conn, &chan); + ble_att_svr_test_misc_init(&conn, &chan); /*** Nonexistent attribute. */ req.bhawq_handle = 0; - rc = ble_hs_att_write_req_write(buf, sizeof buf, &req); + rc = ble_att_write_req_write(buf, sizeof buf, &req); TEST_ASSERT(rc == 0); - memcpy(buf + BLE_HS_ATT_READ_REQ_SZ, ((uint8_t[]){0,1,2,3,4,5,6,7}), 8); + memcpy(buf + BLE_ATT_READ_REQ_SZ, ((uint8_t[]){0,1,2,3,4,5,6,7}), 8); rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf); TEST_ASSERT(rc != 0); ble_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_WRITE_REQ, 0, BLE_HS_ATT_ERR_INVALID_HANDLE); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_WRITE_REQ, 0, BLE_ATT_ERR_INVALID_HANDLE); /*** Successful write. */ - rc = ble_hs_att_svr_register(uuid, 0, &req.bhawq_handle, - ble_hs_att_svr_test_misc_attr_fn_w_1); + rc = ble_att_svr_register(uuid, 0, &req.bhawq_handle, + ble_att_svr_test_misc_attr_fn_w_1); TEST_ASSERT(rc == 0); - rc = ble_hs_att_write_req_write(buf, sizeof buf, &req); + rc = ble_att_write_req_write(buf, sizeof buf, &req); TEST_ASSERT(rc == 0); - memcpy(buf + BLE_HS_ATT_WRITE_REQ_MIN_SZ, + memcpy(buf + BLE_ATT_WRITE_REQ_MIN_SZ, ((uint8_t[]){0,1,2,3,4,5,6,7}), 8); rc = ble_hs_test_util_l2cap_rx_payload_flat(conn, chan, buf, sizeof buf); TEST_ASSERT(rc == 0); ble_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_write_rsp(chan); + ble_att_svr_test_misc_verify_tx_write_rsp(chan); } -TEST_CASE(ble_hs_att_svr_test_find_info) +TEST_CASE(ble_att_svr_test_find_info) { - struct ble_hs_att_find_info_req req; + struct ble_att_find_info_req req; struct ble_l2cap_chan *chan; struct ble_hs_conn *conn; uint16_t handle1; uint16_t handle2; uint16_t handle3; - uint8_t buf[BLE_HS_ATT_FIND_INFO_REQ_SZ]; + uint8_t buf[BLE_ATT_FIND_INFO_REQ_SZ]; uint8_t uuid1[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}; uint8_t uuid2[16] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16}; uint8_t uuid3[16] = { @@ -458,7 +458,7 @@ TEST_CASE(ble_hs_att_svr_test_find_info) }; int rc; - ble_hs_att_svr_test_misc_init(&conn, &chan); + ble_att_svr_test_misc_init(&conn, &chan); /* Increase the MTU to 128 bytes to allow testing of long responses. */ chan->blc_my_mtu = 128; @@ -469,75 +469,75 @@ TEST_CASE(ble_hs_att_svr_test_find_info) req.bhafq_start_handle = 0; req.bhafq_end_handle = 0; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_INFO_REQ, 0, BLE_HS_ATT_ERR_INVALID_HANDLE); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_INFO_REQ, 0, BLE_ATT_ERR_INVALID_HANDLE); /*** Start handle > end handle. */ req.bhafq_start_handle = 101; req.bhafq_end_handle = 100; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_INFO_REQ, 101, BLE_HS_ATT_ERR_INVALID_HANDLE); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_INFO_REQ, 101, BLE_ATT_ERR_INVALID_HANDLE); /*** No attributes. */ req.bhafq_start_handle = 200; req.bhafq_end_handle = 300; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_INFO_REQ, 200, BLE_HS_ATT_ERR_ATTR_NOT_FOUND); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_INFO_REQ, 200, BLE_ATT_ERR_ATTR_NOT_FOUND); /*** Range too late. */ - rc = ble_hs_att_svr_register(uuid1, 0, &handle1, - ble_hs_att_svr_test_misc_attr_fn_r_1); + rc = ble_att_svr_register(uuid1, 0, &handle1, + ble_att_svr_test_misc_attr_fn_r_1); TEST_ASSERT(rc == 0); req.bhafq_start_handle = 200; req.bhafq_end_handle = 300; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_INFO_REQ, 200, BLE_HS_ATT_ERR_ATTR_NOT_FOUND); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_INFO_REQ, 200, BLE_ATT_ERR_ATTR_NOT_FOUND); /*** One 128-bit entry. */ req.bhafq_start_handle = handle1; req.bhafq_end_handle = handle1; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_info_rsp(chan, - ((struct ble_hs_att_svr_test_info_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_info_rsp(chan, + ((struct ble_att_svr_test_info_entry[]) { { .handle = handle1, .uuid128 = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}, }, { @@ -545,23 +545,23 @@ TEST_CASE(ble_hs_att_svr_test_find_info) } })); /*** Two 128-bit entries. */ - rc = ble_hs_att_svr_register(uuid2, 0, + rc = ble_att_svr_register(uuid2, 0, &handle2, - ble_hs_att_svr_test_misc_attr_fn_r_1); + ble_att_svr_test_misc_attr_fn_r_1); TEST_ASSERT(rc == 0); req.bhafq_start_handle = handle1; req.bhafq_end_handle = handle2; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_info_rsp(chan, - ((struct ble_hs_att_svr_test_info_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_info_rsp(chan, + ((struct ble_att_svr_test_info_entry[]) { { .handle = handle1, .uuid128 = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}, }, { @@ -572,23 +572,23 @@ TEST_CASE(ble_hs_att_svr_test_find_info) } })); /*** Two 128-bit entries; 16-bit entry doesn't get sent. */ - rc = ble_hs_att_svr_register(uuid3, 0, + rc = ble_att_svr_register(uuid3, 0, &handle3, - ble_hs_att_svr_test_misc_attr_fn_r_1); + ble_att_svr_test_misc_attr_fn_r_1); TEST_ASSERT(rc == 0); req.bhafq_start_handle = handle1; req.bhafq_end_handle = handle3; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_info_rsp(chan, - ((struct ble_hs_att_svr_test_info_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_info_rsp(chan, + ((struct ble_att_svr_test_info_entry[]) { { .handle = handle1, .uuid128 = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}, }, { @@ -602,15 +602,15 @@ TEST_CASE(ble_hs_att_svr_test_find_info) req.bhafq_start_handle = handle3; req.bhafq_end_handle = handle3; - rc = ble_hs_att_find_info_req_write(buf, sizeof buf, &req); + rc = ble_att_find_info_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_info_rsp(chan, - ((struct ble_hs_att_svr_test_info_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_info_rsp(chan, + ((struct ble_att_svr_test_info_entry[]) { { .handle = handle3, .uuid16 = 0x000f, }, { @@ -618,12 +618,12 @@ TEST_CASE(ble_hs_att_svr_test_find_info) } })); } -TEST_CASE(ble_hs_att_svr_test_find_type_value) +TEST_CASE(ble_att_svr_test_find_type_value) { - struct ble_hs_att_find_type_value_req req; + struct ble_att_find_type_value_req req; struct ble_l2cap_chan *chan; struct ble_hs_conn *conn; - uint8_t buf[BLE_HS_ATT_FIND_TYPE_VALUE_REQ_MIN_SZ + 2]; + uint8_t buf[BLE_ATT_FIND_TYPE_VALUE_REQ_MIN_SZ + 2]; uint16_t handle1; uint16_t handle2; uint16_t handle3; @@ -640,7 +640,7 @@ TEST_CASE(ble_hs_att_svr_test_find_type_value) }; int rc; - ble_hs_att_svr_test_misc_init(&conn, &chan); + ble_att_svr_test_misc_init(&conn, &chan); /* Increase the MTU to 128 bytes to allow testing of long responses. */ chan->blc_my_mtu = 128; @@ -648,90 +648,90 @@ TEST_CASE(ble_hs_att_svr_test_find_type_value) chan->blc_flags |= BLE_L2CAP_CHAN_F_TXED_MTU; /* One-time write of the attribute value at the end of the request. */ - ble_hs_att_svr_test_attr_r_1 = (uint8_t[]){0x99, 0x99}; - ble_hs_att_svr_test_attr_r_1_len = 2; - memcpy(buf + BLE_HS_ATT_FIND_TYPE_VALUE_REQ_MIN_SZ, - ble_hs_att_svr_test_attr_r_1, - ble_hs_att_svr_test_attr_r_1_len); + ble_att_svr_test_attr_r_1 = (uint8_t[]){0x99, 0x99}; + ble_att_svr_test_attr_r_1_len = 2; + memcpy(buf + BLE_ATT_FIND_TYPE_VALUE_REQ_MIN_SZ, + ble_att_svr_test_attr_r_1, + ble_att_svr_test_attr_r_1_len); /*** Start handle of 0. */ req.bhavq_start_handle = 0; req.bhavq_end_handle = 0; req.bhavq_attr_type = 0x0001; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_TYPE_VALUE_REQ, 0, - BLE_HS_ATT_ERR_INVALID_HANDLE); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_TYPE_VALUE_REQ, 0, + BLE_ATT_ERR_INVALID_HANDLE); /*** Start handle > end handle. */ req.bhavq_start_handle = 101; req.bhavq_end_handle = 100; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_TYPE_VALUE_REQ, 101, - BLE_HS_ATT_ERR_INVALID_HANDLE); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_TYPE_VALUE_REQ, 101, + BLE_ATT_ERR_INVALID_HANDLE); /*** No attributes. */ req.bhavq_start_handle = 200; req.bhavq_end_handle = 300; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_TYPE_VALUE_REQ, 200, - BLE_HS_ATT_ERR_ATTR_NOT_FOUND); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_TYPE_VALUE_REQ, 200, + BLE_ATT_ERR_ATTR_NOT_FOUND); /*** Range too late. */ - rc = ble_hs_att_svr_register(uuid1, 0, &handle1, - ble_hs_att_svr_test_misc_attr_fn_r_1); + rc = ble_att_svr_register(uuid1, 0, &handle1, + ble_att_svr_test_misc_attr_fn_r_1); TEST_ASSERT(rc == 0); req.bhavq_start_handle = 200; req.bhavq_end_handle = 300; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_err_rsp( - chan, BLE_HS_ATT_OP_FIND_TYPE_VALUE_REQ, 200, - BLE_HS_ATT_ERR_ATTR_NOT_FOUND); + ble_att_svr_test_misc_verify_tx_err_rsp( + chan, BLE_ATT_OP_FIND_TYPE_VALUE_REQ, 200, + BLE_ATT_ERR_ATTR_NOT_FOUND); /*** One entry, one attribute. */ req.bhavq_start_handle = handle1; req.bhavq_end_handle = handle1; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, - ((struct ble_hs_att_svr_test_type_value_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, + ((struct ble_att_svr_test_type_value_entry[]) { { .first = handle1, .last = handle1, }, { @@ -739,22 +739,22 @@ TEST_CASE(ble_hs_att_svr_test_find_type_value) } })); /*** One entry, two attributes. */ - rc = ble_hs_att_svr_register(uuid1, 0, &handle2, - ble_hs_att_svr_test_misc_attr_fn_r_1); + rc = ble_att_svr_register(uuid1, 0, &handle2, + ble_att_svr_test_misc_attr_fn_r_1); TEST_ASSERT(rc == 0); req.bhavq_start_handle = handle1; req.bhavq_end_handle = handle2; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, - ((struct ble_hs_att_svr_test_type_value_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, + ((struct ble_att_svr_test_type_value_entry[]) { { .first = handle1, .last = handle2, }, { @@ -762,26 +762,26 @@ TEST_CASE(ble_hs_att_svr_test_find_type_value) } })); /*** Entry 1: two attributes; entry 2: one attribute. */ - rc = ble_hs_att_svr_register(uuid2, 0, &handle3, - ble_hs_att_svr_test_misc_attr_fn_r_2); + rc = ble_att_svr_register(uuid2, 0, &handle3, + ble_att_svr_test_misc_attr_fn_r_2); TEST_ASSERT(rc == 0); - rc = ble_hs_att_svr_register(uuid1, 0, &handle4, - ble_hs_att_svr_test_misc_attr_fn_r_1); + rc = ble_att_svr_register(uuid1, 0, &handle4, + ble_att_svr_test_misc_attr_fn_r_1); TEST_ASSERT(rc == 0); req.bhavq_start_handle = 0x0001; req.bhavq_end_handle = 0xffff; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, - ((struct ble_hs_att_svr_test_type_value_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, + ((struct ble_att_svr_test_type_value_entry[]) { { .first = handle1, .last = handle2, }, { @@ -792,21 +792,21 @@ TEST_CASE(ble_hs_att_svr_test_find_type_value) } })); /*** Ensure attribute with wrong value is not included. */ - ble_hs_att_svr_test_attr_r_2 = (uint8_t[]){0x00, 0x00}; - ble_hs_att_svr_test_attr_r_2_len = 2; + ble_att_svr_test_attr_r_2 = (uint8_t[]){0x00, 0x00}; + ble_att_svr_test_attr_r_2_len = 2; req.bhavq_start_handle = 0x0001; req.bhavq_end_handle = 0xffff; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, - ((struct ble_hs_att_svr_test_type_value_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, + ((struct ble_att_svr_test_type_value_entry[]) { { .first = handle1, .last = handle2, }, { @@ -817,21 +817,21 @@ TEST_CASE(ble_hs_att_svr_test_find_type_value) } })); /*** Ensure attribute with wrong type is not included. */ - rc = ble_hs_att_svr_register(uuid3, 0, &handle5, - ble_hs_att_svr_test_misc_attr_fn_r_1); + rc = ble_att_svr_register(uuid3, 0, &handle5, + ble_att_svr_test_misc_attr_fn_r_1); req.bhavq_start_handle = 0x0001; req.bhavq_end_handle = 0xffff; - rc = ble_hs_att_find_type_value_req_write(buf, sizeof buf, &req); + rc = ble_att_find_type_value_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_hs_process_tx_data_queue(); - ble_hs_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, - ((struct ble_hs_att_svr_test_type_value_entry[]) { { + ble_att_svr_test_misc_verify_tx_find_type_value_rsp(chan, + ((struct ble_att_svr_test_type_value_entry[]) { { .first = handle1, .last = handle2, }, { @@ -842,19 +842,19 @@ TEST_CASE(ble_hs_att_svr_test_find_type_value) } })); } -TEST_SUITE(ble_hs_att_svr_suite) +TEST_SUITE(ble_att_svr_suite) { - ble_hs_att_svr_test_mtu(); - ble_hs_att_svr_test_read(); - ble_hs_att_svr_test_write(); - ble_hs_att_svr_test_find_info(); - ble_hs_att_svr_test_find_type_value(); + ble_att_svr_test_mtu(); + ble_att_svr_test_read(); + ble_att_svr_test_write(); + ble_att_svr_test_find_info(); + ble_att_svr_test_find_type_value(); } int -ble_hs_att_svr_test_all(void) +ble_att_svr_test_all(void) { - ble_hs_att_svr_suite(); + ble_att_svr_suite(); return tu_any_failed; } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/31f0c10b/net/nimble/host/src/test/ble_hs_conn_test.c ---------------------------------------------------------------------- diff --git a/net/nimble/host/src/test/ble_hs_conn_test.c b/net/nimble/host/src/test/ble_hs_conn_test.c index 5dc46d5..0a876de 100644 --- a/net/nimble/host/src/test/ble_hs_conn_test.c +++ b/net/nimble/host/src/test/ble_hs_conn_test.c @@ -22,7 +22,7 @@ #include "host/ble_hs_test.h" #include "host/host_hci.h" #include "ble_l2cap.h" -#include "ble_hs_att.h" +#include "ble_att.h" #include "ble_hs_conn.h" #include "ble_hs_ack.h" #include "ble_hs_hci_batch.h" @@ -73,9 +73,9 @@ TEST_CASE(ble_hs_conn_test_master_direct_success) chan = ble_hs_conn_chan_find(conn, BLE_L2CAP_CID_ATT); TEST_ASSERT_FATAL(chan != NULL); - TEST_ASSERT(chan->blc_my_mtu == BLE_HS_ATT_MTU_DFLT); + TEST_ASSERT(chan->blc_my_mtu == BLE_ATT_MTU_DFLT); TEST_ASSERT(chan->blc_peer_mtu == 0); - TEST_ASSERT(chan->blc_default_mtu == BLE_HS_ATT_MTU_DFLT); + TEST_ASSERT(chan->blc_default_mtu == BLE_ATT_MTU_DFLT); } TEST_CASE(ble_hs_conn_test_master_direct_hci_errors) @@ -172,9 +172,9 @@ TEST_CASE(ble_hs_conn_test_slave_direct_success) chan = ble_hs_conn_chan_find(conn, BLE_L2CAP_CID_ATT); TEST_ASSERT_FATAL(chan != NULL); - TEST_ASSERT(chan->blc_my_mtu == BLE_HS_ATT_MTU_DFLT); + TEST_ASSERT(chan->blc_my_mtu == BLE_ATT_MTU_DFLT); TEST_ASSERT(chan->blc_peer_mtu == 0); - TEST_ASSERT(chan->blc_default_mtu == BLE_HS_ATT_MTU_DFLT); + TEST_ASSERT(chan->blc_default_mtu == BLE_ATT_MTU_DFLT); } TEST_SUITE(conn_suite) http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/31f0c10b/net/nimble/host/src/test/ble_hs_test.c ---------------------------------------------------------------------- diff --git a/net/nimble/host/src/test/ble_hs_test.c b/net/nimble/host/src/test/ble_hs_test.c index 6bccf5f..81a5a5a 100644 --- a/net/nimble/host/src/test/ble_hs_test.c +++ b/net/nimble/host/src/test/ble_hs_test.c @@ -40,8 +40,8 @@ main(void) tu_init(); l2cap_test_all(); - ble_hs_att_svr_test_all(); - ble_hs_att_clt_test_all(); + ble_att_svr_test_all(); + ble_att_clt_test_all(); ble_host_hci_test_all(); ble_hs_conn_test_all(); ble_gap_test_all();
