aboutsummaryrefslogtreecommitdiffstats
path: root/editcap.c
AgeCommit message (Collapse)AuthorFilesLines
2013-07-16Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss1-2/+2
there and moving it avoids having to recompile the file for use in editcap and mergecap (which don't link against libwireshark). svn path=/trunk/; revision=50650
2013-07-15Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific ↵Jeff Morriss1-2/+1
there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark). svn path=/trunk/; revision=50598
2013-07-12Allow -C <choplen> to be used more than once so it is now possible to chop ↵Chris Maynard1-26/+37
bytes from both the beginning and end of a packet in a single step. svn path=/trunk/; revision=50536
2013-07-10Add -L option to allow adjustment of original frame length. This change was ↵Chris Maynard1-75/+97
motivated by a question on ask where the user currently has to jump through hoops to accomplish the same thing which can now be done in 1 step via: editcap -T wpan -C 16 -L -F libpcap test.pcap test_wpan.pcap I thought it would be useful enough for others as well. Ref: http://ask.wireshark.org/questions/22689/problems-with-editcap-and-wpan-encapsulation-option svn path=/trunk/; revision=50491
2013-07-10Add strnatcmp by Martin Pool for 'natural order' string comparisons, and ↵Chris Maynard1-2/+10
make use of it in editcap and mergecap for listing encapsulation types. For example: Before: user0 - USER 0 user1 - USER 1 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 After: user0 - USER 0 user1 - USER 1 user2 - USER 2 user3 - USER 3 user4 - USER 4 user5 - USER 5 user6 - USER 6 user7 - USER 7 user8 - USER 8 user9 - USER 9 user10 - USER 10 user11 - USER 11 user12 - USER 12 user13 - USER 13 user14 - USER 14 user15 - USER 15 svn path=/trunk/; revision=50482
2013-06-25Move a couple of time-related modules into wsutil.Jeff Morriss1-1/+1
A bunch of files didn't really need to include these header files so remove the include line rather than changing it. svn path=/trunk/; revision=50154
2013-03-20 From beroset:Bill Meier1-1/+1
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397 svn path=/trunk/; revision=48438
2013-03-07From Balint:Gerald Combs1-3/+12
[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol" warnings. This reverts commit r48158. [PATCH 2/2] Employ small hack in editcap to link with a few objects from libwireshark properly From me: Add the ability to reset symbol exports via ws_symbol_export.h's include guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h in over 200 files so it didn't seem to make sense to remove its include guard entirely. svn path=/trunk/; revision=48170
2013-03-05Use explicit casts.Anders Broman1-2/+2
svn path=/trunk/; revision=48108
2013-02-20When any of our executables start on Windows create or open a "WiresharkGerald Combs1-0/+2
is running" mutex. Have the NSIS installer check for this mutex and ask the user to close Wireshark if it's found. While not perfect this makes the WinSparkle update process much less annoying. svn path=/trunk/; revision=47758
2013-01-14Previous commit put a little too much of the README.developer boilerplate in...Jeff Morriss1-6/+0
svn path=/trunk/; revision=47065
2013-01-14In response to http://ask.wireshark.org/questions/17660/licence-of-editcapJeff Morriss1-2/+28
and as per email response from Richard Sharpe, add GPLv2+ boilerplate header and license. svn path=/trunk/; revision=47063
2013-01-04Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8105 :Pascal Quantin1-1/+1
Allow use of huges values for localtime / ctime / gmtime with MSVC 2008 or later svn path=/trunk/; revision=46930
2012-12-26Fix a bunch of warnings.Guy Harris1-7/+7
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-10-16Add wtap_pseudo_header union to wtap_pkthdr structure.Jakub Zawadzki1-1/+1
Use pkthdr instead of pseudo_header as argument for dissecting. svn path=/trunk/; revision=45601
2012-10-15From Jim Young:Anders Broman1-1/+3
Have editcap use modulo when calculating filenum component of fileset name . https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7863 svn path=/trunk/; revision=45556
2012-10-09From Bill Parker:Anders Broman1-1/+1
Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>' https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7810 svn path=/trunk/; revision=45418
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45015
2012-09-09Make count variable in editcap unsigned, fixes more format stringEvan Huus1-1/+1
mismatches. svn path=/trunk/; revision=44820
2012-07-16Fix a copy+paste error ('capinfos' appearing in error string).Martin Mathieson1-1/+1
svn path=/trunk/; revision=43738
2012-06-15Try to fix pcap-ng - most files created by editcap -c have no IDBAnders Broman1-9/+10
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7350 By using wtap_dump_open_ng() in all places. svn path=/trunk/; revision=43271
2012-03-14Don't free idb_inf in wtap_dump_open_ng(): free it in the callers. This ↵Jeff Morriss1-1/+4
fixes the double-free editcap crashes that the buildbot's been seeing lately. svn path=/trunk/; revision=41542
2012-03-13From Jose Pedro Oliveira:Anders Broman1-1/+3
the shb_userappl value wasn't being changed. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6937 svn path=/trunk/; revision=41530
2012-03-13A modified version of "pcapng: shd_userappl in newly created files"Anders Broman1-0/+5
to only add the name if no name if there yet. Original patch from Jose Pedro Oliveira. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6937 svn path=/trunk/; revision=41524
2012-03-12Free idb_inf and shb_hdr when done.Anders Broman1-0/+2
svn path=/trunk/; revision=41501
2012-03-03Use wtap_dump_open_ng(), so we preserve all the interfaces in pcap-NGGuy Harris1-2/+7
files. svn path=/trunk/; revision=41328
2012-02-24Revert SVN #40866 (which used g_fprintf() in place of fprintf()).Bill Meier1-140/+141
Using g_fprintf() fails (crashes) on Windows because the Windows GLib DLL is linked with (depends upon) MSVCRT while editcap is linked with (depends upon) MSVCR90. IOW: "You can't do that ... (on Windows)" See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6695 (Comment 2) for some additional information. svn path=/trunk/; revision=41168
2012-02-05From Alexander Koeppe:Anders Broman1-141/+140
Eliminate Mixture of libc and glibc in editcap.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6695 svn path=/trunk/; revision=40866
2012-01-23From Michael Mann:Anders Broman1-1/+1
help page update (pcapng is now the default file format). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6551 svn path=/trunk/; revision=40658
2012-01-15Rename crypt-xxx to xxxJörg Mayer1-1/+1
svn path=/trunk/; revision=40511
2011-12-13Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports anyGuy Harris1-2/+2
form of corruption/bogosity in a file, including in a file header as well as in records in the file. Change the error message wtap_strerror() returns for it to reflect that. Use it for some file header problems for which it wasn't already being used - WTAP_ERR_UNSUPPORTED shouldn't be used for that, it should only be used for files that we have no reason to believe are invalid but that have a version number we don't know about or some other non-link-layer-encapsulation-type value we don't know about. svn path=/trunk/; revision=40175
2011-11-19When reporting "sorry, *this* packet can't be written to a file of thatGuy Harris1-2/+19
type" when writing out a capture file (i.e., writing a per-packet-encapsulation capture to a file type that supports it but doesn't support one of the packet's encapsulations), report the packet number and, when doing this in a merge operation, report the file from which it came. When reporting "sorry, that file can't be written to a file of that type, period", show the file type rather than the input file link-layer type that causes the problem. (We could show both. We could be *really* ambitious and iterate through all possible file types and show the ones that will or at least might work....) file_write_error_message() is documented as handling only UNIX-style errnos, and libwireshark should be usable without libwiretap, so leave it up to its callers to handle Wiretap errors such as WTAP_ERR_SHORT_WRITE. Clean up indentation. svn path=/trunk/; revision=39949
2011-08-09Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :Jeff Morriss1-3/+1
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
2011-07-21Remove the snaplen check added in r37633: the change in r37634 makes itJeff Morriss1-6/+0
unnecessary. svn path=/trunk/; revision=38155
2011-07-20Don't sanity-check snaplen against frame length if snaplen is 0.Martin Mathieson1-1/+1
svn path=/trunk/; revision=38132
2011-06-23Prohibited APIs: strncpy -> g_strlcpy.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=37768
2011-06-20Have mergecap, tshark, and editcap write pcap-ng files by default. ThisGerald Combs1-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. svn path=/trunk/; revision=37736
2011-06-15See if this squelches some compiler warnings.Guy Harris1-2/+2
svn path=/trunk/; revision=37669
2011-06-09Simplify timestamp checking: only check the packet's timestamp ifJeff Morriss1-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. svn path=/trunk/; revision=37633
2011-05-31Handle snaplen before choplen for consistency. Also, if chopping more bytesChris Maynard1-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. svn path=/trunk/; revision=37488
2011-05-31When a snaplen is specified using "-s <snaplen", if it's smaller than theChris Maynard1-21/+24
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
2011-05-24Move the Windows argument list conversion code to a common routine.Gerald Combs1-17/+5
svn path=/trunk/; revision=37372
2011-04-12Don't bother to strcpy() an empty string; just set buf[0] = '\0': Coverity 626Chris Maynard1-1/+1
svn path=/trunk/; revision=36601
2011-02-04From Jason Masker (bug 5240):Sake Blok1-10/+16
` Allow editcap to chop from beginning of packet for decapsulation svn path=/trunk/; revision=35832
2011-01-06On Windows, convert all of our command-line arguments from UTF-16 toGerald Combs1-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. svn path=/trunk/; revision=35411
2010-12-06Fix various typos and spelling errors.Bill Meier1-1/+1
svn path=/trunk/; revision=35126
2010-11-24Attempt to fix warnings not previously seen with VS2008EE.Chris Maynard1-5/+8
svn path=/trunk/; revision=35024
2010-11-24When listing encapsulation types with -T or file types with -F, sort them.Chris Maynard1-8/+39
svn path=/trunk/; revision=35022
2010-11-16Make editcap -B work like expected: output no packets after the stop time.Sake Blok1-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. svn path=/trunk/; revision=34913
2010-11-01From Jose Pedro Oliveira via ↵Jeff 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. svn path=/trunk/; revision=34742
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 13:44:00 +0000