diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-08-21 23:43:38 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-08-22 06:44:10 +0000 |
| commit | c00ea6f26e3c83e1db144d9d858cf9c4662d7e19 (patch) | |
| tree | 538f1f22ef7c97df76fdf061d18ec3b91a35fec0 /epan/dissectors/packet-skinny.c | |
| parent | e1f11c97349dad879c3d3a875c289a195a8ba52c (diff) | |
Look up the XML dissector the right way.
Looking up "text/xml" in the "media_type" dissector is somewhat of a
long-way-around way of finding the XML dissector; just look for it by
name.
Change-Id: Ifafeabc563bf7bfa529bc44ba31bf6ae376a09c8
Reviewed-on: https://code.wireshark.org/review/17219
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-skinny.c')
| -rw-r--r-- | epan/dissectors/packet-skinny.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 8d4a0b7c84..b54afb34a1 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -2189,7 +2189,7 @@ static int hf_skinny_wYear = -1; static int hf_skinny_waitTimeBeforeNextReq = -1; static int hf_skinny_xmldata = -1; -static dissector_table_t media_type_dissector_table; +static dissector_handle_t xml_handle; /* Initialize the subtree pointers */ static gint ett_skinny = -1; @@ -2227,7 +2227,6 @@ dissect_skinny_xml(ptvcursor_t *cursor, int hfindex, packet_info *pinfo, guint32 { proto_item *item = NULL; proto_tree *subtree = NULL; - dissector_handle_t handle = NULL; proto_tree *tree = ptvcursor_tree(cursor); guint32 offset = ptvcursor_current_offset(cursor); tvbuff_t *tvb = ptvcursor_tvbuff(cursor); @@ -2245,9 +2244,8 @@ dissect_skinny_xml(ptvcursor_t *cursor, int hfindex, packet_info *pinfo, guint32 item = proto_tree_add_item(tree, hf_skinny_xmlData, tvb, offset, length, ENC_ASCII|ENC_NA); subtree = proto_item_add_subtree(item, 0); next_tvb = tvb_new_subset(tvb, offset, length, -1); - handle = dissector_get_string_handle(media_type_dissector_table, "text/xml"); - if (handle != NULL) { - call_dissector(handle, next_tvb, pinfo, subtree); + if (xml_handle != NULL) { + call_dissector(xml_handle, next_tvb, pinfo, subtree); } ptvcursor_advance(cursor, maxlength); } @@ -9800,7 +9798,7 @@ void proto_reg_handoff_skinny(void) { /* Skinny content type and internet media type used by other dissectors are the same */ - media_type_dissector_table = find_dissector_table("media_type"); + xml_handle = find_dissector("xml"); dissector_add_uint("tcp.port", TCP_PORT_SKINNY, skinny_handle); ssl_dissector_add(SSL_PORT_SKINNY, skinny_handle); } |