aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-openflow_v1.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-03-16 09:02:52 -0400
committerMichael Mann <mmann78@netscape.net>2016-03-20 12:48:48 +0000
commit9bcac48403de9aff6435d0f48028ae1f72f64528 (patch)
tree16989d2207299572c970a79b6d4c4037fa975c55 /epan/dissectors/packet-openflow_v1.c
parent6da50e2fde7b678cfbee922e3b12d588d75b6eef (diff)
Manually add protocol dependencies derived from find_dissector.
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-openflow_v1.c')
-rw-r--r--epan/dissectors/packet-openflow_v1.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c
index 32929defe0..d77776a9ec 100644
--- a/epan/dissectors/packet-openflow_v1.c
+++ b/epan/dissectors/packet-openflow_v1.c
@@ -30,6 +30,7 @@
#include <epan/expert.h>
void proto_register_openflow_v1(void);
+void proto_reg_handoff_openflow_v1(void);
static dissector_handle_t eth_withoutfcs_handle;
@@ -1452,8 +1453,6 @@ proto_register_openflow_v1(void)
register_dissector("openflow_v1", dissect_openflow_v1, proto_openflow_v1);
- eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
-
/* Required function calls to register the header fields and subtrees */
proto_register_field_array(proto_openflow_v1, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
@@ -1461,6 +1460,12 @@ proto_register_openflow_v1(void)
expert_register_field_array(expert_openflow_v1, ei, array_length(ei));
}
+void
+proto_reg_handoff_openflow_v1(void)
+{
+ eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_openflow_v1);
+}
+
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*