diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-26 12:41:27 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-30 16:12:54 +0000 |
| commit | dcf6d44b7f5e69e08be8ccd452b87733326053cc (patch) | |
| tree | 8d68df38e6b5ed2c6caa5f2ccd6c1425eea95d90 /epan/conversation_table.h | |
| parent | 54777bf31566e0e72e9204fd0d60bfbe8521d6c3 (diff) | |
Apply refactored "conversation" (tap) data to TShark.
I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature. But at least all types of conversations allowed are in sync with Wireshark GUI.
Bug:6310
Change-Id: I722837df510a39dadc1f9a07a99275509516698c
Reviewed-on: https://code.wireshark.org/review/3212
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/conversation_table.h')
| -rw-r--r-- | epan/conversation_table.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/conversation_table.h b/epan/conversation_table.h index d9e6f2bd01..4349ac96a1 100644 --- a/epan/conversation_table.h +++ b/epan/conversation_table.h @@ -109,8 +109,9 @@ typedef struct _conversation_item_t { guint64 rx_bytes; /**< number of received bytes */ guint64 tx_bytes; /**< number of transmitted bytes */ - nstime_t start_time; /**< start time for the conversation */ - nstime_t stop_time; /**< stop time for the conversation */ + nstime_t start_time; /**< relative start time for the conversation */ + nstime_t stop_time; /**< relative stop time for the conversation */ + nstime_t start_abs_time; /**< absolute start time for the conversation */ gboolean modified; /**< new to redraw the row (only used in GTK+) */ } conv_item_t; @@ -228,11 +229,12 @@ WS_DLL_PUBLIC const char *get_conversation_filter(conv_item_t *conv_item, conv_d * @param num_frames number of packets * @param num_bytes number of bytes * @param ts timestamp + * @param abs_ts absolute timestamp * @param ct_info callback handlers from the dissector * @param ptype the port type (e.g. PT_TCP) */ extern void add_conversation_table_data(conv_hash_t *ch, const address *src, const address *dst, - guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, nstime_t *ts, + guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, nstime_t *ts, nstime_t *abs_ts, ct_dissector_info_t *ct_info, port_type ptype); /** Add some data to the conversation table, passing a value to be used in @@ -247,6 +249,7 @@ extern void add_conversation_table_data(conv_hash_t *ch, const address *src, con * @param num_frames number of packets * @param num_bytes number of bytes * @param ts timestamp + * @param abs_ts absolute timestamp * @param ct_info callback handlers from the dissector * @param ptype the port type (e.g. PT_TCP) * @param conv_id a value to help differentiate the conversation in case the address and port quadruple is not sufficiently unique @@ -262,6 +265,7 @@ add_conversation_table_data_with_conv_id( int num_frames, int num_bytes, nstime_t *ts, + nstime_t *abs_ts, ct_dissector_info_t *ct_info, port_type ptype); |