diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-23 13:38:55 -0400 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-07-26 20:59:42 +0000 |
| commit | 31ecdf5b06bff3bb2e706e840c28c519698e6f67 (patch) | |
| tree | 71b3e59889e862560412d317df71113f66b094b6 /epan/dissectors/packet-ip.c | |
| parent | 507d07eda6ad562d4567cf0ee83aa9b03997beca (diff) | |
Refactor "common" Conversation table functionality.
Refactor (non-GUI) conversation table functionality from gtk/Qt to epan. Also refactor "common GUI" conversation table functionality.
The idea is to not have to modify the GUI when a dissector adds a new "conversation type"
Change-Id: I11f08d0d7edd631218663ba4b902c4a4c849acda
Reviewed-on: https://code.wireshark.org/review/3113
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-ip.c')
| -rw-r--r-- | epan/dissectors/packet-ip.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index c9e16d315a..ec61d204b8 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -36,6 +36,7 @@ #include <epan/expert.h> #include <epan/ip_opts.h> #include <epan/prefs.h> +#include <epan/conversation_table.h> #include <epan/reassemble.h> #include <epan/etypes.h> #include <epan/greproto.h> @@ -473,6 +474,32 @@ static gpointer ip_value(packet_info *pinfo) return GUINT_TO_POINTER(pinfo->ipproto); } +static const char* ip_conv_get_filter_type(conv_item_t* conv, conv_filter_type_e filter) +{ + if ((filter == CONV_FT_SRC_ADDRESS) && (conv->src_address.type == AT_IPv4)) + return "ip.src"; + + if ((filter == CONV_FT_DST_ADDRESS) && (conv->dst_address.type == AT_IPv4)) + return "ip.dst"; + + if ((filter == CONV_FT_ANY_ADDRESS) && (conv->src_address.type == AT_IPv4)) + return "ip.addr"; + + return CONV_FILTER_INVALID; +} + +static ct_dissector_info_t ip_ct_dissector_info = {&ip_conv_get_filter_type}; + +static int +ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +{ + conv_hash_t *hash = (conv_hash_t*) pct; + const ws_ip *iph=(const ws_ip *)vip; + + add_conversation_table_data(hash, &iph->ip_src, &iph->ip_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &ip_ct_dissector_info, PT_NONE); + + return 1; +} /* * defragmentation of IPv4 @@ -3050,6 +3077,7 @@ proto_register_ip(void) ip_tap = register_tap("ip"); register_decode_as(&ip_da); + register_conversation_table(proto_ip, TRUE, ip_conversation_packet); } void |