Commit Graph

48317 Commits

Author SHA1 Message Date
Evan Huus b5900e53d9 Make sure our ldap_call_response_t struct is always completely initialized,
fixing a "Conditional jump or move depends on uninitialised value" error found
by valgrind fuzzing.

svn path=/trunk/; revision=51516
2013-08-25 17:31:15 +00:00
Evan Huus ccbaea51d8 Valgrind requires more resources than running normally. Bump limits to 1.5x
normal when fuzzing with valgrind, as otherwise half the menagerie runs out of
memory.

svn path=/trunk/; revision=51515
2013-08-25 17:23:15 +00:00
Evan Huus 9d4df60b63 Convert XMPP dissector suite to wmem.
svn path=/trunk/; revision=51514
2013-08-25 14:38:06 +00:00
Evan Huus 14e6dddcdc Replace some emem with wmem.
svn path=/trunk/; revision=51512
2013-08-25 14:23:13 +00:00
Gerald Combs fac9c21047 [Automatic manuf, services and enterprise-numbers update for 2013-08-25]
svn path=/trunk/; revision=51510
2013-08-25 14:03:39 +00:00
Evan Huus 11dbf5d161 From Chris Pane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9063
Fix unregistered hf assertion in 1722.1 entity descriptors.

From me: #if0 out even more unused hfs, what is with this dissector?

svn path=/trunk/; revision=51509
2013-08-24 16:26:49 +00:00
Evan Huus d763a6909a Use the correct length field when tagging the SSID. Fixes the first valgrind
fuzz failure.

svn path=/trunk/; revision=51508
2013-08-24 12:13:11 +00:00
Anders Broman ed2d4bc375 From Tommy Wu:
Handle ERROR-SPEC: mandatory object, with an empty value.

svn path=/trunk/; revision=51507
2013-08-24 07:50:46 +00:00
Michael Mann df309c6c27 Tool to help convert current expert_add_info_format() calls into filterable expert info API. It's not as helpful as convert_proto_tree_add_text.pl because the expert string is usually too long to take the ei_ variable name or display filter string as is, but it does do the batch "search and replace" nicely and makes finding common expert info easier.
svn path=/trunk/; revision=51506
2013-08-24 01:42:43 +00:00
Michael Mann e123d27ca9 If the proto_tree_add_text string is just "%s", assume it won't be converted (it's usually a header that has the same field filterable in its subtree)
svn path=/trunk/; revision=51505
2013-08-24 01:38:43 +00:00
Michael Mann 6614f284b3 From Simon Zhong: Convert several proto_tree_add_text into filterable expert info.
From me: Make "Reserved" fields filterable.  This was enough to pacify checkAPIs.pl, but part of the reason it was complaining in the first place is that many hf items are passed into info_to_display, which will end up calling a proto_tree_add_xxx function, rather than calling a proto_tree_add_xxx function directly.  Cursory glance says info_to_display could probably just be replaced with direct proto_tree_add_xxx calls.

svn path=/trunk/; revision=51504
2013-08-24 01:25:14 +00:00
Guy Harris e45f35d623 Can't use [ as an alias for "test" in configure scripts, as [ and ] are
quoting characters; use test instead.

svn path=/trunk/; revision=51503
2013-08-24 01:01:04 +00:00
Gerald Combs c06e10baa4 Add a routine to create a dummy signal pipe and pass it to dumpcap when
gathering interface statistics. This should help dumpcap exit properly
if its parent process crashes or is killed.

svn path=/trunk/; revision=51502
2013-08-24 00:12:27 +00:00
Guy Harris 98db1cefbb To handle the hypothetical case of an OS X release offering a choice of
installing command-line developer tools with no SDKs but with a standard
UN*Xy /usr/include or of installing Full Frontal Xcode, if the user
didn't specify building against an SDK, check to see whether we *have*
any SDKs and, if not, don't set the deployment target.

svn path=/trunk/; revision=51501
2013-08-23 23:57:09 +00:00
Guy Harris 0675ed7494 Clang, clang, clang went the warning....
Fix a memset (drb_mapping is a pointer, so its size is the size of a
pointer; we want the size of what it points to).

svn path=/trunk/; revision=51500
2013-08-23 23:51:52 +00:00
Guy Harris 9becffea08 To handle the hypothetical case of an OS X release offering a choice of
installing command-line developer tools with no SDKs but with a standard
UN*Xy /usr/include or of installing Full Frontal Xcode, check to see
whether we *have* any SDKs and, if not, don't try to find the
appropriate SDK for the release and use it.

svn path=/trunk/; revision=51499
2013-08-23 23:27:07 +00:00
Guy Harris 1e9a678477 Put back missing space between --disable-cups and --without-libtiff.
Should fix bug 9073.

svn path=/trunk/; revision=51498
2013-08-23 22:59:16 +00:00
Gerald Combs dc87fa2d68 Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try
to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497
2013-08-23 22:18:49 +00:00
Gerald Combs fe0b28463f Assume we always have GNU diff and that we can use --strip-trailing-cr.
svn path=/trunk/; revision=51496
2013-08-23 21:17:56 +00:00
Gerald Combs c3d291754b Correctly reference EXTRA_LIBFILES. Make sure QMAKE_EXTENSION_SHLIB
is set.  Adjust some wildcards.

svn path=/trunk/; revision=51495
2013-08-23 20:47:33 +00:00
Gerald Combs a8c728533d Add a test for rawshark.
svn path=/trunk/; revision=51494
2013-08-23 18:54:22 +00:00
Gerald Combs a4a6af3c5a Initialize our wtap_pkthdr struct so that we don't try to dereference an
invalid opt_comment pointer down the line.

svn path=/trunk/; revision=51493
2013-08-23 18:42:51 +00:00
Balint Reczey baaa0eb1a0 Mention BPF JIT in User Guide
svn path=/trunk/; revision=51492
2013-08-23 18:11:47 +00:00
Gerald Combs c431ae3d81 Make sure we call epan_free() before epan_cleanup() similar to r51342.
svn path=/trunk/; revision=51491
2013-08-23 17:10:32 +00:00
Pascal Quantin ae4f556630 Simplify logic a bit now that we do not use anymore GUINT_TO_POINTER macro
svn path=/trunk/; revision=51490
2013-08-23 12:51:07 +00:00
Pascal Quantin 483ee317f7 From Martin Mathieson:
Follow-up of r51429 that
- uses accessors to lazily allocate a private_data struct and returns the different parts based upon their use
- includes the v1130 DRX Config

svn path=/trunk/; revision=51489
2013-08-23 10:42:11 +00:00
Anders Broman 71f7093cf3 Output a warning about kernel BPF JIT compiler beeing activated.
svn path=/trunk/; revision=51488
2013-08-23 05:25:30 +00:00
Anders Broman f9aaaebdc8 Output a warning about kernel BPF JIT compiler beeing activated.
svn path=/trunk/; revision=51487
2013-08-23 05:21:25 +00:00
Michael Mann 6880359a5f Batch of filterable expert infos.
svn path=/trunk/; revision=51486
2013-08-23 03:17:34 +00:00
Gerald Combs 186babc6ba When we close a main window, delete the welcome screen, which in turn
deletes the interface list, which in turn kills off the dumpcap process
it may be running. This should hopefully keep us from leaving dumpcap
processes running in the background on Windows. (Am I the only one
running QtShark on that platform?)

svn path=/trunk/; revision=51485
2013-08-23 02:34:51 +00:00
Evan Huus 4daaf4fb57 Purge some emem.
- In kingfisher it wasn't even needed, just use a variable on the stack.
- In SDP convert to wmem. Use auto-resetting trees to avoid the need for an init
  routine and somewhat simplify that whole thing.

svn path=/trunk/; revision=51484
2013-08-23 00:51:04 +00:00
Guy Harris 32e1523bb2 For the Windows Open dialog for capture files, get rid of the "(*.*)" in
the "All Files" entry (the current UI guidelines from Microsoft say to
do so, and that's what Paint does, at least), and add an "All Capture
Files" entry with all the file extensions for the file types we support
(it'll pick up all text files, but there's not much we can do about
that, and it won't pick up files with *no* extension or weird
extensions, such as you might get from UN*X systems or from WinDump
commands, but at least it'll filter out some other crud).

Fix what appear to be memory leaks; that should be backported unless
I've missed something and they aren't leaks.

Fix an out-of-date comment, and add an additional comment.

svn path=/trunk/; revision=51481
2013-08-23 00:06:26 +00:00
Gerald Combs 713012163c Split EXTRA_LIBFILES into EXTRA_LIBFILES and EXTRA_BINFILES. Try using
macdeployqt to build our OS X bundle.

svn path=/trunk/; revision=51480
2013-08-22 22:33:19 +00:00
Jakub Zawadzki 850f80fdc1 proto: simplify proto_tree_add_pi() remove out pointer to field_info *
field_info can be already get using PNODE_FINFO(return_value)

svn path=/trunk/; revision=51479
2013-08-22 21:20:50 +00:00
Jakub Zawadzki 401cdb009e Convert more dissectors to use hfinfo instead of hfindex.
svn path=/trunk/; revision=51478
2013-08-22 20:54:50 +00:00
Pascal Quantin 75f4fa5b4b Remove tree check when dissecting PCCH message so as to avoid filtering expert info on first pass
svn path=/trunk/; revision=51477
2013-08-22 19:55:25 +00:00
Martin Kaiser 9e7ce8b817 fix compiler warning on Debian wheezy (gcc 4.7.2)
dumpcap.c:193:10: error: ignoring return value of ‘write’, declared with
attribute warn_unused_result [-Werror=unused-result]

for some reason, using (void)write(fd, ...) did not do the trick

svn path=/trunk/; revision=51476
2013-08-22 18:49:31 +00:00
Guy Harris 347ea71bae Only enable the Linux kernel BPF JIT compiler if we're on Linux.
Unless we're going to do something if that fails, there's no point in
having enable_kernel_bpf_jit_compiler() return a success/failure
indication.

Fix indentation.

svn path=/trunk/; revision=51475
2013-08-22 17:36:30 +00:00
Stig Bjørlykke 4409bc2877 Fixed building documentation for Lua classes and functions containing digits.
svn path=/trunk/; revision=51474
2013-08-22 17:22:25 +00:00
Anders Broman ba1bee9516 On request from Tommy Wu:
Enable Diameter over UDP dissection as there is an application using it.

svn path=/trunk/; revision=51473
2013-08-22 17:21:20 +00:00
Anders Broman 5928ded2b4 Enable Kernel BPF JIT compiler from dumpcap.
svn path=/trunk/; revision=51472
2013-08-22 17:20:09 +00:00
Chris Maynard cc2a6a47a9 Fix clang warning: comma at end of enumerator list
svn path=/trunk/; revision=51471
2013-08-22 17:03:19 +00:00
Stig Bjørlykke 5f35d91ace Added TvbRange strsize().
svn path=/trunk/; revision=51470
2013-08-22 11:58:32 +00:00
Guy Harris d6e80b453e From Stephen Donnelly <stephen.donnelly@emulex.com>:
Move the check for vwr files *after* the check for ERF files, as it
sometimes thinks ERF files are VWR files.

svn path=/trunk/; revision=51467
2013-08-22 03:43:39 +00:00
Guy Harris 0c550e9090 Back out the previous change, so I can check it in again with the
*correct* checkin message.  Sigh....

svn path=/trunk/; revision=51466
2013-08-22 03:42:15 +00:00
Guy Harris a4609262b0 Copy over r51462 from trunk:
------------------------------------------------------------------------
  r51462 | guy | 2013-08-21 20:21:47 -0700 (Wed, 21 Aug 2013) | 8 lines

  What was I thinking?  ".caz" is used for compressed *Windows* Sniffer
  files (which are just gzipped uncompressed Windows Sniffer files, albeit
  with the checksum computed differently in some fashion, or perhaps just
  being computed incorrectly), not compressed *DOS* Sniffer files (which
  use their own form of compression, which doesn't compress the entire
  file, just most of it, and which use the same extensions as uncompressed
  DOS Sniffer files).

svn path=/trunk/; revision=51465
2013-08-22 03:40:30 +00:00
Guy Harris 7a1fdcec89 What was I thinking? ".caz" is used for compressed *Windows* Sniffer
files (which are just gzipped uncompressed Windows Sniffer files, albeit
with the checksum computed differently in some fashion, or perhaps just
being computed incorrectly), not compressed *DOS* Sniffer files (which
use their own form of compression, which doesn't compress the entire
file, just most of it, and which use the same extensions as uncompressed
DOS Sniffer files).

svn path=/trunk/; revision=51462
2013-08-22 03:21:47 +00:00
Evan Huus 7e59f1fce6 Move a brace outside an #ifdef, it was confusing vim's folding.
svn path=/trunk/; revision=51461
2013-08-22 02:29:32 +00:00
Evan Huus 2161550470 Don't look at packet or byte limits during the second pass of two-pass analysis.
The limits are enforced during the first pass, and frames that get dropped from
the first pass for this reason aren't available to the second pass at all, so
checking again is redundant.

svn path=/trunk/; revision=51460
2013-08-22 02:19:22 +00:00
Martin Kaiser 8c484c090b The export PDU mechanism creates a new capture which contains only the
exported PDUs. The currently opened capture file is closed.

Make sure that this does not discard any unsaved data. Ask the user for
confirmation and save the changes before running the export.

svn path=/trunk/; revision=51459
2013-08-21 21:44:48 +00:00