diff options
| -rw-r--r-- | plugins/wimax/mac_hd_generic_decoder.c | 2 | ||||
| -rw-r--r-- | plugins/wimax/packet-wmx.c | 12 | ||||
| -rw-r--r-- | plugins/wimax/wimax-int.h | 3 | ||||
| -rw-r--r-- | plugins/wimax/wimax_pdu_decoder.c | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 55f5a8a137..168f1458bd 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -2292,7 +2292,7 @@ void wimax_proto_register_mac_header_generic(void) } void -proto_reg_handoff_mac_header_generic(void) +wimax_proto_reg_handoff_mac_header_generic(void) { mac_mgmt_msg_decoder_handle = find_dissector("wmx_mac_mgmt_msg_decoder"); mac_ip_handle = find_dissector("ip"); diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c index 89aded3a99..1cdbd97e82 100644 --- a/plugins/wimax/packet-wmx.c +++ b/plugins/wimax/packet-wmx.c @@ -352,6 +352,18 @@ void proto_register_wimax(void) } /* + * If we're going to give the register routines for the above files special + * names to ensure that they're called in the above order in the above + * routine, we have to do the same with their handoff routines, if they + * have any - that's the way the registration generation stuff now works. + */ +void proto_reg_handoff_wimax(void) +{ + wimax_proto_reg_handoff_wimax_pdu(); + wimax_proto_reg_handoff_mac_header_generic(); +} + +/* * Editor modelines - http://www.wireshark.org/tools/modelines.html * * Local variables: diff --git a/plugins/wimax/wimax-int.h b/plugins/wimax/wimax-int.h index 6d8333a785..c22c1dd14b 100644 --- a/plugins/wimax/wimax-int.h +++ b/plugins/wimax/wimax-int.h @@ -36,4 +36,7 @@ void wimax_proto_register_mac_header_generic(void); void wimax_proto_register_mac_header_type_1(void); void wimax_proto_register_mac_header_type_2(void); +void wimax_proto_reg_handoff_wimax_pdu(void); +void wimax_proto_reg_handoff_mac_header_generic(void); + #endif diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/wimax/wimax_pdu_decoder.c index a9f097fc1e..d17b46288f 100644 --- a/plugins/wimax/wimax_pdu_decoder.c +++ b/plugins/wimax/wimax_pdu_decoder.c @@ -245,7 +245,7 @@ void wimax_proto_register_wimax_pdu(void) } void -proto_reg_handoff_wimax_pdu(void) +wimax_proto_reg_handoff_wimax_pdu(void) { mac_generic_decoder_handle = find_dissector("mac_header_generic_handler"); mac_header_type1_handle = find_dissector("mac_header_type_1_handler"); |