When searching for a frame that matches a filter expression, we
shouldn't stop the search as soon as we get back to the starting frame, we should stop the search if the filter expression doesn't match and the frame we tried it on was the starting frame - it's OK if we find the starting frame, it's just not OK to continue if we don't find that frame. svn path=/trunk/; revision=1815
This commit is contained in:
parent
76f0935df9
commit
5fe1de894e
14
file.c
14
file.c
|
@ -1,7 +1,7 @@
|
|||
/* file.c
|
||||
* File I/O routines
|
||||
*
|
||||
* $Id: file.c,v 1.180 2000/04/07 07:48:15 guy Exp $
|
||||
* $Id: file.c,v 1.181 2000/04/07 08:00:34 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@zing.org>
|
||||
|
@ -1194,12 +1194,6 @@ find_packet(capture_file *cf, dfilter *sfcode)
|
|||
fd = cf->plist; /* wrap around */
|
||||
}
|
||||
|
||||
if (fd == start_fd) {
|
||||
/* We're back to the frame we were on originally. The search
|
||||
failed. */
|
||||
break;
|
||||
}
|
||||
|
||||
count++;
|
||||
|
||||
/* Is this packet in the display? */
|
||||
|
@ -1215,6 +1209,12 @@ find_packet(capture_file *cf, dfilter *sfcode)
|
|||
break; /* found it! */
|
||||
}
|
||||
}
|
||||
|
||||
if (fd == start_fd) {
|
||||
/* We're back to the frame we were on originally, and that frame
|
||||
doesn't match the search filter. The search failed. */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
gtk_progress_bar_update(GTK_PROGRESS_BAR(prog_bar), 0);
|
||||
|
|
Loading…
Reference in New Issue