aboutsummaryrefslogtreecommitdiffstats
path: root/editcap.c
AgeCommit message (Collapse)AuthorFilesLines
2011-07-21Remove the snaplen check added in r37633: the change in r37634 makes itmorriss1-6/+0
unnecessary. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38155 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-20Don't sanity-check snaplen against frame length if snaplen is 0.martinm1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38132 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-23Prohibited APIs: strncpy -> g_strlcpy.stig1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37768 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-20Have mergecap, tshark, and editcap write pcap-ng files by default. Thisgerald1-1/+5
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37736 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-15See if this squelches some compiler warnings.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37669 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-09Simplify timestamp checking: only check the packet's timestamp ifmorriss1-4/+10
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37633 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-31Handle snaplen before choplen for consistency. Also, if chopping more bytescmaynard1-10/+13
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37488 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-31When a snaplen is specified using "-s <snaplen", if it's smaller than thecmaynard1-21/+24
original capture file's snaplen, save the new snaplen in the capture file header so wireshark and capinfos can report it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37480 f5534014-38df-0310-8fa8-9805f1628bb7
2011-05-24Move the Windows argument list conversion code to a common routine.gerald1-17/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37372 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-12Don't bother to strcpy() an empty string; just set buf[0] = '\0': Coverity 626cmaynard1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36601 f5534014-38df-0310-8fa8-9805f1628bb7
2011-02-04From Jason Masker (bug 5240):sake1-10/+16
` Allow editcap to chop from beginning of packet for decapsulation git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35832 f5534014-38df-0310-8fa8-9805f1628bb7
2011-01-06On Windows, convert all of our command-line arguments from UTF-16 togerald1-0/+18
UTF-8 where we don't already do so. In Wireshark use g_utf16_to_utf8 instead of utf_16to8. This should fix bug 5520. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35411 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-06Fix various typos and spelling errors.wmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35126 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-24Attempt to fix warnings not previously seen with VS2008EE.cmaynard1-5/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35024 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-24When listing encapsulation types with -T or file types with -F, sort them.cmaynard1-8/+39
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35022 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-16Make editcap -B work like expected: output no packets after the stop time.sake1-4/+4
Old behavior was to include a packet with a timestamp of 12:00:00.934 if -B "YYYY-MM-DD 12:00:00" was used. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34913 f5534014-38df-0310-8fa8-9805f1628bb7
2010-11-01From Jose Pedro Oliveira via ↵morriss1-10/+10
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
2010-09-16Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().gerald1-7/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34137 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-03Fix a gcc -Wshadow warningwmeier1-13/+13
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33077 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-02From Jim Young via bug 4331:gerald1-2/+154
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
2010-05-28Move some code (including the optional objects) into libwsutilmorriss1-7/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33012 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-29Fix various gcc -Wshadow warnings.wmeier1-28/+28
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31729 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-29Make edticap behave like the rest of the Wireshark programs where it willsfisher1-64/+71
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
2009-10-25From Jim Young via bug 4162:gerald1-0/+10
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
2009-10-06Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_Hstig1-4/+4
Rename getopt.[ch] -> wsgetopt.[ch] to avoid name collision. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30370 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-22Use "svn info" to fetch the version by default. Fetch the repository path asgerald1-1/+1
well. Add the repository path to the version strings. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29171 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-21Clean up the "available XXX type" messages a bit.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28793 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-02If no valid packages was found in the input file we write an emptystig1-3/+17
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
2009-06-02Only call wtap_dump_close() if we have an open file.stig1-2/+2
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
2009-05-23Have fileset_extract_prefix_suffix() print an error message if it fails,guy1-12/+13
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
2009-05-23Fix indentation.guy1-6/+6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28457 f5534014-38df-0310-8fa8-9805f1628bb7
2009-05-23Initialize pdh...sake1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28455 f5534014-38df-0310-8fa8-9805f1628bb7
2009-05-23From Kovarththanan Rajaratnam <krj@rajaratnam.dk> in bug 2683sake1-61/+144
(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
2009-05-12Minor cleanup of "-h" output text.wmeier1-23/+24
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28334 f5534014-38df-0310-8fa8-9805f1628bb7
2009-04-17Fix Win64 compilation.gerald1-5/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28076 f5534014-38df-0310-8fa8-9805f1628bb7
2009-04-17From Jim Young <jyoung@gsu.edu>:rbalint1-20/+303
- 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
2009-04-16Fix the last(?) of the Win64 compilation problems.gerald1-5/+5
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28065 f5534014-38df-0310-8fa8-9805f1628bb7
2009-03-22Change the signature of init_progfile_dir() so the casting of theguy1-1/+1
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
2009-03-22In Solaris, the second argument to dladdr() is just a void *, not aguy1-2/+1
const void *. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27813 f5534014-38df-0310-8fa8-9805f1628bb7
2009-03-22Attempt to use dladdr() to get the pathname of the executable image ifguy1-1/+2
it's available and works. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27812 f5534014-38df-0310-8fa8-9805f1628bb7
2009-02-15Add a routine to report write errors to the list of failure-reportingguy1-1/+1
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
2008-12-18Only declare failure_message() if we HAVE_PLUGINS (since it's only used when ↵morriss1-0/+2
that's the case). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27051 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-24Windows build: #include winsock2.h only when needed.wmeier1-0/+3
#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
2008-06-30Move privileges.c and unicode-utils.c from epan to wsutil (so things likemorriss1-1/+1
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
2008-06-21From Ken Smith (bug 2574): Allow editcap to parse files into even time intervalssake1-3/+72
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
2008-05-30Free up the err_info string returned by wtap_read() andguy1-0/+1
wtap_seek_read(). Clean up indentation. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25400 f5534014-38df-0310-8fa8-9805f1628bb7
2008-03-25Long time ago, I added these to troubleshoot a problem a user was seeing but ↵lego1-10/+0
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
2008-03-16Don't link plugins against libwireshark: any program that loads the dissectormorriss1-4/+7
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
2008-03-16Include epan/priveleges.h for get_credential_info()morriss1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24649 f5534014-38df-0310-8fa8-9805f1628bb7
2008-03-16Have started_with_special_privs() assert out if get_credential_info() was notmorriss1-5/+15
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 17:19:04 +0000