diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-05-14 22:53:16 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-05-20 11:03:58 +0000 |
| commit | feb47cf93662723386dbce7d1f180efc39f131f1 (patch) | |
| tree | 535e365114a2df552a963af9a9cead0c9864bff4 /ui/gtk | |
| parent | 713ed3f81724f3ea39ade8fdd53f482715f296ca (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/gtk')
| -rw-r--r-- | ui/gtk/iax2_analysis.c | 2 | ||||
| -rw-r--r-- | ui/gtk/rtp_analysis.c | 2 | ||||
| -rw-r--r-- | ui/gtk/rtp_stream_dlg.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index e167e570ee..3297601d55 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -3771,7 +3771,7 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_) port_dst_rev = edt.pi.srcport; /* Scan for rtpstream */ - rtpstream_scan(rtpstream_dlg_get_tapinfo(), &cfile); + rtpstream_scan(rtpstream_dlg_get_tapinfo(), &cfile, NULL); /* search for reversed direction in the global rtp streams list */ nfound = 0; strinfo_list = g_list_first(rtpstream_dlg_get_tapinfo()->strinfo_list); diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 2e319b440c..4f6fbb9e29 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -3999,7 +3999,7 @@ rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_) } /* Scan for rtpstream */ - rtpstream_scan(rtpstream_dlg_get_tapinfo(), &cfile); + rtpstream_scan(rtpstream_dlg_get_tapinfo(), &cfile, NULL); /* search for reversed direction in the global rtp streams list */ nfound = 0; strinfo_list = g_list_first(rtpstream_dlg_get_tapinfo()->strinfo_list); diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 75b64e4a15..1762f7e6d2 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -1149,11 +1149,13 @@ void rtpstream_dlg_show(GList *list_lcl) /* entry point when called via the GTK menu */ void rtpstream_launch(GtkAction *action _U_, gpointer user_data _U_) { + const char *filter = gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget)); + /* Register the tap listener */ - register_tap_listener_rtp_stream(&the_tapinfo_struct); + register_tap_listener_rtp_stream(&the_tapinfo_struct, filter); /* Scan for RTP streams (redissect all packets) */ - rtpstream_scan(&the_tapinfo_struct, &cfile); + rtpstream_scan(&the_tapinfo_struct, &cfile, filter); /* Show the dialog box with the list of streams */ rtpstream_dlg_show(the_tapinfo_struct.strinfo_list); |