Guy Harris [Sat, 3 Oct 2015 01:14:32 +0000 (18:14 -0700)]
If we don't have an NDP flag, make it 0.
Change-Id: If2576eb6023776a348b3e2c85329509a9f9e80d3
Reviewed-on: https://code.wireshark.org/review/10758
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Fri, 2 Oct 2015 23:56:19 +0000 (16:56 -0700)]
Clean up whitespace.
Change-Id: I9c9301d7eff85b68a892af7b8c1318d0bf8d29bf
Reviewed-on: https://code.wireshark.org/review/10757
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Fri, 2 Oct 2015 23:40:13 +0000 (16:40 -0700)]
Fix some issues with Series III.
The packet data in some records has an FCS and in some records doesn't.
It appears that only the Series III packets do. Handle that.
Handle HT and VHT information supplied by Series III.
Get rid of an unused include while we're at it, and make the checks for
whether the protocol tree is being built a bit clearer, by testing the
tree pointer we'll actually be using. Make some style cleanups. Get
rid of some unused cruft.
Fix FPGA version checks.
This is based on Ixia's patches to an older version of Wireshark, but is
much cleaned up.
Bug: 11464
Change-Id: Ia341e6ffb1771cf38be812bf786f59b3250b7d5b
Reviewed-on: https://code.wireshark.org/review/10756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Dario Lombardo [Fri, 2 Oct 2015 15:56:26 +0000 (17:56 +0200)]
arp: fix typo in switch (CID
1250809)
Change-Id: I4679861383e9548d1cc042d084443a73f73a30de
Reviewed-on: https://code.wireshark.org/review/10743
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Fri, 2 Oct 2015 22:47:52 +0000 (15:47 -0700)]
Add another speex cast.
Change-Id: Ic46823788fa240ebadd44ec2c6d332980af597be
Reviewed-on: https://code.wireshark.org/review/10755
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Fri, 2 Oct 2015 21:11:32 +0000 (14:11 -0700)]
Use QVector::size instead of ::length.
Qt < 5.2 doesn't have ::length.
Change-Id: Ie6a06034c5e2ea8ddc1f9e1131a682ff9442fb75
Reviewed-on: https://code.wireshark.org/review/10754
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Fri, 2 Oct 2015 20:50:11 +0000 (20:50 +0000)]
Revert "CMake: Don't feed -fPIC to Visual C++."
This doesn't appear to fix the issue unfortunately.
This reverts commit
fd5eafa50a77bc319a240727600be38307e54f86.
Change-Id: Ida25881fca0a667c7d47692465b8f1fc9d335697
Reviewed-on: https://code.wireshark.org/review/10753
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Fri, 2 Oct 2015 20:23:08 +0000 (13:23 -0700)]
Add casts to the speex resampler.
Try to fix
speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:324: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:419: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:536: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:632: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:638: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:645: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:697: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:699: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:817: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:818: warning: implicit conversion shortens 64-bit value into a 32-bit value
speex/resample.c:819: warning: implicit conversion shortens 64-bit value into a 32-bit value
on the 64-bit OS X builder.
Change-Id: Ifad32f5cd6ffe1186c8f9db593cc1c34e67357ce
Reviewed-on: https://code.wireshark.org/review/10752
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Fri, 2 Oct 2015 19:42:54 +0000 (12:42 -0700)]
Fix indentation after previous change.
Change-Id: I64ead71afe09cb330163d4a15fc1310d07a23bb1
Reviewed-on: https://code.wireshark.org/review/10751
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Fri, 2 Oct 2015 19:40:27 +0000 (12:40 -0700)]
Rename vwr_read_s2_W_rec - it handles both series II and III records.
Change-Id: Ia6c61500345a9f80945c900813e502046ac870c1
Reviewed-on: https://code.wireshark.org/review/10750
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Fri, 2 Oct 2015 19:37:20 +0000 (12:37 -0700)]
Distcheck fixes.
Add more speex files to the distribution.
Comment out a for-now-unused variable.
Change-Id: Iea3a0fad81e2cb599209e1c30ecbdbdb153d1328
Reviewed-on: https://code.wireshark.org/review/10749
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Fri, 2 Oct 2015 19:31:44 +0000 (12:31 -0700)]
More formatting cleanups (no space between "no" and comma).
Change-Id: I873756df4f78977bcee416c089537cd238d6104a
Reviewed-on: https://code.wireshark.org/review/10748
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Fri, 2 Oct 2015 19:23:59 +0000 (12:23 -0700)]
Get rid of unused variable.
Change-Id: Ife7f0c972ed67ef4f89c71faf6bc9cdccf007284
Reviewed-on: https://code.wireshark.org/review/10747
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Fri, 2 Oct 2015 19:22:26 +0000 (12:22 -0700)]
Clean up formatting.
Fix "a ,b" to "a, b" in both code and displayed output.
Indent continuation lines of multi-line statements.
Change-Id: Ic2d96a498fbb716fa2be23bcd94bed14b9df7823
Reviewed-on: https://code.wireshark.org/review/10746
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Thu, 1 Oct 2015 22:51:34 +0000 (15:51 -0700)]
Qt: Show the QtMultimedia status.
Show the QtMultimedia status in the compiled version info instead of
PortAudio.
Change-Id: Id4a657b1a65e4d0127a3a36643d1c446ed79b8e5
Reviewed-on: https://code.wireshark.org/review/10742
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Sat, 13 Dec 2014 00:51:40 +0000 (16:51 -0800)]
Qt: Initial RTP playback.
Note the "initial". This is woefully incomplete. See the "to do" lists
below and in the code.
This differs a bit from the GTK+ version in that you specify one or more
streams to be decoded.
Instead of showing waveforms in individual widgets, add them all to a
single QCustomPlot. This conserves screen real estate and lets us more
easily take advantage of the QCP API. It also looks better IMHO.
Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We
probably won't use the widgets until we make 5.0 our minimum Qt
version and plain old QtMultimedia lets us support Qt 4 more easily
(in theory at least).
Add resampling code from libspeex. I initially used this to resample
each packet to match the preferred rate of our output device, but this
resulted in poorer audio quality than expected. Leave it in and use to
create visual samples for QCP and to match rates any time the rate
changes. The latter is currently untested.
Add some debugging macros.
Note that both the RTP player and RTP analysis dialogs decode audio data
using different code.
Note that voip_calls_packet and voip_calls_init_tap appear to be dead
code.
To do:
- Add silence frames where needed.
- Implement the jitter buffer.
- Implement the playback timing controls.
- Tapping / scanning streams might be too slow.
Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4
Bug: 9007
Reviewed-on: https://code.wireshark.org/review/10458
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Thu, 1 Oct 2015 22:39:38 +0000 (15:39 -0700)]
CMake: Don't feed -fPIC to Visual C++.
Change-Id: If6dd0619052b7735d7c5eb84aadc191545df7bee
Reviewed-on: https://code.wireshark.org/review/10735
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Kaiser [Wed, 30 Sep 2015 21:03:21 +0000 (23:03 +0200)]
[isns] replace THROW() with an expert info
this removes 37 THROW() calls
do some minor reformatting while at it
Change-Id: Ib1611d9a9e7cca9c59451b4040bbaa26cd300aa0
Reviewed-on: https://code.wireshark.org/review/10733
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Fri, 2 Oct 2015 00:55:19 +0000 (20:55 -0400)]
Conversation filter address types for IEEE 802.11 should include WLAN Address types
Bug: 11562
Change-Id: I49338e12c80963403c1253ec9251a3a3767f2526
Reviewed-on: https://code.wireshark.org/review/10738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Richard Sharpe [Mon, 27 Jul 2015 03:13:57 +0000 (20:13 -0700)]
Add support for the FSCTL_QUERY_FILE_REGION FSCTL.
Found when looking at support for HyperV under Samba.
Change-Id: I78d7d0c68c7821c952316beb6fc34cd047d146aa
Reviewed-on: https://code.wireshark.org/review/9803
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Fri, 2 Oct 2015 00:42:43 +0000 (17:42 -0700)]
CMake: Fix the dmg_package target.
We don't have Wireshark.pkgproj so don't try to copy it.
Change-Id: I649fce27e53cbd45ffc50e4095252a665c49165d
Reviewed-on: https://code.wireshark.org/review/10739
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Fri, 2 Oct 2015 00:34:57 +0000 (17:34 -0700)]
Try to fix the NMake + QMake build.
Add supported_protocols_dialog.cpp to Wireshark.pro.
Change-Id: I7ff95960ca2ddccaa3f8d997173142cc77950efa
Reviewed-on: https://code.wireshark.org/review/10736
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Thu, 1 Oct 2015 17:36:22 +0000 (10:36 -0700)]
Set the minimum Qt version to 4.7.
We've been using QElapsedTimer for a while now with no complaints. It
was introduced in Qt 4.7, which was first released in September 2010.
Change-Id: I21ca768c6a7bab8a08626957583d81fd771c64b4
Reviewed-on: https://code.wireshark.org/review/10732
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Thu, 1 Oct 2015 17:18:56 +0000 (10:18 -0700)]
Add the supported protocols internals dialog.
Includes a bonus search field.
Change-Id: I0b101b725d531a59c8a2fdbfbf4690b507135546
Reviewed-on: https://code.wireshark.org/review/10731
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Thu, 1 Oct 2015 21:00:51 +0000 (14:00 -0700)]
CMake: OS X packaging updates.
Add a dmg_package_prep target as an alias to app_bundle. Rename the
osx-dmg target to dmg_package. This matches the Windows packaging
target names.
In osx-app.sh, make sure we rpathify the bundle plugin directory.
Change-Id: If41195c9d405ad6bff865625500a8227b77e8092
Reviewed-on: https://code.wireshark.org/review/10734
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Jeffrey Smith [Mon, 7 Sep 2015 01:56:30 +0000 (20:56 -0500)]
Treat IPv4 subnet masks as distinct from addresses
While IPv4 subnet masks are obviously related and similar to IPv4
addresses, they are distinct enough that they need to be treated
seperately in some aspects. For instance, there is no value in
attempting to resolve a subnet mask.
This change creates a new display type: BASE_NETMASK, which allows distinction from FT_IPv4
(and possible name resolution) where appropriate.
Change-Id: I99e19c9a58eb613f8e58d481af84c30e2e5e14d7
Reviewed-on: https://code.wireshark.org/review/10438
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Thu, 1 Oct 2015 14:56:01 +0000 (16:56 +0200)]
Fix crashes related to RTP Streams analysis
The data that describes RTP streams become invalid when packets are
re-dissected. This results in a crash in GTK when the "RTP Analyse"
option is used and and a crash in Qt when the display filter is changed
while the RTP Streams dialog is open.
Fix this by adding a tap_reset callback (modelled after mcaststream) to
the RTP tap listener that allows the GTK+ and Qt dialogs to clear the
displayed list of RTP streams.
Bug: 10016
Change-Id: I7478678db63d7ac8110c44c163844e9f66fad9e9
Reviewed-on: https://code.wireshark.org/review/10728
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Thu, 1 Oct 2015 14:29:59 +0000 (16:29 +0200)]
Revert "gtk: Fix crash on Analyze RTP stream"
Qt is affected by a similar issue, a different approach is needed.
This reverts commit
01bd832b9df9570ddfd81ab4985f71ff6abd9b12.
Change-Id: Ic03807e8d00a3114bac1507762df05870b0346d9
Reviewed-on: https://code.wireshark.org/review/10727
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Thu, 1 Oct 2015 15:31:04 +0000 (16:31 +0100)]
IPv6: Remove two offsetof()s
Change-Id: I41c93927595be523528d44c263b7028f40e524e2
Reviewed-on: https://code.wireshark.org/review/10706
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Wed, 30 Sep 2015 23:54:40 +0000 (16:54 -0700)]
Add the conversation hash tables internals dialog.
The GTK+ version dumps "new" and "old" hash values. It looks like
neither are valid since the code in conversation.c and
conversation_hashtables_dlg.c have diverged.
For now just dump the addresses and ports for each hash table in the Qt
UI.
Change-Id: I832522dff06da769bd4ad3ead3d541206f283a90
Reviewed-on: https://code.wireshark.org/review/10713
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
AndersBroman [Thu, 1 Oct 2015 16:42:54 +0000 (18:42 +0200)]
Add dissection of 3GPP AVP 655 refactor to use proto_tree_add_bitmask_with_flags() in some cases.
Part 2
Change-Id: I18a17202f1c547b2257549ea0245350227edafa0
Reviewed-on: https://code.wireshark.org/review/10730
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 23 Oct 2014 17:57:45 +0000 (10:57 -0700)]
OS X: Integrate CMake and osx-dmg.sh
Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d
Reviewed-on: https://code.wireshark.org/review/10694
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
AndersBroman [Thu, 1 Oct 2015 16:02:41 +0000 (18:02 +0200)]
[Diameter] Add dissection of 3GPP AVP 655 refactor to use
proto_tree_add_bitmask_with_flags() in some cases.
Change-Id: I280c8f33aeacb84561243b38497276099621bfe9
Reviewed-on: https://code.wireshark.org/review/10729
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Tüxen [Thu, 1 Oct 2015 14:17:26 +0000 (14:17 +0000)]
Revert "SCTP: Add I_DATA support"
This reverts commit
4e9361dc88eefef27d031e29e2f8ca9891cc03eb.
Change-Id: Ia7aee9ffbe5bc5d3ae88e957c234cbee7b65f457
Reviewed-on: https://code.wireshark.org/review/10723
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Michael Tüxen [Thu, 1 Oct 2015 14:11:47 +0000 (14:11 +0000)]
Revert "Fix typos."
This reverts commit
e47ea6d7493c60e1761da4f5fbb6bee68fdb5847.
Change-Id: Ia5b7f5cdb1f17705010ac60bd2105156014f6d00
Reviewed-on: https://code.wireshark.org/review/10721
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Pascal Quantin [Thu, 1 Oct 2015 11:21:54 +0000 (13:21 +0200)]
ZigBee: fix dissection of Link Status Address field
Bug: 11564
Change-Id: I4320c794a0b6ba1693e2729eea424a0a43cf54d8
Reviewed-on: https://code.wireshark.org/review/10715
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Michael Tüxen [Thu, 1 Oct 2015 12:23:00 +0000 (14:23 +0200)]
Fix typos.
Change-Id: I3c03cbb064d1d7ffd579982b2e670b84b1768db2
Reviewed-on: https://code.wireshark.org/review/10717
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
ruengeler [Thu, 1 Oct 2015 11:36:24 +0000 (13:36 +0200)]
SCTP: Add I_DATA support
Change-Id: Ib8566b7d94fdafdb9735b356d129f378c94af3cf
Reviewed-on: https://code.wireshark.org/review/10716
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
AndersBroman [Thu, 1 Oct 2015 10:40:14 +0000 (12:40 +0200)]
[Diameter] Add 3GPP AVP 652-655
Change-Id: I4db21e3e095f7cb466759a96706ec17c8429386e
Reviewed-on: https://code.wireshark.org/review/10714
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Wed, 30 Sep 2015 22:22:58 +0000 (15:22 -0700)]
It's "-Wno-XXX", not "-WnoXXX".
Change-Id: I90ac4872e2a792dac07a6c12c8f059795f7f6bc3
Reviewed-on: https://code.wireshark.org/review/10712
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 30 Sep 2015 22:20:06 +0000 (15:20 -0700)]
Another big hammer to shut Apple's deprecation squealing up.
Change-Id: Ifeb37566468fca0afceab1d74baa23fd05a46057
Reviewed-on: https://code.wireshark.org/review/10711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Wed, 30 Sep 2015 16:53:46 +0000 (09:53 -0700)]
Add more CORBA dissectors back to the dirty list.
Change-Id: Ic55a2d444b924a6b13bdfd479a38d90589be8a1f
Reviewed-on: https://code.wireshark.org/review/10709
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Kaiser [Thu, 24 Sep 2015 16:13:36 +0000 (18:13 +0200)]
[isns] refactor the attribute parsing code
* go through the data only once, increment offset along the way
* remove tag, length dissection from the payload functions
* handle all undecoded elements in the default case
* don't bring up an exception for an invalid ip address length,
proto_tree_add_item() already does this for us
* replace the payload functions for string, integer, ip address
with proto_tree_add_item()
Change-Id: I2a96cb0b22961f63256d7bf0dfe138c6d8100fde
Reviewed-on: https://code.wireshark.org/review/10682
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Alexis La Goutte [Wed, 30 Sep 2015 10:34:14 +0000 (12:34 +0200)]
DNS: Replace cinfo by pinfo->cinfo (no longer need to check if cinfo is not NULL)
Change-Id: Ib7cebd588924270b2003fad575f4cd0c3ec2678e
Reviewed-on: https://code.wireshark.org/review/10698
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Wed, 30 Sep 2015 09:14:43 +0000 (11:14 +0200)]
DNS: Fix Col Info display (Missing space between rcodes)
Change-Id: I79ecb77ac5ab7e18f9986f2987fafeab8a117644
Reviewed-on: https://code.wireshark.org/review/10697
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Mathieson [Wed, 30 Sep 2015 11:49:01 +0000 (04:49 -0700)]
Use a 'recent' setting to persist the checkbox controlling the source of PDUs to use in LTE RLC statistics
Change-Id: I20234c3a3bf7761f70b0db5a6acbbf54ffbfcef5
Reviewed-on: https://code.wireshark.org/review/10699
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Peter Wu [Wed, 30 Sep 2015 12:35:13 +0000 (14:35 +0200)]
qt: warn when jumping to an invalid packet number
I was confused when double-clicking a packet number did not work. It
turns out that the display filter was hiding the destination.
Check the packet number for sanity, just like GTK+ does.
Change-Id: If50b2a3091a468f880b42fd2385f1b74c30d2f2b
Reviewed-on: https://code.wireshark.org/review/10700
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Peter Wu [Sun, 27 Sep 2015 22:08:39 +0000 (00:08 +0200)]
wslua: do not pop from empty stack on newer LUA versions
Fixes this failure:
tshark: lapi.c:175: lua_settop: Assertion `(-(idx+1) <= (L->top - (func + 1))) && "invalid new top"' failed.
Found using LUA 5.2 compiled with -DLUA_USE_APICHECK. Note that the
value returned by luaopen_bit does not affect the size of the stack
after using lua_call; if there are excess return values, then these will
be dropped after calling lua_call. See http://www.lua.org/pil/26.2.html
I also verified that the stack is still empty after calling all
wslua_reg_module functions.
Change-Id: Ia72635277ca4d8077e47a5c472391a78fe6d311e
Reviewed-on: https://code.wireshark.org/review/10664
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Peter Wu [Tue, 29 Sep 2015 20:30:06 +0000 (22:30 +0200)]
gtk: Fix crash on Analyze RTP stream
When updating the RTP streams list, the data associated with the current
selection becomes invalid when the old list is cleared.
gtk_list_store_clear somehow triggers the selection callback which
attempts to access the invalid memory.
Avoid this by disabling selectability while clearing the list.
Bug: 10016
Change-Id: Id5126ec5ffa41fa6a65339f4453546223124ed67
Reviewed-on: https://code.wireshark.org/review/10690
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Cody Doucette [Sun, 30 Aug 2015 03:57:11 +0000 (23:57 -0400)]
nwp: add support for NWP packets
Neighborhood Watch Protocol (NWP) is an XIA protocol for resolving network
addresses to link-layer addresses. Hosts on a LAN send NWP Announcement
packets with their host identifiers (HIDs), and neighbors in the LAN respond
with NWP Neighbor List packets containing their HIDs and associated link-layer
addresses.
Bug: 11492
Change-Id: Ib1e801474b1aa72f5dd3d8303eeec36b96ee0a99
Reviewed-on: https://code.wireshark.org/review/10316
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jeff Morriss [Mon, 28 Sep 2015 16:50:13 +0000 (12:50 -0400)]
automake: get docbook builds working for out of (source) tree builds.
Change-Id: I483596d21f072b97ae87d5032bd450adcafcf243
Reviewed-on: https://code.wireshark.org/review/10678
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Fri, 25 Sep 2015 12:53:18 +0000 (13:53 +0100)]
IPv6: Remove extra spacing from info arrays.
Internal formatting: remove extra spacing from 'hf_register_info' array
(as suggested during review), plus indentation changes. Do the same
for expert info array.
External formatting: Minor cleanups.
Change-Id: I4d8db4891824e75d413b0eb53ebcc2e7b128c0bb
Reviewed-on: https://code.wireshark.org/review/10683
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Bill Meier [Wed, 30 Sep 2015 00:54:46 +0000 (20:54 -0400)]
[ieee80211] Fix: "DSCP Range description user priority" off by 1
Bug: 11555
Change-Id: Ic12c7882dbe4f6eca72f7eed3ee8d0e5618afdd8
Reviewed-on: https://code.wireshark.org/review/10695
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Pascal Quantin [Tue, 29 Sep 2015 21:27:01 +0000 (23:27 +0200)]
file.c: do not rescan packets is no capture file is opened
Otherwise we will end up calling cf_cb_file_rescan_started and cf_cb_file_rescan_finished callbacks while no capture file is available
Bug: 11552
Change-Id: Ib6fd7b13ce1b083d5f5b4e05d80152112c1451f6
Reviewed-on: https://code.wireshark.org/review/10692
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Tue, 29 Sep 2015 20:41:44 +0000 (13:41 -0700)]
Add back DIRTY_CORBA_IDL_DISSECTOR_SRC.
Add DIRTY_CORBA_IDL_DISSECTOR_SRC back to our various makefiles and move
packet-cosnaming.c back to it.
Change-Id: I2f0427ad47bf0e2f166577608da7f5feaf848a48
Reviewed-on: https://code.wireshark.org/review/10691
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Pascal Quantin [Tue, 29 Sep 2015 20:29:41 +0000 (22:29 +0200)]
NCP2222: change ncp.nds_return_all_classes filter type from FT_STRING to FT_UINT32
Otherwise a call to proto_tree_add_uint_format_value will trigger an assert
Bug: 11550
Change-Id: Ic30b07a424cd94b861cee8999b91154ceeb72469
Reviewed-on: https://code.wireshark.org/review/10689
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michal Labedzki [Tue, 8 Sep 2015 13:42:12 +0000 (15:42 +0200)]
Qt: Add F5 as shortcut to refresh interfaces
I am tired to go menu to refresh interfaces.
Shortcut make our live easier.
Change-Id: Ic2a478d7857b8138897088f0a6610df7988b1be9
Reviewed-on: https://code.wireshark.org/review/10520
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Mathieson [Tue, 29 Sep 2015 16:54:48 +0000 (09:54 -0700)]
lte_rlc_statistics: fix cosmetic issues with data in columns
Change-Id: I2bec8de3d5fe84f0a2287c750c9c9151906fe71e
Reviewed-on: https://code.wireshark.org/review/10688
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
AndersBroman [Tue, 29 Sep 2015 14:00:30 +0000 (16:00 +0200)]
[Diameter] Add command code
8388717 Ericsson Trace-Report
Change-Id: Ifabb920eb4ddb1a46f2dbf7e03478d0abe10305a
Reviewed-on: https://code.wireshark.org/review/10687
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Tue, 29 Sep 2015 13:07:44 +0000 (15:07 +0200)]
[Diameter] Add enum value to 3GPP AVP PDN-Type" code="1456"
<enum name="IPv4_OR_IPv6" code="3"/>
Change-Id: I8fa328c0c6915cda835754d12bc4d48608608500
Reviewed-on: https://code.wireshark.org/review/10686
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Mon, 28 Sep 2015 12:22:44 +0000 (14:22 +0200)]
tcp: remove misleading, outdated comment
v1.99.1rc0-717-ga2c2f87 removed pinfo->private_data assignment, but left
the comment in place. Since
v1.99.1rc0-761-g6d207fe, the member is
removed completely, so let's drop the comment.
Change-Id: Ib36b6b979abda786202867ea1e6ef0d11487f61c
Reviewed-on: https://code.wireshark.org/review/10684
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Pascal Quantin [Mon, 28 Sep 2015 19:40:00 +0000 (21:40 +0200)]
Decode as (Qt): fix dereference of null pointer found by Clang analyzer
Also fix usage of 'Decode As' window when no file is opened (broken by gf189cb8)
Change-Id: I06ff83394cf31763cecfbbedd99ce7438488872a
Reviewed-on: https://code.wireshark.org/review/10665
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Pascal Quantin [Mon, 28 Sep 2015 20:35:19 +0000 (22:35 +0200)]
LTE RRC: upgrade dissector to v12.7.0
Change-Id: I95660eb302fde06c2034b023e60c7b83c67fe71b
Reviewed-on: https://code.wireshark.org/review/10680
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Martin Kaiser [Mon, 28 Sep 2015 20:44:42 +0000 (22:44 +0200)]
[isns] re-indent the AddAttribute() function
hopefully, this will make my further patches easier to review
Change-Id: If9fe4aa03c08dd38eccae3d4a0accdcbb5d62111
Reviewed-on: https://code.wireshark.org/review/10681
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Pascal Quantin [Mon, 28 Sep 2015 20:13:24 +0000 (22:13 +0200)]
Qt: fix OVERRUN error reported by Coverity in LTE MAC statistics window (CID
1325078)
Change-Id: I281b344ea76418399e2a8038f1220310f6a50bc2
Reviewed-on: https://code.wireshark.org/review/10679
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Graham Bloice [Mon, 28 Sep 2015 16:07:37 +0000 (17:07 +0100)]
Fix tests to allow selection of suite 10
The tests only allowed a single character suite selection, which
prevented suite 10 from being run on its own.
Modified test.sh to now require a newline in addition to the input
so that a 2 digit number can be entered.
Also fixed test display to remove illusion that an individual step
could be run. Only whole suites can be run.
Change-Id: I4dee0ec6a8e1f34fa443a6a0a3f2d52a73146e54
Reviewed-on: https://code.wireshark.org/review/10676
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Graham Bloice [Mon, 28 Sep 2015 14:29:55 +0000 (15:29 +0100)]
Cosmetic tidy up for the projects in the Visual Studio solution
Change-Id: Ie4ed28ee7e59def2e8a15433334988b4d0225d1d
Reviewed-on: https://code.wireshark.org/review/10675
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Michael Mann [Sat, 26 Sep 2015 04:08:18 +0000 (00:08 -0400)]
idl2wrs: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
It looks like "items" could have contributed to fields/data being at an incorrect level off of a tree.
Change-Id: I93616ef8b6b364c578f989882045dee42cb6d3c3
Reviewed-on: https://code.wireshark.org/review/8558
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Sun, 6 Sep 2015 12:08:08 +0000 (13:08 +0100)]
Improve IPv6 routing header dissection
Remove size limitation of 23 addresses to Type 0. Add validity checks to Type 0 and Type 2.
Add address count vs segments left check to RPL.
Use hf_ipv6_routing_* for shared routing header fields and hf_ipv6_routing_<type>_* for the rest.
Change-Id: I98796504a0f7643476c4c3550586b5da2cf70f6d
Reviewed-on: https://code.wireshark.org/review/10470
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Jeff Morriss [Mon, 28 Sep 2015 16:20:19 +0000 (12:20 -0400)]
WSUG: send readers to the wiki's SSL page for help on decryption.
This replaces a question (recently remarked upon on -users) with a link to
someplace where we already have documentation on the subject.
Change-Id: I6c5cf2b0f674c129aaa017da0ca44176c5be665f
Reviewed-on: https://code.wireshark.org/review/10677
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Dario Lombardo [Mon, 28 Sep 2015 13:11:44 +0000 (15:11 +0200)]
editcap/reordercap: rename time to frame_time.
According to checkAPI.
Change-Id: Iddad6253fc4711ed7870eccadb91d94e5fecd24d
Reviewed-on: https://code.wireshark.org/review/10672
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Mon, 28 Sep 2015 13:46:10 +0000 (15:46 +0200)]
IPv6: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ibe53f22f4f68efd121b8eae48418bad8baabd1a8
Reviewed-on: https://code.wireshark.org/review/10674
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Mathieson [Mon, 28 Sep 2015 10:38:29 +0000 (03:38 -0700)]
LTE RLC Statistics Dialog
Change-Id: Id0af0227a398fd06ba37c23097fa6809db432d0f
Reviewed-on: https://code.wireshark.org/review/10669
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Alexis La Goutte [Mon, 28 Sep 2015 08:26:14 +0000 (10:26 +0200)]
NCP2222: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I739262c0d6b8bd961cc75a18e7bdbb794806e2b7
Reviewed-on: https://code.wireshark.org/review/10668
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Mon, 28 Sep 2015 11:39:42 +0000 (13:39 +0200)]
Qt: mlt_info parameter is unused
Change-Id: Ie5744d076ae4997bd2252dd66bbc92780ffe73e0
Reviewed-on: https://code.wireshark.org/review/10670
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sat, 26 Sep 2015 20:46:00 +0000 (22:46 +0200)]
MAC LTE: upgrade dissector to v12.7.0
Change-Id: I5d97bc9199349c20598d68a92065e72fcaa88795
Reviewed-on: https://code.wireshark.org/review/10663
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Balint Reczey [Sat, 26 Sep 2015 17:07:22 +0000 (19:07 +0200)]
debian: Enable parallel package build
Debian packages used to build with parallel build enabled when
debian/rules used autotools but with switching to CMake the
parallel build failed sometimes. Now the CMake based build
system seems to be working for parallel builds, too, thus
it seems to be safe to enable parallel building of .debs again.
Change-Id: I79003bf6c4b74640f24d907b763a5cc3da595e68
Reviewed-on: https://code.wireshark.org/review/10657
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Pascal Quantin [Sun, 27 Sep 2015 18:31:42 +0000 (20:31 +0200)]
SNA: add value 0xC8 to the list registered SAP
Bug: 11551
Change-Id: I74e2c1b67b3d7a3462d99e941b1c637ba1227a71
Reviewed-on: https://code.wireshark.org/review/10662
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Peter Wu [Sun, 27 Sep 2015 13:46:09 +0000 (15:46 +0200)]
addr_resolv: cosmetic change for flags
Reduce some magic numbers and add parentheses,
change ((flags & X) == X) to simply (flags * X),
change tp->flags = tp->flags | x to tp->flags |= x.
Change-Id: Ida2d1aa59a3efc20d5fe6910d7b757277eb7e627
Reviewed-on: https://code.wireshark.org/review/10659
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Peter Wu [Sun, 27 Sep 2015 13:41:25 +0000 (15:41 +0200)]
ui/gtk: fix weird check for axis orientation
There is only one meaning for the flags parameter, namely axis
orientation (x or y). Replace the bitmap by a bool instead.
Clang 3.7.0 reported this warning:
ui/gtk/tcp_graph.c:1652:29: warning: shifting a negative signed value is undefined [-Wshift-negative-value]
g->y_axis->flags &= ~AXIS_ORIENTATION;
~^~~~~~~~~~~~~~~~
ui/gtk/tcp_graph.c:140:28: note: expanded from macro 'AXIS_ORIENTATION'
#define AXIS_ORIENTATION 1 << 0
^
1 warning generated.
This (~1 << 0) happened to work because nothing is actually shifted.
Change-Id: I406235148b7826649d35647f5d0702cd72a925a5
Reviewed-on: https://code.wireshark.org/review/10658
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Gerald Combs [Fri, 25 Sep 2015 21:33:54 +0000 (14:33 -0700)]
Qt: Add the Dissector Tables dialog.
Add the "Internals" menu under the View menu instead of at the top level
for now at least. Add the Dissector Tables dialog there.
Change-Id: Ieb23b0015591bac196e4ef94e3443832288333f9
Reviewed-on: https://code.wireshark.org/review/10654
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Balint Reczey [Sat, 26 Sep 2015 13:46:14 +0000 (15:46 +0200)]
debian: Show hardening results after build
Change-Id: I121d264b86ecf9e0607e6fe00c2791a91d8fe974
Reviewed-on: https://code.wireshark.org/review/10656
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Sun, 27 Sep 2015 15:12:32 +0000 (08:12 -0700)]
[Automatic update for 2015-09-27]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: Ia290c7a187630547265bfd014c18e2523a36842b
Reviewed-on: https://code.wireshark.org/review/10660
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Alexis La Goutte [Thu, 24 Sep 2015 15:17:51 +0000 (17:17 +0200)]
QUIC: Update QUIC Error Codes lists...
From See src/net/quic/quic_protocol.h
Change-Id: I5fbc037186491dc8555f7f41b3e43d7d6a628f88
Reviewed-on: https://code.wireshark.org/review/10647
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Fri, 11 Sep 2015 08:06:49 +0000 (09:06 +0100)]
More consistency for IPv6 extension headers
'hf_ipv6_opt_length' is being used both for extension header length
and option length.
Change-Id: I012e4d43abdf57997a24ab6f2d2c93d121f9f123
Reviewed-on: https://code.wireshark.org/review/10478
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Fri, 18 Sep 2015 01:08:34 +0000 (02:08 +0100)]
Try to make IPv6 fragmentation code simpler
Fixes two issues:
- Null IPv6 Fragment extension headers confuse Wireshark, because the 'offlg'
variable gets reset
- Dissection doesn't stop when reassembly is enabled and it is the first
fragment followed by more IPv6 extension headers
Bug: 8362
Change-Id: Ibe229a63d7a6ab8523ddfcae30e58d19cc2ce2bd
Reviewed-on: https://code.wireshark.org/review/10482
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Graham Bloice [Sat, 26 Sep 2015 14:46:52 +0000 (15:46 +0100)]
Fix checkapi warnings
Fix some (mostly spurious) checkapi warnings by renaming the
offending variables.
Change-Id: I7a43ac89f5ed35053a6526fa838fbad67669a49a
Reviewed-on: https://code.wireshark.org/review/10655
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Stig Bjørlykke [Tue, 15 Sep 2015 06:46:43 +0000 (08:46 +0200)]
Qt: Use "" for empty QString const reference.
Change-Id: I686eadc865ae38433c3795450aeca8582a74d2c8
Reviewed-on: https://code.wireshark.org/review/10535
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Fri, 25 Sep 2015 17:00:14 +0000 (10:00 -0700)]
Qt: Update packet detail selection behavior.
Some menu items always need to be enabled or disabled when we call
setMenusForSelectedTreeRow. Do so.
Add some NULL checks.
Change-Id: I5de3df2ceb1dfe19e1cea548b0299004fbea2ec7
Reviewed-on: https://code.wireshark.org/review/10651
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Fri, 25 Sep 2015 16:11:23 +0000 (09:11 -0700)]
Help dialog shortcut list updates.
Make it clear that the shortcuts are for the main window. Add and update
a few tooltips.
Change-Id: I9ee082a9ede95f4b727fb652437f9ed16c9ef2bf
Reviewed-on: https://code.wireshark.org/review/10650
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
João Valverde [Sat, 12 Sep 2015 05:35:22 +0000 (06:35 +0100)]
Don't display duplicate addresses without name resolution enabled
Change-Id: Ieb88e2632401cbf50c4ae51768a64df64d54a45d
Reviewed-on: https://code.wireshark.org/review/10497
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Fri, 25 Sep 2015 14:09:07 +0000 (10:09 -0400)]
ncp2222: Use BASE_CUSTOM for date and time fields.
This simplifies some of the logic required for field formatting.
Change-Id: I2f9a612b18e3e4ca01311683d9cf61cbad9950f4
Reviewed-on: https://code.wireshark.org/review/10649
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Thu, 24 Sep 2015 02:55:35 +0000 (22:55 -0400)]
Convert dissect_nds_request and dissect_nds_reply to use proto_tree_add_xxx directly instead of the homegrown nds_val.
Change-Id: Ie67892caec2cddee591631045233f8a3f1cc0bc6
Reviewed-on: https://code.wireshark.org/review/10648
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Thu, 24 Sep 2015 17:42:46 +0000 (10:42 -0700)]
CMake: Add a hardening-check target.
On Windows, add a hardening-check target which checks for DYNAMICBASE
and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1.
For a Visual Studio solution, run the check by calling:
msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj
using the config as appropriate for your build.
Otherwise if we find the Debian/Fedora hardening-check script add a
target which runs it for each of our executables.
Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96
Reviewed-on: https://code.wireshark.org/review/10641
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Pascal Quantin [Fri, 25 Sep 2015 19:38:03 +0000 (21:38 +0200)]
airpdcap: fix WEP decryption
Using memcpy with overlapping buffers is not safe; use memmove instead
Bug: 11549
Change-Id: I8e15eb0af38d325a5e67e8748008126ac5994588
Reviewed-on: https://code.wireshark.org/review/10652
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michal Pazdera [Mon, 14 Sep 2015 08:28:30 +0000 (10:28 +0200)]
Multiple SSL content in one packet fix
When SSL packet contains multiple encrypted contents the WS shows only the
last record due the wrong indexing of the structure where the decrypted
contents are stored. Should use tvb_raw_offset(tvb)+offset instead of
offset as I think was intended.
Added the same fix for DTLS.
Bug: 11523
Change-Id: I0a977a0e6ebe7c45e526fa5152b8614463abd4fa
Reviewed-on: https://code.wireshark.org/review/10528
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Balint Reczey [Thu, 24 Sep 2015 07:56:14 +0000 (09:56 +0200)]
cmake: Enable PIE when it is available by default
Change-Id: I88930b8a9de596f93677052b2046c1b85cc34c6b
Reviewed-on: https://code.wireshark.org/review/10635
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Balint Reczey [Fri, 25 Sep 2015 07:53:25 +0000 (09:53 +0200)]
Export all hardening options in .deb packages
Change-Id: I0448e564305ce78dee4ec364007e0162c6f74c09
Reviewed-on: https://code.wireshark.org/review/10644
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Alexis La Goutte [Fri, 25 Sep 2015 09:24:07 +0000 (11:24 +0200)]
ISAKMP(ikev2): Type Hash and URL of X.509 certificate is not decoded
Reported by Marius
Bug:11543
Change-Id: Ic9d3b6b26a917601356eb957fd8270f2482f6aee
Reviewed-on: https://code.wireshark.org/review/10645
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Thu, 24 Sep 2015 00:56:50 +0000 (20:56 -0400)]
Refactor NCP Python data so that INFO column can be generated on the fly (TAKE 2)
The "old" method of populating the INFO column was to dissect all fields of a function/subfunction, then do a search in the tree to find the hf_ values of interest to then format into something for the INFO column. This is very expensive and requires "low level" APIs (for tree manipulation) which really shouldn't be used in a dissector.
The "new" method populates the INFO column at the same time a field is parsed, so nothing has to be revisited (and allows for more fields to be displayed on some malformed packets).
There are still expert infos (and possibly column APIs) under if (tree)s, but I'm not sure how FAKE_TREE_IS_VISIBLE factors into that. Removing the FAKE_TREE_IS_VISIBLE seems to negatively affect dissection.
Change-Id: Ie487e851c2f6558dd12f0c7010757b4a5f36226b
Reviewed-on: https://code.wireshark.org/review/10631
Reviewed-by: Michael Mann <mmann78@netscape.net>