git.samba.org - metze/wireshark/wip.git/log

BER: fix call to proto_tree_add_bytes_format()

The start_ptr parameter was missing.

Bug: 11264
Fixes: 8ccf65bfb244 Eliminate proto_tree_add_text from a few dissectors.
Change-Id: I52a59fe572cd1d0da8c6eb64e703752f5e352ed6
Reviewed-on: https://code.wireshark.org/review/8878
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>

ZVT: use the transaction info to set source and destination address

Change-Id: Ieef2747ce7cc42f0f1b56dd48268d65b1875a5d6
Reviewed-on: https://code.wireshark.org/review/8879
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

Provide port names for UDP ports so they can be used in filter expressions.

Change-Id: I134290624d40b7a14c3aaeb2f0793838a411805e
Reviewed-on: https://code.wireshark.org/review/8876
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>

Provide port names for TCP ports so they can be used in filter expressions.

Bug: 594
Change-Id: Ib41c4c753e24ac78b39463ab1daae7fd00631230
Reviewed-on: https://code.wireshark.org/review/8851
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>

epl: Add config option for dupl. cmd layer

Allow the command layer to be shown for duplicated frames
if needed for deep-packet analysis

Change-Id: I2e0026b6e448ebfd96f879f2f002a6f30a0a5031
Reviewed-on: https://code.wireshark.org/review/8874
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

openSAFETY: Fix smaller bugs in detection and tap

- Add b16 counter to SPDO Time Request/Response
- Mark generated time fields as generated
- Fix +1 addition for frameOffset
- Fix CRC2 calculation for subframes with just 5 bytes datalength

Change-Id: I59ef7bf445de47c2bd165ae0f94d64d9f11d636b
Reviewed-on: https://code.wireshark.org/review/8875
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

[MSVC 2015] Use intptr_t to make MSVC happy.

Change-Id: I1a39495bc2a752070db8c62136b17d9567bc33ab
Reviewed-on: https://code.wireshark.org/review/8856
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

tshark: fix computation of iostat table width when specifying an interval

Bug: 11262
Change-Id: I57468d1e96ade8926a2911bd035adf85500eba39
Reviewed-on: https://code.wireshark.org/review/8860
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>

NFSv4: A zero attribute mask is acceptable in dissect_nfs4_fattrs() if
'type' = FATTR4_BITMAP_ONLY

This patch updates the code accordingly.

Vars 'num_bitmaps', and 'count' are declared as guint8 but being passed to
32-bit fields of proto_tree_add_uint() and tvb_ensure_bytes_exist(). In
glibconfig.h 'guint8' is defined as 'typedef unsigned char guint8;' and in
'limits.h', ‘char’ is defined as 8 bits: #define CHAR_BIT 8 /* number of
bits in a char */. These vars have been changed to 32-bits.

There are 22 other dissectors that call "tvb_ensure_bytes_exist()". In
addition, there are an 215 CHECK_BYTE_COUNT_SUBR macro calls in
packet-smb.c which essentially do the same thing. README.developer does
state "you can check whether the data is present by using
"tvb_ensure_bytes_exist()" although this frequently is not needed." This
call has been removed in accordance with that statement.

Bug: 10483
Change-Id: Ib06ab14254882e9110af265d2d67a66dcce694f2
Reviewed-on: https://code.wireshark.org/review/8847
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

It's INVALID_HANDLE_VALUE, not INVALID_HANDLE.

Change-Id: I71d18ced0a1bd3438498230b6e647697be8e275d
Reviewed-on: https://code.wireshark.org/review/8872
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Squelch some type-clash warnings on Windows.

Define WS_INVALID_PID to be the appropriate "there is no process" value.
On UN*X, -1 works; the "pid" is actually a HANDLE for the process on
Windows, so INVALID_HANDLE is appropriate.

Cast HANDLE to intptr_t in the _cwait() call.

Change-Id: Ica2d2319f5c95ba41f590776a745fe040fe494d2
Reviewed-on: https://code.wireshark.org/review/8871
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Rename wsutil/process.h to wsutil/processes.h to avoid collisions.

The MSVC rules for searching for headers are a huge barrel of fun; it
appears that, for some files that need the MSVC <process.h> to declare
getpid(), they're getting our <wsutil/process.h> instead, as that's in
the current directory. Rename it to avoid the collision.

Change-Id: I88eb70237062fa7957e38d7ff8132524390a6a5c
Reviewed-on: https://code.wireshark.org/review/8870
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Make sure we include <windows.h> to get HANDLE declared.

Change-Id: I8cba1120f4667864eadeebd48bcdced3a2b71f4c
Reviewed-on: https://code.wireshark.org/review/8867
Reviewed-by: Guy Harris <guy@alum.mit.edu>

One more ws_process_id change.

Change-Id: I21dc38c248f4412e8f48e7dfd54aa12497167e5a
Reviewed-on: https://code.wireshark.org/review/8866
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Get rid of extra blank line at the end.

Change-Id: Ibe7904b7e01a1b0b81ba20673cd85e08ebf660c2
Reviewed-on: https://code.wireshark.org/review/8863
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Use pid_t on UN*X, and HANDLE on Windows, for the process ID.

This avoids type punning; at least with Xcode 7 beta on El Capitan beta,
that produces warnings that get turned into errors.

Change-Id: I57f47455b9630f359828c07c92a190b5cb33816f
Reviewed-on: https://code.wireshark.org/review/8862
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Clean up --with-qt handling.

If you don't specify --with-qt or --without-qt, we build with Qt iff we
find it; we don't fail if we don't find it.

If you specify --with-qt, we build with Qt if we find it and fail if we
don't find it.

If you specify --without-qt, we don't look for Qt and don't build with
it.

This is all independent of --with-gtk2 or --with-gtk3.

Change-Id: I508d3281192bda9168fc46aba6011687c83ef818
Reviewed-on: https://code.wireshark.org/review/8861
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Qt: fix a V595 warning reported by PVS-Studio

The 'cur_item' pointer was utilized before it was verified against nullptr.

Change-Id: I46185f24cf5700e2137f6e40bed45575197c36e7
Reviewed-on: https://code.wireshark.org/review/8858
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

GTK: fix a V610 warning reported by PVS-Studio

Unspecified behavior. Check the shift operator '>>'. The left operand '(- 1)' is negative.

Change-Id: I508d451736830a150b8839aa6353ee4c7bcf848f
Reviewed-on: https://code.wireshark.org/review/8859
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[MSVC 2015] Use intptr_t for "pointer stored as int" to make MSVC happy.

Change-Id: I5dbbea8527a8bb73b17e5a8a5611c3923d82459c
Reviewed-on: https://code.wireshark.org/review/8852
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove the executable bit from epan/addr_resolv.c

It was added (presumably by accident) in 41ac67c.

Change-Id: If9c2daae6d9f6a0f09fc04c5332faeaa69d355c2
Reviewed-on: https://code.wireshark.org/review/8855
Reviewed-by: Evan Huus <eapache@gmail.com>

Add PortAudio to Windows CMake build

Change-Id: I774ff0bf858280f2a5aa551ae1a5e23eedf8dc20
Reviewed-on: https://code.wireshark.org/review/8848
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

[MSVC 2015] Change the check to look for MSVC 2010 or newer rather than
adding MSVC 2015

Change-Id: I151be089529f2bb460b313f84a348f51689eb445
Reviewed-on: https://code.wireshark.org/review/8854
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Don't try to clean up uninitialized Lua and crash

Reported to Debian BTS at:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786704

Change-Id: I3045a68f0dd557bf64ea26a488a1bcece4828fec
Reviewed-on: https://code.wireshark.org/review/8765
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>

Fix insertion of subnets read from the subnets file: append to the *end* of
the list.

The patch ensures that non-duplicate subnets are appended to the end of the
list rather than as the second element, which if there had been a second
element previously, the memory for it was effectively leaked.

It also allows /32 "subnets", even though arguably the hosts file should be
used instead, but now the test in read_subnets_file() matches the assert in
subnet_entry_set().

Bug: 11247
Change-Id: I54bf1cbb34edfcf410aa634043a377c27091df51
Reviewed-on: https://code.wireshark.org/review/8802
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

tshark: add ability to display streams in EBCDIC

As requested in https://ask.wireshark.org/questions/42958/tshark-follow-tcp-stream-for-ebcdic

Change-Id: Ia8d93f59aa038bd6328adea137c92ea5a52361b5
Reviewed-on: https://code.wireshark.org/review/8844
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: Anders Broman <a.broman58@gmail.com>

tap-macltestat.c: fix some V523 warnings reported by PVS-Studio

The 'then' statement is equivalent to the 'else' statement.

Change-Id: I9e39afed3520cd4dffee52d5e57830817a8c4399
Reviewed-on: https://code.wireshark.org/review/8846
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

SMB: fix a V595 warning reported by PVS-Studio

The 'si' pointer was utilized before it was verified against nullptr.

Change-Id: I92faf43160698a548531dceb557cf4153d15d03f
Reviewed-on: https://code.wireshark.org/review/8845
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

LBMC: fix Truncation of constant value -16. The value range of unsigned char type: [0, 255] found by PVS Studio (V569)

Change-Id: I5dacce44941ac132172df6d7f343fddd114bd888
Reviewed-on: https://code.wireshark.org/review/8792
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Add TapParameterDialog.

Split StatsTreeDialog into StatsTreeDialog and TapParameterDialog (its
base class). This more closely matches the GTK+ UI and paves the way for
more statistics dialogs.

Change-Id: I2630385534e829d99724673ade372fcb33200d07
Reviewed-on: https://code.wireshark.org/review/8842
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Revert "NFSv4: Fix for Bug 10483"

This reverts commit da1766e9871ba1eb4156ebd05c819eee9d91c10f.

I should have set CR-2 because I was working on the following update: According to RFC 5661, a zero attribute mask is acceptable if type FATTR4_BITMAP_ONLY is passed to dissect_nfs4_fattrs(). In addition I found guint8 vars 'num_bitmaps', and 'count' are declared as guint8 but being passed into 32-bit fields of proto_tree_add_uint() and tvb_ensure_bytes_exist().I will push a new patch for review.

Change-Id: I95e55af7fef17d0554f9741aa426feeeb95e2c21
Reviewed-on: https://code.wireshark.org/review/8843
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

aeron: fix infinite loop

`dissected_length` can come from the packet in some paths, meaning it can be 0
or negative and we need to check for underflows and other such problems

Bug: 11255
Change-Id: Iba55ec1824a391ec1c717bfea5b65cc6610fc081
Reviewed-on: https://code.wireshark.org/review/8839
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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: Evan Huus <eapache@gmail.com>

PMPROXY: check that pointer is not NULL before doing a strlen

Bug: 11258
Change-Id: I5c8c17861f79d0b0cc5286fca742ed16e8d4ba74
Reviewed-on: https://code.wireshark.org/review/8840
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

AMQP: fix The 'format_name' variable is assigned to itself found by PVS Studio (V570)

Change-Id: I97cdfc20cc635bccea5c96db33f46cdd970e933a
Reviewed-on: https://code.wireshark.org/review/8785
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Petr Gotthard <petr.gotthard@centrum.cz>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Print "and greater" instead of a ten digit number.

Change-Id: I97dfabe3ec48acf57b33ec15486d2d660d610f6d
Reviewed-on: https://code.wireshark.org/review/8841
Reviewed-by: Gerald Combs <gerald@wireshark.org>

tcp: simplify tcp.flags.str, fix off-by-one

Observe that tcp_flags_to_str_first_letter is a copy of tcp_flags_to_str
with the flags[][4] variables copied and the loop variables inverted.
This misses the FIN bit, and runs past the flags buffer.

Behavior change: for consistency, move the reserved bits to the front
and print reserved bits individually. Old output / new output:

    NCEUAPRSRRR
    RRRNCEUAPRSF

Tested with this pcap with all flag bits set (0x0fff). hexdump:

    d4c3b2a1020004000000000000000000ff7f000065000000b6b77455f3ac
    06002800000028000000450000280001000040067ccd7f0000017f000001
    0014005000000000000000005fff2000907f0000

Change-Id: I70e070808d1f0f9cd60eaf4f2b3f4ac6e3cfaada
Reviewed-on: https://code.wireshark.org/review/8826
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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>

Profinet: OEM Device ID is added

The Device ID of the OEM part may additionally be offered using OEM Device ID

Change-Id: Ic51cc4c05a41a8d18f265fb1abab739d1e82e28a
Reviewed-on: https://code.wireshark.org/review/8832
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>

rpc: Support IB transport

Bug: 11251

Change-Id: I1e6fab86af3c95a5303af90079c99424941b6e6e
Signed-off-by: Slava Shwartsman <slavash@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/8759
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>

GTPv2: fix indent (use 4 spaces)

Change-Id: I9f20a5797ec0f8f3ae67b1be67d342b256da03ae
Reviewed-on: https://code.wireshark.org/review/8836
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix MSCV 2015RC Warning in_cksum.c(92): warning C4311: 'type cast':
pointer truncation from 'const guint16 *' to 'unsigned long'.

Even if we only require GLIB 2.16 this will fix the Windows build as we do
have a newer Glib on Windows.

Change-Id: Ie0644536783e8b298de59094fec240e249c9b27f
Reviewed-on: https://code.wireshark.org/review/8833
Reviewed-by: Anders Broman <a.broman58@gmail.com>

BGP: fix an infinite loop when finding an invalid length in EVPN NLRI Route Type 5 option

Bug: 11256
Change-Id: I6fb037d8a3b8b0f22ebea6d08f69fb8afeed90f9
Reviewed-on: https://code.wireshark.org/review/8835
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[GTPv2] Throttling Delay unit values are not the same as the timer values,
make a separate Value_string.

Change-Id: I79cb3b9d7261f8fba97f1938464d38c218282cb5
Reviewed-on: https://code.wireshark.org/review/8834
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Update how we search for Lua with pkg-config.

First, search for packages with the version number without the period (bug
11219).

Second, don't look for Lua 5.3 because we don't work with it. If what we find
(without pkg-config's help) is Lua 5.3, disable Lua support (bug 10881).

Cmake support by Peter Wu (originally Ie73e5b53640f10432881a9671c0a605f7f027ed8):
Note the check for "lua<=5.2.99" instead of "lua<5.3" since cmake does not
support the latter syntax. Tested with lua5.2, lua5.1 and lua (5.3) installed.

Bug: 11219
Ping-Bug: 10881
Change-Id: I382d07ca00eafc6111cd4e9faa2b66f6b8f95b6e
Reviewed-on: https://code.wireshark.org/review/8783
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

NFSv4: Fix for Bug 10483

Bug: 10483
Change-Id: Ic0df7d92c6ec2da83ad02796a008f6512d7fdc9b
Reviewed-on: https://code.wireshark.org/review/8731
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Aruba ERM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: If29fce277b43d287ad9cea47477b19320831c943
Reviewed-on: https://code.wireshark.org/review/8830
Reviewed-by: Anders Broman <a.broman58@gmail.com>

PER: fix indent (use tabs)

Change-Id: I123960f475550b5e3cab9e6eb7eaa6d896fae557
Reviewed-on: https://code.wireshark.org/review/8815
Reviewed-by: Anders Broman <a.broman58@gmail.com>

THRIFT: fix function name typo

disscet -> dissect

Change-Id: I0cceaad616d0929a562df3e2ac1b567ffb9ead36
Reviewed-on: https://code.wireshark.org/review/8831
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Register http.unknown_header as an FT_STRING (rather than FT_BYTES).

This avoids assertions when the field is added with proto_tree_add_string*()
(some of which show up in the fuzzed capture in bug 11254).

Ping-Bug: 11254
Change-Id: Iaf02f59443da0cf279d65eed049122d4dfaf7bcd
Reviewed-on: https://code.wireshark.org/review/8829
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Add editor-modelines; Don't use tabwidth=4; Adjust whitespace.

Change-Id: I7c287b176002c48dee6ae44334ee9fad221b4cd3
Reviewed-on: https://code.wireshark.org/review/8816
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Eliminate proto_tree_add_text from some dissectors.

"file" dissectors are now rid of proto_tree_add_text.

Change-Id: I4e0f7248135e6ce194fcafde47e538db84b964aa
Reviewed-on: https://code.wireshark.org/review/8828
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

igmp: fix memleak

dissector_add_uint_range walks through ranges and then does not need the
range anymore. Discovered with `tshark -G fields` and GCC 5.1 + ASAN.

Change-Id: I76f98a6ccee6dbbecc1efb847c358bd6d010e1dc
Reviewed-on: https://code.wireshark.org/review/8825
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: Anders Broman <a.broman58@gmail.com>

Debugging printf.

The buildbot printed "expr: syntax error", presumably from this, but
that oh-so-descriptive error message doesn't indicate what the problem
is, and just about any string should be valid as the left-hand operand
of the : operator.

Change-Id: I1140522357b8df07e4183bf0eb8c5fa9fbe275e4
Reviewed-on: https://code.wireshark.org/review/8827
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Restore image/expert_ok.png, it is used by GTK+ UI

Change-Id: I22f414ca030dcb701c1b21808cd4356b7c291291
Reviewed-on: https://code.wireshark.org/review/8805
Reviewed-by: Gerald Combs <gerald@wireshark.org>

NCP: fix V519 warnings reported by PVS-Studio

The variable is assigned values twice successively. Perhaps this is a mistake.

Change-Id: I3b567626c6046be8898db70580e98b339c0c8c2a
Reviewed-on: https://code.wireshark.org/review/8819
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

PER: fix V593 warning reported by PVS-Studio

Consider reviewing the expression of the 'A = B == C' kind. The expression is calculated as following: 'A = (B == C)'.

Change-Id: I162a2d081a70cb39b326d3aa2dc4108f49962169
Reviewed-on: https://code.wireshark.org/review/8821
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

NDPS: fix V535 warnings reported by PVS-Studio

The variable 'ii' is being used for this loop and for the outer loop.

Change-Id: I3e6e0e390a646fac62fd46ebf9dcdc56070f7609
Reviewed-on: https://code.wireshark.org/review/8820
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

H248: fix V712 warning reported by PVS-Studio

Be advised that compiler may delete this cycle or make it infinity. Use volatile variable(s) or synchronization primitives to avoid this.

Change-Id: I39104ec09f4c12994d62ed23e7a0cc00829b1255
Reviewed-on: https://code.wireshark.org/review/8818
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

GSM Um: fix V695 warning found by PVS-Studio

Range intersections are possible within conditional expressions. Example: if (A > 0 && A < 5) { ... } else if (A > 3 && A < 9) { ... }.
E-GSM and R-GSM EARFCNs are overlapping, as seen in 3GPP TS 05.05.

Change-Id: I5b9be53ba85109a674b05ae16cd729557cec6318
Reviewed-on: https://code.wireshark.org/review/8817
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[Automatic update for 2015-06-07]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I8051df9353cdce000f3b76229df1b2bf7e6b0d57
Reviewed-on: https://code.wireshark.org/review/8811
Reviewed-by: Gerald Combs <gerald@wireshark.org>

ECP: fix V562 warning reported by PVS-Studio

It's odd to compare 0 or 1 with a value of 1: ((entries > 1)) == 1.

Change-Id: I6261389dddbbd7e60e98b8c351150d491f9cbddb
Reviewed-on: https://code.wireshark.org/review/8810
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

iax2_analysis.c: fix V610 warning reported by PVS-Studio

Unspecified behavior. Check the shift operator '>>'. The left operand '(- 1)' is negative.

Change-Id: Icdb999c2df0e7843086ec811ca4747876fbf2424
Reviewed-on: https://code.wireshark.org/review/8809
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

dwarf.c: fix V629 warning reported by PVS-Studio

Consider inspecting the '1 << shift' expression. Bit shifting of the 32-bit value with a subsequent expansion to the 64-bit type.

Change-Id: I9939f3c471fcbbb033bbd5f846b9e09e8b8fd125
Reviewed-on: https://code.wireshark.org/review/8808
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

airpdcap: fix V512 warning reported by PVS-Studio

A call of the 'memcpy' function will lead to the '& tmp_key' buffer becoming out of range.

Change-Id: I615a6c3e0dab8cfc2d240b6b39cff387e0689f35
Reviewed-on: https://code.wireshark.org/review/8796
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

NFS: do not use reported remaining length as the backing length

Otherwise it could throw an exception if captured length < reported length

Change-Id: Ia9eb2778dbfebc1865a0040020a62ba20882b482
Reviewed-on: https://code.wireshark.org/review/8804
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

nfs: Git rid of deprecated tvb_length,tvb_length_remaining

Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Change-Id: I413a77903c8a56cb722e38ff9f64cf3d9c668ed8
Reviewed-on: https://code.wireshark.org/review/8801
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Don't initialize a variable if the first thing we do is set it.

Change-Id: I14e8a15fdea1526c1c4bd2a0f19925ff41c15608
Reviewed-on: https://code.wireshark.org/review/8800
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Use %zu, not %zd, to print a size_t value (%zd would be for ssize_t).

Change-Id: I3aee7028cc43ca487492b0c5c6872be5c52d1a80
Reviewed-on: https://code.wireshark.org/review/8799
Reviewed-by: Guy Harris <guy@alum.mit.edu>

ZVT: call zvt_set_addresses() for each apdu

the pinfo parameter is not unused btw

Change-Id: Id038979cb64e858aa0b7b44ca8c6e3d4b7d2d05e
Reviewed-on: https://code.wireshark.org/review/8798
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

ZVT: match requests and responses

Change-Id: Idc6fc8fb21ee2e096e92e590c9b27c8363fced4f
Reviewed-on: https://code.wireshark.org/review/8797
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

ui/follow: fix The 'find_addr[UDP_STREAM]' variable is assigned values twice successively. Perhaps this is a mistake. Found by PVS Studio (V519)

Yes, there is a mistake !

Change-Id: I6c6c67300c0e05d3ede00be27f675cc8b15bb439
Reviewed-on: https://code.wireshark.org/review/8794
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

ISAKMP: fix dissection when building with libgcrypt

Regression introduced in gb5b3a6b

Change-Id: I26b9d703a40ca92703fd3e2a749386996667ea4c
Reviewed-on: https://code.wireshark.org/review/8795
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

SKYPE: fix The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence found by PVS Studio (V517).

Yes, there is a bug ! :-)

Change-Id: I16319e6441575b9d7b702e6b23f7a7996ef85523
Reviewed-on: https://code.wireshark.org/review/8793
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

SMB2: There are identical sub-expressions to the left and to the right of the '&&' operator: si && si->saved && si->saved found by PVS Studio (V501)

Change-Id: I9323ee98bd0f4b9b6d8c6921e99d32ad62a5f18f
Reviewed-on: https://code.wireshark.org/review/8791
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

SCSI: There are identical sub-expressions 'tvb_reported_length_remaining(tvb, offset)' to the left and to the right of the '!=' operator found by PVS Studio (V501)

Change-Id: Iaf7ea99e983d3b42dedf2620250dec0f3d68f937
Reviewed-on: https://code.wireshark.org/review/8790
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

DCERPC: There are identical sub-expressions 'tvb_reported_length(tvb)' to the left and to the right of the '==' operator found by PVS Studio (V501)

Change-Id: I6cd745d07c89a5fa08ef976bab406f96cdae2881
Reviewed-on: https://code.wireshark.org/review/8789
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

DCC: fix There are identical sub-expressions 'tvb_get_guint8(tvb, offset + 4)' to the left and to the right of the '|' operator found by PVS Studio (V501)

Change-Id: I8c71ee5b0c07f7ee9a4b64fee4ac226918ed4307
Reviewed-on: https://code.wireshark.org/review/8788
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

BER: fix There are identical sub-expressions 'tvb_reported_length_remaining(tvb, offset)' to the left and to the right of the '==' operator found by PVS Studio (V501)

Change-Id: I9e462461c66f2f3338a059b64dbc28682df94ae2
Reviewed-on: https://code.wireshark.org/review/8787
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

ISAKMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I06d09d5d0d54c96e18d9b423999cb309559612dd
Reviewed-on: https://code.wireshark.org/review/8784
Reviewed-by: Anders Broman <a.broman58@gmail.com>

IEEE 802.11: Add a option for disable FCS check

Bug:11205
Change-Id: Ia3bc63dbb1504381b58f9e31b56412574ec96f4e
Reviewed-on: https://code.wireshark.org/review/8675
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>

Aruba ERM: Use decode AS for decode Aruba ERM Type..

Change-Id: I4c0813a273e88b16dcad7996dc1dcaaac3d01944
Reviewed-on: https://code.wireshark.org/review/8712
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>

Aruba ERM: Fix FCS for Type 1 (PEEK)

Type 1 is Peek type (using Peek dissector)
Peek dissector is also update for Cisco AP, Pass info to peek dissector it is "Aruba PEEK" (with buggy FCS)

Add also check of signal value (when signal strength = 100%) it is a TX packet and there is no FCS

Bug:11204

Change-Id: I435e0e3275bc0a03fa534e49e86251114f568040
Reviewed-on: https://code.wireshark.org/review/8710
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Aruba ERM: Fix FCS for Type 3

Add a check of signal value (when signal strength = 100%) it is a TX packet and there is no FCS
Only work for Type3 (no signal information on Type 0)

For type 0, Always display the FCS

Bug:11204
Change-Id: I837f8c01c0d0284ecb218b6b03fa9ac025fac5f2
Reviewed-on: https://code.wireshark.org/review/8569
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

TCP: Add (generated) field with first letter of TCP Flags

from help TCP Troubleshooter
Based on http://blog.didierstevens.com/2014/04/28/tcp-flags-for-wireshark/

Change-Id: I115717f738a77dd1b22cefa8f646bcdbe9884ec2
Reviewed-on: https://code.wireshark.org/review/8733
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>

Print unsigned long values with %lu, not %ld.

Change-Id: Ic437f5ec918c1cd4d39eb27e0a4fafb2a2f4b244
Reviewed-on: https://code.wireshark.org/review/8782
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Clean up stats_tree_presentation.

Remove some unused struct members and accompanying callbacks.

Change-Id: I64d32ddf886038e8f19bc3f88e86c8d7578db648
Reviewed-on: https://code.wireshark.org/review/8779
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Qt: clear Go To Packet text box when opening it

Most of the time you intend to go to a new packet, not to go to the previously selected one.
This makes it consistent with all the editors I have used so far.

Change-Id: Ib0cde3c8361a8c3103dd05d622eaba4ee7deab78
Reviewed-on: https://code.wireshark.org/review/8772
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>

Fix a few issues reported by PVS-Studio

See http://www.viva64.com/en/b/0328/ for details

Change-Id: Ic9ddfd690b49401c96cb8a4a277c671f9824be31
Reviewed-on: https://code.wireshark.org/review/8775
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>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

GTK: fix a crash when switching a column to custom through 'Edit Column Details'

Bug: 11245
Change-Id: I269d4dc8bd1ec23e3e6be4c9432563b8e275c548
Reviewed-on: https://code.wireshark.org/review/8778
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>

Qt: Add the capture and display filter dialog.

Use a single overloaded dialog, similar to the GTK+ UI.

Change-Id: If85db14a7101770f115bef725f5145e0010c518d
Reviewed-on: https://code.wireshark.org/review/8776
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Don't include cfile.h.

Change-Id: I98bc0d02e23abd32796f15bf28ceef0b6ea56d42
Reviewed-on: https://code.wireshark.org/review/8777
Reviewed-by: Gerald Combs <gerald@wireshark.org>

BGP: MP (UN)REACH NLRI SAFI is 1 octet long

Break when remove proto_tree_add_text (g1307c2255f)

Change-Id: Id5512424180b4834c20fa5416499fc939c06d1ea
Reviewed-on: https://code.wireshark.org/review/8774
Reviewed-by: Anders Broman <a.broman58@gmail.com>

BGP: Add EVPN draft-rabadan-l2vpn-evpn-prefix-advertisement support

Bug: 11252
Change-Id: I125e3075125451d2cbeac6cc183977e73040887f
Reviewed-on: https://code.wireshark.org/review/8767
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

iSCSI: handle repetition of InitiatorTaskTag fore request / response tracking

Use a red-black tree instead of a hash map so as to take he current frame number into account
Only insert entries in the red-black tree on first pass

Bug: 11250
Change-Id: Ic6e4a5e4f3cd4a22c2df0b8851c6651695648fa8
Reviewed-on: https://code.wireshark.org/review/8763
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>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Add dissector for the Aeron protocol.

Bug: 11164

Change-Id: I7ed6a3fd18aaadfc9b7b9619b1035206e86f46d6
Reviewed-on: https://code.wireshark.org/review/8240
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

ZVT: start dissecting the tlv container

Change-Id: I555e4f487fb5aafa61dabfcab784dad5e71510ec
Reviewed-on: https://code.wireshark.org/review/8769
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

DVB-CI: minor cleanup

tvb_length -> tvb_captured_length
copyright ... - 2015

Change-Id: Id3043725edda2b59c06d17de41c8dfc8ea4ae11c
Reviewed-on: https://code.wireshark.org/review/8768
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

Fix decryption test suite on Windows

Change-Id: Ib8207d56a7e064855ce1444c927913c9c9258788
Reviewed-on: https://code.wireshark.org/review/8766
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Ensure that run_and_catch_crashes has UNIX/POSIX line endings

Change-Id: If7b5047c15c747ac306960003c60a3ccd35f3e51
Reviewed-on: https://code.wireshark.org/review/8764
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

SSL: Add support for private key password when decrypting
SSL traffic from tshark with -o ssl.keys_list.

For example, as used in a new test also added in this commit:

-o "ssl.keys_list: 127.0.0.1,9131,http,$TEST_KEYS_DIR/key.p12,WebAS"

Change-Id: Ia6960fa4ae88182277f6d22d84ec9170ea74d54e
Reviewed-on: https://code.wireshark.org/review/8746
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>