diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2016-09-25 20:17:29 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2016-09-25 20:08:24 +0000 |
| commit | 156584660b0e8b133385d34a90c78e6b378870fe (patch) | |
| tree | 18888aacf3e8058d74a3c56f8cbe7701b3b21114 | |
| parent | aeb112fde85197d4bf665d513d333ace0896c4f8 (diff) | |
| download | wireshark-156584660b0e8b133385d34a90c78e6b378870fe.tar.gz | |
btle: Add LL_LENGTH_REQ/RSP control data
Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e
Reviewed-on: https://code.wireshark.org/review/17932
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
| -rw-r--r-- | epan/dissectors/packet-btle.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index f9947aabfd..042501eb1a 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -118,6 +118,10 @@ static int hf_control_master_session_key_diversifier = -1; static int hf_control_master_session_initialization_vector = -1; static int hf_control_slave_session_key_diversifier = -1; static int hf_control_slave_session_initialization_vector = -1; +static int hf_control_max_rx_octets = -1; +static int hf_control_max_rx_time = -1; +static int hf_control_max_tx_octets = -1; +static int hf_control_max_tx_time = -1; static int hf_btle_l2cap_msg_fragments = -1; static int hf_btle_l2cap_msg_fragment = -1; static int hf_btle_l2cap_msg_fragment_overlap = -1; @@ -258,6 +262,8 @@ static const value_string control_opcode_vals[] = { { 0x11, "LL_REJECT_IND_EXT" }, { 0x12, "LL_PING_REQ" }, { 0x13, "LL_PING_RSP" }, + { 0x14, "LL_LENGTH_REQ" }, + { 0x15, "LL_LENGTH_RSP" }, { 0, NULL } }; static value_string_ext control_opcode_vals_ext = VALUE_STRING_EXT_INIT(control_opcode_vals); @@ -1135,6 +1141,23 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset += 1; break; + case 0x14: /* LL_LENGTH_REQ */ + case 0x15: /* LL_LENGTH_RSP */ + proto_tree_add_item(btle_tree, hf_control_max_rx_octets, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + + sub_item = proto_tree_add_item(btle_tree, hf_control_max_rx_time, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_item_append_text (sub_item, " microseconds"); + offset += 2; + + proto_tree_add_item(btle_tree, hf_control_max_tx_octets, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + + sub_item = proto_tree_add_item(btle_tree, hf_control_max_tx_time, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_item_append_text (sub_item, " microseconds"); + offset += 2; + + break; default: if (tvb_reported_length_remaining(tvb, offset) > 3) { proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3); @@ -1566,6 +1589,26 @@ proto_register_btle(void) FT_UINT64, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL } }, + { &hf_control_max_rx_octets, + { "Max RX octets", "btle.control.max_rx_octets", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_control_max_rx_time, + { "Max RX time", "btle.control.max_rx_time", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_control_max_tx_octets, + { "Max TX octets", "btle.control.max_tx_octets", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, + { &hf_control_max_tx_time, + { "Max TX time", "btle.control.max_tx_time", + FT_UINT16, BASE_DEC, NULL, 0x0, + NULL, HFILL } + }, { &hf_l2cap_fragment, { "L2CAP Fragment", "btle.l2cap_data", FT_NONE, BASE_NONE, NULL, 0x0, |