Commit Graph

44008 Commits

Author SHA1 Message Date
Michael Mann 072041e3fb Add absolute date options (-ad) for start date/time of conversation in TShark. Bug 1849 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1849)
svn path=/trunk/; revision=46626
2012-12-20 01:19:22 +00:00
Evan Huus 5ca70369a0 Add missing wmem strbuf routine to the documentation.
svn path=/trunk/; revision=46625
2012-12-19 23:12:58 +00:00
Evan Huus b0ca152217 Only include wmem_core.h in packet_info.h. It's not technically a
public header, but since packet_info.h is included in most of the tree it saves
a great deal of recompilation when something in one of the wmem data structures
changes.

svn path=/trunk/; revision=46624
2012-12-19 23:11:22 +00:00
Jeff Morriss 935b4904d4 Add a new target: install_desktop_files which installs some files for
use with a freekdesktop (at least I think so).  This stuff was taken from
Fedora's Wireshark RPM.

The intent is to a) use Wireshark's own files and b) remove most of the manual
installation steps from RPMs.

svn path=/trunk/; revision=46623
2012-12-19 22:51:51 +00:00
Jeff Morriss 9e21fcc087 Also register Wireshark for MIME types application/x-pcapng and application/x-snoop.
svn path=/trunk/; revision=46622
2012-12-19 21:02:07 +00:00
Jeff Morriss b10f83c531 Add wireshark-mime-package.xml to EXTRA_DIST.
svn path=/trunk/; revision=46621
2012-12-19 21:01:00 +00:00
Jeff Morriss 9780dcf7be Add a mime-info file for freedesktop.org-compliant desktops; this one is
based on that from Fedora.

Define MIME information for PCAP, PCAPNG, and Snoop files.

svn path=/trunk/; revision=46620
2012-12-19 20:59:41 +00:00
Michael Tüxen 10dbe80c65 Add support for writing the flags option in the enhanced
packet block (pcapng).

svn path=/trunk/; revision=46619
2012-12-19 20:27:12 +00:00
Gerald Combs 1208041a4a Try using the system-supplied zlib on OS X.
svn path=/trunk/; revision=46618
2012-12-19 19:04:57 +00:00
Jeff Morriss 456acec892 Do a little more to discourage the use of proto_tree_add_text(): don't
use it as example in a few places and point out that if you're not using the
return value to build a subtree, you probably shouldn't be using the function.

svn path=/trunk/; revision=46617
2012-12-19 15:54:40 +00:00
Michael Tüxen 3859fdc040 Whitespace change.
svn path=/trunk/; revision=46616
2012-12-19 13:08:24 +00:00
Irene Rüngeler 12a6a5dce3 Set the icon for the wireless device if the decription name contains Wi-Fi
svn path=/trunk/; revision=46615
2012-12-19 09:51:20 +00:00
Anders Broman c3040a0489 Don't yse the new GTK3 bundle, it lacks the tools
svn path=/trunk/; revision=46614
2012-12-19 06:55:11 +00:00
Anders Broman acab4fe903 Use the new bundle
svn path=/trunk/; revision=46613
2012-12-19 06:52:56 +00:00
Bill Meier 919c192780 Let's try using the new Win32 GTK2 bundle 2.24.14 (as suggested by Anders).
svn path=/trunk/; revision=46612
2012-12-19 04:44:01 +00:00
Guy Harris 292b386089 See if *this* squelches the MSVC errors.
svn path=/trunk/; revision=46611
2012-12-19 04:30:02 +00:00
Jeff Morriss cb994b4f80 -pie also needs -fPIE (at least sometimes)
svn path=/trunk/; revision=46610
2012-12-19 03:50:52 +00:00
Jeff Morriss f35a7d2ba7 Set SVN properties
svn path=/trunk/; revision=46609
2012-12-19 02:56:01 +00:00
Jeff Morriss 8a916449e5 As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8076 :
Enable PIE (if the compiler supports it) when compiling dumpcap.  Do this
regardless of whether we're configured to install dumpcap setuid-root because
some users will end up running dumpcap as root regardless of how we were
configured.

svn path=/trunk/; revision=46608
2012-12-19 02:09:48 +00:00
Evan Huus 3739c083bf Implement a basic singly-linked for wmem.
Re-implement the stack as a wrapper for that.

svn path=/trunk/; revision=46607
2012-12-19 01:37:28 +00:00
Evan Huus 77d69b36b2 Try to fix windows builds - MSVC doesn't like g_assert_not_reached() ?
svn path=/trunk/; revision=46606
2012-12-19 01:08:21 +00:00
Evan Huus 03af5455c7 Make the wmem string-buffer marginally useful but providing some accessors so
it's not a write-only data structure.

svn path=/trunk/; revision=46605
2012-12-19 00:51:48 +00:00
Evan Huus 5cf858ec52 Dispatch all allocator creations through a single function using an enum to
determine the desired type. This has two advantages over the old way:
 - just one environment variable for valgrind to override in order to guarantee
   that ALL allocators use memory it can track, and just one place to check that
   variable
 - allocator owners no longer have to include headers specific to their
   allocator, allowing them to change allocators without adjusting all their
   #includes

svn path=/trunk/; revision=46604
2012-12-19 00:43:36 +00:00
Evan Huus 561525cbb5 Rename allocator_glib to allocator_simple, since the block allocator also
uses glib and 'simple' describes the intention far better.

svn path=/trunk/; revision=46603
2012-12-18 23:36:45 +00:00
Jeff Morriss 09221f45e4 When copying addresses, also copy the (new) hf field.
Use SET_ADDRESS in some dissectors that weren't using it (so that the hf field
is correctly initialized).

Introduce a COPY_ADDRESS_SHALLOW (which copies an address without copying the
contents of the data field).

svn path=/trunk/; revision=46602
2012-12-18 23:28:38 +00:00
Evan Huus 8b69e3ee22 Use 'new' instead of 'create' a consistent manner.
svn path=/trunk/; revision=46601
2012-12-18 23:25:11 +00:00
Michael Tüxen 0461a705c0 text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).
svn path=/trunk/; revision=46600
2012-12-18 22:56:06 +00:00
Michael Tüxen e8d6a3a627 Make handling of inconsistent transport layer parameters more consistent.
svn path=/trunk/; revision=46599
2012-12-18 22:29:44 +00:00
Jeff Morriss 02a69849b7 Don't do proto_tree_add_ether(..., tvb_get_ptr(...)), just use proto_tree_add_item().
svn path=/trunk/; revision=46598
2012-12-18 22:29:11 +00:00
Michael Tüxen 0ba722d3bf Whitespace changes. Use consistent 4 space indent.
svn path=/trunk/; revision=46597
2012-12-18 21:52:08 +00:00
Pascal Quantin 4ffc5d699b From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8103 :
Add parsing of free_stateid, why_no_delegation, backchannel_ctl, secinfo_no_name and destroy_session fields to NFSv4.1 dissector

svn path=/trunk/; revision=46596
2012-12-18 20:58:01 +00:00
Pascal Quantin 8cbbff352e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
Add dissection of GPRS-NS protocol inside MPLS

svn path=/trunk/; revision=46595
2012-12-18 20:36:21 +00:00
Michael Tüxen 3895df85aa Simplify code.
svn path=/trunk/; revision=46594
2012-12-18 19:16:11 +00:00
Michael Tüxen 86925e10e1 fwrite() returns the number of objects written, not the number of bytes.
svn path=/trunk/; revision=46593
2012-12-18 19:09:27 +00:00
Michael Tüxen f55922be77 Fix sequence of parameters. The size is the second parameter of fwrite,
the nitems the third, not vice versa.

svn path=/trunk/; revision=46592
2012-12-18 18:18:11 +00:00
Gerald Combs 7cf5334332 Add an AccordionFrame class which can animate showing and hiding (except
when we detect a remote connection). Use it for the "go to" and search
frames. Properly detect remote connections in the splash overlay.

svn path=/trunk/; revision=46591
2012-12-18 17:21:20 +00:00
Jeff Morriss ed87fa9e3b Come down harder on the evils of tvb_get_ptr(): advise not to use it.
Combine the two comments in the Portability section (which largely said the
same thing) on the perils of that function.

Don't suggest it as an option to ensure there are enough bytes in the TVB.

svn path=/trunk/; revision=46590
2012-12-18 16:42:16 +00:00
Anders Broman 2977bde9f1 - Make dumpcap build with the new bundle.
- Use the correct bundle id for GTK3

svn path=/trunk/; revision=46586
2012-12-18 11:58:22 +00:00
Anders Broman 4e254a907c Prepare to ubdate the GTK bundles
svn path=/trunk/; revision=46585
2012-12-18 07:42:17 +00:00
Ronnie Sahlberg 38289963da SCSI: PERSISTENT_RESERVE_IN add names for service action 2/3 report capabilities/read full status
svn path=/trunk/; revision=46584
2012-12-18 04:02:57 +00:00
Evan Huus fc1d83d924 Fix a double-free by setting the GSList back to NULL when we free it.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8101

svn path=/trunk/; revision=46583
2012-12-18 03:31:25 +00:00
Evan Huus 7577443c0f Use pinfo-scoped memory for 6LoWPAN addresses.
Fixes at least part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7885

svn path=/trunk/; revision=46582
2012-12-18 03:15:23 +00:00
Jeff Morriss c858bd1452 Get rid of another tvb_get_ptr() abuse (just like r46577 but in a different
function).

svn path=/trunk/; revision=46579
2012-12-18 02:20:38 +00:00
Jeff Morriss b66af9eea7 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7945
(or at least the complaints from Valgrind; I couldn't reproduce the crash).

What part of:

~~~
 * If you're thinking of using tvb_get_ptr, STOP WHAT YOU ARE DOING
 * IMMEDIATELY. Go take a break. Consider that tvb_get_ptr hands you
 * a raw, unprotected pointer that you can easily use to create a
 * security vulnerability or otherwise crash Wireshark. Then consider
 * that you can probably find a function elsewhere in this file that
 * does exactly what you want in a much more safe and robust manner.
~~~

did someone not read?

Use tvb_get_ephemeral_stringz() instead of adding (apparently not sufficiently
checked!) offsets to the result of tvb_get_ptr() and assuming that the result
is a) in bounds and b) a NULL-terminated string.

svn path=/trunk/; revision=46577
2012-12-18 02:02:28 +00:00
Gerald Combs 77e6140ba9 Implement the frame mark, ignore, and time reference actions. Update the
text of a few menu items.

svn path=/trunk/; revision=46576
2012-12-17 23:03:21 +00:00
Gerald Combs dc908733ea Add libui_dirty.
svn path=/trunk/; revision=46575
2012-12-17 21:24:22 +00:00
Jeff Morriss e3cc19d866 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8100 :
Wrap some variable declarations in #ifdef HAVE_LIBZ.

svn path=/trunk/; revision=46574
2012-12-17 19:24:06 +00:00
Martin Mathieson 9ab999a6f8 Fix a copy and paste error.
svn path=/trunk/; revision=46573
2012-12-17 14:39:59 +00:00
Pascal Quantin a7f5c35d1e From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8092 :
Add SSL segment data and SSL reassmebled data fields and improve readability of the hex/ASCII data blocks written to the SSL debug log

svn path=/trunk/; revision=46572
2012-12-16 20:30:42 +00:00
Jeff Morriss bd3a06065d Another composite-TVB fix inspired by
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8097 :

Assert out if tvb_composite_finalize() is called on a composite TVB with
no members (sub-TVBs).

svn path=/trunk/; revision=46570
2012-12-16 19:26:12 +00:00