diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-07-13 19:01:48 +0200 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2015-07-17 08:06:40 +0000 |
| commit | dac7cf9f8c5bf5ce0d0abe10c5a04950716d02bc (patch) | |
| tree | 2ccb6f3bdf57aade00f14917986b505419d0cff2 /epan/dissectors/packet-btsdp.c | |
| parent | 5491fea2017f8c1ad92476f25bee7219e3c68155 (diff) | |
| download | wireshark-dac7cf9f8c5bf5ce0d0abe10c5a04950716d02bc.tar.gz | |
Bluetooth: Add generic UUID table for DecodeBy
Replace L2CAP Service, RFCOMM Service and AVCTP PID dissector table
by shared Bluetooth Service UUID table. It also supports UUID16,
UUID32 and UUID128 by hex-string, like for AVRCP: "110e".
Change-Id: I473bc73d10939e8ed6dd55a6a92387c7a1ec125a
Reviewed-on: https://code.wireshark.org/review/9678
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-btsdp.c')
| -rw-r--r-- | epan/dissectors/packet-btsdp.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 23eedead74..49597e1488 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -573,9 +573,6 @@ static expert_field ei_data_element_value_large = EI_INIT; static dissector_handle_t btsdp_handle; -static dissector_table_t btrfcomm_service_table; -static dissector_table_t btl2cap_service_table; - static wmem_tree_t *tid_requests = NULL; static wmem_tree_t *continuation_states = NULL; static wmem_tree_t *record_handle_services = NULL; @@ -1124,9 +1121,9 @@ get_specified_uuid(wmem_array_t *uuid_array) for (i_uuid = 0; i_uuid < size; i_uuid += 1) { p_uuid = (bluetooth_uuid_t *) wmem_array_index(uuid_array, i_uuid); - if (dissector_get_uint_handle(btrfcomm_service_table, p_uuid->bt_uuid)) + if (p_uuid->size == 16) /* CustomUUID (UUID128) is always ok */ break; - if (dissector_get_uint_handle(btl2cap_service_table, p_uuid->bt_uuid)) + if (dissector_get_string_handle(bluetooth_uuid_table, print_numeric_uuid(p_uuid))) break; } @@ -6545,9 +6542,6 @@ proto_reg_handoff_btsdp(void) { dissector_add_uint("btl2cap.psm", BTL2CAP_PSM_SDP, btsdp_handle); dissector_add_for_decode_as("btl2cap.cid", btsdp_handle); - - btrfcomm_service_table = find_dissector_table("btrfcomm.service"); - btl2cap_service_table = find_dissector_table("btl2cap.service"); } /* |