Add the ability to specify a filter to be used when reading the file to

the "Open File" dialog box (the "Open File" dialog box equivalent of the
"-R" flag).  Have "load_cap_file()" take the filter expression as an
argument, and make the global "rfilter" into a member of a
"capture_file" structure.

When reading a temporary capture file after a live capture, don't apply
any filter.

Move the code that pops up error boxes on file opens when reading a
capture file back to "load_cap_file()"; it also pops up error boxes if
the filter expression can't be parsed.

Don't enable "File/Save" or "File/Save As..." if an attempt to read a
capture file fails - if there was already an open capture file, it was
closed by "load_cap_file()", so we no longer have an open file to save.

svn path=/trunk/; revision=460

1 files changed, 5 insertions, 2 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index e382783a7c..ff5df6327d 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -121,7 +121,7 @@ Reads packet data from I<file>.
 =item -R
 
 Causes the specified filter (which uses the syntax of display filters,
-rather than that of capture filters) to be applied, when a packet file
+rather than that of capture filters) to be applied, when a capture file
 is read, to all packets read from the capture file; packets not matching
 the filter are discarded.
 
@@ -169,7 +169,10 @@ Sets the default capture file name.
 
 =item File:Open, File:Close, File:Reload
 
-Open, close, or reload a capture file.
+Open, close, or reload a capture file.  The I<File:Open> dialog box
+allows a filter to be specified; when the capture file is read, the
+filter is applied to all packets read from the file, and packets not
+matching the filter are discarded.
 
 =item File:Print