Commit Graph

58356 Commits

Author SHA1 Message Date
Pascal Quantin b30d7b1f77 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>
2015-06-08 17:50:54 +00:00
Alexis La Goutte a36ec5a0bb 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>
2015-06-08 17:33:58 +00:00
Gerald Combs 845a832fac 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>
2015-06-08 16:05:11 +00:00
Peter Wu 69dac89280 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>
2015-06-08 13:05:17 +00:00
Birol Capa 09e3505701 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>
2015-06-08 13:01:24 +00:00
Slava Shwartsman 951ddf736e 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>
2015-06-08 11:15:46 +00:00
Alexis La Goutte 7948378260 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>
2015-06-08 11:14:49 +00:00
Anders 049fc494d0 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>
2015-06-08 11:13:23 +00:00
Pascal Quantin 9223567993 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>
2015-06-08 10:04:04 +00:00
Anders fa64878f8f [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>
2015-06-08 08:13:38 +00:00
Jeff Morriss 032ad5a7aa 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>
2015-06-08 08:13:09 +00:00
cturney da1766e987 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>
2015-06-08 07:30:54 +00:00
Alexis La Goutte 5ce025c124 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>
2015-06-08 07:28:54 +00:00
Alexis La Goutte 71b6be7f87 PER: fix indent (use tabs)
Change-Id: I123960f475550b5e3cab9e6eb7eaa6d896fae557
Reviewed-on: https://code.wireshark.org/review/8815
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-08 07:28:07 +00:00
Alexis La Goutte a942df9eb9 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>
2015-06-08 07:25:54 +00:00
Jeff Morriss 0cec384fde 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>
2015-06-08 04:51:04 +00:00
Bill Meier f95db69aa1 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>
2015-06-08 04:47:48 +00:00
Michael Mann 639fd7d60d 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>
2015-06-08 04:34:00 +00:00
Peter Wu 2c56c6fa76 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>
2015-06-08 04:21:48 +00:00
Guy Harris 5472e4d6e9 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>
2015-06-08 01:10:28 +00:00
Balint Reczey 2d757b8a56 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>
2015-06-07 20:52:33 +00:00
Pascal Quantin acbc4181be 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>
2015-06-07 19:12:23 +00:00
Pascal Quantin c100e1cf52 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>
2015-06-07 19:00:33 +00:00
Pascal Quantin ae027ecd7c 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>
2015-06-07 19:00:16 +00:00
Pascal Quantin 093aebf5ee 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>
2015-06-07 18:59:49 +00:00
Pascal Quantin d48fe0d2e4 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>
2015-06-07 18:59:22 +00:00
Gerald Combs 7fc302e7a7 [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>
2015-06-07 15:08:49 +00:00
Pascal Quantin cefe9d3c26 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>
2015-06-07 14:35:27 +00:00
Pascal Quantin 83351a9996 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>
2015-06-07 14:35:07 +00:00
Pascal Quantin 6e58ae3dee 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>
2015-06-07 14:34:36 +00:00
Pascal Quantin 99d56fb0f8 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>
2015-06-07 13:07:33 +00:00
Pascal Quantin e9c94731f6 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>
2015-06-07 10:41:53 +00:00
Tom Haynes ad0b29c44b 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>
2015-06-07 06:37:58 +00:00
Guy Harris 8d7e0fc703 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>
2015-06-06 19:29:47 +00:00
Guy Harris b950c0849c 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>
2015-06-06 19:20:19 +00:00
Martin Kaiser cd2e901fd9 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>
2015-06-06 18:03:36 +00:00
Martin Kaiser 6b65437f44 ZVT: match requests and responses
Change-Id: Idc6fc8fb21ee2e096e92e590c9b27c8363fced4f
Reviewed-on: https://code.wireshark.org/review/8797
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-06 17:49:09 +00:00
Alexis La Goutte da8c79dc7c 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>
2015-06-06 17:11:45 +00:00
Pascal Quantin be701f6b98 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>
2015-06-06 15:06:08 +00:00
Alexis La Goutte ac9f248d81 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>
2015-06-06 14:22:37 +00:00
Alexis La Goutte 027b0cb9ca 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>
2015-06-06 14:07:48 +00:00
Alexis La Goutte 3cc1178bbf 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>
2015-06-06 14:06:39 +00:00
Alexis La Goutte 31f5e79d20 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>
2015-06-06 14:05:45 +00:00
Alexis La Goutte 6c2de574fb 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>
2015-06-06 14:04:34 +00:00
Alexis La Goutte 9d3e8f9ac5 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>
2015-06-06 14:03:54 +00:00
Alexis La Goutte b5b3a6b9af 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>
2015-06-06 11:52:33 +00:00
Alexis La Goutte 04f08471b3 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>
2015-06-06 09:48:06 +00:00
Alexis La Goutte ac51c091a9 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>
2015-06-06 09:47:58 +00:00
Alexis La Goutte 7e2e8ef04c 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>
2015-06-06 09:47:35 +00:00
Alexis La Goutte 8d46c411e9 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>
2015-06-06 09:46:00 +00:00