diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-23 22:48:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-23 22:48:52 +0000 |
| commit | 6064ef84c20c8793f2097a5d262c7d1c1aa4a800 (patch) | |
| tree | a215667aa765deb015fc5b3faa6f94a2f92309fb /gtk/follow_dlg.c | |
| parent | 5de3a44126731eb7686eca522d99a26d1fedce2f (diff) | |
Add a "force" argument to "filter_packets()" and
"main_filter_packets()", to force the filtering to be done even if the
filter is the same as the current one; this is necessary in order to
make sure "Follow TCP Stream" gets the packets processed even if you're
filtering the stream that's currently filtered in.
svn path=/trunk/; revision=10209
Diffstat (limited to 'gtk/follow_dlg.c')
| -rw-r--r-- | gtk/follow_dlg.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index 986f607e25..f201a072fb 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.49 2004/02/23 19:19:36 ulfl Exp $ + * $Id: follow_dlg.c,v 1.50 2004/02/23 22:48:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -211,6 +211,7 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_) and set the display filter entry accordingly */ reset_tcp_reassembly(); follow_filter = build_follow_filter(&cfile.edt->pi); +fprintf(stderr, "Follow filter = \"%s\"\n", follow_filter); /* Set the display filter entry accordingly */ filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY); @@ -234,10 +235,12 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_) sprintf(follow_info->filter_out_filter, "!(%s)", follow_filter); } + gtk_entry_set_text(GTK_ENTRY(filter_te), follow_filter); - /* Run the display filter so it goes in effect. */ - main_filter_packets(&cfile, follow_filter); + /* Run the display filter so it goes in effect - even if it's the + same as the previous display filter. */ + main_filter_packets(&cfile, follow_filter, TRUE); /* Free the filter string, as we're done with it. */ g_free(follow_filter); @@ -755,7 +758,7 @@ follow_filter_out_stream(GtkWidget * w _U_, gpointer data) gtk_entry_set_text(GTK_ENTRY(follow_info->filter_te), follow_info->filter_out_filter); /* Run the display filter so it goes in effect. */ - main_filter_packets(&cfile, follow_info->filter_out_filter); + main_filter_packets(&cfile, follow_info->filter_out_filter, FALSE); /* we force a subsequent close */ gtk_widget_destroy(follow_info->streamwindow); |