diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-02 13:05:58 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-02 13:05:58 +0000 |
| commit | 872f3efeca821b9bf41152c1e962a10bbd13374d (patch) | |
| tree | 5e0db679a4f57c7c7731fdfd77a404a9098bb75a /epan/dissectors/packet-isup.c | |
| parent | 26105b7739e8cf7bdefa6549155dfe62419d07ba (diff) | |
| download | wireshark-872f3efeca821b9bf41152c1e962a10bbd13374d.tar.gz | |
Prep a few more dissectors to receive their string data through dissector data.
svn path=/trunk/; revision=53045
Diffstat (limited to 'epan/dissectors/packet-isup.c')
| -rw-r--r-- | epan/dissectors/packet-isup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 234ee17dcb..3bd5325447 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -10734,8 +10734,8 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_fence(pinfo->cinfo, COL_INFO); } -static void -dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { /* Set up structures needed to add the protocol subtree and manage it */ proto_item *ti; @@ -10762,7 +10762,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_tvb = tvb_new_subset_remaining(tvb, 0); dissect_ansi_isup_message(message_tvb, pinfo, isup_tree, ISUP_ITU_STANDARD_VARIANT); - return; + return tvb_length(tvb); } else if(strstr(content_type_parameter_str,"spirou")) { isup_standard = ITU_STANDARD; itu_isup_variant = ISUP_FRENCH_VARIANT; @@ -10824,6 +10824,7 @@ dissect_application_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_tvb = tvb_new_subset_remaining(tvb, 0); dissect_isup_message(message_tvb, pinfo, isup_tree, itu_isup_variant); + return tvb_length(tvb); } /* ---------------------------------------------------- stats tree */ @@ -12181,7 +12182,7 @@ proto_reg_handoff_isup(void) dissector_handle_t application_isup_handle; isup_handle = create_dissector_handle(dissect_isup, proto_isup); - application_isup_handle = create_dissector_handle(dissect_application_isup, proto_isup); + application_isup_handle = new_create_dissector_handle(dissect_application_isup, proto_isup); dissector_add_uint("mtp3.service_indicator", MTP_SI_ISUP, isup_handle); dissector_add_string("media_type","application/isup", application_isup_handle); dissector_add_string("tali.opcode", "isot", isup_handle); |