Commit Graph

48380 Commits

Author SHA1 Message Date
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
Martin Kaiser ac73f00086 From Michael Reschly
Support dissection of TLS Application Layer Protocol Negotiation

from me:
fix indentation, add check for minimum ext_len, encoding for string hf

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9051

svn path=/trunk/; revision=51458
2013-08-21 20:24:39 +00:00
Anders Broman 61d2e64163 Make it possible to add custom Diameter AVP .xml files and distribute them by adding the file name to separate files and leave the "normal" makefiles untouched.
svn path=/trunk/; revision=51457
2013-08-21 19:53:57 +00:00
Guy Harris d9ebff02be Arrange that "make distcheck" use the GUI configure flags used to
configure Wireshark, so we don't, for example, do "make distcheck" with
no options, and thus default to GTK+ 3, on a system without GTK+ 3 where
Wireshark was configured with --with-gtk2.  (This also means that if
we're configuring only with Qt, or with GTK+ *and* Qt, "make distcheck"
will check with those.)

svn path=/trunk/; revision=51456
2013-08-21 18:39:39 +00:00
Pascal Quantin 438f2f4558 Fix typo errors
svn path=/trunk/; revision=51455
2013-08-21 17:58:16 +00:00
Chris Maynard 19edfe8940 Fully parenthesize the isprint() macro.
svn path=/trunk/; revision=51454
2013-08-21 17:26:49 +00:00
Alexis La Goutte 67131fcf8b FromChun-Yeow via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9059
Add Support of Decoding 802.11s Mesh Channel Switch Parameter Element

From me:
Remove some trailing whitespace
Add subtree for flag
Change typo of display filter

svn path=/trunk/; revision=51453
2013-08-21 17:05:20 +00:00
Alexis La Goutte a6409fd3e9 From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values
According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful.

svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
Jakub Zawadzki 0b4c57e3c0 small fix for r51448 isprint() is locale aware, we want just ascii
svn path=/trunk/; revision=51451
2013-08-21 17:01:05 +00:00
Chris Maynard b3dc1eed1c Fix Coverity CID's 1063706-1063710: Out-of-bounds read (OVERRUN_STATIC)
svn path=/trunk/; revision=51450
2013-08-21 14:08:42 +00:00
Chris Maynard 121d02eaee No need to initialize length_remaining to 0.
svn path=/trunk/; revision=51449
2013-08-20 22:53:26 +00:00
Chris Maynard 3accefd72e Simplify find_delimiter() by making use of tvb_find_guint8().
In sss_string():
 -> Protect against tvb_length_remaining() possibly returning -1.
 -> Fix off-by-1 potential buffer overflow condition.
 -> Use isprint() rather than "do-it-yourself" code.
 -> Remove the extra unnecessary "length_remaining" checks in the for() loop.

#BACKPORT(1.10, 1.8)

svn path=/trunk/; revision=51448
2013-08-20 22:42:46 +00:00
Evan Huus 21ad5c11b2 Clean-up ipxnet hash table in host_name_lookup_cleanup. Should fix the buildbot
test suite failures.

svn path=/trunk/; revision=51447
2013-08-20 22:41:49 +00:00
Chris Maynard 2cfb8df682 Whitespace changes. Add modelines.
svn path=/trunk/; revision=51446
2013-08-20 21:21:10 +00:00
Jakub Zawadzki c27481b03c Fix for bug #9034: Composite TVBs aren't supported by tvb_find_guint8()
Add generic tvb_find_guint8, tvb_pbrk_guint8

svn path=/trunk/; revision=51445
2013-08-20 19:56:57 +00:00
Jakub Zawadzki 8ade8c4750 Composite tvb (tvb_memcpy/tvb_get_ptr): don't assert with offset == tvb->length, and 0 length
svn path=/trunk/; revision=51444
2013-08-20 19:54:42 +00:00
Jakub Zawadzki 39122c4ec8 If packet was modified fallback to generic clone
svn path=/trunk/; revision=51443
2013-08-20 19:53:24 +00:00
Chris Maynard b0adfae289 Fix clang warnings: Value stored to '[offset|length]' is never read.
svn path=/trunk/; revision=51442
2013-08-20 18:50:40 +00:00
Chris Maynard 2cb65291c1 Fix clang warnings: Value stored to '[decrypted_]offset' is never read.
svn path=/trunk/; revision=51441
2013-08-20 18:46:46 +00:00
Chris Maynard e37aa2ab5b Fix clang warning: Value stored to 'netl' is never read.
Other misc. whitespace changes.

svn path=/trunk/; revision=51440
2013-08-20 18:30:46 +00:00
Chris Maynard e7242f0f3e Fix several instances of clang warnings: Value stored to 'length' is never read
Also, whitespace changes (tabs ->spaces, indentation) and add modelines.

svn path=/trunk/; revision=51439
2013-08-20 17:25:17 +00:00
Jörg Mayer 0f74dff2f9 Fix for
[  6%] Building C object epan/CMakeFiles/epan.dir/addr_resolv.c.o
/home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:1927:1: error: unused function
      'get_ipxnetbyname' [-Werror,-Wunused-function]
get_ipxnetbyname(const gchar *name)
^
/home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:2009:1: error: unused function
      'add_ipxnet_name' [-Werror,-Wunused-function]

by #if 0/#endif the functions. If they really are not needed any more
they should be removed.

svn path=/trunk/; revision=51438
2013-08-20 06:35:45 +00:00
Anders Broman cb1bd182f2 Mark an unused parameter.
svn path=/trunk/; revision=51437
2013-08-20 05:27:48 +00:00
Anders Broman 4e63bb5ec5 Use g_hash_table() for ipxnet name resolution.
svn path=/trunk/; revision=51436
2013-08-20 05:06:26 +00:00
Anders Broman ce6a604f07 From Tommy Wu:
Update Octet 7 of Indication IE.

svn path=/trunk/; revision=51435
2013-08-20 05:04:45 +00:00
Evan Huus 1a884bf191 Add a valgrind suppressions file set to suppress the zlib error which otherwise
pops up immediately on the fuzzbot. Hopefully there won't be too many more of
these.

svn path=/trunk/; revision=51434
2013-08-20 03:21:06 +00:00
Chris Maynard f0a66b2e3e Another acknowledgment number tweak: If the ACK flag wasn't set such that the base_seq wasn't subtracted from it, then if we need to recover absolute values later on, don't add the base_seq value back either.
svn path=/trunk/; revision=51433
2013-08-19 22:06:48 +00:00
Chris Maynard d0722af6f7 When using relative sequence numbers, don't scale acknowledgment numbers unless the ACK bit is actually set; otherwise doing so results in many erroneous packets matching a filter such as, "(tcp.ack > 0) && (tcp.flags.ack == 0)". With this change, the number of expert infos noting non-zero acknowledgment numbers when the ACK bit is not set is the same as the number of packets that are displayed when applying the above display filter regardless of whether using relative or absolute sequence numbers. (Tested using the menagerie's mond.pcap file)
svn path=/trunk/; revision=51432
2013-08-19 21:41:49 +00:00
Chris Maynard e20e338a9e Someone is bound to miss these expert info items, so add back expert info items for ack and urgent pointer when their respective flags are not set; however, don't indicate "Broken TCP" and only add them as Notes rather than as Warnings as was previously the case prior to r51356 since nowhere does it indicate these fields must be zero when their respective bits aren't set.
Speaking of r51356, a clarification to its commit message is in order: Initially my intention was to only add the urgent pointer field when the URG bit was set; however, I then noticed that the acknowledgment number field was always being added irrespective of the ACK bit.  Had I made the change as I originally intended, it would have introduced an inconsistency.  After some deliberation, I opted for consistency, but botched the commit message.

svn path=/trunk/; revision=51431
2013-08-19 21:17:04 +00:00
Chris Maynard 5dee89a18a Fix Coverity CID 1063335: Unused pointer value.
svn path=/trunk/; revision=51430
2013-08-19 19:59:52 +00:00
Martin Mathieson 641032ea44 Gather together dedicated DRX configuration, and make sure that it
is internally consistent.

TODO: include r11 sequence that can overwrite some of these values.
TODO: actx->private_data gets reused for several purposes, need to
separate these uses out and avoid possible conflicts...

svn path=/trunk/; revision=51429
2013-08-19 17:06:42 +00:00
Pascal Quantin 85667447f1 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9053 :
Update DDS RTPS Vendor and Product Ids based on http://portals.omg.org/dds/content/page/dds-rtps-vendor-and-product-ids

svn path=/trunk/; revision=51428
2013-08-19 16:56:05 +00:00
Pascal Quantin b46f9bebe2 Change some dissectors to use pinfo memory pool instead of malloc if it can trigger an exception between between buffer allocation and tvb_set_free_cb call
svn path=/trunk/; revision=51427
2013-08-19 14:55:41 +00:00
Pascal Quantin 02cae558f9 Do not use ephemeral memory when adding a new data source
svn path=/trunk/; revision=51424
2013-08-19 11:11:11 +00:00
Pascal Quantin 81b6d6aab3 Do not use ephemeral memory when adding a new data source
svn path=/trunk/; revision=51423
2013-08-19 10:39:43 +00:00
Michael Mann b38ec03858 Bugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT, bug 8989 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8989)
From Karl Beldan

BACKPORT(1.8,1.10)

svn path=/trunk/; revision=51422
2013-08-19 00:11:50 +00:00
Evan Huus bf9d434e56 One more 64/32-conversion fix for rtpproxy
svn path=/trunk/; revision=51421
2013-08-18 21:31:07 +00:00
Evan Huus 4dfcdcfba5 Take another stab at
packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into a
32-bit value

svn path=/trunk/; revision=51420
2013-08-18 20:09:05 +00:00