summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-rsvp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-10-30 08:37:09 -0400
committerMichael Mann <mmann78@netscape.net>2015-10-30 23:24:09 +0000
commit6503689958399a57a2dea7c81b4fef6ac648693e (patch)
tree88013a8e2c86a538141ccdd07a2a26e333821d06 /epan/dissectors/packet-rsvp.c
parent5ab8b8d79370a8c7450fd60bb134eeb215fa3ad5 (diff)
downloadwireshark-6503689958399a57a2dea7c81b4fef6ac648693e.tar.gz
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>
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
-rw-r--r--epan/dissectors/packet-rsvp.c5
1 files changed, 4 insertions, 1 deletions
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);