diff options
Diffstat (limited to 'epan/dissectors/packet-brp.c')
| -rw-r--r-- | epan/dissectors/packet-brp.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c index a0430bd812..e641f65c78 100644 --- a/epan/dissectors/packet-brp.c +++ b/epan/dissectors/packet-brp.c @@ -30,7 +30,6 @@ #include <epan/packet.h> #include <epan/expert.h> -#include <epan/prefs.h> /* Forward declaration we need below */ void proto_register_brp(void); @@ -43,8 +42,6 @@ static int proto_brp = -1; static dissector_handle_t brp_handle; -/*static int global_brp_port = 1958; *//* The port is registered for another protocol */ - static const value_string brp_packettype_names[] = { { 0, "BRP" }, { 1, "Setup Request - BRC -> BRS" }, @@ -127,9 +124,6 @@ static gint ett_brp_fltype = -1; static expert_field ei_brp_type_unknown = EI_INIT; -/* Preferences */ -static guint global_brp_port = 0; - static int dissect_brp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -324,7 +318,6 @@ return offset; /*--- proto_register_brp ----------------------------------------------*/ void proto_register_brp (void) { - module_t *brp_module; expert_module_t* expert_brp; /* A data field is something you can search/filter on. @@ -402,38 +395,13 @@ void proto_register_brp (void) expert_brp = expert_register_protocol(proto_brp); expert_register_field_array(expert_brp, ei, array_length(ei)); - /* Register preferences module */ - brp_module = prefs_register_protocol(proto_brp, proto_reg_handoff_brp); - - /* Register preferences */ - prefs_register_uint_preference(brp_module, "port", - "BRP Port", - "Set the UDP port for BRP messages", - 10, &global_brp_port); - brp_handle = register_dissector("brp", dissect_brp, proto_brp); } /*--- proto_reg_handoff_brp -------------------------------------------*/ void proto_reg_handoff_brp(void) { - static gboolean initialized = FALSE; - static guint saved_brp_port; - - if (!initialized) { - dissector_add_for_decode_as("udp.port", brp_handle); - initialized = TRUE; - } else { - if (saved_brp_port != 0) { - dissector_delete_uint("udp.port", saved_brp_port, brp_handle); - } - } - - /* Set the port number */ - if (global_brp_port != 0) { - dissector_add_uint("udp.port", global_brp_port, brp_handle); - } - saved_brp_port = global_brp_port; + dissector_add_for_decode_as_with_preference("udp.port", brp_handle); } /* |