Age | Commit message (Collapse) | Author | Files | Lines |
|
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5353 :
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34742 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34137 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33077 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33042 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33012 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31729 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31388 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30698 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30370 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
well. Add the repository path to the version strings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29171 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28793 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
header in the output file. This way we at least create a file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28617 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
We can have a situation where a file only contains a valid file header
without any packages, so this will avoid a crash.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28602 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28458 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28457 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28455 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2683):
Editcap should split file according to fileset pattern
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28454 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28334 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28076 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
- 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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28074 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28065 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
function pointer (to main) to an argument to dladdr() is done in
init_progfile_dir() rather than its callers.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27814 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
const void *.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27813 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
it's available and works.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27812 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27456 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
that's the case).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27051 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
#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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26535 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25640 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25499 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
wtap_seek_read().
Clean up indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25400 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
I could not reproduce, as I had no feedback I forgot about removing these prints.
This must be copied over to the release branch.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24727 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
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.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24650 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24649 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
previously called. This prevents the function from always returning TRUE in
programs that hadn't called get_credential_info().
Call get_credential_info() in the programs that should have been.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24648 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
meta information that is found at the beginning of
the data - this lets me fuzztest my .out files
properly.
Also make some whitespace more consistent.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24401 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24275 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24260 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24258 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
Removed a debug printout in t38.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24188 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24179 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24176 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24124 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
of the -t option to fit its current behaviour
('fixes' bug 2101)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24072 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23416 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
"time_t" is not guaranteed to be an "unsigned long"; when printing it
with %lu, cast it to "unsigned long".
The "secs" field of a wtap_nstime, however, *is* defined to be a time_t;
there's no need to cast it to time_t.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23036 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
configure is run with "--without-plugins"
cc1: warnings being treated as errors
about_dlg.c: In function ‘about_wireshark_cb’:
about_dlg.c:426: warning: unused variable ‘plugins_page’
make[2]: *** [about_dlg.o] Error 1
editcap.c: In function ‘main’:
editcap.c:663: error: ‘check_ts’ undeclared (first use in this function)
editcap.c:663: error: (Each undeclared identifier is reported only once
editcap.c:663: error: for each function it appears in.)
make[2]: *** [editcap.o] Error 1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22761 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
encap type is registered the plugin probably needs it before reg_handoff)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22461 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22426 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
I can get feedback from the user.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22425 f5534014-38df-0310-8fa8-9805f1628bb7
|
|
importantly, give the user feedback if we run out of room for packet selections. As mentioned on the list, this could be made completely dynamic if someone actually goes over the (new) limit. OK for 0.99.6 but not necessary.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22145 f5534014-38df-0310-8fa8-9805f1628bb7
|