diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-14 17:25:56 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-30 06:48:32 +0000 |
| commit | 2bf7878e8a7455fe656bb07e9a7d42e6ac4d87fd (patch) | |
| tree | 3a0c99831311c43017d1d9b3336856e4a956c353 /ui/tap-rtp-common.c | |
| parent | 6824cee6c4b5f7c00b9dc4e9013aaa936b18b739 (diff) | |
| download | wireshark-2bf7878e8a7455fe656bb07e9a7d42e6ac4d87fd.tar.gz | |
Qt: Add the RTP Streams dialog.
Add keyboard shortcuts. Note that not all of the buttons made it from
GTK+. Add a "Go to setup frame" option.
Move rtp_streams.c from ui/gtk to ui.
Add a help URL for RTP analysis (which needs to be split into streams +
analysis).
Fix RTP stream packet marking.
Change-Id: Ifb8192ff701a933422509233d76461a46e459f4f
Reviewed-on: https://code.wireshark.org/review/6852
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/tap-rtp-common.c')
| -rw-r--r-- | ui/tap-rtp-common.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index 8e5f2c92b0..5b14f8e308 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -46,7 +46,7 @@ /****************************************************************************/ /* GCompareFunc style comparison function for _rtp_stream_info */ -gint rtp_stream_info_cmp(gconstpointer aa, gconstpointer bb) +static gint rtp_stream_info_cmp(gconstpointer aa, gconstpointer bb) { const struct _rtp_stream_info* a = (const struct _rtp_stream_info*)aa; const struct _rtp_stream_info* b = (const struct _rtp_stream_info*)bb; @@ -264,15 +264,13 @@ int rtpstream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con rtp_write_sample(&sample, tapinfo->save_file); } } -#ifdef __GTK_H__ - else if (tapinfo->mode == TAP_MARK) { - if (rtp_stream_info_cmp(&tmp_strinfo, tapinfo->filter_stream_fwd)==0 - || rtp_stream_info_cmp(&tmp_strinfo, tapinfo->filter_stream_rev)==0) + else if (tapinfo->mode == TAP_MARK && tapinfo->tap_mark_packet) { + if (rtp_stream_info_cmp(&new_stream_info, tapinfo->filter_stream_fwd)==0 + || rtp_stream_info_cmp(&new_stream_info, tapinfo->filter_stream_rev)==0) { - cf_mark_frame(&cfile, pinfo->fd); + tapinfo->tap_mark_packet(tapinfo, pinfo->fd); } } -#endif return 0; } |