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>

23 files changed, 26 insertions, 26 deletions

diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index d2c7871dcc..7ca2788747 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -2920,8 +2920,8 @@ proto_register_bluetooth(void)
             decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
 
 
-    proto_bluetooth = proto_register_protocol("Bluetooth",
-            "Bluetooth", "bluetooth");
+    proto_bluetooth = proto_register_protocol("Bluetooth", "Bluetooth", "bluetooth");
+    prefs_register_protocol(proto_bluetooth, NULL);
 
     register_dissector("bluetooth_ubertooth", dissect_bluetooth_ubertooth, proto_bluetooth);
 
diff --git a/epan/dissectors/packet-bt3ds.c b/epan/dissectors/packet-bt3ds.c
index eb6bbb1bb4..fd78d1849f 100644
--- a/epan/dissectors/packet-bt3ds.c
+++ b/epan/dissectors/packet-bt3ds.c
@@ -170,7 +170,7 @@ proto_register_bt3ds(void)
     expert_bt3ds = expert_register_protocol(proto_bt3ds);
     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",
             "Bluetooth Profile 3DS version: 1.0",
             "Version of profile supported by this dissector.");
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c
index 2bcae61596..70276a732f 100644
--- a/epan/dissectors/packet-btatt.c
+++ b/epan/dissectors/packet-btatt.c
@@ -15671,7 +15671,7 @@ proto_register_btatt(void)
     fragments = 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",
             "Bluetooth Protocol ATT version from Core 4.0",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c
index 25ce1cc09e..4026d8d3f9 100644
--- a/epan/dissectors/packet-btavctp.c
+++ b/epan/dissectors/packet-btavctp.c
@@ -472,7 +472,7 @@ proto_register_btavctp(void)
     expert_btavctp = expert_register_protocol(proto_btavctp);
     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",
             "Bluetooth Protocol AVCTP version: 1.4",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index 12cac4337c..1e2b0138b0 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -2730,7 +2730,7 @@ proto_register_btavdtp(void)
     proto_register_field_array(proto_btavdtp, hf, array_length(hf));
     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",
             "Bluetooth Protocol AVDTP version: 1.3",
             "Version of protocol supported by this dissector.");
@@ -3147,7 +3147,7 @@ proto_register_bta2dp(void)
 
     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",
             "Bluetooth Profile A2DP version: 1.3",
             "Version of profile supported by this dissector.");
@@ -3387,7 +3387,7 @@ proto_register_btvdp(void)
     expert_btavdtp = expert_register_protocol(proto_btvdp);
     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",
             "Bluetooth Profile VDP version: 1.1",
             "Version of profile supported by this dissector.");
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index aadad422d2..d8f9b0cff5 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -3156,7 +3156,7 @@ proto_register_btavrcp(void)
     expert_btavrcp = expert_register_protocol(proto_btavrcp);
     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",
             "Bluetooth Profile AVRCP version: 1.5",
             "Version of profile supported by this dissector.");
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c
index e2c59ecbfc..ce355154c0 100644
--- a/epan/dissectors/packet-btbnep.c
+++ b/epan/dissectors/packet-btbnep.c
@@ -629,7 +629,7 @@ proto_register_btbnep(void)
     expert_btbnep = expert_register_protocol(proto_btbnep);
     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",
             "Bluetooth Protocol BNEP version: 1.0",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index 2de99bfbcc..4f802b8f9e 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -683,7 +683,7 @@ proto_register_bthci_acl(void)
     expert_register_field_array(bthci_acl_expert_module, ei, array_length(ei));
 
     /* 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",
         "Reassemble ACL Fragments",
         "Whether the ACL dissector should reassemble fragmented PDUs",
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 32bff9b594..76d46d5e90 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -7230,7 +7230,7 @@ proto_register_bthci_cmd(void)
 
     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",
             "Bluetooth HCI version: 4.0 (Core)",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index 6269e25602..7178dfed48 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -7997,7 +7997,7 @@ proto_register_bthci_evt(void)
     expert_bthci_evt = expert_register_protocol(proto_bthci_evt);
     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",
             "Bluetooth HCI version: 4.0 (Core) + Addendum 4",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c
index 93cae59773..d8a49eaa65 100644
--- a/epan/dissectors/packet-bthcrp.c
+++ b/epan/dissectors/packet-bthcrp.c
@@ -645,7 +645,7 @@ proto_register_bthcrp(void)
     expert_bthcrp = expert_register_protocol(proto_bthcrp);
     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",
             "Bluetooth Profile HCRP version: 1.2",
             "Version of profile supported by this dissector.");
diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c
index 8c0aa63124..d8d8ed5858 100644
--- a/epan/dissectors/packet-bthfp.c
+++ b/epan/dissectors/packet-bthfp.c
@@ -2944,7 +2944,7 @@ proto_register_bthfp(void)
     proto_register_field_array(proto_bthfp, hf, array_length(hf));
     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",
             "Bluetooth Profile HFP version: 1.7",
             "Version of profile supported by this dissector.");
diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c
index 2a1e7b9d5a..1f791d2c5e 100644
--- a/epan/dissectors/packet-bthid.c
+++ b/epan/dissectors/packet-bthid.c
@@ -408,7 +408,7 @@ proto_register_bthid(void)
     expert_bthid = expert_register_protocol(proto_bthid);
     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",
             "Bluetooth Profile HID version: 1.1",
             "Version of profile supported by this dissector.");
diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c
index 7b91d10ee8..dfc6b89fba 100644
--- a/epan/dissectors/packet-bthsp.c
+++ b/epan/dissectors/packet-bthsp.c
@@ -1126,7 +1126,7 @@ proto_register_bthsp(void)
     proto_register_field_array(proto_bthsp, hf, array_length(hf));
     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",
             "Bluetooth Profile HSP version: 1.2",
             "Version of profile supported by this dissector.");
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c
index ca5c7de7c3..b7256a09be 100644
--- a/epan/dissectors/packet-btle.c
+++ b/epan/dissectors/packet-btle.c
@@ -2060,7 +2060,7 @@ proto_register_btle(void)
     expert_module = expert_register_protocol(proto_btle);
     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",
             "Bluetooth LE LL version: 5.0 (Core)",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c
index 82cec2b773..5f3ff6706d 100644
--- a/epan/dissectors/packet-btmcap.c
+++ b/epan/dissectors/packet-btmcap.c
@@ -420,7 +420,7 @@ proto_register_btmcap(void)
     expert_btmcap = expert_register_protocol(proto_btmcap);
     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",
             "Bluetooth Protocol MCAP version: 1.0",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c
index 284175ce11..3e6658e091 100644
--- a/epan/dissectors/packet-btmesh.c
+++ b/epan/dissectors/packet-btmesh.c
@@ -1271,7 +1271,7 @@ proto_register_btmesh(void)
     expert_btmesh = expert_register_protocol(proto_btmesh);
     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",
         sizeof(uat_btmesh_record_t),    /* record size */
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index 3c2336f86c..e04b71dd8e 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -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);
 
-    module = prefs_register_protocol(proto_btrfcomm, NULL);
+    module = prefs_register_protocol_subtree("Bluetooth", proto_btrfcomm, NULL);
     prefs_register_static_text_preference(module, "rfcomm.version",
             "Bluetooth Protocol RFCOMM version: 1.1", "Version of protocol supported by this dissector.");
 
diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c
index 493fd9971c..8abcf745e6 100644
--- a/epan/dissectors/packet-btsap.c
+++ b/epan/dissectors/packet-btsap.c
@@ -715,7 +715,7 @@ proto_register_btsap(void)
     expert_btsap = expert_register_protocol(proto_btsap);
     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",
             "Bluetooth Profile SAP version: 1.1",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index e4e51e4e19..ff0cee3a51 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -6514,7 +6514,7 @@ proto_register_btsdp(void)
 
     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",
             "Bluetooth Protocol SDP version from Core 4.0",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c
index 7854f31d9f..65953b2562 100644
--- a/epan/dissectors/packet-hci_mon.c
+++ b/epan/dissectors/packet-hci_mon.c
@@ -304,7 +304,7 @@ proto_register_hci_mon(void)
 
     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",
             "Bluetooth Linux Monitor Transport introduced in BlueZ 5.x",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c
index 30721e5cd4..c26423ae3a 100644
--- a/epan/dissectors/packet-hci_usb.c
+++ b/epan/dissectors/packet-hci_usb.c
@@ -371,7 +371,7 @@ proto_register_hci_usb(void)
     proto_register_subtree_array(ett, array_length(ett));
     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",
             "Bluetooth HCI USB Transport from Core 4.0",
             "Version of protocol supported by this dissector.");
diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c
index e10519c264..c187499189 100644
--- a/epan/dissectors/packet-sbc.c
+++ b/epan/dissectors/packet-sbc.c
@@ -416,7 +416,7 @@ proto_register_sbc(void)
 
     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",
             "Bluetooth Audio Codec SBC version based on A2DP 1.3",
             "Version of codec supported by this dissector.");