bluetooth: Group Bluetooth dissector preferences
Change-Id: Ib5360fcbfd8f6b2aee6b33ec7d9dc77362feb50e Reviewed-on: https://code.wireshark.org/review/25162 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
9295535220
commit
29798bb8c9
|
@ -2920,8 +2920,8 @@ proto_register_bluetooth(void)
|
||||||
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
|
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
|
||||||
|
|
||||||
|
|
||||||
proto_bluetooth = proto_register_protocol("Bluetooth",
|
proto_bluetooth = proto_register_protocol("Bluetooth", "Bluetooth", "bluetooth");
|
||||||
"Bluetooth", "bluetooth");
|
prefs_register_protocol(proto_bluetooth, NULL);
|
||||||
|
|
||||||
register_dissector("bluetooth_ubertooth", dissect_bluetooth_ubertooth, proto_bluetooth);
|
register_dissector("bluetooth_ubertooth", dissect_bluetooth_ubertooth, proto_bluetooth);
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ proto_register_bt3ds(void)
|
||||||
expert_bt3ds = expert_register_protocol(proto_bt3ds);
|
expert_bt3ds = expert_register_protocol(proto_bt3ds);
|
||||||
expert_register_field_array(expert_bt3ds, ei, array_length(ei));
|
expert_register_field_array(expert_bt3ds, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bt3ds, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bt3ds, NULL);
|
||||||
prefs_register_static_text_preference(module, "3ds.version",
|
prefs_register_static_text_preference(module, "3ds.version",
|
||||||
"Bluetooth Profile 3DS version: 1.0",
|
"Bluetooth Profile 3DS version: 1.0",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
|
|
@ -15671,7 +15671,7 @@ proto_register_btatt(void)
|
||||||
fragments = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
fragments = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
||||||
handle_to_uuid = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
handle_to_uuid = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btatt, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btatt, NULL);
|
||||||
prefs_register_static_text_preference(module, "att.version",
|
prefs_register_static_text_preference(module, "att.version",
|
||||||
"Bluetooth Protocol ATT version from Core 4.0",
|
"Bluetooth Protocol ATT version from Core 4.0",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -472,7 +472,7 @@ proto_register_btavctp(void)
|
||||||
expert_btavctp = expert_register_protocol(proto_btavctp);
|
expert_btavctp = expert_register_protocol(proto_btavctp);
|
||||||
expert_register_field_array(expert_btavctp, ei, array_length(ei));
|
expert_register_field_array(expert_btavctp, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btavctp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btavctp, NULL);
|
||||||
prefs_register_static_text_preference(module, "avctp.version",
|
prefs_register_static_text_preference(module, "avctp.version",
|
||||||
"Bluetooth Protocol AVCTP version: 1.4",
|
"Bluetooth Protocol AVCTP version: 1.4",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -2730,7 +2730,7 @@ proto_register_btavdtp(void)
|
||||||
proto_register_field_array(proto_btavdtp, hf, array_length(hf));
|
proto_register_field_array(proto_btavdtp, hf, array_length(hf));
|
||||||
proto_register_subtree_array(ett, array_length(ett));
|
proto_register_subtree_array(ett, array_length(ett));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btavdtp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btavdtp, NULL);
|
||||||
prefs_register_static_text_preference(module, "avdtp.version",
|
prefs_register_static_text_preference(module, "avdtp.version",
|
||||||
"Bluetooth Protocol AVDTP version: 1.3",
|
"Bluetooth Protocol AVDTP version: 1.3",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
@ -3147,7 +3147,7 @@ proto_register_bta2dp(void)
|
||||||
|
|
||||||
bta2dp_handle = register_dissector("bta2dp", dissect_bta2dp, proto_bta2dp);
|
bta2dp_handle = register_dissector("bta2dp", dissect_bta2dp, proto_bta2dp);
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bta2dp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bta2dp, NULL);
|
||||||
prefs_register_static_text_preference(module, "a2dp.version",
|
prefs_register_static_text_preference(module, "a2dp.version",
|
||||||
"Bluetooth Profile A2DP version: 1.3",
|
"Bluetooth Profile A2DP version: 1.3",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
@ -3387,7 +3387,7 @@ proto_register_btvdp(void)
|
||||||
expert_btavdtp = expert_register_protocol(proto_btvdp);
|
expert_btavdtp = expert_register_protocol(proto_btvdp);
|
||||||
expert_register_field_array(expert_btavdtp, ei, array_length(ei));
|
expert_register_field_array(expert_btavdtp, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btvdp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btvdp, NULL);
|
||||||
prefs_register_static_text_preference(module, "vdp.version",
|
prefs_register_static_text_preference(module, "vdp.version",
|
||||||
"Bluetooth Profile VDP version: 1.1",
|
"Bluetooth Profile VDP version: 1.1",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
|
|
@ -3156,7 +3156,7 @@ proto_register_btavrcp(void)
|
||||||
expert_btavrcp = expert_register_protocol(proto_btavrcp);
|
expert_btavrcp = expert_register_protocol(proto_btavrcp);
|
||||||
expert_register_field_array(expert_btavrcp, ei, array_length(ei));
|
expert_register_field_array(expert_btavrcp, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btavrcp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btavrcp, NULL);
|
||||||
prefs_register_static_text_preference(module, "avrcp.version",
|
prefs_register_static_text_preference(module, "avrcp.version",
|
||||||
"Bluetooth Profile AVRCP version: 1.5",
|
"Bluetooth Profile AVRCP version: 1.5",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
|
|
@ -629,7 +629,7 @@ proto_register_btbnep(void)
|
||||||
expert_btbnep = expert_register_protocol(proto_btbnep);
|
expert_btbnep = expert_register_protocol(proto_btbnep);
|
||||||
expert_register_field_array(expert_btbnep, ei, array_length(ei));
|
expert_register_field_array(expert_btbnep, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btbnep, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btbnep, NULL);
|
||||||
prefs_register_static_text_preference(module, "bnep.version",
|
prefs_register_static_text_preference(module, "bnep.version",
|
||||||
"Bluetooth Protocol BNEP version: 1.0",
|
"Bluetooth Protocol BNEP version: 1.0",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -683,7 +683,7 @@ proto_register_bthci_acl(void)
|
||||||
expert_register_field_array(bthci_acl_expert_module, ei, array_length(ei));
|
expert_register_field_array(bthci_acl_expert_module, ei, array_length(ei));
|
||||||
|
|
||||||
/* Register configuration preferences */
|
/* Register configuration preferences */
|
||||||
bthci_acl_module = prefs_register_protocol(proto_bthci_acl, NULL);
|
bthci_acl_module = prefs_register_protocol_subtree("Bluetooth", proto_bthci_acl, NULL);
|
||||||
prefs_register_bool_preference(bthci_acl_module, "hci_acl_reassembly",
|
prefs_register_bool_preference(bthci_acl_module, "hci_acl_reassembly",
|
||||||
"Reassemble ACL Fragments",
|
"Reassemble ACL Fragments",
|
||||||
"Whether the ACL dissector should reassemble fragmented PDUs",
|
"Whether the ACL dissector should reassemble fragmented PDUs",
|
||||||
|
|
|
@ -7230,7 +7230,7 @@ proto_register_bthci_cmd(void)
|
||||||
|
|
||||||
bthci_cmds = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
bthci_cmds = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bthci_cmd, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bthci_cmd, NULL);
|
||||||
prefs_register_static_text_preference(module, "hci_cmd.version",
|
prefs_register_static_text_preference(module, "hci_cmd.version",
|
||||||
"Bluetooth HCI version: 4.0 (Core)",
|
"Bluetooth HCI version: 4.0 (Core)",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -7997,7 +7997,7 @@ proto_register_bthci_evt(void)
|
||||||
expert_bthci_evt = expert_register_protocol(proto_bthci_evt);
|
expert_bthci_evt = expert_register_protocol(proto_bthci_evt);
|
||||||
expert_register_field_array(expert_bthci_evt, ei, array_length(ei));
|
expert_register_field_array(expert_bthci_evt, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bthci_evt, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bthci_evt, NULL);
|
||||||
prefs_register_static_text_preference(module, "hci_evt.version",
|
prefs_register_static_text_preference(module, "hci_evt.version",
|
||||||
"Bluetooth HCI version: 4.0 (Core) + Addendum 4",
|
"Bluetooth HCI version: 4.0 (Core) + Addendum 4",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -645,7 +645,7 @@ proto_register_bthcrp(void)
|
||||||
expert_bthcrp = expert_register_protocol(proto_bthcrp);
|
expert_bthcrp = expert_register_protocol(proto_bthcrp);
|
||||||
expert_register_field_array(expert_bthcrp, ei, array_length(ei));
|
expert_register_field_array(expert_bthcrp, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bthcrp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bthcrp, NULL);
|
||||||
prefs_register_static_text_preference(module, "hcrp.version",
|
prefs_register_static_text_preference(module, "hcrp.version",
|
||||||
"Bluetooth Profile HCRP version: 1.2",
|
"Bluetooth Profile HCRP version: 1.2",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
|
|
@ -2944,7 +2944,7 @@ proto_register_bthfp(void)
|
||||||
proto_register_field_array(proto_bthfp, hf, array_length(hf));
|
proto_register_field_array(proto_bthfp, hf, array_length(hf));
|
||||||
proto_register_subtree_array(ett, array_length(ett));
|
proto_register_subtree_array(ett, array_length(ett));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bthfp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bthfp, NULL);
|
||||||
prefs_register_static_text_preference(module, "hfp.version",
|
prefs_register_static_text_preference(module, "hfp.version",
|
||||||
"Bluetooth Profile HFP version: 1.7",
|
"Bluetooth Profile HFP version: 1.7",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
|
|
@ -408,7 +408,7 @@ proto_register_bthid(void)
|
||||||
expert_bthid = expert_register_protocol(proto_bthid);
|
expert_bthid = expert_register_protocol(proto_bthid);
|
||||||
expert_register_field_array(expert_bthid, ei, array_length(ei));
|
expert_register_field_array(expert_bthid, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bthid, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bthid, NULL);
|
||||||
prefs_register_static_text_preference(module, "hid.version",
|
prefs_register_static_text_preference(module, "hid.version",
|
||||||
"Bluetooth Profile HID version: 1.1",
|
"Bluetooth Profile HID version: 1.1",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
|
|
@ -1126,7 +1126,7 @@ proto_register_bthsp(void)
|
||||||
proto_register_field_array(proto_bthsp, hf, array_length(hf));
|
proto_register_field_array(proto_bthsp, hf, array_length(hf));
|
||||||
proto_register_subtree_array(ett, array_length(ett));
|
proto_register_subtree_array(ett, array_length(ett));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_bthsp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_bthsp, NULL);
|
||||||
prefs_register_static_text_preference(module, "hsp.version",
|
prefs_register_static_text_preference(module, "hsp.version",
|
||||||
"Bluetooth Profile HSP version: 1.2",
|
"Bluetooth Profile HSP version: 1.2",
|
||||||
"Version of profile supported by this dissector.");
|
"Version of profile supported by this dissector.");
|
||||||
|
|
|
@ -2060,7 +2060,7 @@ proto_register_btle(void)
|
||||||
expert_module = expert_register_protocol(proto_btle);
|
expert_module = expert_register_protocol(proto_btle);
|
||||||
expert_register_field_array(expert_module, ei, array_length(ei));
|
expert_register_field_array(expert_module, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btle, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btle, NULL);
|
||||||
prefs_register_static_text_preference(module, "version",
|
prefs_register_static_text_preference(module, "version",
|
||||||
"Bluetooth LE LL version: 5.0 (Core)",
|
"Bluetooth LE LL version: 5.0 (Core)",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -420,7 +420,7 @@ proto_register_btmcap(void)
|
||||||
expert_btmcap = expert_register_protocol(proto_btmcap);
|
expert_btmcap = expert_register_protocol(proto_btmcap);
|
||||||
expert_register_field_array(expert_btmcap, ei, array_length(ei));
|
expert_register_field_array(expert_btmcap, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btmcap, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btmcap, NULL);
|
||||||
prefs_register_static_text_preference(module, "mcap.version",
|
prefs_register_static_text_preference(module, "mcap.version",
|
||||||
"Bluetooth Protocol MCAP version: 1.0",
|
"Bluetooth Protocol MCAP version: 1.0",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -1271,7 +1271,7 @@ proto_register_btmesh(void)
|
||||||
expert_btmesh = expert_register_protocol(proto_btmesh);
|
expert_btmesh = expert_register_protocol(proto_btmesh);
|
||||||
expert_register_field_array(expert_btmesh, ei, array_length(ei));
|
expert_register_field_array(expert_btmesh, ei, array_length(ei));
|
||||||
|
|
||||||
btmesh_module = prefs_register_protocol(proto_btmesh, NULL);
|
btmesh_module = prefs_register_protocol_subtree("Bluetooth", proto_btmesh, NULL);
|
||||||
|
|
||||||
btmesh_uat = uat_new("BTMesh Network keys",
|
btmesh_uat = uat_new("BTMesh Network keys",
|
||||||
sizeof(uat_btmesh_record_t), /* record size */
|
sizeof(uat_btmesh_record_t), /* record size */
|
||||||
|
|
|
@ -1142,7 +1142,7 @@ proto_register_btrfcomm(void)
|
||||||
|
|
||||||
rfcomm_dlci_dissector_table = register_dissector_table("btrfcomm.dlci", "BT RFCOMM Directed Channel", proto_btrfcomm, FT_UINT16, BASE_DEC);
|
rfcomm_dlci_dissector_table = register_dissector_table("btrfcomm.dlci", "BT RFCOMM Directed Channel", proto_btrfcomm, FT_UINT16, BASE_DEC);
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btrfcomm, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btrfcomm, NULL);
|
||||||
prefs_register_static_text_preference(module, "rfcomm.version",
|
prefs_register_static_text_preference(module, "rfcomm.version",
|
||||||
"Bluetooth Protocol RFCOMM version: 1.1", "Version of protocol supported by this dissector.");
|
"Bluetooth Protocol RFCOMM version: 1.1", "Version of protocol supported by this dissector.");
|
||||||
|
|
||||||
|
|
|
@ -715,7 +715,7 @@ proto_register_btsap(void)
|
||||||
expert_btsap = expert_register_protocol(proto_btsap);
|
expert_btsap = expert_register_protocol(proto_btsap);
|
||||||
expert_register_field_array(expert_btsap, ei, array_length(ei));
|
expert_register_field_array(expert_btsap, ei, array_length(ei));
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btsap, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btsap, NULL);
|
||||||
prefs_register_static_text_preference(module, "sap.version",
|
prefs_register_static_text_preference(module, "sap.version",
|
||||||
"Bluetooth Profile SAP version: 1.1",
|
"Bluetooth Profile SAP version: 1.1",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -6514,7 +6514,7 @@ proto_register_btsdp(void)
|
||||||
|
|
||||||
service_infos = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
service_infos = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_btsdp, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_btsdp, NULL);
|
||||||
prefs_register_static_text_preference(module, "bnep.version",
|
prefs_register_static_text_preference(module, "bnep.version",
|
||||||
"Bluetooth Protocol SDP version from Core 4.0",
|
"Bluetooth Protocol SDP version from Core 4.0",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -304,7 +304,7 @@ proto_register_hci_mon(void)
|
||||||
|
|
||||||
adapter_to_disconnect_in_frame = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
adapter_to_disconnect_in_frame = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_hci_mon, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_hci_mon, NULL);
|
||||||
prefs_register_static_text_preference(module, "bthci_mon.version",
|
prefs_register_static_text_preference(module, "bthci_mon.version",
|
||||||
"Bluetooth Linux Monitor Transport introduced in BlueZ 5.x",
|
"Bluetooth Linux Monitor Transport introduced in BlueZ 5.x",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -371,7 +371,7 @@ proto_register_hci_usb(void)
|
||||||
proto_register_subtree_array(ett, array_length(ett));
|
proto_register_subtree_array(ett, array_length(ett));
|
||||||
hci_usb_handle = register_dissector("hci_usb", dissect_hci_usb, proto_hci_usb);
|
hci_usb_handle = register_dissector("hci_usb", dissect_hci_usb, proto_hci_usb);
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_hci_usb, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_hci_usb, NULL);
|
||||||
prefs_register_static_text_preference(module, "bthci_usb.version",
|
prefs_register_static_text_preference(module, "bthci_usb.version",
|
||||||
"Bluetooth HCI USB Transport from Core 4.0",
|
"Bluetooth HCI USB Transport from Core 4.0",
|
||||||
"Version of protocol supported by this dissector.");
|
"Version of protocol supported by this dissector.");
|
||||||
|
|
|
@ -416,7 +416,7 @@ proto_register_sbc(void)
|
||||||
|
|
||||||
register_dissector("sbc", dissect_sbc, proto_sbc);
|
register_dissector("sbc", dissect_sbc, proto_sbc);
|
||||||
|
|
||||||
module = prefs_register_protocol(proto_sbc, NULL);
|
module = prefs_register_protocol_subtree("Bluetooth", proto_sbc, NULL);
|
||||||
prefs_register_static_text_preference(module, "a2dp.version",
|
prefs_register_static_text_preference(module, "a2dp.version",
|
||||||
"Bluetooth Audio Codec SBC version based on A2DP 1.3",
|
"Bluetooth Audio Codec SBC version based on A2DP 1.3",
|
||||||
"Version of codec supported by this dissector.");
|
"Version of codec supported by this dissector.");
|
||||||
|
|
Loading…
Reference in New Issue