diff options
author | Michael Mann <mmann78@netscape.net> | 2013-09-22 00:50:24 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-09-22 00:50:24 +0000 |
commit | 6ceb84b10bbfbb9743be074016b7de8cbab9bbcb (patch) | |
tree | 4ba4dfcbe710c7dff825412ea566250976aab314 /plugins/wimax/msg_ulmap.c | |
parent | 39d3b8c16a0317d94f05b9e4c9eef541ee0515ee (diff) | |
download | wireshark-6ceb84b10bbfbb9743be074016b7de8cbab9bbcb.tar.gz |
Make dissectors register for their MAC Management Message Type and use dissector_try_uint to do any dissection. Many "outside" (third-party) message types appear to exist.
Have the makefiles do all the work setting up proto_register_<dissector> and proto_reg_handoff_<dissector>, rather than sprinkled throughout the dissectors with extern declarations.
More is coming to make more functions static (because of current makefile fixes) and cleanup MAC Management dissectors to remove unnecessary/duplicative code, but I wanted to get the build issues squared away.
svn path=/trunk/; revision=52167
Diffstat (limited to 'plugins/wimax/msg_ulmap.c')
-rw-r--r-- | plugins/wimax/msg_ulmap.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c index 26e8189fba..248b30d6c3 100644 --- a/plugins/wimax/msg_ulmap.c +++ b/plugins/wimax/msg_ulmap.c @@ -33,6 +33,7 @@ #include <glib.h> #include <epan/packet.h> #include "crc.h" +#include "wimax_mac.h" #include "wimax_bits.h" extern gint proto_mac_mgmt_msg_dlmap_decoder; @@ -2430,8 +2431,20 @@ void proto_register_mac_mgmt_msg_ulmap(void) &ett_315d, }; - proto_mac_mgmt_msg_ulmap_decoder = proto_mac_mgmt_msg_dlmap_decoder; + proto_mac_mgmt_msg_ulmap_decoder = proto_register_protocol ( + "WiMax ULMAP Messages", /* name */ + "WiMax ULMAP", /* short name */ + "wmx.ulmap" /* abbrev */ + ); proto_register_field_array(proto_mac_mgmt_msg_ulmap_decoder, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } + +void proto_reg_handoff_mac_mgmt_msg_ulmap(void) +{ + dissector_handle_t ulmap_handle; + + ulmap_handle = create_dissector_handle(dissect_mac_mgmt_msg_ulmap_decoder, proto_mac_mgmt_msg_ulmap_decoder); + dissector_add_uint("wmx.mgmtmsg", MAC_MGMT_MSG_UL_MAP, ulmap_handle); +}
\ No newline at end of file |