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-ncp.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-ncp.c')
| -rw-r--r-- | epan/dissectors/packet-ncp.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 8398dc8264..c75c2430ee 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -54,6 +54,7 @@ #include "packet-ncp-int.h" #include <epan/reassemble.h> #include <epan/conversation.h> +#include <epan/conversation_table.h> #include <epan/tap.h> void proto_register_ncp(void); @@ -295,6 +296,31 @@ mncp_hash_lookup(conversation_t *conversation, guint32 nwconnection, guint8 nwta return (mncp_rhash_value *)g_hash_table_lookup(mncp_rhash, &key); } +static const char* ncp_conv_get_filter_type(conv_item_t* conv _U_, conv_filter_type_e filter) +{ + if ((filter == CONV_FT_SRC_PORT) || (filter == CONV_FT_DST_PORT) || (filter == CONV_FT_ANY_PORT)) + return "ncp.connection"; + + return CONV_FILTER_INVALID; +} + +static ct_dissector_info_t ncp_ct_dissector_info = {&ncp_conv_get_filter_type}; + +static int +ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +{ + conv_hash_t *hash = (conv_hash_t*) pct; + const struct ncp_common_header *ncph=(const struct ncp_common_header *)vip; + guint32 connection; + + connection = (ncph->conn_high * 256)+ncph->conn_low; + if (connection < 65535) { + add_conversation_table_data(hash, &pinfo->src, &pinfo->dst, connection, connection, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, &ncp_ct_dissector_info, PT_NCP); + } + + return 1; +} + /* * Burst packet system flags. */ @@ -1098,8 +1124,10 @@ proto_register_ncp(void) &ncp_echo_file); register_init_routine(&mncp_init_protocol); ncp_tap.stat=register_tap("ncp_srt"); - ncp_tap.hdr=register_tap("ncp_hdr"); + ncp_tap.hdr=register_tap("ncp"); register_postseq_cleanup_routine(&mncp_postseq_cleanup); + + register_conversation_table(proto_ncp, FALSE, ncp_conversation_packet); } void |