Commit Graph

1588 Commits

Author SHA1 Message Date
Chris Maynard cab1f9fc0c Allow -C <choplen> to be used more than once so it is now possible to chop bytes from both the beginning and end of a packet in a single step.
svn path=/trunk/; revision=50536
2013-07-12 17:14:19 +00:00
Chris Maynard e7a7293bee Add -L option to allow adjustment of original frame length. This change was 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-10 20:02:45 +00:00
Jeff Morriss 36d3734dcb From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8906 :
This patch augments Wireshark's and tshark's augument usage reports (-? and
-t?) and the Wireshark and tshark man pages to list all available timestamp
options available for the -t option.

svn path=/trunk/; revision=50445
2013-07-08 16:25:13 +00:00
Evan Huus c574f7d1ea Simple growable array implementation for wmem.
svn path=/trunk/; revision=50400
2013-07-06 04:02:08 +00:00
Guy Harris 5d87a8c461 WS_DLL_PUBLIC is now always WS_DLL_PUBLIC_NOEXTERN with "extern" added;
just define WS_DLL_PUBLIC_NOEXTERN inside the ifdefs, and define
WS_DLL_PUBLIC as WS_DLL_PUBLIC_NOEXTERN followed by "extern".

Then rename WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, to clarify that
it's what should be used for definitions; at least on Windows, you
*have* to use it when declaring arrays without a size, and, whilst you
might be able to use WS_DLL_PUBLIC for definitions of functions and
perhaps data definitions other than no-size arrays, it might be clearer
to rename WS_DLL_PUBLIC to WS_DLL_PUBLIC_DECL and use it only for
declarations.

svn path=/trunk/; revision=50334
2013-07-03 01:43:39 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Balint Reczey b276978309 Dumpcap can write raw packets to stdout
svn path=/trunk/; revision=50126
2013-06-24 14:49:19 +00:00
Evan Huus 602cf9cd4e Split README.developer into two: README.developer and README.dissector. All the
documentation specific to dissectors should now live in README.dissector - what
remains in README.developer should be useful to anybody coding on Wireshark
regardless of if you're working on the GUI, wiretap, dissectors, etc.

This first pass I did a fairly dumb split of copy-pasting relevant chunks from
one file to the other. There are probably fragments that aren't in the right
file anymore, so cleanup welcome.

svn path=/trunk/; revision=50092
2013-06-20 22:46:08 +00:00
Evan Huus 8e060a2ad5 Update READMEs.
svn path=/trunk/; revision=50020
2013-06-18 21:47:18 +00:00
Evan Huus 80c51f1df0 Update wmem README for the tree implementation.
svn path=/trunk/; revision=49967
2013-06-16 22:08:56 +00:00
Michael Mann 75420f4ab2 Prepend custom Destination IP and Source IP (ipv4 or ipv6) in the pcap. Bug 5650 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5650)
svn path=/trunk/; revision=49964
2013-06-16 16:50:17 +00:00
Gerald Combs d0adf25e25 Update OS X instructions and add Qt Mac Extras.
svn path=/trunk/; revision=49874
2013-06-10 22:32:01 +00:00
Luis Ontanon 613739da3a The API is almost there I guess...
svn path=/trunk/; revision=49867
2013-06-09 22:33:37 +00:00
Chris Maynard b1f9d0134d Back out the Makefile changes from r49865. The OSX buildbots don't like --utf8. Is the change to wireshark.pod.template sufficient?
svn path=/trunk/; revision=49866
2013-06-09 21:17:13 +00:00
Chris Maynard ad6ae6f993 Due to utf8 characters in the AUTHORS file, pass --utf8 to pod2man.
Fixes the 2nd problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774

svn path=/trunk/; revision=49865
2013-06-09 20:52:15 +00:00
Luis Ontanon afe4c8e755 A further iteration on epan_child
svn path=/trunk/; revision=49849
2013-06-08 21:37:55 +00:00
Chris Maynard e62f4cc4f6 Fix all errors and warnings found by podchecker.
svn path=/trunk/; revision=49837
2013-06-07 17:06:27 +00:00
Jeff Morriss 470bd4455a Add a new environment variable to cause abort()s if we add too many items
to the tree (to separate this case from the generic DISSECTOR_BUG case).

Enable this environment variable when fuzz testing.

Enable the 3rd (without tree but with a read filter) check (added in r49643)
when testing capture files but not when fuzz testing--not sure if we want to
add even more to the fuzzbot's work load now (OTOH I've been running it for
a while and it hasn't buried me in bugs).

svn path=/trunk/; revision=49784
2013-06-05 14:08:40 +00:00
Evan Huus a9c35aa4b6 First batch of doxygen for wmem. Remove some things from README.wmem now that
they're in doxygen instead.

svn path=/trunk/; revision=49583
2013-05-26 02:40:40 +00:00
Alexis La Goutte 30251a84f5 Use -DBUILD_qtshark=YES for build qtshark with cmake (May be set by default ON qtshark with cmake ?)
svn path=/trunk/; revision=49578
2013-05-25 15:20:34 +00:00
Chris Maynard 2084249565 It's actually enough just to add some blank lines without the need for the <pre> tags.
svn path=/trunk/; revision=49545
2013-05-23 17:45:21 +00:00
Chris Maynard 05288f355c Generate the man pages for dftest and randpkt.
svn path=/trunk/; revision=49515
2013-05-22 17:53:24 +00:00
Chris Maynard 0efcb85a2a Fix presentation of types.
svn path=/trunk/; revision=49513
2013-05-22 15:42:34 +00:00
Evan Huus 5426ba4e02 Minor refactor: make the framework responsible for allocating and freeing the
actual wmem_allocator_t structure. This simplifies the internal API and
deduplicates a few alloc/free calls in the individual allocator implementations.

I'd originally made the allocators responsible for this on purpose with the
idea that they'd be able to optimize something clever based on the type of
allocator, but that's clearly more work and complexity than it's worth given
the small number of allocators we create/destroy.

svn path=/trunk/; revision=49512
2013-05-22 15:42:12 +00:00
Gerald Combs 2ecdd5b669 Make sure we apply POD_CSS_URL everywhere. Capitalize a couple of titles.
svn path=/trunk/; revision=49466
2013-05-20 22:51:33 +00:00
Evan Huus 4e1f558b1d Fix "./reordercap.pod: unterminated list(s) at =head in paragraph 14. ignoring."
svn path=/trunk/; revision=49436
2013-05-20 14:56:18 +00:00
Chris Maynard 08b0f7296a If tcpdump doesn't exist, why refer to it? Omit this confusing phrase.
svn path=/trunk/; revision=49427
2013-05-20 02:21:07 +00:00
Chris Maynard ba8322cda4 Add some newlines at the end of the file so the authors are printer properly.
svn path=/trunk/; revision=49426
2013-05-20 01:53:26 +00:00
Chris Maynard 17bbb2dbe9 Clean up some documentation a bit, removing non-ASCII characters, formatting like other pages, alphabetizing options, describing options under their own headingadding missing newline at end of file, fixing typos and some minor rewording.
svn path=/trunk/; revision=49424
2013-05-20 01:41:52 +00:00
Chris Maynard ab10fed503 Trivial: remove extraneous word, 'is'.
svn path=/trunk/; revision=49423
2013-05-20 01:35:17 +00:00
Evan Huus 7e0082988b At the suggestion of Stuart Kendrick via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8647
Improve documentation for tshark's -z io,stat somewhat so that it's clear(er)
that filters for the statistics must be associated with the -z flag and not
applied via -Y.

svn path=/trunk/; revision=49422
2013-05-19 19:49:36 +00:00
Evan Huus f2bdbd2b32 Use a readable name for the wmem callback test. Warn that reallocing memory
for which a callback is registered is also a fairly stupid thing to do.

svn path=/trunk/; revision=49354
2013-05-16 23:38:31 +00:00
Gerald Combs 23474d450d "URL" is probably more correct than "PATH".
svn path=/trunk/; revision=49220
2013-05-09 22:17:36 +00:00
Gerald Combs 8322d5eb59 Allow the CSS path in the HTML man pages to be specified via POD_CSS_PATH, e.g.
make POD_CSS_PATH=/my/strange/and/wonderful.css

svn path=/trunk/; revision=49219
2013-05-09 22:15:52 +00:00
Evan Huus d860a01aaf Round two of wmem cleanup callbacks. While the emem tree behaviour will require
recurring callbacks, I suspect most other potential uses will be once-only, so
make that possible, and improve the documentation on the remaining issues.

Also separate out the code into its own files and the testing into its own
test case.

svn path=/trunk/; revision=49209
2013-05-08 01:14:01 +00:00
Evan Huus 2e92c6dfde Add user callbacks to wmem. This feature is a generic way to transparently mimic
the behaviour emem has for seasonal trees, which is that the master tree
structure is not actually seasonal - it is permanent. When the seasonal memory
pool is cleared, the root node pointer in all of these permanent trees is set
to NULL, and the pool takes care of actually freeing the nodes.

Wmem can now mimic this by allocating the tree header struct in epan_scope(),
allocating any node structs in file_scope(), and registering a callback on
file_scope() that NULLs the pointer in the epan_scope() header. Yes, this is
confusing, but it seemed simpler than adding manual callback registrations to
every single dissector that currently uses seasonal trees.

The callbacks may also be useful for other things that need cleanup (I'm
thinking resource handles stored in wmem memory that need to be fclosed or
what-have-you before they the handle is lost).

As indicated by the number of caveats in README.wmem, the implementation
probably needs a bit of work to make it safer/saner/more-useful. Thoughts
(or patches!) in this direction are more than welcome.

svn path=/trunk/; revision=49205
2013-05-07 19:23:10 +00:00
Jörg Mayer e73e5f2d05 Update to cover Qt5 builds via cmake.
svn path=/trunk/; revision=49168
2013-05-05 08:52:47 +00:00
Jeff Morriss 2602490a2d From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8626 :
It is useful to see not only the minimal, maximum and average service time for
RPC procedures, but also the total time these took.


From me: add it to the man page.

svn path=/trunk/; revision=49144
2013-05-03 13:53:16 +00:00
Evan Huus f19efd05f7 Remove singly-linked list from the wmem TODO list. Now that it has append
all of the really important stuff is there, and emem doesn't provide it at all
so it's not blocking migration.

svn path=/trunk/; revision=49103
2013-05-01 01:09:57 +00:00
Evan Huus b39cf04f14 Add CppCheck to the list of things to run before submitting code for review.
svn path=/trunk/; revision=49077
2013-04-27 23:11:06 +00:00
Evan Huus 5deac1e6e1 Wmem string-buffer improvements:
- better tests
- fix a bug caught by the better tests
- implement append_c and append_unichar, with tests

Wmem string-buffers now have feature parity with their emem equivalents, so
remove them from the TODO list.

svn path=/trunk/; revision=49060
2013-04-26 21:30:24 +00:00
Evan Huus e8fc503c21 Summarize the API listing in the wmem README. Doxygen in the header files will
be much easier to keep in sync with the actual code.

svn path=/trunk/; revision=49040
2013-04-25 22:29:48 +00:00
Evan Huus 2a50c31800 Add a section to the wmem README about testing.
svn path=/trunk/; revision=48990
2013-04-22 21:29:57 +00:00
Jörg Mayer 6c137314aa Add col. pseudo dissector to thsark manpage.
svn path=/trunk/; revision=48931
2013-04-19 16:36:52 +00:00
Jeff Morriss 5c85df8a93 Add packet-PROTOABBREV.c to source distribution. Reorder some entries.
svn path=/trunk/; revision=48878
2013-04-16 13:57:06 +00:00
Evan Huus 4e3c836273 Major cleanup of skeleton dissector and related bits of README.developer.
Changes of note:
- Removed the 'Copied from' notice, it's only relevant if they're *not* using
  the skeleton code. Added a paragraph to README.developer instead.
- Exorcised all references to if (tree) and placed them in their own section
  at the bottom as an optimization. Hopefully this will be less confusing.

svn path=/trunk/; revision=48861
2013-04-15 21:43:40 +00:00
Evan Huus bb2820deb0 Put the skeleton sample code from README.developer into its own file - it's
much easier to edit/maintain that way as well as much easier to copy for a
new dissector. Explicitly don't set the SVN id tag since this is a template.

svn path=/trunk/; revision=48860
2013-04-15 20:56:55 +00:00
Martin Kaiser ff72006da8 list the new option -k in the capinfos manpage
svn path=/trunk/; revision=48838
2013-04-13 17:52:52 +00:00
Chris Maynard 4ac2441d7c Coalesce "-G fields2" and "-G fields3" into "-G fields", as discussed on -dev.
See: http://www.wireshark.org/lists/wireshark-dev/201304/msg00015.html

svn path=/trunk/; revision=48753
2013-04-05 21:58:43 +00:00
Chris Maynard 2239e7618d As forewarned at http://www.wireshark.org/lists/wireshark-dev/201304/msg00009.html, change the default snaplen to 65KiB-1. While we're at it, push the max packet size to that value as well.
Also: convert the few tabs to spaces and add modelines.


svn path=/trunk/; revision=48738
2013-04-04 19:48:20 +00:00