Add some "protocol placeholders" to remove confusion with Decode As.

Change-Id: Icc4bf0149af81c35bc6b615add473168600468fb
Reviewed-on: https://code.wireshark.org/review/11429
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

3 files changed, 24 insertions, 13 deletions

diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index b79dd909f5..48eb4c0afd 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -2991,6 +2991,7 @@ static const value_string ff_vht_mimo_cntrl_feedback_vals[] = {
 
 
 static int proto_wlan = -1;
+static int proto_centrino = -1;
 static int proto_aggregate = -1;
 static gboolean ieee80211_tvb_invalid = FALSE;
 
@@ -27010,8 +27011,9 @@ proto_register_ieee80211 (void)
       "IEEE 802.11 Aggregate Data", "wlan_aggregate");
   proto_register_field_array(proto_aggregate, aggregate_fields, array_length(aggregate_fields));
 
-  proto_wlan = proto_register_protocol("IEEE 802.11 wireless LAN",
-      "IEEE 802.11", "wlan");
+  proto_wlan = proto_register_protocol("IEEE 802.11 wireless LAN", "IEEE 802.11", "wlan");
+  /* Created to remove Decode As confusion */
+  proto_centrino = proto_register_protocol("IEEE 802.11 wireless LAN (Centrino)", "IEEE 802.11 (Centrino)", "wlan_centrino");
   proto_register_field_array(proto_wlan, hf, array_length (hf));
 
   proto_wlan_mgt = proto_register_protocol("IEEE 802.11 wireless LAN management frame",
@@ -27255,7 +27257,7 @@ proto_reg_handoff_ieee80211(void)
   ieee80211_handle = find_dissector("wlan");
   dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11, ieee80211_handle);
 
-  centrino_handle = create_dissector_handle( dissect_ieee80211_centrino, proto_wlan );
+  centrino_handle = create_dissector_handle( dissect_ieee80211_centrino, proto_centrino );
   dissector_add_uint("ethertype", ETHERTYPE_CENTRINO_PROMISC, centrino_handle);
 
   /* Register handoff to Aruba GRE */
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 0189bf5c62..50219ac92a 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -388,6 +388,10 @@ static gint ett_ipv6cp_if_id_opt = -1;
 static gint ett_ipv6cp_compress_opt = -1;
 
 static int proto_iphc_crtp = -1;            /* CRTP vars */
+static int proto_iphc_crtp_cudp16 = -1;
+static int proto_iphc_crtp_cudp8 = -1;
+static int proto_iphc_crtp_cs = -1;
+
 static int hf_iphc_crtp_cid8 = -1;
 static int hf_iphc_crtp_cid16 = -1;
 static int hf_iphc_crtp_gen = -1;
@@ -5104,10 +5108,9 @@ proto_reg_handoff_ppp_raw_hdlc(void)
 {
     dissector_handle_t ppp_raw_hdlc_handle;
 
-    ppp_raw_hdlc_handle = create_dissector_handle(dissect_ppp_raw_hdlc,
-        proto_ppp);
-    dissector_add_uint("gre.proto", ETHERTYPE_CDMA2000_A10_UBS,
-        ppp_raw_hdlc_handle);
+    ppp_raw_hdlc_handle = create_dissector_handle(dissect_ppp_raw_hdlc, proto_ppp);
+
+    dissector_add_uint("gre.proto", ETHERTYPE_CDMA2000_A10_UBS, ppp_raw_hdlc_handle);
     dissector_add_uint("gre.proto", ETHERTYPE_3GPP2, ppp_raw_hdlc_handle);
 
     heur_dissector_add("usb.bulk", dissect_ppp_usb, "PPP USB bulk endpoint", "ppp_usb_bulk", proto_ppp, HEURISTIC_ENABLE);
@@ -6833,6 +6836,11 @@ proto_register_iphc_crtp(void)
     expert_module_t* expert_iphc_crtp;
 
     proto_iphc_crtp = proto_register_protocol("CRTP", "CRTP", "crtp");
+    /* Created to remove Decode As confusion */
+    proto_iphc_crtp_cudp16 = proto_register_protocol("CRTP (CUDP 16)", "CRTP (CUDP 16)", "crtp_cudp16");
+    proto_iphc_crtp_cudp8 = proto_register_protocol("CRTP (CUDP 8)", "CRTP (CUDP 8)", "crtp_cudp8");
+    proto_iphc_crtp_cs = proto_register_protocol("CRTP (CS)", "CRTP (CS)", "crtp_cs");
+
     proto_register_field_array(proto_iphc_crtp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
     expert_iphc_crtp = expert_register_protocol(proto_iphc_crtp);
@@ -6850,15 +6858,13 @@ proto_reg_handoff_iphc_crtp(void)
     fh_handle = create_dissector_handle(dissect_iphc_crtp_fh, proto_iphc_crtp);
     dissector_add_uint("ppp.protocol", PPP_RTP_FH, fh_handle);
 
-    cudp16_handle = create_dissector_handle(dissect_iphc_crtp_cudp16,
-        proto_iphc_crtp);
+    cudp16_handle = create_dissector_handle(dissect_iphc_crtp_cudp16, proto_iphc_crtp_cudp16);
     dissector_add_uint("ppp.protocol", PPP_RTP_CUDP16, cudp16_handle);
 
-    cudp8_handle = create_dissector_handle(dissect_iphc_crtp_cudp8,
-        proto_iphc_crtp);
+    cudp8_handle = create_dissector_handle(dissect_iphc_crtp_cudp8, proto_iphc_crtp_cudp8);
     dissector_add_uint("ppp.protocol", PPP_RTP_CUDP8, cudp8_handle);
 
-    cs_handle = create_dissector_handle(dissect_iphc_crtp_cs, proto_iphc_crtp);
+    cs_handle = create_dissector_handle(dissect_iphc_crtp_cs, proto_iphc_crtp_cs);
     dissector_add_uint("ppp.protocol", PPP_RTP_CS, cs_handle);
 
     /*
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 3f57411b8b..ae99baab06 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -122,6 +122,7 @@ void proto_register_rsvp(void);
 void proto_reg_handoff_rsvp(void);
 
 static int proto_rsvp = -1;
+static int proto_rsvp_e2e1 = -1;
 
 static int hf_rsvp_error_flags = -1;
 static int hf_rsvp_error_flags_path_state_removed = -1;
@@ -9531,6 +9532,8 @@ proto_register_rsvp(void)
         ett_tree[i] = &(ett_treelist[i]);
     }
     proto_rsvp = proto_register_protocol("Resource ReserVation Protocol (RSVP)", "RSVP", "rsvp");
+    /* Created to remove Decode As confusion */
+    proto_rsvp_e2e1 = proto_register_protocol("Resource ReserVation Protocol (RSVP-E2EI)", "RSVP-E2EI", "rsvp-e2ei");
 
     proto_register_field_array(proto_rsvp, rsvpf_info, array_length(rsvpf_info));
     proto_register_subtree_array(ett_tree, array_length(ett_tree));
@@ -9551,7 +9554,7 @@ proto_reg_handoff_rsvp(void)
     dissector_handle_t rsvp_handle, rsvpe2ei_handle;
 
     rsvp_handle = new_create_dissector_handle(dissect_rsvp, proto_rsvp);
-    rsvpe2ei_handle = new_create_dissector_handle(dissect_rsvp_e2ei, proto_rsvp);
+    rsvpe2ei_handle = new_create_dissector_handle(dissect_rsvp_e2ei, proto_rsvp_e2e1);
     dissector_add_uint("ip.proto", IP_PROTO_RSVP, rsvp_handle);
     dissector_add_uint("ip.proto", IP_PROTO_RSVPE2EI, rsvpe2ei_handle);
     dissector_add_uint("udp.port", UDP_PORT_PRSVP, rsvp_handle);