metze/wireshark/wip.git
8 years agotshark: add ability to display streams in EBCDIC
Pascal Quantin [Mon, 8 Jun 2015 19:24:22 +0000 (21:24 +0200)]
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>
8 years agotap-macltestat.c: fix some V523 warnings reported by PVS-Studio
Pascal Quantin [Mon, 8 Jun 2015 20:48:05 +0000 (22:48 +0200)]
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>
8 years agoSMB: fix a V595 warning reported by PVS-Studio
Pascal Quantin [Mon, 8 Jun 2015 20:46:49 +0000 (22:46 +0200)]
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>
8 years agoLBMC: fix Truncation of constant value -16. The value range of unsigned char type...
Alexis La Goutte [Sat, 6 Jun 2015 13:32:07 +0000 (15:32 +0200)]
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>
8 years agoAdd TapParameterDialog.
Gerald Combs [Mon, 8 Jun 2015 18:33:16 +0000 (11:33 -0700)]
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>
8 years agoRevert "NFSv4: Fix for Bug 10483"
Cal Turney [Mon, 8 Jun 2015 19:18:32 +0000 (19:18 +0000)]
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>
8 years agoaeron: fix infinite loop
Evan Huus [Mon, 8 Jun 2015 14:07:43 +0000 (10:07 -0400)]
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>
8 years agoPMPROXY: check that pointer is not NULL before doing a strlen
Pascal Quantin [Mon, 8 Jun 2015 14:09:29 +0000 (16:09 +0200)]
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>
8 years agoAMQP: fix The 'format_name' variable is assigned to itself found by PVS Studio (V570)
Alexis La Goutte [Sat, 6 Jun 2015 12:44:58 +0000 (14:44 +0200)]
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>
8 years agoPrint "and greater" instead of a ten digit number.
Gerald Combs [Mon, 8 Jun 2015 15:39:02 +0000 (08:39 -0700)]
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>
8 years agotcp: simplify tcp.flags.str, fix off-by-one
Peter Wu [Sun, 7 Jun 2015 22:10:21 +0000 (00:10 +0200)]
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>
8 years agoProfinet: OEM Device ID is added
Birol Capa [Mon, 8 Jun 2015 06:19:52 +0000 (09:19 +0300)]
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>
8 years agorpc: Support IB transport
Slava Shwartsman [Wed, 3 Jun 2015 08:36:56 +0000 (11:36 +0300)]
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>
8 years agoGTPv2: fix indent (use 4 spaces)
Alexis La Goutte [Mon, 8 Jun 2015 10:23:34 +0000 (12:23 +0200)]
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>
8 years agoFix MSCV 2015RC Warning in_cksum.c(92): warning C4311: 'type cast':
Anders [Mon, 8 Jun 2015 07:57:35 +0000 (09:57 +0200)]
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>
8 years agoBGP: fix an infinite loop when finding an invalid length in EVPN NLRI Route Type...
Pascal Quantin [Mon, 8 Jun 2015 09:57:36 +0000 (11:57 +0200)]
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>
8 years ago[GTPv2] Throttling Delay unit values are not the same as the timer values,
Anders [Mon, 8 Jun 2015 08:10:00 +0000 (10:10 +0200)]
[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>
8 years agoUpdate how we search for Lua with pkg-config.
Jeff Morriss [Sat, 6 Jun 2015 02:04:29 +0000 (22:04 -0400)]
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>
8 years agoNFSv4: Fix for Bug 10483
cturney [Wed, 3 Jun 2015 03:06:58 +0000 (23:06 -0400)]
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>
8 years agoAruba ERM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 8 Jun 2015 06:00:11 +0000 (08:00 +0200)]
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>
8 years agoPER: fix indent (use tabs)
Alexis La Goutte [Sun, 7 Jun 2015 17:50:42 +0000 (19:50 +0200)]
PER: fix indent (use tabs)

Change-Id: I123960f475550b5e3cab9e6eb7eaa6d896fae557
Reviewed-on: https://code.wireshark.org/review/8815
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoTHRIFT: fix function name typo
Alexis La Goutte [Mon, 8 Jun 2015 06:06:44 +0000 (08:06 +0200)]
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>
8 years agoRegister http.unknown_header as an FT_STRING (rather than FT_BYTES).
Jeff Morriss [Mon, 8 Jun 2015 01:40:20 +0000 (21:40 -0400)]
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>
8 years agoAdd editor-modelines; Don't use tabwidth=4; Adjust whitespace.
Bill Meier [Sun, 7 Jun 2015 17:46:59 +0000 (13:46 -0400)]
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>
8 years agoEliminate proto_tree_add_text from some dissectors.
Michael Mann [Sun, 7 Jun 2015 03:01:39 +0000 (23:01 -0400)]
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>
8 years agoigmp: fix memleak
Peter Wu [Sun, 7 Jun 2015 21:21:14 +0000 (23:21 +0200)]
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>
8 years agoDebugging printf.
Guy Harris [Mon, 8 Jun 2015 01:09:47 +0000 (18:09 -0700)]
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>
8 years agoRestore image/expert_ok.png, it is used by GTK+ UI
Balint Reczey [Sun, 7 Jun 2015 01:34:22 +0000 (03:34 +0200)]
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>
8 years agoNCP: fix V519 warnings reported by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 17:40:58 +0000 (19:40 +0200)]
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>
8 years agoPER: fix V593 warning reported by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 18:47:11 +0000 (20:47 +0200)]
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>
8 years agoNDPS: fix V535 warnings reported by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 18:39:09 +0000 (20:39 +0200)]
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>
8 years agoH248: fix V712 warning reported by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 16:03:25 +0000 (18:03 +0200)]
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>
8 years agoGSM Um: fix V695 warning found by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 15:47:25 +0000 (17:47 +0200)]
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>
8 years ago[Automatic update for 2015-06-07]
Gerald Combs [Sun, 7 Jun 2015 15:08:43 +0000 (08:08 -0700)]
[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>
8 years agoECP: fix V562 warning reported by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 14:16:37 +0000 (16:16 +0200)]
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>
8 years agoiax2_analysis.c: fix V610 warning reported by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 14:01:30 +0000 (16:01 +0200)]
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>
8 years agodwarf.c: fix V629 warning reported by PVS-Studio
Pascal Quantin [Sun, 7 Jun 2015 13:08:18 +0000 (15:08 +0200)]
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>
8 years agoairpdcap: fix V512 warning reported by PVS-Studio
Pascal Quantin [Sat, 6 Jun 2015 17:29:21 +0000 (19:29 +0200)]
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>
8 years agoNFS: do not use reported remaining length as the backing length
Pascal Quantin [Sun, 7 Jun 2015 10:04:28 +0000 (12:04 +0200)]
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>
8 years agonfs: Git rid of deprecated tvb_length,tvb_length_remaining
Tom Haynes [Sat, 6 Jun 2015 21:53:01 +0000 (14:53 -0700)]
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>
8 years agoDon't initialize a variable if the first thing we do is set it.
Guy Harris [Sat, 6 Jun 2015 19:29:24 +0000 (12:29 -0700)]
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>
8 years agoUse %zu, not %zd, to print a size_t value (%zd would be for ssize_t).
Guy Harris [Sat, 6 Jun 2015 19:19:26 +0000 (12:19 -0700)]
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>
8 years agoZVT: call zvt_set_addresses() for each apdu
Martin Kaiser [Mon, 1 Jun 2015 05:53:45 +0000 (07:53 +0200)]
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>
8 years agoZVT: match requests and responses
Martin Kaiser [Sun, 31 May 2015 17:02:29 +0000 (19:02 +0200)]
ZVT: match requests and responses

Change-Id: Idc6fc8fb21ee2e096e92e590c9b27c8363fced4f
Reviewed-on: https://code.wireshark.org/review/8797
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years agoui/follow: fix The 'find_addr[UDP_STREAM]' variable is assigned values twice successi...
Alexis La Goutte [Sat, 6 Jun 2015 14:18:41 +0000 (16:18 +0200)]
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>
8 years agoISAKMP: fix dissection when building with libgcrypt
Pascal Quantin [Sat, 6 Jun 2015 15:03:30 +0000 (17:03 +0200)]
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>
8 years agoSKYPE: fix The use of 'if (A) {...} else if (A) {...}' pattern was detected. There...
Alexis La Goutte [Sat, 6 Jun 2015 14:01:51 +0000 (16:01 +0200)]
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>
8 years agoSMB2: There are identical sub-expressions to the left and to the right of the '&...
Alexis La Goutte [Sat, 6 Jun 2015 13:29:01 +0000 (15:29 +0200)]
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>
8 years agoSCSI: There are identical sub-expressions 'tvb_reported_length_remaining(tvb, offset...
Alexis La Goutte [Sat, 6 Jun 2015 13:19:44 +0000 (15:19 +0200)]
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>
8 years agoDCERPC: There are identical sub-expressions 'tvb_reported_length(tvb)' to the left...
Alexis La Goutte [Sat, 6 Jun 2015 13:17:28 +0000 (15:17 +0200)]
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>
8 years agoDCC: fix There are identical sub-expressions 'tvb_get_guint8(tvb, offset + 4)' to...
Alexis La Goutte [Sat, 6 Jun 2015 13:13:53 +0000 (15:13 +0200)]
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>
8 years agoBER: fix There are identical sub-expressions 'tvb_reported_length_remaining(tvb,...
Alexis La Goutte [Sat, 6 Jun 2015 13:12:55 +0000 (15:12 +0200)]
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>
8 years agoISAKMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sat, 6 Jun 2015 10:35:16 +0000 (12:35 +0200)]
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>
8 years agoIEEE 802.11: Add a option for disable FCS check
Alexis La Goutte [Thu, 28 May 2015 17:44:21 +0000 (19:44 +0200)]
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>
8 years agoAruba ERM: Use decode AS for decode Aruba ERM Type..
Alexis La Goutte [Sun, 31 May 2015 16:53:45 +0000 (18:53 +0200)]
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>
8 years agoAruba ERM: Fix FCS for Type 1 (PEEK)
Alexis La Goutte [Sun, 31 May 2015 15:48:55 +0000 (17:48 +0200)]
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>
8 years agoAruba ERM: Fix FCS for Type 3
Alexis La Goutte [Thu, 21 May 2015 11:51:23 +0000 (13:51 +0200)]
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>
8 years agoTCP: Add (generated) field with first letter of TCP Flags
Alexis La Goutte [Tue, 2 Jun 2015 09:36:43 +0000 (11:36 +0200)]
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>
8 years agoPrint unsigned long values with %lu, not %ld.
Guy Harris [Sat, 6 Jun 2015 01:39:41 +0000 (18:39 -0700)]
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>
8 years agoClean up stats_tree_presentation.
Gerald Combs [Fri, 5 Jun 2015 20:44:42 +0000 (13:44 -0700)]
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>
8 years agoQt: clear Go To Packet text box when opening it
Pascal Quantin [Fri, 5 Jun 2015 08:06:16 +0000 (10:06 +0200)]
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>
8 years agoFix a few issues reported by PVS-Studio
Pascal Quantin [Fri, 5 Jun 2015 13:43:10 +0000 (15:43 +0200)]
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>
8 years agoGTK: fix a crash when switching a column to custom through 'Edit Column Details'
Pascal Quantin [Fri, 5 Jun 2015 19:08:31 +0000 (21:08 +0200)]
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>
8 years agoQt: Add the capture and display filter dialog.
Gerald Combs [Wed, 3 Jun 2015 23:26:00 +0000 (16:26 -0700)]
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>
8 years agoDon't include cfile.h.
Gerald Combs [Fri, 5 Jun 2015 18:29:49 +0000 (11:29 -0700)]
Don't include cfile.h.

Change-Id: I98bc0d02e23abd32796f15bf28ceef0b6ea56d42
Reviewed-on: https://code.wireshark.org/review/8777
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years agoBGP: MP (UN)REACH NLRI SAFI is 1 octet long
Alexis La Goutte [Fri, 5 Jun 2015 10:34:13 +0000 (12:34 +0200)]
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>
8 years agoBGP: Add EVPN draft-rabadan-l2vpn-evpn-prefix-advertisement support
Matthieu Texier [Thu, 4 Jun 2015 11:23:14 +0000 (13:23 +0200)]
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>
8 years agoiSCSI: handle repetition of InitiatorTaskTag fore request / response tracking
Pascal Quantin [Thu, 4 Jun 2015 19:54:44 +0000 (21:54 +0200)]
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>
8 years agoAdd dissector for the Aeron protocol.
David Ameiss [Mon, 2 Mar 2015 16:42:44 +0000 (10:42 -0600)]
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>
8 years agoZVT: start dissecting the tlv container
Martin Kaiser [Fri, 17 Apr 2015 17:14:13 +0000 (19:14 +0200)]
ZVT: start dissecting the tlv container

Change-Id: I555e4f487fb5aafa61dabfcab784dad5e71510ec
Reviewed-on: https://code.wireshark.org/review/8769
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
8 years agoDVB-CI: minor cleanup
Martin Kaiser [Sun, 31 May 2015 16:31:24 +0000 (18:31 +0200)]
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>
8 years agoFix decryption test suite on Windows
Pascal Quantin [Thu, 4 Jun 2015 21:32:14 +0000 (23:32 +0200)]
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>
8 years agoEnsure that run_and_catch_crashes has UNIX/POSIX line endings
Pascal Quantin [Thu, 4 Jun 2015 21:00:32 +0000 (23:00 +0200)]
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>
8 years agoSSL: Add support for private key password when decrypting
Kevin Grigorenko [Wed, 3 Jun 2015 19:42:51 +0000 (14:42 -0500)]
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>
8 years ago[MSVC 2015] Try to fix warinings turned errors.
Anders [Thu, 4 Jun 2015 14:12:04 +0000 (16:12 +0200)]
[MSVC 2015] Try to fix warinings turned errors.

Change-Id: Ife5aba55d6953fbd3874095f2e469a844ca8ef2e
Reviewed-on: https://code.wireshark.org/review/8762
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>
8 years agopacket-pmproxy.c:94: warning: implicit conversion shortens 64-bit value
Anders [Thu, 4 Jun 2015 13:37:53 +0000 (15:37 +0200)]
packet-pmproxy.c:94: warning: implicit conversion shortens 64-bit value
into a 32-bit value

Change-Id: Ib741ad1c4f237ca921c01c86a521a238cdf25e8f
Reviewed-on: https://code.wireshark.org/review/8761
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years ago[MSVC2015] TRy to fix Warnings turned errors.
Anders [Thu, 4 Jun 2015 12:28:40 +0000 (14:28 +0200)]
[MSVC2015] TRy to fix Warnings turned errors.

Change-Id: I1156e66daad84004f4f7acae0175fcbb475db71a
Reviewed-on: https://code.wireshark.org/review/8760
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoProfinet: Add Fiber Optic Diagnosis Info.
Birol Capa [Thu, 4 Jun 2015 04:35:35 +0000 (07:35 +0300)]
Profinet: Add Fiber Optic Diagnosis Info.

This make reading fiber optic diagnosis data possible.

Change-Id: I90b49443ffa1b69912d37cbf7a751328eec9d590
Reviewed-on: https://code.wireshark.org/review/8750
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
8 years agoP1: fix request for implicit conversion from 'gpointer' to 'struct p1_address_ctx_t...
Alexis La Goutte [Thu, 4 Jun 2015 09:55:32 +0000 (11:55 +0200)]
P1: fix  request for implicit conversion from 'gpointer' to 'struct p1_address_ctx_t *' not permitted in C++ [-Wc++-compat]

Change-Id: I43364dda21abe3281fbd15ad953232093bb1fffa
Reviewed-on: https://code.wireshark.org/review/8756
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 years agortp/pm proxy: fix implicit conversion shortens 64-bit value into a 32-bit value
Alexis La Goutte [Thu, 4 Jun 2015 09:01:51 +0000 (11:01 +0200)]
rtp/pm proxy: fix implicit conversion shortens 64-bit value into a 32-bit value

packet-pmproxy.c:93: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-pmproxy.c:94: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-pmproxy.c:95: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-rtpproxy.c:831: warning: implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: Ibf1491c1e56dfe6684fe2fe67edc1a721d5de56f
Reviewed-on: https://code.wireshark.org/review/8753
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoISAKMP: fix build about unused variable
Alexis La Goutte [Thu, 4 Jun 2015 09:01:24 +0000 (11:01 +0200)]
ISAKMP: fix build about unused variable

Change-Id: Id55eeb6d4c29088dec97b270aca61f8c5d777a46
Reviewed-on: https://code.wireshark.org/review/8752
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoDissection support for pmproxy
Ryan Doyle [Sun, 31 May 2015 03:48:44 +0000 (13:48 +1000)]
Dissection support for pmproxy

Implements dissection for the Performance Co-Pilot proxy protocol. Its a
simple protocol that exchanges host and port information and then passes
all traffic via the usual PCP protocol.

Change-Id: I54fbf6b7755b7b1c60e0e1696ac9c4f0d98d8fe7
Reviewed-on: https://code.wireshark.org/review/8704
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>
8 years ago[RTPproxy] Simplify positive reply parsing and minor cleanups
Peter Lemenkov [Fri, 22 May 2015 15:49:55 +0000 (18:49 +0300)]
[RTPproxy] Simplify positive reply parsing and minor cleanups

* Merge both 'positive reply' and 'version ack' processing into one block.
* Also use realsize where possible instead of recalculating packet's size
again.
* Add a bit more comments.
* Remove some 'magic' numbers. Use actual string sizes instead.
* Skip trailing zeroes inserted by some old SIP-servers.

Change-Id: Ie66aa4d6e807a1f351b62d36333301fdec1550fa
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8738
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>
8 years agoEliminate proto_tree_add_text from a few dissectors.
Michael Mann [Thu, 4 Jun 2015 03:18:42 +0000 (23:18 -0400)]
Eliminate proto_tree_add_text from a few dissectors.

Change-Id: Ia6b62fae76ae76a2859ec47229e1c299bddb5a31
Reviewed-on: https://code.wireshark.org/review/8749
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>
8 years agoWCCP: Fix up storing and decoding of IP addresses.
Jeff Morriss [Thu, 4 Jun 2015 02:16:37 +0000 (22:16 -0400)]
WCCP: Fix up storing and decoding of IP addresses.

Try to decode as many IP addresses as we can, even if they don't fit in the
table we store them in.

Only add IP addresses in the table once.  We could theoretically reallocate
the table but the original code seems to assume the addresses should (in
non-fuzzed captures) only show up once per PDU.  This part of the change fixes
the fuzz failure.

Bug: 11153
Change-Id: I56b9854ac1342080c9f32699a3f97750fa335696
Reviewed-on: https://code.wireshark.org/review/8748
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoMIME Multipart: fix display of the last IMF field
Pascal Quantin [Wed, 3 Jun 2015 22:05:52 +0000 (00:05 +0200)]
MIME Multipart: fix display of the last IMF field

Regression was introduced in g23f0e16

Bug: 11249
Change-Id: I2822a4452d3cdf2e53e5f3f1f3034e758fec129b
Reviewed-on: https://code.wireshark.org/review/8747
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>
8 years agoUse the GPOINTER_TO UINT macro rather than trying to do the casts
Anders [Wed, 3 Jun 2015 14:14:42 +0000 (16:14 +0200)]
Use the GPOINTER_TO UINT macro rather than trying to do the casts
manually. This makes MSVC 2015 happy.

Change-Id: I50ebcb5860863cd6e212bb0964998292a46075f5
Reviewed-on: https://code.wireshark.org/review/8744
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>
8 years agoUpdate mobile network codes of South Korean mobile networks.
Shinjo Park [Wed, 3 Jun 2015 15:21:26 +0000 (17:21 +0200)]
Update mobile network codes of South Korean mobile networks.

Change-Id: I4f988da98846ebeeba47ace270f64911baaca0b7
Reviewed-on: https://code.wireshark.org/review/8745
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoIS-IS (LSP) Add Shared Risk Link Group (SRLG) clv (138)
Alexis La Goutte [Wed, 3 Jun 2015 06:55:37 +0000 (08:55 +0200)]
IS-IS (LSP) Add Shared Risk Link Group (SRLG) clv (138)

Bug:11246
Change-Id: I303de72cda8e667dcd3ccd1af3f2989123718544
Reviewed-on: https://code.wireshark.org/review/8743
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>
8 years agoNetscaler: Fix issue where packets were lost when selected packets were exported
anilkumar911 [Thu, 28 May 2015 09:08:56 +0000 (14:38 +0530)]
Netscaler: Fix issue where packets were lost when selected packets were exported

Only this issue with a netscaler trace file

Bug: 11248
Change-Id: I2bc2cae5c988eeff7bdd08471bf421faafcd4e73
Reviewed-on: https://code.wireshark.org/review/8672
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 years agoopenSAFETY: Fix false-positive
Roland Knall [Tue, 2 Jun 2015 21:17:27 +0000 (23:17 +0200)]
openSAFETY: Fix false-positive

 - The starting offset for a consecutive frame search was off by 1

Change-Id: Ife77f9823e7e6d9a6601dba9c4cca74984e4ed40
Reviewed-on: https://code.wireshark.org/review/8741
Reviewed-by: Roland Knall <rknall@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: Michael Mann <mmann78@netscape.net>
8 years agoG_STRUCT_OFFSET gives warnings turned errors with MSVC2015,
Anders [Tue, 2 Jun 2015 13:23:33 +0000 (15:23 +0200)]
G_STRUCT_OFFSET gives warnings turned errors with MSVC2015,
use offsetof if defined or define it ourselfs as done in other
places in our code base.

Change-Id: Ia1c72c9648336e93ba8c14d4bc0371d782835370
Reviewed-on: https://code.wireshark.org/review/8735
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>
8 years agoISAKMP: Don't complain about zero-length config attributes in request messages -...
Martin Mathieson [Tue, 2 Jun 2015 17:31:21 +0000 (18:31 +0100)]
ISAKMP: Don't complain about zero-length config attributes in request messages - this is expected

Change-Id: I1cedb7d84ca7e4c2af30405f5624a327fd796c86
Reviewed-on: https://code.wireshark.org/review/8739
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>
8 years agoFix OSX CMake warnings
Graham Bloice [Tue, 2 Jun 2015 21:11:56 +0000 (22:11 +0100)]
Fix OSX CMake warnings

Set the CMake policy for CMP0042 to old

Change-Id: I2b71e1d8d9b9b90ede11df1a7874a2360c3032c5
Reviewed-on: https://code.wireshark.org/review/8740
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoAdd the Display Filter Expression dialog.
Gerald Combs [Mon, 1 Jun 2015 23:29:17 +0000 (16:29 -0700)]
Add the Display Filter Expression dialog.

Changes from the GTK+ UI:
- The display filter is built on the fly with immediate syntax feedback.
- Slightly different layout.
- You can search for fields.

Make the plain SyntaxLineEdit a bit more plain.

Bug: 11128
Change-Id: I06a48cd7b9ba7b9dc193b0199540aede4eb62fa7
Reviewed-on: https://code.wireshark.org/review/8742
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 years ago[RTPproxy] Set column name to RTPProxy-ng
Peter Lemenkov [Thu, 21 May 2015 14:39:31 +0000 (17:39 +0300)]
[RTPproxy] Set column name to RTPProxy-ng

Set column name to RTPProxy-ng if a new protocol is used.

Change-Id: I8c79ad5426808ad6944060e9c12fa4ac1f02e432
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8737
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoRevert "MSVC 2015RC does not like the #defines using OFFSETOF replace them by absoulu...
Anders Broman [Tue, 2 Jun 2015 13:27:52 +0000 (13:27 +0000)]
Revert "MSVC 2015RC does not like the #defines using OFFSETOF replace them by absoulute numbers."

This reverts commit 0808f4c9584b309548996388aafde51820a68932.

Change-Id: I899cbeec86f34a00ded41040257e5de3ab537175
Reviewed-on: https://code.wireshark.org/review/8736
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoMSVC 2015RC does not like the #defines using OFFSETOF replace them by
Anders [Tue, 2 Jun 2015 11:35:10 +0000 (13:35 +0200)]
MSVC 2015RC does not like the #defines using OFFSETOF replace them by
absoulute numbers.

Change-Id: I1de97be98c06bee2d7ddca38496a72e93567cbcf
Reviewed-on: https://code.wireshark.org/review/8734
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 years agoISAKMP: do not try to defragment IKEv1 packets
Pascal Quantin [Mon, 1 Jun 2015 20:10:06 +0000 (22:10 +0200)]
ISAKMP: do not try to defragment IKEv1 packets

Bug: 11242
Change-Id: I289a5eeb056822299f6cb436047418aec785dca5
Reviewed-on: https://code.wireshark.org/review/8728
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: Martin Mathieson <martin.r.mathieson@googlemail.com>
8 years agogtk: Don't handle deprecation warnings as errors
Balint Reczey [Sun, 31 May 2015 20:34:59 +0000 (22:34 +0200)]
gtk: Don't handle deprecation warnings as errors

This fixes compilation with latest gdk-pixbuf. I plan rewriting
the code to drop deprecaated function usage in a different commit
and reverting this one.

Ping-Bug: 10750
Change-Id: I400e34e625b147a4858e73240602d75910c6eece
Reviewed-on: https://code.wireshark.org/review/8720
Reviewed-by: Anders Broman <a.broman58@gmail.com>