From bc654875f03fef8248b06b4bdc8bd26df0a50211 Mon Sep 17 00:00:00 2001 From: Chris Maynard Date: Thu, 29 Aug 2013 18:15:13 +0000 Subject: Handle the 2GiB boundary case of the max filesize autostop condition properly so that we avoid overflow conditions and so that we ensure we don't capture more than 2GiB. Also, document the max filesize autostop value of 2GIB as well as indicating that it's truly GiB and not GB. This fixes the problem reported on ask: http://ask.wireshark.org/questions/23891/wireshark-wont-run-with-multiple-capture-files #BACKPORT(1.10) ... not sure about 1.8? svn path=/trunk/; revision=51576 --- doc/dumpcap.pod | 8 ++++---- doc/tshark.pod | 14 +++++++------- doc/wireshark.pod.template | 11 ++++++----- 3 files changed, 17 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/dumpcap.pod b/doc/dumpcap.pod index de969ceaa1..dc2ef1df66 100644 --- a/doc/dumpcap.pod +++ b/doc/dumpcap.pod @@ -68,9 +68,9 @@ B:I Stop writing to a capture file after I seconds have elapsed. B:I Stop writing to a capture file after it reaches a size of -I kilobytes (where a kilobyte is 1024 bytes). If this option is used -together with the -b option, dumpcap will stop writing to the current capture -file and switch to the next one if filesize is reached. +I KiB. If this option is used together with the -b option, dumpcap will +stop writing to the current capture file and switch to the next one if filesize +is reached. Note that the filesize is limited to a maximum value of 2 GiB. B:I Stop writing to capture files after I number of files were written. @@ -99,7 +99,7 @@ B:I switch to the next file after I seconds have elapsed, even if the current file is not completely filled up. B:I switch to the next file after it reaches a size of -I kilobytes (where a kilobyte is 1024 bytes). +I KiB. Note that the filesize is limited to a maximum value of 2 GiB. B:I begin again with the first file after I number of files were written (form a ring buffer). This value must be less than 100000. diff --git a/doc/tshark.pod b/doc/tshark.pod index 670a2bd659..a8c3059108 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -165,12 +165,12 @@ B:I Stop writing to a capture file after I seconds have elapsed. B:I Stop writing to a capture file after it reaches a size of -I kilobytes (where a kilobyte is 1024 bytes). If this option is used -together with the -b option, B will stop writing to the current -capture file and switch to the next one if filesize is reached. When reading a -capture file, B will stop reading the file after the number of bytes -read exceeds this number (the complete packet will be read, so more bytes than -this number may be read). +I KiB. If this option is used together with the -b option, B +will stop writing to the current capture file and switch to the next one if +filesize is reached. When reading a capture file, B will stop reading +the file after the number of bytes read exceeds this number (the complete +packet will be read, so more bytes than this number may be read). Note that +the filesize is limited to a maximum value of 2 GiB. B:I Stop writing to capture files after I number of files were written. @@ -199,7 +199,7 @@ B:I switch to the next file after I seconds have elapsed, even if the current file is not completely filled up. B:I switch to the next file after it reaches a size of -I kilobytes (where a kilobyte is 1024 bytes). +I KiB. Note that the filesize is limited to a maximum value of 2 GiB. B:I begin again with the first file after I number of files were written (form a ring buffer). This value must be less than 100000. diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template index 9f2f2c5478..28e1ebfc31 100644 --- a/doc/wireshark.pod.template +++ b/doc/wireshark.pod.template @@ -232,9 +232,10 @@ B:I Stop writing to a capture file after I seconds have elapsed. B:I Stop writing to a capture file after it reaches a size of -I kilobytes (where a kilobyte is 1024 bytes). If this option is used -together with the -b option, Wireshark will stop writing to the current -capture file and switch to the next one if filesize is reached. +I KiB. If this option is used together with the -b option, Wireshark +will stop writing to the current capture file and switch to the next one if +filesize is reached. Note that the filesize is limited to a maximum value of +2 GiB. B:I Stop writing to capture files after I number of files were written. @@ -263,7 +264,7 @@ B:I switch to the next file after I seconds have elapsed, even if the current file is not completely filled up. B:I switch to the next file after it reaches a size of -I kilobytes (where a kilobyte is 1024 bytes). +I KiB. Note that the filesize is limited to a maximum value of 2 GiB. B:I begin again with the first file after I number of files were written (form a ring buffer). This value must be less than 100000. @@ -2361,7 +2362,7 @@ I option is checked. The I check box and fields lets you specify that a switch to a next file should be done if the specified filesize is reached. You can also select the appropriate -unit, but beware that the filesize has a maximum of 2 GB. +unit, but beware that the filesize has a maximum of 2 GiB. The check box is forced to be checked, as "multiple files" mode requires a file size to be specified. -- cgit v1.2.3