From Michal Labedzki:

Be consistent in short name of protocols

Use prefix "BT " in short name for all Bluetooth dissectors. A reason
for that is protocol names start by "bt", Bluetooth dissectors can
be easy identificated, also DecodeBy looks better (sorted).
Please be note that "SDP" is reserved for different dissector, so using
"BT SDP" is good choice.

Also fix two naming mistakes.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304

svn path=/trunk/; revision=48389

13 files changed, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c
index 1f84e26f10..6f098dc67a 100644
--- a/epan/dissectors/packet-btamp.c
+++ b/epan/dissectors/packet-btamp.c
@@ -639,7 +639,7 @@ proto_register_btamp(void)
     };
 
     /* Register the protocol name and description */
-    proto_btamp = proto_register_protocol("Bluetooth AMP Packet", "AMP", "btamp");
+    proto_btamp = proto_register_protocol("Bluetooth AMP Packet", "BT AMP", "btamp");
 
     new_register_dissector("btamp", dissect_btamp, proto_btamp);
 
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c
index 7d3f1aabf8..1577c20f1c 100644
--- a/epan/dissectors/packet-btatt.c
+++ b/epan/dissectors/packet-btatt.c
@@ -657,7 +657,7 @@ proto_register_btatt(void)
     };
 
     /* Register the protocol name and description */
-    proto_btatt = proto_register_protocol("Bluetooth Attribute Protocol", "ATT", "btatt");
+    proto_btatt = proto_register_protocol("Bluetooth Attribute Protocol", "BT ATT", "btatt");
 
     register_dissector("btatt", dissect_btatt, proto_btatt);
 
diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c
index e45a5fd5a4..86d6afd1c9 100644
--- a/epan/dissectors/packet-btavctp.c
+++ b/epan/dissectors/packet-btavctp.c
@@ -444,7 +444,7 @@ proto_register_btavctp(void)
 
     avctp_service_dissector_table = register_dissector_table("btavctp.service", "AVCTP Service", FT_UINT16, BASE_HEX);
 
-    proto_btavctp = proto_register_protocol("Bluetooth AVCTP Protocol", "AVCTP", "btavctp");
+    proto_btavctp = proto_register_protocol("Bluetooth AVCTP Protocol", "BT AVCTP", "btavctp");
     register_dissector("btavctp", dissect_btavctp, proto_btavctp);
 
     proto_register_field_array(proto_btavctp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index 1129395a21..d724d9355d 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -1926,7 +1926,7 @@ proto_register_btavdtp(void)
         &ett_btavdtp_service,
     };
 
-    proto_btavdtp = proto_register_protocol("Bluetooth AVDTP Protocol", "AVDTP", "btavdtp");
+    proto_btavdtp = proto_register_protocol("Bluetooth AVDTP Protocol", "BT AVDTP", "btavdtp");
     register_dissector("btavdtp", dissect_btavdtp, proto_btavdtp);
 
     proto_register_field_array(proto_btavdtp, hf, array_length(hf));
@@ -2048,7 +2048,7 @@ proto_register_bta2dp(void)
         &ett_bta2dp
     };
 
-    proto_bta2dp = proto_register_protocol("Bluetooth A2DP Profile", "A2DP", "bta2dp");
+    proto_bta2dp = proto_register_protocol("Bluetooth A2DP Profile", "BT A2DP", "bta2dp");
 
     proto_register_subtree_array(ett, array_length(ett));
 
@@ -2161,7 +2161,7 @@ proto_register_btvdp(void)
         &ett_btvdp
     };
 
-    proto_btvdp = proto_register_protocol("Bluetooth VDP Profile", "VDP", "btvdp");
+    proto_btvdp = proto_register_protocol("Bluetooth VDP Profile", "BT VDP", "btvdp");
     new_register_dissector("btvdp", dissect_btvdp, proto_btvdp);
 
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index 0ff80168ca..6988b665f4 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -3091,7 +3091,7 @@ proto_register_btavrcp(void)
     reassembling = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "btavrcp reassembling");
     timing       = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "btavrcp timing");
 
-    proto_btavrcp = proto_register_protocol("Bluetooth AVRCP Profile", "AVRCP", "btavrcp");
+    proto_btavrcp = proto_register_protocol("Bluetooth AVRCP Profile", "BT AVRCP", "btavrcp");
     register_dissector("btavrcp", dissect_btavrcp, proto_btavrcp);
 
     proto_register_field_array(proto_btavrcp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c
index b067abdd45..10cc138fcc 100644
--- a/epan/dissectors/packet-btbnep.c
+++ b/epan/dissectors/packet-btbnep.c
@@ -509,7 +509,7 @@ proto_register_btbnep(void)
         &ett_addr
     };
 
-    proto_btbnep = proto_register_protocol("Bluetooth BNEP Potocol", "BNEP", "btbnep");
+    proto_btbnep = proto_register_protocol("Bluetooth BNEP Protocol", "BT BNEP", "btbnep");
     register_dissector("btbnep", dissect_btbnep, proto_btbnep);
 
     proto_register_field_array(proto_btbnep, hf, array_length(hf));
diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c
index 65feaa03af..c311f586c1 100644
--- a/epan/dissectors/packet-bthcrp.c
+++ b/epan/dissectors/packet-bthcrp.c
@@ -536,7 +536,7 @@ proto_register_bthcrp(void)
         &ett_bthcrp
     };
 
-    proto_bthcrp = proto_register_protocol("Bluetooth HCRP Profile", "HCRP", "bthcrp");
+    proto_bthcrp = proto_register_protocol("Bluetooth HCRP Profile", "BT HCRP", "bthcrp");
     register_dissector("bthcrp", dissect_bthcrp, proto_bthcrp);
 
     proto_register_field_array(proto_bthcrp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c
index 94199de666..2f8f1d155b 100644
--- a/epan/dissectors/packet-bthid.c
+++ b/epan/dissectors/packet-bthid.c
@@ -1081,7 +1081,7 @@ proto_register_bthid(void)
         &ett_bthid
     };
 
-    proto_bthid = proto_register_protocol("Bluetooth HID Profile", "HID", "bthid");
+    proto_bthid = proto_register_protocol("Bluetooth HID Profile", "BT HID", "bthid");
     register_dissector("bthid", dissect_bthid, proto_bthid);
 
     proto_register_field_array(proto_bthid, hf, array_length(hf));
diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c
index 625826a1c1..75121ff027 100644
--- a/epan/dissectors/packet-btmcap.c
+++ b/epan/dissectors/packet-btmcap.c
@@ -412,7 +412,7 @@ proto_register_btmcap(void)
         &ett_btmcap
     };
 
-    proto_btmcap = proto_register_protocol("Bluetooth MCAP Profile", "MCAP", "btmcap");
+    proto_btmcap = proto_register_protocol("Bluetooth MCAP Protocol", "BT MCAP", "btmcap");
     register_dissector("btmcap", dissect_btmcap, proto_btmcap);
 
     proto_register_field_array(proto_btmcap, hf, array_length(hf));
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c
index f3a0d06bd9..582c50e8d0 100644
--- a/epan/dissectors/packet-btobex.c
+++ b/epan/dissectors/packet-btobex.c
@@ -2289,7 +2289,7 @@ proto_register_btobex(void)
     obex_last_opcode = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "obex_last_opcode");
     obex_over_l2cap = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "obex_over_l2cap");
 
-    proto_btobex = proto_register_protocol("Bluetooth OBEX Protocol", "OBEX", "btobex");
+    proto_btobex = proto_register_protocol("Bluetooth OBEX Protocol", "BT OBEX", "btobex");
 
     register_dissector("btobex", dissect_btobex, proto_btobex);
 
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index 89190398bd..734b0968e6 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -932,7 +932,7 @@ proto_register_btrfcomm(void)
     };
 
     /* Register the protocol name and description */
-    proto_btrfcomm = proto_register_protocol("Bluetooth RFCOMM Protocol", "RFCOMM", "btrfcomm");
+    proto_btrfcomm = proto_register_protocol("Bluetooth RFCOMM Protocol", "BT RFCOMM", "btrfcomm");
 
     register_dissector("btrfcomm", dissect_btrfcomm, proto_btrfcomm);
 
@@ -1073,7 +1073,7 @@ proto_register_btdun(void)
         &ett_btdun,
     };
 
-    proto_btdun = proto_register_protocol("Bluetooth DUN Packet", "BTDUN", "btdun");
+    proto_btdun = proto_register_protocol("Bluetooth DUN Packet", "BT DUN", "btdun");
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_btdun, hf, array_length(hf));
@@ -1139,7 +1139,7 @@ proto_register_btspp(void)
         &ett_btspp,
     };
 
-    proto_btspp = proto_register_protocol("Bluetooth SPP Packet", "BTSPP", "btspp");
+    proto_btspp = proto_register_protocol("Bluetooth SPP Packet", "BT SPP", "btspp");
 
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_btspp, hf, array_length(hf));
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index eeb580dde6..940af70cb0 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -1092,7 +1092,7 @@ proto_register_btsdp(void)
         &ett_btsdp_attribute_idlist
     };
 
-    proto_btsdp = proto_register_protocol("Bluetooth SDP Protocol", "BTSDP", "btsdp");
+    proto_btsdp = proto_register_protocol("Bluetooth SDP Protocol", "BT SDP", "btsdp");
 
     new_register_dissector("btsdp", dissect_btsdp, proto_btsdp);
 
diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c
index 8c9aef0862..b2ff355102 100644
--- a/epan/dissectors/packet-btsmp.c
+++ b/epan/dissectors/packet-btsmp.c
@@ -375,7 +375,7 @@ proto_register_btsmp(void)
 
     /* Register the protocol name and description */
     proto_btsmp = proto_register_protocol("Bluetooth Security Manager Protocol",
-        "SMP", "btsmp");
+        "BT SMP", "btsmp");
 
     register_dissector("btsmp", dissect_btsmp, proto_btsmp);