diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-29 08:53:15 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2015-01-10 15:36:02 +0000 |
| commit | 55df238efd77a3d1787a8adc1d5c81d05469bcc8 (patch) | |
| tree | f08fe2c15cc2b6114c8eebf472cbd0b8c9a34d98 /epan/dissectors/packet-bluetooth.c | |
| parent | d6e040989280e9999ddbe0a2b41f9fd80c746dbd (diff) | |
Bluetooth: SMP: Add missing opcode for "Identity Address Information"
Also fix tvb_length, tvb_length_remaining warnings.
Bug: 10299
Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13
Reviewed-on: https://code.wireshark.org/review/6407
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-bluetooth.c')
| -rw-r--r-- | epan/dissectors/packet-bluetooth.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index b5cb9f0cf6..43bb695962 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -1002,6 +1002,12 @@ static const value_string bluetooth_company_id_vals[] = { }; value_string_ext bluetooth_company_id_vals_ext = VALUE_STRING_EXT_INIT(bluetooth_company_id_vals); +const value_string bluetooth_address_type_vals[] = { + { 0x00, "Public" }, + { 0x01, "Random" }, + { 0, NULL } +}; + guint32 max_disconnect_in_frame = G_MAXUINT32; @@ -1192,7 +1198,7 @@ dissect_bluetooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat pinfo->ptype = PT_BLUETOOTH; get_conversation(pinfo, &pinfo->dl_src, &pinfo->dl_dst, pinfo->srcport, pinfo->destport); - main_item = proto_tree_add_item(tree, proto_bluetooth, tvb, 0, tvb_length(tvb), ENC_NA); + main_item = proto_tree_add_item(tree, proto_bluetooth, tvb, 0, tvb_captured_length(tvb), ENC_NA); main_tree = proto_item_add_subtree(main_item, ett_bluetooth); bluetooth_data = (bluetooth_data_t *) wmem_new(wmem_packet_scope(), bluetooth_data_t); @@ -1260,7 +1266,7 @@ dissect_bluetooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat call_dissector(data_handle, tvb, pinfo, tree); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } void |