diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-07-15 14:47:39 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-07-15 18:30:57 +0000 |
commit | 79774329d7cc324b3d7c3a5a013abea85a20885e (patch) | |
tree | a2d17c007f62c070d39ca59aa06e96207128a293 /epan/dissectors/packet-exported_pdu.c | |
parent | 52e2908729c0d0d45df572ff3aaf3e41258c2d4e (diff) |
Simply code for export of PDUs coming from heuristic dissectors
Let's use the newly introduced find_heur_dissector_by_unique_short_name() function
Change-Id: I5781b9b2f1ab679da07e97755b71840b4b3a9361
Reviewed-on: https://code.wireshark.org/review/9645
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-exported_pdu.c')
-rw-r--r-- | epan/dissectors/packet-exported_pdu.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index a08c48a120..3bf022d215 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -211,16 +211,10 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case EXPORTED_PDU_NEXT_HEUR_PROTO_STR: { - gchar **heur_proto_str = wmem_strsplit(wmem_packet_scope(), proto_name, "##", 2); - if (heur_proto_str && heur_proto_str[0] && heur_proto_str[1]) { - heur_dissector_list_t heur_list = find_heur_dissector_list(heur_proto_str[0]); - if (heur_list) { - heur_dtbl_entry_t *heur_diss = find_heur_dissector_by_short_name(heur_list, heur_proto_str[1]); - if (heur_diss) { - col_clear(pinfo->cinfo, COL_PROTOCOL); - call_heur_dissector_direct(heur_diss, payload_tvb, pinfo, tree, NULL); - } - } + heur_dtbl_entry_t *heur_diss = find_heur_dissector_by_unique_short_name(proto_name); + if (heur_diss) { + col_clear(pinfo->cinfo, COL_PROTOCOL); + call_heur_dissector_direct(heur_diss, payload_tvb, pinfo, tree, NULL); } break; } |