diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-09-19 17:31:11 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-20 04:48:55 +0000 |
| commit | 8f4692f6f94d06d3fa3926333d3ffd3354066f96 (patch) | |
| tree | e1e86b9c364c304434e9425c5c2abf12f31446cc /epan/dissectors/packet-icmp.c | |
| parent | b5759cafae8f1cf852f39fe68accd126d40955cb (diff) | |
Explicitly add ICMP and ICMPv6 to Flow graph.
Functionality for ICMP was "hidden" in the frame/"any" flow.
Pull it out into its own using the new sequence analysis API.
Change-Id: I2035f1a59a9e46ea1086443ad4b4a9723dc13883
Reviewed-on: https://code.wireshark.org/review/23625
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-icmp.c')
| -rw-r--r-- | epan/dissectors/packet-icmp.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index bd6b2658b0..5988da0b8b 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -38,6 +38,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/in_cksum.h> +#include <epan/sequence_analysis.h> #include <epan/to_str.h> #include <epan/conversation.h> #include <epan/tap.h> @@ -372,6 +373,48 @@ static const value_string interface_role_str[] = { #define ADDR_IS_NOT_UNICAST(addr) \ (ADDR_IS_MULTICAST(addr) || ADDR_IS_BROADCAST(addr)) + +/* whenever a ICMP packet is seen by the tap listener */ +/* Add a new frame into the graph */ +static gboolean +icmp_seq_analysis_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_) +{ + seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr; + + if ((sainfo->all_packets) || (pinfo->fd->flags.passed_dfilter == 1)) { + + seq_analysis_item_t *sai = sequence_analysis_create_sai_with_addresses(pinfo, sainfo); + if (!sai) + return FALSE; + + sai->frame_number = pinfo->num; + + sequence_analysis_use_color_filter(pinfo, sai); + + sai->port_src=pinfo->srcport; + sai->port_dst=pinfo->destport; + + sequence_analysis_use_col_info_as_label_comment(pinfo, sai); + + if (pinfo->ptype == PT_NONE) { + icmp_info_t *p_icmp_info = (icmp_info_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_icmp, 0); + + if (p_icmp_info != NULL) { + sai->port_src = 0; + sai->port_dst = p_icmp_info->type * 256 + p_icmp_info->code; + } + } + + sai->line_style = 1; + sai->conv_num = 0; + sai->display = TRUE; + + g_queue_push_tail(sainfo->items, sai); + } + + return TRUE; +} + static conversation_t *_find_or_create_conversation(packet_info * pinfo) { conversation_t *conv = NULL; @@ -2028,6 +2071,7 @@ void proto_register_icmp(void) "Whether the 128th and following bytes of the ICMP payload should be decoded as MPLS extensions or as a portion of the original packet", &favor_icmp_mpls_ext); + register_seq_analysis("icmp", "ICMP Flows", proto_icmp, NULL, TL_REQUIRES_COLUMNS, icmp_seq_analysis_packet); icmp_handle = register_dissector("icmp", dissect_icmp, proto_icmp); icmp_tap = register_tap("icmp"); } |