diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-24 08:22:57 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-24 14:52:17 +0000 |
| commit | 8a999d7bb843790ec069baf02cc4fbb2ea530605 (patch) | |
| tree | 99552386aa0d555f1abc66bcb38d89992fea3630 /asn1 | |
| parent | dc93041dfe788af0aed776e1ec69fa3017424df2 (diff) | |
Convert T.124 API to use "new style" dissectors.
This seems like an unnecessary encapsulation of registering a dissector, but it can be used at runtime and not just a handoff function.
Change-Id: Ic13e34b5cecf493115f27a984bb886f2f76bc7de
Reviewed-on: https://code.wireshark.org/review/12096
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/t124/packet-t124-template.c | 8 | ||||
| -rw-r--r-- | asn1/t124/packet-t124-template.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index c8a7f27ac9..6dab75f214 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -74,15 +74,15 @@ static const per_sequence_t t124Heur_sequence[] = { }; void -register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto) +register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int proto) { dissector_handle_t dissector_handle; - dissector_handle=create_dissector_handle(dissector, proto); + dissector_handle=new_create_dissector_handle(dissector, proto); dissector_add_string("t124.ns", nsKey, dissector_handle); } -void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param, dissector_t dissector, int proto) +void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param, new_dissector_t dissector, int proto) { /* XXX: we should keep the sub-dissectors list per conversation as the same channels may be used. @@ -91,7 +91,7 @@ void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param, dissector_handle_t dissector_handle; - dissector_handle=create_dissector_handle(dissector, proto); + dissector_handle=new_create_dissector_handle(dissector, proto); dissector_add_uint("t124.sd", channelId_param, dissector_handle); } diff --git a/asn1/t124/packet-t124-template.h b/asn1/t124/packet-t124-template.h index 487718c86a..f86b48501c 100644 --- a/asn1/t124/packet-t124-template.h +++ b/asn1/t124/packet-t124-template.h @@ -31,8 +31,8 @@ extern int dissect_DomainMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p extern guint32 t124_get_last_channelId(void); extern void t124_set_top_tree(proto_tree *tree); -extern void register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto); -extern void register_t124_sd_dissector(packet_info *pinfo, guint32 channelId, dissector_t dissector, int proto); +extern void register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int proto); +extern void register_t124_sd_dissector(packet_info *pinfo, guint32 channelId, new_dissector_t dissector, int proto); #include "packet-t124-exp.h" |