metze/wireshark/wip.git
7 years agoGSM A GM: use same spelling as the 3GPP specification
Pascal Quantin [Fri, 23 Dec 2016 08:34:42 +0000 (09:34 +0100)]
GSM A GM: use same spelling as the 3GPP specification

Change-Id: I706b64bb3875a15d8be0e486a03784e19ab5af23
Reviewed-on: https://code.wireshark.org/review/19392
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoInitialize the dissection options along with the other command-line options.
Guy Harris [Fri, 23 Dec 2016 03:29:46 +0000 (19:29 -0800)]
Initialize the dissection options along with the other command-line options.

Change-Id: I35ff8f36d12831d408666c3422444371a2ac0c25
Reviewed-on: https://code.wireshark.org/review/19391
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agopacket-rtp.c: Fix of decoding RTP over TCP
Jiri Novak [Thu, 22 Dec 2016 10:37:19 +0000 (11:37 +0100)]
packet-rtp.c: Fix of decoding RTP over TCP

During patch modification in https://code.wireshark.org/review/#/c/19293/ we made mistake :-(

Change-Id: I2ff65170dbcf3b5c4d27d6d7c629092d5080ed28
Reviewed-on: https://code.wireshark.org/review/19382
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoudpdump: set default value for payload
Dario Lombardo [Thu, 22 Dec 2016 10:43:05 +0000 (11:43 +0100)]
udpdump: set default value for payload

Change-Id: Iad8624cbb9102611f806cdcce152b8ed14ce4474
Reviewed-on: https://code.wireshark.org/review/19383
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoRPC: fix crash when using "Dissect unknown RPC program numbers" option
Pascal Quantin [Thu, 22 Dec 2016 14:14:47 +0000 (15:14 +0100)]
RPC: fix crash when using "Dissect unknown RPC program numbers" option

When using this option, rpc_prog_info_value structure is not fully initialized.
Depending on the memory allocator used, this can lead to a NULL pointer
dereference or an access to a random memory block.
Ensure that the structure if fully initialized and test pointer before
dereferencing it.

Bug: 13266
Change-Id: Ifdc54b31c8dd3b2b6220dbe9ee27272758ff60ca
Reviewed-on: https://code.wireshark.org/review/19385
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>
7 years agoQt: use references on tap_rtp_stat_t private members (CID 1397703 and 1397704)
Pascal Quantin [Thu, 22 Dec 2016 08:36:18 +0000 (09:36 +0100)]
Qt: use references on tap_rtp_stat_t private members (CID 1397703 and 1397704)

This should solve the "passing parameter statinfo of type "tap_rtp_stat_t"
(size 5040 bytes) by value" warnings reported by Coverity.

Change-Id: I327906f7925ab21a914b8a98ff8481a0af9f7a2f
Reviewed-on: https://code.wireshark.org/review/19380
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: Anders Broman <a.broman58@gmail.com>
7 years agoRTP: fix a possible NULL pointer dereference (CID 1397705 & 1397706)
Pascal Quantin [Thu, 22 Dec 2016 08:49:56 +0000 (09:49 +0100)]
RTP: fix a possible NULL pointer dereference (CID 1397705 & 1397706)

As those dissectors are registered by name, let's not make the assumption
that rtp_info is always present.

Change-Id: I959b8c71485471b3be4cd2e71a6d96c2d4b278ff
Reviewed-on: https://code.wireshark.org/review/19381
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>
7 years agoGtk: add initializers.
Dario Lombardo [Thu, 22 Dec 2016 08:28:05 +0000 (09:28 +0100)]
Gtk: add initializers.

As per coverity multiple CIDs.

Change-Id: I30b5a5e45de2fc9b3c563c56151bd33483c754cd
Reviewed-on: https://code.wireshark.org/review/19379
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
7 years agoRTSP dissector: Decode RTP/AVP/TCP and configure RTP session for it
Jiri Novak [Wed, 14 Dec 2016 21:55:05 +0000 (22:55 +0100)]
RTSP dissector: Decode RTP/AVP/TCP and configure RTP session for it

rtsp_create_conversation was modified significantly:
- ignore non response calls => process only the complete information
- distinguish between UDP, TCP and RTSP interlaced media
- supports ED137 recording with RTP/UDP or RTP/TCP

It was tested on many samples from bugzilla and from my library.
Tests noted in bug 13257

Bug: 13257
Change-Id: I054505bcb9334c3abfff6d61c18c9cb6d2a6d56e
Reviewed-on: https://code.wireshark.org/review/19341
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>
7 years agoGTK: fix Export Objects sub menu warning
Pascal Quantin [Wed, 21 Dec 2016 21:26:37 +0000 (22:26 +0100)]
GTK: fix Export Objects sub menu warning

Change-Id: I513fd643a8c4849462ee6c4b296d86d04517b3db
Reviewed-on: https://code.wireshark.org/review/19378
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>
7 years agoNAS EPS: upgrade dissector to v13.8.0
Pascal Quantin [Wed, 21 Dec 2016 20:46:02 +0000 (21:46 +0100)]
NAS EPS: upgrade dissector to v13.8.0

Change-Id: Ifad1fbd22984ad777278c7cc90622b205405cf1f
Reviewed-on: https://code.wireshark.org/review/19377
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>
7 years ago[rpm-build] Add an option to exclude extcap.
AndersBroman [Tue, 20 Dec 2016 12:22:15 +0000 (13:22 +0100)]
[rpm-build] Add an option to exclude extcap.

Change-Id: Ibe16ad31986818fcd6e1bfbcfdd38ecc7663dd39
Reviewed-on: https://code.wireshark.org/review/19360
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoCIP: More attribute updates
D. Ulis [Wed, 21 Dec 2016 15:13:53 +0000 (10:13 -0500)]
CIP: More attribute updates
1. CIP Safety: SERCOS Safety Network Number attribute should be 6 bytes. Don't just use all remaining bytes
2. Remove cip_byte_array type. The last remaining usage was #1 above and it really shouldn't be used in the future. Any attribute that would eat up all remaining bytes would have issues with Get Attribute List responses and Set Attribute List requests.
3. Optional Attribute List: Display the attribute name if known.
4. Port: Display Port Number name
5. Port: Associated Communication Objects attribute

Change-Id: I94d99bb1f07aa4b8c44949b2ffb5d75e72483459
Reviewed-on: https://code.wireshark.org/review/19374
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agopacket-rpcrdma: Fix Reply chunk selection size
Chuck Lever [Mon, 19 Dec 2016 19:59:39 +0000 (14:59 -0500)]
packet-rpcrdma: Fix Reply chunk selection size

When a Reply chunk is not present, selecting the "Reply chunk" in
the protocol tree should also select the four bytes of zeroes in
the header. This should work the same way as for the Read list and
Write list.

Change-Id: I0a9b7f927cad21e39189cfc1f2b619537ba26a30
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-on: https://code.wireshark.org/review/19376
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agodecoders(transum): fix redundant redeclaration of 'add_detected_tcp_svc’ [-Wredundant...
Alexis La Goutte [Wed, 21 Dec 2016 12:56:45 +0000 (13:56 +0100)]
decoders(transum): fix redundant redeclaration of 'add_detected_tcp_svc’ [-Wredundant-decls]

Change-Id: I70ccf182160086a4c04467eec214857a461a2869
Reviewed-on: https://code.wireshark.org/review/19373
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agotransum: fix no previous prototype for ‘proto_register_transum’ [-Wmissing-prototypes]
Alexis La Goutte [Wed, 21 Dec 2016 12:51:29 +0000 (13:51 +0100)]
transum: fix no previous prototype for ‘proto_register_transum’ [-Wmissing-prototypes]

the last one

Change-Id: I8b279d11b61645a19b0b356d52cf66eed0180700
Reviewed-on: https://code.wireshark.org/review/19372
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoLua: Fix some typos.
Stig Bjørlykke [Wed, 21 Dec 2016 11:46:15 +0000 (12:46 +0100)]
Lua: Fix some typos.

Change-Id: I4d1cf878245b03665207a500fb7593be1435c3d3
Reviewed-on: https://code.wireshark.org/review/19371
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agopacket-tns.c: add Version and Services parsing for SNS messages.
chinarulezzz [Wed, 21 Dec 2016 04:20:55 +0000 (06:20 +0200)]
packet-tns.c: add Version and Services parsing for SNS messages.

Tested with pcaps from SampleCaptures wiki.

Change-Id: I13656ec484f276024160c8994a6750704058b2db
Reviewed-on: https://code.wireshark.org/review/19367
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agotransum: fix no previous prototype for '...’ [-Wmissing-prototypes]
Alexis La Goutte [Wed, 21 Dec 2016 07:05:12 +0000 (08:05 +0100)]
transum: fix no previous prototype for '...’ [-Wmissing-prototypes]

Part 2...

Change-Id: Id219bd2b04de2003b5bfa4a33893d0310856275d
Reviewed-on: https://code.wireshark.org/review/19368
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>
7 years agogsm_abis_om2000: restore offset increment removed by g1643e37
Pascal Quantin [Wed, 21 Dec 2016 09:39:41 +0000 (10:39 +0100)]
gsm_abis_om2000: restore offset increment removed by g1643e37

Change-Id: I34666a74f8769c63ecc982bd034b2563ba0298ff
Reviewed-on: https://code.wireshark.org/review/19370
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>
7 years agogsmtap_log: fix no previous prototype for function 'proto_register_/reg_handoff_gsmta...
Alexis La Goutte [Wed, 21 Dec 2016 07:07:29 +0000 (08:07 +0100)]
gsmtap_log: fix no previous prototype for function 'proto_register_/reg_handoff_gsmtap_log' [-Wmissing-prototypes]

Change-Id: I5fbd79f056cff330dafbe57ea350768acd820b65
Reviewed-on: https://code.wireshark.org/review/19369
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>
7 years agopacket: duplicate short_name to fix UAF in wslua
Peter Wu [Wed, 21 Dec 2016 01:23:35 +0000 (02:23 +0100)]
packet: duplicate short_name to fix UAF in wslua

The "short_name" parameter of heur_dissector_add is defined as const
(and was assumed to be a string literal). This was no longer the case
though since a change in Lua where "short_name" is a dynamically
allocated string.

This "simple" fix clones the memory for internal use to avoid a
heap-use-after-free when heur_dissector_delete tries to access
"short_name".

An alternative option is to make Proto_register_heuristic track the
memory, but since there are multiple possible heuristics lists for a
protocol, the Proto (struct _wslua_field_t) structure is not
appropriate. A possible working alternative is to store the string into
lua_heur_dissectors_table_ref (replacing the value (function) by a tuple
{function,short_name}).

Change-Id: I6c6b393f4d304dd847e864da6ad17b54c8cd80e2
Fixes: v2.3.0rc0-1474-g7f2a838922 ("lua: Allow proto:register_heuristic to be used on multiple list names")
Reviewed-on: https://code.wireshark.org/review/19365
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Franklin Mathieu <snaipe@diacritic.io>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoX-Rite i1 Display Pro USB protocol dissector.
Etienne Dechamps [Sun, 23 Oct 2016 10:32:29 +0000 (11:32 +0100)]
X-Rite i1 Display Pro USB protocol dissector.

This commit introduces a new dissector aimed at decoding the USB
protocol used by X-Rite i1 Display Pro (and derivatives) colorimeter. It
is based on reverse engineering work by Graeme Gill from the ArgyllCMS
project.

Change-Id: Icdfd0c3f75499d0df4360c6eb6856078de30ba56
Reviewed-on: https://code.wireshark.org/review/18901
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoImprove Infiniband heuristic subdissection.
Michael Mann [Tue, 20 Dec 2016 13:58:49 +0000 (08:58 -0500)]
Improve Infiniband heuristic subdissection.

Add preference in Infiniband dissector to distinguish between
heuristic and non-heuristic dissection (that uses Decode As).
Remove all of the preferences in the Infiniband subdissectors that
tried to put in "manual" heuristics and direct users to just use
Decode As.  Most subdissectors still kept some basic heuristics in
their heuristic functions, but now also register with the Infiniband
dissector table for "manually" forcing dissection with Decode As.

Ping-Bug: 13259
Change-Id: I20d56eee38887664b439e52ec5f5b8f962c45ef1
Reviewed-on: https://code.wireshark.org/review/19362
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoMake EAPOL packet types into a dissector table.
Ethan Young [Sun, 18 Dec 2016 20:37:56 +0000 (15:37 -0500)]
Make EAPOL packet types into a dissector table.

This decouples EAPOL from the few dissectors it needs to call based
on packet type and moves registration to the dissectors themselves.

Change-Id: Ia8412fe33370f4aeece52c2c80cda7f140a950cf
Reviewed-on: https://code.wireshark.org/review/19328
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdd HomePNA dissector
Michael Mann [Fri, 9 Dec 2016 22:03:45 +0000 (17:03 -0500)]
Add HomePNA dissector

Ping-Bug: 12759
Change-Id: Ic4d47155168978541fb8c3670fcabaf3c35f8aad
Reviewed-on: https://code.wireshark.org/review/19187
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoICMP: fix typo
Alexis La Goutte [Tue, 20 Dec 2016 19:07:08 +0000 (20:07 +0100)]
ICMP: fix typo

Change-Id: Iffa10a3a14ec2ff32e51d92a1936d7e110a76bd4
Reviewed-on: https://code.wireshark.org/review/19364
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoICMP: fix indent (use always tab)
Alexis La Goutte [Tue, 20 Dec 2016 19:06:53 +0000 (20:06 +0100)]
ICMP: fix indent (use always tab)

Change-Id: I939bf83ef6f6385dbad642aeef38673862c04bf0
Reviewed-on: https://code.wireshark.org/review/19363
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoCast larger types to time_t
Your Name [Tue, 20 Dec 2016 03:05:36 +0000 (22:05 -0500)]
Cast larger types to time_t

Resolves truncation warnings on the x86 clang build

Change-Id: I14ebbe39b8235bd1b909c488c0402b77deb6dde1
Reviewed-on: https://code.wireshark.org/review/19354
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQt+Win32: Make software updates more friendly.
Gerald Combs [Tue, 13 Dec 2016 18:33:02 +0000 (10:33 -0800)]
Qt+Win32: Make software updates more friendly.

Add WinSparkle can_shutdown and shutdown_request callbacks which are
called prior to running the installer. Reject updates when we have
unsaved information. Add notes about possible improvements.

Ping-Bug: 9687
Ping-Bug: 12989
Change-Id: Ia126244b311417aa3105ea8136f186adc2745445
Reviewed-on: https://code.wireshark.org/review/19244
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agopacket-rtp.c: Fixed problem - when ED137 header was decoded with tshark, no ED137...
Jiri Novak [Tue, 20 Dec 2016 11:04:05 +0000 (12:04 +0100)]
packet-rtp.c: Fixed problem - when ED137 header was decoded with tshark, no ED137 headers were shown.

Change-Id: Ic072212497ff084778f74d19be294a5b8ff8cbd5
Reviewed-on: https://code.wireshark.org/review/19359
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>
7 years agoLua: Add string types and byte seperators support.
Stig Bjørlykke [Sun, 18 Dec 2016 18:03:44 +0000 (19:03 +0100)]
Lua: Add string types and byte seperators support.

Add handling of STR_ASCII and STR_UNICODE as base types for string
and stringz.  Add handling of SEP_DOT, SEP_DASH, SEP_COLON and
SEP_SPACE for bytes and uint_bytes.  Add SEP_NONE for completeness.

Change-Id: Ida46c215fee7ec7132ec91ab5dd6cb3de4628920
Reviewed-on: https://code.wireshark.org/review/19337
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agocmake,wslua,wsutil: load files from run/ instead of source tree
Peter Wu [Sun, 18 Dec 2016 15:49:24 +0000 (16:49 +0100)]
cmake,wslua,wsutil: load files from run/ instead of source tree

Fixes Lua on macOS, tested with an out-of-tree build:

    WS_BIN_PATH=$PWD/run ../wireshark/test/test.sh -s wslua

Previously programs that were ran from the build directory would load
data files (radius/, diameter/, init.lua) from the source directory.
Then in the case of Lua, files were loaded from the program directory
($BUILDDIR/run/init.lua on Linux) or source directory
(sSOURCEDIR/epan/wslua/console.lua).

On macOS, this does not work for Lua since files are installed into
$BUILDDIR/run/Wireshark.app/Contents/Resources/share/wireshark/init.lua
instead. Since CMake always copies data files (radius, console.lua,
etc.) into the build directory, make get_datafile_dir() return this
"run" directory instead.

Change-Id: If97d2f5686271caf9ad4d4e4fc58e902dc592a98
Reviewed-on: https://code.wireshark.org/review/19330
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoLua: Remove an obsolete comment.
Stig Bjørlykke [Tue, 20 Dec 2016 12:32:53 +0000 (13:32 +0100)]
Lua: Remove an obsolete comment.

Change-Id: I6a946eb44f4a574d6d9add3604b2dac924c33a9f
Reviewed-on: https://code.wireshark.org/review/19361
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoGtk: don't use GTimeZone/GDateTime
Dario Lombardo [Tue, 20 Dec 2016 08:41:20 +0000 (09:41 +0100)]
Gtk: don't use GTimeZone/GDateTime

Use struct tm instead.

Change-Id: I678797b93062305849875b33867faa52379c3dcb
Reviewed-on: https://code.wireshark.org/review/19356
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>
7 years agoLua: Add unit names support.
Stig Bjørlykke [Sat, 17 Dec 2016 09:08:54 +0000 (10:08 +0100)]
Lua: Add unit names support.

Add support for using unit names in ProtoField integer types by
using base.UNIT_STRING.

Add unit name table argument in ProtoField.float() and
ProtoField.double() (and made backward compatibility).

The use of base.UNIT_STRING is not really the best API for adding
unit names in Lua, but is the simples solution without adding new
arguments to ProtoField.

Change-Id: Ib5d064480cffd970a41db1764440642f6c593bb2
Reviewed-on: https://code.wireshark.org/review/19313
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoUpdate comments and messages for the new name for Apple's OS for Macs.
Guy Harris [Tue, 20 Dec 2016 08:44:31 +0000 (00:44 -0800)]
Update comments and messages for the new name for Apple's OS for Macs.

Change-Id: I96be861220f6052cb1bc61f5f4e74e76821ff565
Reviewed-on: https://code.wireshark.org/review/19358
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoextcap: set help page for all extcaps.
Dario Lombardo [Fri, 9 Dec 2016 10:52:42 +0000 (11:52 +0100)]
extcap: set help page for all extcaps.

They've been set to the manpage of the local filesystem.

Ping-Bug: 13218
Change-Id: Iacd5d2ba7ae39ee1718b59747c245d1c07785e8f
Reviewed-on: https://code.wireshark.org/review/19179
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
7 years agobtle: Add a convenience btle.length field
Stig Bjørlykke [Mon, 19 Dec 2016 14:40:59 +0000 (15:40 +0100)]
btle: Add a convenience btle.length field

Add a convenience btle.length field for easier filtering of BTLE
packets without data and with specific length ranges.

Change-Id: If56eac9c86ccf40741a6ceb50d13a1733132f448
Reviewed-on: https://code.wireshark.org/review/19348
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoUse -bbigtoc for libwireshark on AIX (if we're using GCC or Clang).
Guy Harris [Tue, 20 Dec 2016 05:29:27 +0000 (21:29 -0800)]
Use -bbigtoc for libwireshark on AIX (if we're using GCC or Clang).

This will have to be done differently with xlc if it's necessary.

While we're at it, fix the spelling of "Cygwin" (no InterCaps).

Bug: 13262
Change-Id: If3084cfb58f4abd9048afafecdd24c13645c2776
Reviewed-on: https://code.wireshark.org/review/19355
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoDon't use PCAP_ERROR if it's not known to be defined.
Guy Harris [Mon, 19 Dec 2016 18:54:50 +0000 (10:54 -0800)]
Don't use PCAP_ERROR if it's not known to be defined.

The introduction of pcap_list_datalinks() predates the introduction of
PCAP_ERROR, so the presence of pcap_list_datalinks() doesn't guarantee
that PCAP_ERROR is defined.  Change the use of PCAP_ERROR when checking
the result of pcap_list_datalinks() to just check for -1.

Change-Id: Id8229b7aebd02eaf3701983f9343503397af4fb3
Reviewed-on: https://code.wireshark.org/review/19351
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoLua: Include all BASE_PT_* to base table.
Stig Bjørlykke [Sun, 18 Dec 2016 18:00:52 +0000 (19:00 +0100)]
Lua: Include all BASE_PT_* to base table.

Also added a note above field_display_e enum to indicate that this
values are parsed in make-init-lua.pl to build init.lua.

Change-Id: Ibd125684f9a68e1b8116fae0ccbc72147825d75d
Reviewed-on: https://code.wireshark.org/review/19336
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoMake more infiniband subdissectors heuristic.
Michael Mann [Sat, 17 Dec 2016 16:20:38 +0000 (11:20 -0500)]
Make more infiniband subdissectors heuristic.

1. Convert the Mellanox encapsulation header into a heuristic dissector.
2. Convert EtherType header dissection into a heuristic dissector.
3. Convert "heuristic preferences" to use deprecated_heur_dissector_pref.

Ping-Bug: 5061
Ping-Bug: 2672
Change-Id: Iabcac1af8e07f3f6f25f825ed56b2036c3285783
Reviewed-on: https://code.wireshark.org/review/19317
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agotransum: add Modelines info
Alexis La Goutte [Mon, 19 Dec 2016 07:54:11 +0000 (08:54 +0100)]
transum: add Modelines info

Change-Id: I9d9ffdb7d32a940dbe155e82946d59f649cafe09
Reviewed-on: https://code.wireshark.org/review/19345
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agotransum: fix no previous prototype for '...’ [-Wmissing-prototypes]
Alexis La Goutte [Mon, 19 Dec 2016 07:51:13 +0000 (08:51 +0100)]
transum: fix no previous prototype for '...’ [-Wmissing-prototypes]

Comment set_pkt_rrpd (not used)

Change-Id: I8d571f3cd45c51b07969132718a43244003c0f59
Reviewed-on: https://code.wireshark.org/review/19344
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years ago[SMTP] Bugfix BDAT command handling
Michael Mann [Mon, 19 Dec 2016 04:38:53 +0000 (23:38 -0500)]
[SMTP] Bugfix BDAT command handling

BDAT handling takes the whole packet to add to its count of necessary
bytes, but wasn't updating the offset, so if a BDAT "data packet" had
multiple CRLF segments in it, the BDAT byte counter became inaccurate.

Bug: 13030
Change-Id: Idd44ccb95a8f4710db4546a918661c63a343260c
Reviewed-on: https://code.wireshark.org/review/19343
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdded decoding of RAN/NAS cause IE/AVP
Jan Spevak [Mon, 12 Dec 2016 09:48:37 +0000 (10:48 +0100)]
Added decoding of RAN/NAS cause IE/AVP

Change-Id: I889820405528be5e17edf85e52291d642a98cce6
Reviewed-on: https://code.wireshark.org/review/19216
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>
7 years agotools: add rpm-setup.sh.
Dario Lombardo [Sun, 4 Dec 2016 22:30:46 +0000 (23:30 +0100)]
tools: add rpm-setup.sh.

This script mimics tools/debian-setup.sh for RPM based systems.
It installs all the required and optional packages to compile
Wireshark. Tested on Centos 7, Fedora 25, openSUSE Leap 42.1.

Change-Id: Ifc55f45608e5f5a74188d4fb5612bedb6437fcb1
Reviewed-on: https://code.wireshark.org/review/19088
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
7 years agotap-rtp-common.c: set STAT_FLAG_WRONG_TIMESTAMP when timestamp sequence is wrong
Alexis La Goutte [Tue, 13 Dec 2016 10:39:16 +0000 (11:39 +0100)]
tap-rtp-common.c: set STAT_FLAG_WRONG_TIMESTAMP when timestamp sequence is wrong

Set STAT_FLAG_WRONG_TIMESTAMP for RTP sequence when newer packet has lower timestamp than previous one.

Change-Id: Ib18830eea33ddb3dbbdf3beba279131c0fc5a948
Reviewed-on: https://code.wireshark.org/review/19292
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>
7 years agoRTP analyzis dialog/Qt: fix - when dialog is called from RTP stream dialog, G (select...
Jiri Novak [Sun, 18 Dec 2016 20:08:16 +0000 (21:08 +0100)]
RTP analyzis dialog/Qt: fix - when dialog is called from RTP stream dialog, G (select packet) signal is not passed to parent dialog

Problem is in 2.0 and master. It is probably in 2.2 too.

Change-Id: Iaa8adea788dcd5da7cff32d56d483a1e7d52d226
Reviewed-on: https://code.wireshark.org/review/19340
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoQt: minor updates to TCP stream dialog and throughput moving average
Kevin Hogan [Tue, 6 Dec 2016 07:50:45 +0000 (23:50 -0800)]
Qt: minor updates to TCP stream dialog and throughput moving average

The time-based moving average code should use a constant window size
  as the denominator when calculating throughput.
Added QDoubleSpinbox widget to choose the time-based moving average size.
Also added (optional) ability to select ACK (reverse) packets as well as data
  packets when clicking on the base graph.
  (useful, for example, when examining SACK or DSACK packets)
Added CheckBox widget (with tooltip) for user to choose ACK selection

Change-Id: Ib3ba4f9be9e30aa8f3088b0b2d48b4ca214f7cc3
Reviewed-on: https://code.wireshark.org/review/19108
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
7 years agoRTSP: Decode XML data in ED-137 messages
Jiri Novak [Sun, 18 Dec 2016 22:45:06 +0000 (23:45 +0100)]
RTSP: Decode XML data in ED-137 messages

Based on EUROCAE ED-137B specification: ED-137B, Part 4: RADIO, INTEROPERABILITY STANDARDS FOR VOIP ATM COMPONENTS
https://boutique.eurocae.net/eshop/catalog/index.php

Can be verified with sample from Bug 13257, #18, #58, #64, #100

Change-Id: I91b7ec84b8cee8797306be1d1c0bd2af8f7b8f45
Reviewed-on: https://code.wireshark.org/review/19342
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agodecoders(transum): fix no previous prototype for ‘decode_*’ [-Wmissing-prototypes]
Alexis La Goutte [Sun, 18 Dec 2016 18:57:32 +0000 (19:57 +0100)]
decoders(transum): fix no previous prototype for ‘decode_*’ [-Wmissing-prototypes]

Change-Id: I93b24285443d99799f83c40f61f413c2d106c85f
Reviewed-on: https://code.wireshark.org/review/19338
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoLua: Fix some memory leaks in error paths.
Stig Bjørlykke [Sat, 17 Dec 2016 22:19:10 +0000 (23:19 +0100)]
Lua: Fix some memory leaks in error paths.

Because luaL_argerror() does a longjmp all memory free must be done
before calling this.

Also rewrote true_false_string_from_table() to be a bit simpler
and to give argument error when too many strings in the table.

Change-Id: Ied0fa468f1274155c746fe2e086dacf1a8582b08
Reviewed-on: https://code.wireshark.org/review/19325
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoCall Flow: Fix - Duration of segment of RTP flow is wrong in call flow.
Jiri Novak [Sat, 17 Dec 2016 16:45:40 +0000 (17:45 +0100)]
Call Flow: Fix - Duration of segment of RTP flow is wrong in call flow.

But is observed in 2.0 and later branches.

Change-Id: I46fcbb33824d30bac1999e1b61d9c249972d17f0
Reviewed-on: https://code.wireshark.org/review/19316
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoBluetooth: BTLE: Add new commands parsing
Jakub Pawlowski [Wed, 14 Dec 2016 01:03:55 +0000 (17:03 -0800)]
Bluetooth: BTLE: Add new commands parsing

Add "LE Set Extended Advertising Data",
"LE Set Extended Scan Response Data", and
"LE Set Extended Advertising Enable" command parser.

Change-Id: I3027dc9c213c15f503fa5495829726db3a207300
Reviewed-on: https://code.wireshark.org/review/19251
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years ago[Automatic update for 2016-12-18]
Gerald Combs [Sun, 18 Dec 2016 16:13:10 +0000 (08:13 -0800)]
[Automatic update for 2016-12-18]

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

Change-Id: I3c720c31d7ddfbef001bda47eca49ab4804e8e74
Reviewed-on: https://code.wireshark.org/review/19332
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years ago[docsis->type2ucd] Fix issue with decoding
AdrianSimionov [Sun, 18 Dec 2016 02:00:17 +0000 (13:00 +1100)]
[docsis->type2ucd] Fix issue with decoding

Burst 4 and Burst 5 values are now properly decoded.

Change-Id: I6232a19eb849a419825be69435069e4be721cbc1
Reviewed-on: https://code.wireshark.org/review/19327
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoSIP/SDP, RTP: Dissectors shows information about ED-137 related states of radio in...
Jiri Novak [Fri, 16 Dec 2016 10:49:56 +0000 (11:49 +0100)]
SIP/SDP, RTP: Dissectors shows information about ED-137 related states of radio in info column/VoIP call flow

Based on EUROCAE ED-137B specification:
ED-137B, Part 1: RADIO, INTEROPERABILITY STANDARDS FOR VOIP ATM COMPONENTS
https://boutique.eurocae.net/eshop/catalog/index.php

Bug: 13252
Change-Id: Ifab1aaf47e3405fcd46309167237f11ce2d7e2ff
Reviewed-on: https://code.wireshark.org/review/19302
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoS1AP: use unit strings
Pascal Quantin [Sat, 17 Dec 2016 21:34:29 +0000 (22:34 +0100)]
S1AP: use unit strings

Change-Id: I53a639b210592b36fc3f5aaf45db3932a469b49f
Reviewed-on: https://code.wireshark.org/review/19321
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoRTP: RTP dissector is able to decode RTP over TCP (RFC 4571)
Jiri Novak [Wed, 14 Dec 2016 21:55:05 +0000 (22:55 +0100)]
RTP: RTP dissector is able to decode RTP over TCP (RFC 4571)

Bug: 13251
Change-Id: I56a01e779f7f0eadc8a078f88543269a91148f00
Reviewed-on: https://code.wireshark.org/review/19293
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoX2AP: use unit strings
Pascal Quantin [Sat, 17 Dec 2016 21:49:29 +0000 (22:49 +0100)]
X2AP: use unit strings

Change-Id: Icac054fda0b1e1b8d79c33fc967345a7497e812b
Reviewed-on: https://code.wireshark.org/review/19322
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoM2AP: use unit strings
Pascal Quantin [Sat, 17 Dec 2016 21:51:43 +0000 (22:51 +0100)]
M2AP: use unit strings

Change-Id: Id9aa6a48faaf749a439f0f61b5ad8d2920c56ac7
Reviewed-on: https://code.wireshark.org/review/19323
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoM3AP: use unit strings
Pascal Quantin [Sat, 17 Dec 2016 21:55:59 +0000 (22:55 +0100)]
M3AP: use unit strings

Change-Id: I433b6357914063ba7dbbe119771770e98e019091
Reviewed-on: https://code.wireshark.org/review/19324
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoLTE RRC: use unit strings
Pascal Quantin [Sat, 17 Dec 2016 20:40:49 +0000 (21:40 +0100)]
LTE RRC: use unit strings

Change-Id: Ib18301246f051f1362ba93621c533044a118189f
Reviewed-on: https://code.wireshark.org/review/19320
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agokafka: add expert info about unsupported api key and version
Dmitry Lazurkin [Sat, 10 Dec 2016 13:45:10 +0000 (16:45 +0300)]
kafka: add expert info about unsupported api key and version

Change-Id: I622e6f06529377e089cbeeb83d926135f983d3f3
Reviewed-on: https://code.wireshark.org/review/19194
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>
7 years agoNBIFOM: upgrade dissector to v13.3.0
Pascal Quantin [Sat, 17 Dec 2016 22:23:32 +0000 (23:23 +0100)]
NBIFOM: upgrade dissector to v13.3.0

Change-Id: I95166c355bccc74705812f495066b55eedccedb0
Reviewed-on: https://code.wireshark.org/review/19326
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoLPP: use unit strings
Pascal Quantin [Sat, 17 Dec 2016 14:53:40 +0000 (15:53 +0100)]
LPP: use unit strings

Change-Id: Ic7767b9b47e200b0b0cae70e9781b417cf7d2a3b
Reviewed-on: https://code.wireshark.org/review/19315
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>
7 years agoULP: follow-up of gda5cad4
Pascal Quantin [Sat, 17 Dec 2016 13:06:33 +0000 (14:06 +0100)]
ULP: follow-up of gda5cad4

Uniformize unit display

Change-Id: Ie89ad77be81232692ee7f4f220157d2d0cab21ea
Reviewed-on: https://code.wireshark.org/review/19314
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>
7 years agobootp: Update DHCP Message Type 53 Values
Alexis La Goutte [Wed, 30 Dec 2015 20:31:10 +0000 (21:31 +0100)]
bootp: Update DHCP Message Type 53 Values

Add RFC6926 and RFC7724

Change-Id: I2e10c337f3fe3043e5c36f501eb3e29b16bfcecc
Reviewed-on: https://code.wireshark.org/review/19312
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>
7 years agobootp: fix indent (use tabs)
Alexis La Goutte [Sat, 17 Dec 2016 09:34:16 +0000 (10:34 +0100)]
bootp: fix indent (use tabs)

Change-Id: I0c16bf29631e9376b9f3b701627bd5f8fb133397
Reviewed-on: https://code.wireshark.org/review/19311
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoIPsec: Revert g232cb9a2dd
João Valverde [Sat, 17 Dec 2016 07:23:31 +0000 (07:23 +0000)]
IPsec: Revert g232cb9a2dd

Change-Id: I9e353215c17c9a868b1cbbcd18a5707e023d86bb
Reviewed-on: https://code.wireshark.org/review/19310
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoULP: use unit strings
Pascal Quantin [Fri, 16 Dec 2016 22:33:49 +0000 (23:33 +0100)]
ULP: use unit strings

Change-Id: Id6cca5fa5b7547a43488e0bd83bb150ef008f48e
Reviewed-on: https://code.wireshark.org/review/19309
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoImprove some unit strings with unicode characters
João Valverde [Fri, 16 Dec 2016 20:35:13 +0000 (20:35 +0000)]
Improve some unit strings with unicode characters

Change-Id: Ic6812fd266832743962e020cfc8f0af2d4742fdf
Reviewed-on: https://code.wireshark.org/review/19308
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoIPv6: Fix IPv6 fragment header offset unit display
João Valverde [Fri, 16 Dec 2016 19:57:54 +0000 (19:57 +0000)]
IPv6: Fix IPv6 fragment header offset unit display

Fragment offset unit is 8-octet, not bytes.

Reverts regression introduced in 232cb9a2dd87ea9cc9c88d4c32bfb7b452705130.

Change-Id: Id015209b45e15cd630f42ed2c3bbf342094b8ba6
Reviewed-on: https://code.wireshark.org/review/19307
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoSort opttype_vals by the option value.
Guy Harris [Fri, 16 Dec 2016 19:13:02 +0000 (11:13 -0800)]
Sort opttype_vals by the option value.

Otherwise, we get complaints when generating the value_string_ext from
it.

Change-Id: I2b4fc4c57b1f0c47706fe73187192c155593da84
Reviewed-on: https://code.wireshark.org/review/19306
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years ago6LoWPAN: Make UDP NHC port endianness code cleaner
João Valverde [Fri, 16 Dec 2016 01:42:16 +0000 (01:42 +0000)]
6LoWPAN: Make UDP NHC port endianness code cleaner

Change-Id: I7abb29a8368a91d113038bc878aaf47ed58360bb
Reviewed-on: https://code.wireshark.org/review/19298
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years ago6LoWPAN: Display UDP NHC port encoding field as 2-bit
João Valverde [Thu, 15 Dec 2016 23:48:25 +0000 (23:48 +0000)]
6LoWPAN: Display UDP NHC port encoding field as 2-bit

Reference: RFC 6282 Section 4.3.3

Change-Id: I8ff46452d80b1aba4545967bc05310c341f6e174
Reviewed-on: https://code.wireshark.org/review/19297
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoRename packet-range.[ch] to packet_range.[ch]
Michael Mann [Fri, 16 Dec 2016 14:35:01 +0000 (09:35 -0500)]
Rename packet-range.[ch] to packet_range.[ch]

The check*.pl scripts presume that files with the prefix "packet-"
are dissector files and therefore have different rules than other
files.  Rather than trying to clarify that more with additional
directory information, just make any non-dissector file with
"packet-" filename prefix conform if it fails a "dissector specific"
check from the scripts.

Change-Id: I7cb52e1fad4ea62320492bb690904260f958aeb4
Reviewed-on: https://code.wireshark.org/review/19304
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdd GSMTAP logging sub-dissector
Harald Welte [Fri, 2 Dec 2016 21:29:36 +0000 (22:29 +0100)]
Add GSMTAP logging sub-dissector

Applications can also use GSMTAP framing to convey log messages
which would traditionally be printed on stderr or on log files. This
allows the ordered/interspersed display of protocol messages with log
lines from the applications that send or received those messages.

The osmocom logging framework (part of libosmocore) implements this in
libosmocore.git Change-Id I9a7e72b8c9c6f6f2d76d1ea2332dcdee12394625

Change-Id: I0de723445e5b5ce0199a4081808111240a9ed047
Reviewed-on: https://code.wireshark.org/review/19183
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: Pascal Quantin <pascal.quantin@gmail.com>
7 years ago6LoWPAN: bugfix in extracting in-line UDP checksum of IPHC
Yasuyuki Tanaka [Sun, 11 Dec 2016 14:35:30 +0000 (15:35 +0100)]
6LoWPAN: bugfix in extracting in-line UDP checksum of IPHC

Bug: 13233
Change-Id: Ie697d5a2d8a604bf3348f690d78ada4f9f0b1b89
Reviewed-on: https://code.wireshark.org/review/19208
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoautotools: Add tag glob pattern for distribution VCS version
João Valverde [Fri, 25 Nov 2016 09:41:37 +0000 (09:41 +0000)]
autotools: Add tag glob pattern for distribution VCS version

Avoid leaking private tags and prefer vX.X.X over wireshark-X.X.X.

Ping-Bug: 12901
Change-Id: I7a4e2de283b87047e435a0b0abe72bc18819a985
Reviewed-on: https://code.wireshark.org/review/18951
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years ago[S1AP] Handle the case where the TransparentContainer is empty.
AndersBroman [Fri, 16 Dec 2016 14:13:31 +0000 (15:13 +0100)]
[S1AP] Handle the case where the TransparentContainer is empty.

Change-Id: I6b2333c32119149b32beacc660b48970e0ddbae6
Reviewed-on: https://code.wireshark.org/review/19303
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>
7 years agoCIP: Always handle extra data
D. Ulis [Wed, 14 Dec 2016 15:40:44 +0000 (10:40 -0500)]
CIP: Always handle extra data

1. Generically handle/display all unparsed data. Any unparsed data can be found with cip.data
2. This now shows at least some unparsed data that was not previously displayed. Previously, extra data sent with Get Attribute List requests was not displayed. It was difficult to tell why devices were returning errors, without knowing there was extra data.
3. Make most functions return the number of bytes processed to support the above points.

Change-Id: I290c09d76e74c18facaef99c8903e7937fbdd710
Reviewed-on: https://code.wireshark.org/review/19263
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years ago[BOOTP/DHCPv6] Add new manufacturer usage description (MUD) DHCP option, which presen...
Eliot Lear [Thu, 15 Dec 2016 15:21:06 +0000 (10:21 -0500)]
[BOOTP/DHCPv6] Add new manufacturer usage description (MUD) DHCP option, which presents a URL.

Change-Id: I152a388db2f3b8c035c80bd06dfbb9a18f10c031
Reviewed-on: https://code.wireshark.org/review/19284
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agopacket-rtp.c: Fix of variable names to test
Jiri Novak [Thu, 15 Dec 2016 22:15:51 +0000 (23:15 +0100)]
packet-rtp.c: Fix of variable names to test

Variables are removed

Change-Id: I54bb00a74255625c7ce487cfd31794fcdb9fa979
Reviewed-on: https://code.wireshark.org/review/19295
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>
7 years agoFix typo in unit_name_string units_decibels name.
Stig Bjørlykke [Fri, 16 Dec 2016 07:54:56 +0000 (08:54 +0100)]
Fix typo in unit_name_string units_decibels name.

Change-Id: Ib17ca3a613648667d0f99fa7412d074a205840a9
Reviewed-on: https://code.wireshark.org/review/19300
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoRemove proto_item_append_text calls in favor of BASE_UNIT_STRING.
Michael Mann [Thu, 15 Dec 2016 18:01:27 +0000 (13:01 -0500)]
Remove proto_item_append_text calls in favor of BASE_UNIT_STRING.

Many proto_item_append_text calls were just adding a unit string to a field.
There's a better way to do that now.

Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78
Reviewed-on: https://code.wireshark.org/review/19289
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdjust proto_tree_add_xxx_format_value calls to use unit string
Michael Mann [Wed, 14 Dec 2016 22:34:56 +0000 (17:34 -0500)]
Adjust proto_tree_add_xxx_format_value calls to use unit string

proto_tree_add_uint_format_value had the most use of unit strings, this
patch handles all of the other proto_tree_add_xxx_format_value calls that
could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field.

Added more "common" unit string values to unit_strings.[ch]

Change-Id: I0fb680be781e10037eb7bd40dd21a9ee20c1fb1c
Reviewed-on: https://code.wireshark.org/review/19288
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdd symlinks to Wireshark binaries in Resources/bin, and point there.
Guy Harris [Fri, 16 Dec 2016 01:48:59 +0000 (17:48 -0800)]
Add symlinks to Wireshark binaries in Resources/bin, and point there.

That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so
the man command will look in
.../Wireshark.app/Contents/Resources/share/man.

This also may obviate the need to install the wrapper scripts in
/usr/local/bin, although those scripts obviate the need to re-set PATH
after installing Wireshark.

Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d
Reviewed-on: https://code.wireshark.org/review/19296
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoFix release-notes.html generation
Graham Bloice [Thu, 15 Dec 2016 19:54:01 +0000 (19:54 +0000)]
Fix release-notes.html generation

The ASCIIDOC_CONF_FILES setting for asciidoc was only generated
if any of the guides were being built.

Clean up a dup setting and some and blank lines in FindASCIIDOC

Change-Id: Ie8ab97db09e18cdb8d7e2a7bd4dcf8c288dd036f
Reviewed-on: https://code.wireshark.org/review/19291
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
7 years agoUpdate tools/commit-msg.
Gerald Combs [Thu, 15 Dec 2016 19:42:50 +0000 (11:42 -0800)]
Update tools/commit-msg.

Update tools/commit-msg to version 2.12.7 by running

    curl -Lo tools/commit-msg https://code.wireshark.org/review/tools/hooks/commit-msg

Change-Id: Ie70a8e869968b5237c9e21c0624f1f8af696d83b
Reviewed-on: https://code.wireshark.org/review/19290
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoUDP: Add missing space to string
João Valverde [Thu, 15 Dec 2016 18:15:09 +0000 (18:15 +0000)]
UDP: Add missing space to string

Change-Id: I0b5a60d426b2d06441323d74aa973e1b700d4f03
Reviewed-on: https://code.wireshark.org/review/19286
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoUpdate the release notes.
Gerald Combs [Thu, 15 Dec 2016 17:32:53 +0000 (09:32 -0800)]
Update the release notes.

Change-Id: Id26548a1c262a91e4fe0a4c44dcb578b5b4e5c11
Reviewed-on: https://code.wireshark.org/review/19285
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years ago[GTPv2] Fix dissection of MM Context fpr EPS
AndersBroman [Thu, 15 Dec 2016 13:49:31 +0000 (14:49 +0100)]
[GTPv2] Fix dissection of MM Context fpr EPS

Change-Id: I1ee7f4caa23834ac8bcbd56731c116a785b67d6b
Reviewed-on: https://code.wireshark.org/review/19283
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>
7 years agopacket.c: add initializer.
Dario Lombardo [Tue, 13 Dec 2016 11:40:47 +0000 (12:40 +0100)]
packet.c: add initializer.

As per glib manual, GSLists need to be NULL initialized.

Change-Id: If78904b900f6ddd7a0afaf3a1c480ec7626f2027
Reviewed-on: https://code.wireshark.org/review/19281
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoMake some items that don't need to be size_t guint.
Guy Harris [Thu, 15 Dec 2016 08:29:38 +0000 (00:29 -0800)]
Make some items that don't need to be size_t guint.

Those sizes are limited by the packet sizes we support, and we only
support a maximum packet size of 2^32.

This squelches some compiler warnings.

Remove some casts that this renders unnecessary.

Change-Id: Id9a7bcf8c2ce30bbed7be6c0e28deb9cf38002e0
Reviewed-on: https://code.wireshark.org/review/19279
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoImproved parsing of sniffed homeplug-av data
Nora Sandler [Fri, 9 Dec 2016 00:54:37 +0000 (16:54 -0800)]
Improved  parsing of sniffed homeplug-av data

This patch modifies the homeplug-av dissector to better decode sniffer data according to the IEEE 1901-2010 standard.
The dissector now decodes MPDU variant fields correctly based on delimiter type, and decodes beacon MPDU payloads.
There are some variable-length fields it doesn't handle yet.
This patch should have no effect on how non-sniffer-data packets are decoded.
These changes are based on Andrew Margolis' pull request to faifa at https://github.com/ffainelli/faifa/pull/11

Change-Id: Ia60ac7affa99a68b38f04ab66373ac715c761328
Reviewed-on: https://code.wireshark.org/review/19156
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>
7 years ago802.11(ad): fix wrong dissection of Grant Frame
Alexis La Goutte [Tue, 13 Dec 2016 20:02:21 +0000 (21:02 +0100)]
802.11(ad): fix wrong dissection of Grant Frame

See 8.4a.2 from 802.11ad-2012(.pdf)

Issue reported by Hany ASSASA

Ping-Bug: 13244
Change-Id: I6e22de3009b722e61b30ce2dd93596c4f51bb2fe
Reviewed-on: https://code.wireshark.org/review/19243
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>
7 years agopkixtsp: add support for dissecting CMS signature time-stamps
Роман Донченко [Wed, 14 Dec 2016 20:55:31 +0000 (23:55 +0300)]
pkixtsp: add support for dissecting CMS signature time-stamps

As per RFC 3161 Appendix A. The ASN.1 elements it defines are not
officially part of any module, so just stick them into PKIXTSP.

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