osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

It's not possible to check whether the capture file has reached its 

maximum size if there is no capture file; in fact, if you do, you get a
core dump.  Skip the capture file size test if not capturing to a file.

svn path=/trunk/; revision=4434
This commit is contained in:
Guy Harris 2001-12-21 19:51:03 +00:00
parent ec46daf88b
commit 7ff0e8e3ce
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tethereal.c
View File

@ -1,6 +1,6 @@
/* tethereal.c /* tethereal.c
* *
* $Id: tethereal.c,v 1.107 2001/12/18 19:09:02 gram Exp $ * $Id: tethereal.c,v 1.108 2001/12/21 19:51:03 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com> * By Gerald Combs <gerald@ethereal.com>
@ -929,10 +929,12 @@ capture(int packet_count, int out_file_type)
if (packet_count == 0) { if (packet_count == 0) {
ld.go = FALSE; ld.go = FALSE;
} else if (cnd_eval(cnd_stop_timeout) == TRUE) { } else if (cnd_eval(cnd_stop_timeout) == TRUE) {
/* The specified capture time has elapsed; stop the capture. */
ld.go = FALSE; ld.go = FALSE;
} else if ((cnd_eval(cnd_stop_capturesize, } else if (ld.pdh != NULL && (cnd_eval(cnd_stop_capturesize,
(guint32)wtap_get_bytes_dumped(ld.pdh))) == TRUE){ (guint32)wtap_get_bytes_dumped(ld.pdh))) == TRUE){
/* A capture stop condition has become true. */ /* We're saving the capture to a file, and the capture file reached
its maximum size. */
if (cfile.ringbuffer_on) { if (cfile.ringbuffer_on) {
/* Switch to the next ringbuffer file */ /* Switch to the next ringbuffer file */
if (ringbuf_switch_file(&cfile, &ld.pdh, &err) == TRUE) { if (ringbuf_switch_file(&cfile, &ld.pdh, &err) == TRUE) {