getopt() can/should normally be found in unistd.h, so:
- When testing for getopt(), define that we HAVE_GETOPT instead of
HAVE_GETOPT_H (to avoid confusion).
- Don't attempt to include getopt.h: not all OS's have it (for example,
Solaris 9 does not).
- (All the places which need getopt already include unistd.h (if we have it).)
If this breaks things on some OS, we might need (a real) HAVE_GETOPT_H check.
svn path=/trunk/; revision=38437
is mainly an attempt to fix the currently-broken "test.sh" step on the
XP buildbot. If this causes too many problems we might want to have
suite-capture.sh:capture_step_snapshot pass "-P" to dumpcap instead.
svn path=/trunk/; revision=37736
check_startstop is set.
Refuse to write packets that do not fit in the file type we're writing. This
allows fuzz testing to be done on JPEGs without generating bogus files (with
packets bigger than the maximum packet size). This fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6010 .
Note that this is only a problem with editcap is run with -T to force the
encapsulation type.
Maybe this needs a more generic solution (e.g., should this check be done in
the wiretap routines?), but at least for now it'll pacify the buildbot.
svn path=/trunk/; revision=37633
than present, just chop all by setting caplen to 0. In all cases, don't touch
len. In other words, change incl_len but leave orig_len alone.
svn path=/trunk/; revision=37488
original capture file's snaplen, save the new snaplen in the capture file
header so wireshark and capinfos can report it.
svn path=/trunk/; revision=37480
editcap -h sends 9 lines to stderr and the rest to stdout. This problem
affects editcap 1.4.x (branch 1.4) and devel (trunk).
How to duplicate:
1) run "editcap -h"
2) run "editcap -h > /dev/null"
The attached patch replaces 9 ocurrences of "stderr" by "output" in the usage
function.
svn path=/trunk/; revision=34742
This patch adds a new '-S' option to editcap that will rewrite timestamps of
packets to insure that the new capture file is in strict chronological order.
This option's primary use case is to fixup the occasional timestamps that have
a negative delta time relative to previous packet.
This feature is related to (but does not depend on) capinfos enhancement
submitted in bug #4315 which helps identify tracefiles with "out-of-order"
packets.
svn path=/trunk/; revision=33042
send normal -h output to stdout so it can be paginated and the usage output
to stderr when there was an error in the command arguments.
svn path=/trunk/; revision=31388
This patch limits the number of fractional digits used to calculate the
fractional component of editcap's -t and -w options.
Specifically this patch truncates the fractional component (if any) of the -t
and -w options to 6 and 9 respectively.
svn path=/trunk/; revision=30698
We can have a situation where a file only contains a valid file header
without any packages, so this will avoid a crash.
svn path=/trunk/; revision=28602
so we don't just exit silently. Don't bother checking the validity of
arguments - it shouldn't be passed NULL fprefix or fsuffix arguments in
the first place, and isn't passed them.
Exit with an exit status of 1 for command-line syntax errors and 2 for
file open/close/IO errors.
svn path=/trunk/; revision=28458
- New duplicate packet removal options for editcap
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3168
I changed the patch a bit:
- Adapted to 80 chars wide screen
- Merged -w and -W parameters
svn path=/trunk/; revision=28074
routines handled by epan/report_err.c.
Move copy_binary_file() in file.c to epan/filesystem.c, and rename it to
copy_file_binary_mode() (to clarify that it *can* copy text files;
arguably, *all* files are "binary" unless you're on, say, an IBM 1401
:-)). Have it use the report_err.c routines, so it works in
console-mode programs.
Clean up some comments while we're at it.
svn path=/trunk/; revision=27456
#include winsock2.h pulls in about 90 distinct .h files
and about 140 total .h files.
Currently winsock2.h is (mostly unnecessarily) included
for each dissector via packet.h/wtap.h.
This patch removes #include winsock2.h from wtap.h and
then includes winsock2.h (or windows.h) in the
few specific places required.
With this patch, my Windows Wireshark build takes
about 30% less time.
svn path=/trunk/; revision=26535
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules). Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.
svn path=/trunk/; revision=25640
A few changes from me:
- make use of nstime_set_unset and nstime_is_unset i.s.o. extra variable first_pass
- change 'if' to 'while' to allow intervals with no packets
- remove 'unused' variable current_pkt_ts
svn path=/trunk/; revision=25499
plugins should already be linked against libwireshark.
Don't link capinfos and editcap against libwireshark: they only needed to be
because the plugins were linked against libwireshark (see rev 24123 and the
ensuing discussion on -dev).
capinfos and editcap: don't complain if plugins fail to load: dissector
plugins should fail to load because they need libwireshark. I am assuming
here that wiretap plugins don't need libwireshark (I've never seen such a
plugin but LEGO's code and comments suggest this is the case).
(The goal of this checkin is to stop linking capinfos and editcap against
libwireshark while still allowing wiretap plugins. Since we don't have any
such plugins in the tree I do somewhat doubt the need for all this but I don't
want to be the one to remove the functionality.)
svn path=/trunk/; revision=24650