diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-09-21 11:28:26 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-21 22:16:09 +0000 |
| commit | 620d54b1e3a4fcad1994409013f6a5b2b76913b4 (patch) | |
| tree | 57178fbcdd56a4628a359c996c69f4b256a7f848 /epan/dissectors/packet-lbmc.c | |
| parent | bd28737d7f0e4cd30f68f16ee94dcc0dfcf33ea3 (diff) | |
Complete move of tap-sequence-analysis.c functionality to sequence_analysis.c
Since dissectors are now populating the timestamp of the seq_analysis_item_t
structure within the tap function, don't have the sequence_anaylsis redo it
when writing an ASCII file. This removes the need for the capture_file
parameter and simplifies the logic a bit.
Also just have GUI register the tap itself. It will provide for some more
flexibility in the future.
Change-Id: I55b2f951b977ea70ac9f7eb4929245b0779e5f0e
Reviewed-on: https://code.wireshark.org/review/23650
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/dissectors/packet-lbmc.c')
| -rw-r--r-- | epan/dissectors/packet-lbmc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 888fdeb9cb..bdf5318da2 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -27,6 +27,7 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/sequence_analysis.h> +#include <epan/column-info.h> #include <epan/to_str.h> #include <epan/tap.h> #include "packet-lbm.h" @@ -6084,6 +6085,7 @@ lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _ gchar * ctxinst2; gboolean swap_endpoints = FALSE; seq_analysis_item_t* sai; + char time_str[COL_MAX_LEN]; int rc; if ((sainfo->all_packets)||(pinfo->fd->flags.passed_dfilter==1)) @@ -6188,6 +6190,11 @@ lbm_uim_seq_analysis_packet(void *ptr, packet_info *pinfo, epan_dissect_t *edt _ epb.stream_info.dest.port, stream_info->channel); } + + /* Fill in the timestamps */ + set_fd_time(pinfo->epan, pinfo->fd, time_str); + sai->time_str = g_strdup(time_str); + sai->conv_num = (guint16)LBM_CHANNEL_ID(stream_info->channel); sai->display = TRUE; sai->line_style = 1; |