aboutsummaryrefslogtreecommitdiffstats
path: root/ui/rtp_stream.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-05-14 22:53:16 -0400
committerAnders Broman <a.broman58@gmail.com>2015-05-20 11:03:58 +0000
commitfeb47cf93662723386dbce7d1f180efc39f131f1 (patch)
tree535e365114a2df552a963af9a9cead0c9864bff4 /ui/rtp_stream.c
parent713ed3f81724f3ea39ade8fdd53f482715f296ca (diff)
Start exposing the filter field of a tap listener to the RTP GUI APIs.
A tap listener has the ability to apply a filter (typically the display filter). Add a parameter to RTP GUI API functions to allow them to pass in a filter. Bug: 996 Change-Id: Ib184dfb023be5d1d24a0d842b4039311426b5293 Reviewed-on: https://code.wireshark.org/review/8468 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/rtp_stream.c')
-rw-r--r--ui/rtp_stream.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/rtp_stream.c b/ui/rtp_stream.c
index 11f41c15a5..f54235519d 100644
--- a/ui/rtp_stream.c
+++ b/ui/rtp_stream.c
@@ -64,7 +64,7 @@ static void rtpstream_draw(void *ti_ptr)
/****************************************************************************/
/* scan for RTP streams */
-void rtpstream_scan(rtpstream_tapinfo_t *tapinfo, capture_file *cap_file)
+void rtpstream_scan(rtpstream_tapinfo_t *tapinfo, capture_file *cap_file, const char *fstring)
{
gboolean was_registered;
@@ -74,7 +74,7 @@ void rtpstream_scan(rtpstream_tapinfo_t *tapinfo, capture_file *cap_file)
was_registered = tapinfo->is_registered;
if (!tapinfo->is_registered)
- register_tap_listener_rtp_stream(tapinfo);
+ register_tap_listener_rtp_stream(tapinfo, fstring);
tapinfo->mode = TAP_ANALYSE;
cf_retap_packets(cap_file);
@@ -111,7 +111,7 @@ gboolean rtpstream_save(rtpstream_tapinfo_t *tapinfo, capture_file *cap_file, rt
}
if (!tapinfo->is_registered)
- register_tap_listener_rtp_stream(tapinfo);
+ register_tap_listener_rtp_stream(tapinfo, NULL);
tapinfo->mode = TAP_SAVE;
tapinfo->filter_stream_fwd = stream;
@@ -163,7 +163,7 @@ void rtpstream_mark(rtpstream_tapinfo_t *tapinfo, capture_file *cap_file, rtp_st
was_registered = tapinfo->is_registered;
if (!tapinfo->is_registered)
- register_tap_listener_rtp_stream(tapinfo);
+ register_tap_listener_rtp_stream(tapinfo, NULL);
tapinfo->mode = TAP_MARK;
tapinfo->filter_stream_fwd = stream_fwd;
@@ -193,7 +193,7 @@ remove_tap_listener_rtp_stream(rtpstream_tapinfo_t *tapinfo)
/****************************************************************************/
void
-register_tap_listener_rtp_stream(rtpstream_tapinfo_t *tapinfo)
+register_tap_listener_rtp_stream(rtpstream_tapinfo_t *tapinfo, const char *fstring)
{
GString *error_string;
@@ -203,7 +203,7 @@ register_tap_listener_rtp_stream(rtpstream_tapinfo_t *tapinfo)
if (!tapinfo->is_registered) {
error_string = register_tap_listener("rtp", tapinfo,
- NULL, 0, rtpstream_reset_cb, rtpstream_packet,
+ fstring, 0, rtpstream_reset_cb, rtpstream_packet,
rtpstream_draw);
if (error_string != NULL) {