diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-24 13:13:18 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-25 19:21:14 +0000 |
| commit | 0cd1a8506425fa379c88df941e3039ce9a1164d4 (patch) | |
| tree | 9c2cb1edbaf7de9fa028e4b05fcc13f491a4230b /epan/dissectors/packet-ber.h | |
| parent | 992a7ee6e7603c2552971dc516ca4e6c45ae2d21 (diff) | |
Require BER dissector (OID) registration to be "new style".
Both old and new style API existed, just remove the "old" one.
Change-Id: If725e778a0ecad5a431d634ed5c4856b4a281013
Reviewed-on: https://code.wireshark.org/review/12107
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ber.h')
| -rw-r--r-- | epan/dissectors/packet-ber.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index 87a18699e4..7b8fcf9d54 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -199,17 +199,13 @@ int call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_inf WS_DLL_PUBLIC void register_ber_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto, const char *name); WS_DLL_PUBLIC -void register_ber_oid_dissector(const char *oid, dissector_t dissector, int proto, const char *name); -WS_DLL_PUBLIC void new_register_ber_oid_dissector(const char *oid, new_dissector_t dissector, int proto, const char *name); WS_DLL_PUBLIC -void register_ber_syntax_dissector(const char *oid, int proto, dissector_t dissector); -WS_DLL_PUBLIC void new_register_ber_syntax_dissector(const char *syntax, int proto, new_dissector_t dissector); void register_ber_oid_name(const char *oid, const char *name); WS_DLL_PUBLIC void register_ber_oid_syntax(const char *oid, const char *name, const char *syntax); -void dissect_ber_oid_NULL_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +int dissect_ber_oid_NULL_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data); WS_DLL_PUBLIC void ber_decode_as_foreach(GHFunc func, gpointer user_data); /* iterate through known syntaxes */ |