Guy Harris [Thu, 24 Nov 2016 22:32:43 +0000 (14:32 -0800)]
Squelch warnings.
There's some problem with our RADIUS dictionary reader that causes it to
produce
radius: Vendor: 'integer', does not exist in .../dictionary.rfc7930
warnings when reading entries such as
ATTRIBUTE Response-Length 241.3 integer
Change-Id: I90548281ce4e5ffce974b9fe074266adbfdf2a5c
Reviewed-on: https://code.wireshark.org/review/18945
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Mon, 21 Nov 2016 11:06:43 +0000 (12:06 +0100)]
RADIUS: Add RFC7930 dictionnary
From FreeRADIUS master
commit
42e55cca4cee6524475f0461b00f0f96769ab40b
Author: Alan T. DeKok <aland@freeradius.org>
Date: Wed Oct 12 10:13:00 2016 -0400
added RFC 7930
Change-Id: Icb69117cad84fcaf9d9ffe8040962afb33709441
Reviewed-on: https://code.wireshark.org/review/18913
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Mon, 21 Nov 2016 11:13:04 +0000 (12:13 +0100)]
RADIUS: Add Microsemi dictionnary
commit
503e1e78daaa51d9a47e85bd7c9f5fb096a25b87
Author: Alan T. DeKok <aland@freeradius.org>
Date: Fri Nov 11 06:56:23 2016 -0500
from Microsemi
Change-Id: Icc5e5f74f7d34aaebdb192c83908856189082cf0
Reviewed-on: https://code.wireshark.org/review/18914
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>
Günther Deschner [Wed, 21 Sep 2016 14:50:21 +0000 (16:50 +0200)]
dissectors: add PRINTER_INFO_5 decoding for DCE/RPC spoolss dissector.
Guenther
Change-Id: I9eb8be636ebdf81092b7abd8d4749410cc5dcc06
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/18932
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>
Seth Alexander [Wed, 23 Nov 2016 22:09:18 +0000 (15:09 -0700)]
Removed Manipulation of Visited Flag
Change-Id: Ic77afa3fd0b9cabb3f2681be099e11be79d271be
Reviewed-on: https://code.wireshark.org/review/18938
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 24 Nov 2016 02:25:53 +0000 (18:25 -0800)]
Note that we can't use a child setup routine in g_spawn routines.
They don't work on Windows, and we support Windows, so....
Change-Id: Icdbdfcfd930ae13aba6d8fb018d7e2af55b76fa1
Reviewed-on: https://code.wireshark.org/review/18943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Martin Mathieson [Thu, 24 Nov 2016 00:31:57 +0000 (16:31 -0800)]
Return from snort_start early if dissector not enabled.
Change-Id: Idf63210ce33d92ac8619fe3295bd3e6c0bb304a9
Reviewed-on: https://code.wireshark.org/review/18941
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Martin Mathieson [Wed, 23 Nov 2016 23:53:28 +0000 (15:53 -0800)]
Add missing header file for distcheck
Change-Id: I230c8886585f30fae101ac40a1cd5018a2a62e8b
Reviewed-on: https://code.wireshark.org/review/18940
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Martin Mathieson [Wed, 16 Nov 2016 20:33:09 +0000 (12:33 -0800)]
Initial commit of Snort post-dissector.
This dissector allows Snort to process all of the
packets passed to Wireshark, and for the alerts to
be shown in the protocol tree. It is also possible
to set the source of alerts to be packet comments.
Change-Id: I6e0a50d3418001cbac2d185639adda2553a40de8
Reviewed-on: https://code.wireshark.org/review/18848
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Dario Lombardo [Mon, 21 Nov 2016 22:52:04 +0000 (23:52 +0100)]
debian-setup: check for both libgnutls-dev and libgnutls28-dev.
Change-Id: Ibe63e1d9b7527295223fc817889a60db79869e27
Reviewed-on: https://code.wireshark.org/review/18935
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Dario Lombardo [Mon, 21 Nov 2016 21:51:26 +0000 (22:51 +0100)]
debian-setup: remove lsb_relese check.
It is not used anymore and breaks docker builds.
Change-Id: Ic4a2e6abf2da8059f28fcee19e611a8a83165895
Reviewed-on: https://code.wireshark.org/review/18934
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Guy Harris [Tue, 22 Nov 2016 19:19:37 +0000 (11:19 -0800)]
Include <io.h> and <fcntl.h> for _setmode().
Change-Id: I1910275653ef4a985e9894f01cf5cb5fa33070d4
Reviewed-on: https://code.wireshark.org/review/18928
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 22 Nov 2016 18:01:29 +0000 (10:01 -0800)]
On Windows, put the standard output in binary mode if we're writing the capture file to it.
While we're at it, explicitly compare the restult of strcmp() against 0,
to make it clearer that it's testing for the argument *not* being equal
to "-".
Bug: 13165
Change-Id: Ic63085abb2de5f5c60d2101d19c1a269b7e0c9d7
Reviewed-on: https://code.wireshark.org/review/18924
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Fri, 18 Nov 2016 02:45:28 +0000 (21:45 -0500)]
Add prefs_get_uint_value and prefs_get_range_value
This allows dissectors to not need to know about the internal preference structure.
Change-Id: I1ae67248cd0b0132aefc225ea0a9befaf9afdde2
Reviewed-on: https://code.wireshark.org/review/18864
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jaap Keuter [Sat, 19 Nov 2016 17:13:47 +0000 (18:13 +0100)]
Improve name resolution preference tooltips.
Change the tooltips texts to make them better describe the preference.
Bug: 13130
Bug: 13131
Change-Id: Ie753e3703a702bdafed91cf0f41b306347088526
Reviewed-on: https://code.wireshark.org/review/18878
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dmitry Lazurkin [Sun, 20 Nov 2016 13:39:31 +0000 (16:39 +0300)]
extract common logic of proto_item_set_len/proto_item_set_end
Change-Id: I55f9303624471d09b446c10939e5c22bf8e21511
Reviewed-on: https://code.wireshark.org/review/18894
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Yasuyuki Tanaka [Mon, 14 Nov 2016 22:47:51 +0000 (23:47 +0100)]
ieee802154: support 6top protocol (6P) draft-03
- support draft-ietf-6tisch-6top-protocol-03
- rename variables and constants to reflect the protocol hierarchy
- show 6P specific information in the "Protocol" and "Info" column
- cleanup
Bug: 13136
Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f
Reviewed-on: https://code.wireshark.org/review/18824
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>
Seth Alexander [Tue, 1 Nov 2016 16:42:46 +0000 (09:42 -0700)]
Added Path Value and CRC to DOCSIS Plugin
DOCSIS update with basic defragmentation
Bug: 13106
Change-Id: Idbb42c80b87c0c3189da087b523733cf0b19967c
Reviewed-on: https://code.wireshark.org/review/18676
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Franklin "Snaipe" Mathieu [Mon, 21 Nov 2016 18:20:41 +0000 (19:20 +0100)]
lua: Allow FT_ETHER protofields to be inserted in TreeItems.
Change-Id: If1daef88dce166ec92f00a8c6e71bcb220d25e0c
Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
Reviewed-on: https://code.wireshark.org/review/18917
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 22 Nov 2016 07:10:53 +0000 (08:10 +0100)]
PW-ATM: fix code will never be executed [-Wunreachable-code]
Change-Id: If838db823dd1c7614fcfdfc2774952bf70da3c6e
Reviewed-on: https://code.wireshark.org/review/18919
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>
Alexis La Goutte [Mon, 21 Nov 2016 09:09:50 +0000 (10:09 +0100)]
ieee80211: Add 20/40 BSS Coexistence IE Parameters (72)
Bug: 13148
Change-Id: I60bb679b8b8221f5229146ca1120d00ce9e2ec66
Reviewed-on: https://code.wireshark.org/review/18911
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Pascal Quantin [Tue, 22 Nov 2016 06:16:17 +0000 (07:16 +0100)]
RLC: always initialize LI length, even when it is malformed
Bug: 13162
Change-Id: Ie0938611b4c90fd54e7ccda0ee5f3d791078be06
Reviewed-on: https://code.wireshark.org/review/18918
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>
Dario Lombardo [Sun, 20 Nov 2016 21:13:52 +0000 (22:13 +0100)]
bgp: remove dead code (CID
1158699).
Change-Id: Ib7f766819bb81858fa0c3a0b49fe39de7123bf6d
Reviewed-on: https://code.wireshark.org/review/18908
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Mathieson [Sun, 20 Nov 2016 09:43:02 +0000 (01:43 -0800)]
Kafka: show API versions in root, and don't show bogus size for GZIP messages.
Change-Id: Ib8182537a791ed24bcc417594713dd6c206ce0ce
Reviewed-on: https://code.wireshark.org/review/18885
Reviewed-by: Dmitry Lazurkin <dilaz03@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Michael Mann [Sun, 20 Nov 2016 22:38:14 +0000 (17:38 -0500)]
packet-dcm.c: Assorted cleanup
1. Use tvb_get_guintXX with encoding parameter rather than have an "is_little_endian" flag
2. Replace proto_tree_add_xxx_format with proto_tree_add_xxx_format_value or proto_tree_add_item
3. Create some value_strings in favor of functions.
Change-Id: If4b8e8992662bda768b39ba5f1932272760eef65
Reviewed-on: https://code.wireshark.org/review/18909
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Mon, 21 Nov 2016 09:41:08 +0000 (10:41 +0100)]
NAS EPS: fill info column when receiving a ciphered message
Change-Id: I2aaad1e7682025f38d78198c7fef7c759629d762
Reviewed-on: https://code.wireshark.org/review/18912
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>
Alexis La Goutte [Sun, 20 Nov 2016 11:39:39 +0000 (12:39 +0100)]
bthci_evt: Fix conflict for hf fields
'bthci_evt.pending_response_delta' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_DOUBLE
Change-Id: I7665ea0c007ef089c6986c102f2358d08d4628df
Reviewed-on: https://code.wireshark.org/review/18889
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Etienne Dechamps [Sun, 20 Nov 2016 18:37:19 +0000 (18:37 +0000)]
Fix -1 lengths in proto_tree_add_item_ret_string_and_length().
Currently, when passing a -1 length to proto_tree_add_item_ret_string_and_length() or
proto_tree_add_item_ret_string(), the -1 length will be passed directly
to the field info. The calculated length should be used instead.
Bug: 13159
Change-Id: I980d18fb9bde3c452e64a8735e62d4830ce53b64
Reviewed-on: https://code.wireshark.org/review/18904
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Dario Lombardo [Sun, 20 Nov 2016 19:34:09 +0000 (20:34 +0100)]
cmake: add creation of version.conf to be shipped in tarball.
Change-Id: I2bb66844b29cd4805d201891ffba342d26ee475f
Reviewed-on: https://code.wireshark.org/review/18731
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Nick Lowe [Sun, 20 Nov 2016 15:20:48 +0000 (15:20 +0000)]
QBSS Load IE: Correct 'Available Admission Capabilities' to 'Available Admission Capacity'
Change-Id: Ic4e6fe7978382854b4f36eebc8372eb3cd8e7551
Signed-off-by: Nick Lowe <nick.lowe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/18895
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Sun, 20 Nov 2016 18:45:03 +0000 (10:45 -0800)]
Make something to which we assign a string pointer const.
Change-Id: I4b292f252f0e4290fc8adc1e76aa589108fc597e
Reviewed-on: https://code.wireshark.org/review/18905
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pascal Quantin [Sun, 20 Nov 2016 16:36:02 +0000 (17:36 +0100)]
PDCP LTE: add NB-IoT channels
Change-Id: I3dfb54bc4614ea033ba89ab1fc8be83ad5025473
Reviewed-on: https://code.wireshark.org/review/18900
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>
Pascal Quantin [Sun, 20 Nov 2016 16:21:06 +0000 (17:21 +0100)]
PDCP LTE: cache LTE RRC dissectors handles
Change-Id: I35ac69aaf5ce6c3fe14c5af2182e4e53f2aded9b
Reviewed-on: https://code.wireshark.org/review/18899
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Alexis La Goutte [Sun, 20 Nov 2016 09:37:41 +0000 (10:37 +0100)]
uds: Fix conflict for hf fields
'uds.tp.suppress_reply' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
Change-Id: I8f6035c79c7b6481dd2915cfcfc99963fef7fc23
Reviewed-on: https://code.wireshark.org/review/18884
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sun, 20 Nov 2016 11:23:42 +0000 (12:23 +0100)]
hsms: Fix conflict for hf fields
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_BYTES
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_INT64 and FT_STRING
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_INT8 and FT_INT64
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_DOUBLE and FT_INT32
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_FLOAT
'hsms.data.item.value' exists multiple times with NOT compatible types: FT_UINT8 and FT_UINT64
Change-Id: I83697e72ebfa4e164178141d789c4ca2d9d09db0
Reviewed-on: https://code.wireshark.org/review/18887
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Benjamin Parzella <bparzella@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sun, 20 Nov 2016 09:18:56 +0000 (10:18 +0100)]
uftp4: fix last argument of proto_tree_add_item
It can be not FALSE
Change-Id: I938011296b40013a1dad813c3196e899b1b90347
Reviewed-on: https://code.wireshark.org/review/18883
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sun, 20 Nov 2016 09:13:18 +0000 (10:13 +0100)]
uftp4: Fix conflict for hf fields
'uftp4.announce.publicmcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'uftp4.announce.privatemcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'uftp4.fileinfo.tstamp' exists multiple times with NOT compatible types: FT_ABSOLUTE_TIME and FT_UINT32
Change-Id: I94b235e9ba8ebe8a036620f9537eb674f418f1e5
Reviewed-on: https://code.wireshark.org/review/18882
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Sun, 20 Nov 2016 16:12:08 +0000 (08:12 -0800)]
[Automatic update for 2016-11-20]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: I037cbaa9226ddf6630ae95865da7f67920592295
Reviewed-on: https://code.wireshark.org/review/18896
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Alexis La Goutte [Sun, 20 Nov 2016 11:20:12 +0000 (12:20 +0100)]
radiotap: Fix conflict for hf fields
'radiotap.present.flags' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32
Change-Id: Ib53eb43c2103b24bd02bd41fd20030b7e7ae321b
Reviewed-on: https://code.wireshark.org/review/18886
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sun, 20 Nov 2016 09:06:18 +0000 (10:06 +0100)]
VXLAN: Fix conflict for hf fields
'vxlan.flags_reserved' exists multiple times with NOT compatible types: FT_UINT8 and FT_BOOLEAN
Change-Id: I98d296393796defc5741c41a496432eb8f927be2
Reviewed-on: https://code.wireshark.org/review/18881
Reviewed-by: Michael Mann <mmann78@netscape.net>
Uli Heilmeier [Mon, 14 Nov 2016 23:14:51 +0000 (00:14 +0100)]
DICOM: Fix handling of AT tag elements
A Attribute Identifier List can have more than one AT element. Therefore
we have to loop through the elements list.
Bug: 13077
Change-Id: I3adaa5ba50a1ad01e7c5bacd05118c65afcf4442
Reviewed-on: https://code.wireshark.org/review/18825
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>
Martin Mathieson [Sun, 20 Nov 2016 11:37:03 +0000 (03:37 -0800)]
kafka: fix mac build breakage by adding int cast
Change-Id: Ic57d49f7408f041b60b719a3da4971c499122930
Reviewed-on: https://code.wireshark.org/review/18888
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Guy Harris [Sun, 20 Nov 2016 05:59:28 +0000 (21:59 -0800)]
proto_item_set_end() should set the FT_BYTES value length as well.
Change-Id: I33459aabf059e1dc746e7e5f9d5ca28095e056f4
Reviewed-on: https://code.wireshark.org/review/18880
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alex Badea [Thu, 17 Nov 2016 14:46:16 +0000 (16:46 +0200)]
tcp: fix "calculated checksum" tree item for bad checksums
The Calculated Checksum tree item prints the checksum from the
tvb, instead of the computed one (the "should be 0x...." tree
item above it _does_ print the computed one). As such, in a packet
with bad checksum, the Calculated Checksum is incorrect. Fix the value.
This seems to have been introduced in
ad6fc87d ("Add
proto_tree_add_checksum.")
Change-Id: Ia20d5addc40956713a944102e79d25317b969a0e
Reviewed-on: https://code.wireshark.org/review/18859
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
John A. Thacker [Fri, 18 Nov 2016 23:35:28 +0000 (18:35 -0500)]
Reassemble: fix premature free
Fix a memory error found by the buildbot and valgrind in my recent patch
Bug: 13100
Change-Id: Ieb21aa25e048f90ce7192546b0ad3d4718ff07df
Reviewed-on: https://code.wireshark.org/review/18877
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dmitry Lazurkin [Thu, 17 Nov 2016 21:19:18 +0000 (00:19 +0300)]
kafka: Update supported api keys to latest spec
Details:
- update supported api keys
- add api key ApiVersions
- change api key names according to documentation
- add pcapng files for supported api keys
- add new documentation link
- add declaration of lz4 message codec
Change-Id: I943dc31144890dcd3dd333981a86754668c2bec4
Reviewed-on: https://code.wireshark.org/review/18861
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Dario Lombardo [Thu, 10 Nov 2016 09:35:56 +0000 (10:35 +0100)]
cpack: improve source tarball generation by adding the "dist" target.
The source package must not contain compiled objects. If the build dir
is under the source tree, it is included too. By excluding /build/ we
avoid to add every build dir, but if the build dir doesn't contain
build the problem still persist.
Change-Id: I75021565c058c1a93945f43b9b49cb3d04c960d4
Reviewed-on: https://code.wireshark.org/review/18729
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Jaap Keuter [Fri, 18 Nov 2016 09:42:26 +0000 (10:42 +0100)]
LBM_UIMflow: Fix range_ratio calculation (CID-
1355421)
Port the same calculation from sequence_dialog.cpp.
Resolves the Coverity issue and aligns the output just a bit better.
Change-Id: Iaa464149630e0fafb5bdff20019440c3fb67bbbd
Reviewed-on: https://code.wireshark.org/review/18868
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Tue, 8 Nov 2016 14:20:30 +0000 (15:20 +0100)]
cmake: install icons and .desktop files
Based on the install-data-local target from Makefile.am.
Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c
Reviewed-on: https://code.wireshark.org/review/18708
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Guy Harris [Fri, 18 Nov 2016 18:51:12 +0000 (10:51 -0800)]
Create /etc/paths.d and /etc/manpaths.d if they don't exist.
Bug: 13152
Change-Id: I6ecfd1e3f7f10a3a63b44b0d8bf137f0b3450391
Reviewed-on: https://code.wireshark.org/review/18871
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Tue, 15 Nov 2016 20:13:45 +0000 (21:13 +0100)]
cmake/FindPCAP: fix use of bad cached function checks
When libpcap-dev is not installed, do not look for functions like
pcap_datalink_name_to_val since the negative result would be cached.
Then after installing libpcap-dev, the build would fail due to
redeclaration of functions.
Change-Id: Ifdbad09e9cf160383b16b6459693f7ea5d65b9c3
Reviewed-on: https://code.wireshark.org/review/18834
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
AndersBroman [Fri, 18 Nov 2016 12:47:06 +0000 (13:47 +0100)]
[GSM A RR] Fix dissection of c1_delta.
Change-Id: I500b3e0abd4368511842ff795b91d1ebbbf46bbc
Reviewed-on: https://code.wireshark.org/review/18869
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>
Dario Lombardo [Thu, 17 Nov 2016 10:33:02 +0000 (11:33 +0100)]
androiddump: check return value in useSndTimeout() (CID
1394378).
Change-Id: I14109ffe1b9930c464ce2c42767f96b8ba4e5b67
Reviewed-on: https://code.wireshark.org/review/18855
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Pascal Quantin [Fri, 18 Nov 2016 08:39:24 +0000 (09:39 +0100)]
GTP: fix dissection of GGSN Back-Off Time IE
Bug: 13153
Change-Id: I2f404515187f9f29a45f101c8ff294a971ffddac
Reviewed-on: https://code.wireshark.org/review/18865
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Joakim Karlsson [Thu, 17 Nov 2016 19:10:07 +0000 (20:10 +0100)]
gtpv2: correct order in bearer qos
Change-Id: I4acc4d0546f90fcb574a77b5f8abe1b9f9e5bdc5
Reviewed-on: https://code.wireshark.org/review/18860
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>
Guy Harris [Fri, 18 Nov 2016 02:35:11 +0000 (18:35 -0800)]
Don't assume we have a protocol tree.
In the association_sanity_check_t structure:
Have separate flags to indicate whether we *have* an IE specifying an
FT AKM suite and whether we *have* an IE specifying a non-FT AKM suite.
Use those to decide whether to add an expert info, so we add it
regardless of whether we are building a protocol tree or not.
Set the protocol tree item for the first FT AKM suite and the first
non-FT AKM suite only if we have a protocol tree.
Bug: 13149
Change-Id: I16a3194017b34d8d2c9128364c2761d1c202969d
Reviewed-on: https://code.wireshark.org/review/18863
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Will Glynn [Thu, 17 Nov 2016 21:48:18 +0000 (15:48 -0600)]
ieee80211: warn about FT AKM suite mismatches
Bug: 13149
Change-Id: I8bceeeadf30c9594aa4be8cc195e694594de1d97
Reviewed-on: https://code.wireshark.org/review/18862
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Uli Heilmeier [Wed, 16 Nov 2016 22:32:34 +0000 (23:32 +0100)]
BGP: Fix length in decode_prefix4()
When decode_prefix4() gets called with more prefixes the length of
proto_tree_add_subtree_format() should not be the total length.
As the "Withdrawn route" part was the only one where decode_prefix4() has
been called with a tlen not equal 0 we can eliminate the tlen parameter.
Bug: 13146
Change-Id: I708dec2cecbed6054b60190104b82c72d54e8037
Reviewed-on: https://code.wireshark.org/review/18852
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Jaap Keuter [Wed, 16 Nov 2016 23:49:10 +0000 (00:49 +0100)]
TCP: Add MD5 signature option dissection
Bug: 13147
Change-Id: Icfd1343458c0795c4e3a74e4ed4f06d18f1c1831
Reviewed-on: https://code.wireshark.org/review/18854
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Dario Lombardo [Tue, 15 Nov 2016 16:10:11 +0000 (17:10 +0100)]
debian-setup: remove libssh-dev from basic list.
Change-Id: I34c0c24bc9240e27cbdf71f6ef1ae0adbb27cd7f
Reviewed-on: https://code.wireshark.org/review/18830
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Deep Datta [Mon, 14 Nov 2016 21:43:05 +0000 (15:43 -0600)]
Adding new Ixia netflow fields for Source and Dest AS Names and Transaction Latency
Change-Id: I48c0cb58cd5643ad1c930b668b81cc3cc7270afa
Reviewed-on: https://code.wireshark.org/review/18837
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>
Jaap Keuter [Tue, 15 Nov 2016 22:36:26 +0000 (23:36 +0100)]
Resolv: various code / comment cleanups
Various cleanups and corrections regarding MAC address handling.
Change-Id: I31e2e377bc1c73705a89517c776d51bbb19b9ce3
Reviewed-on: https://code.wireshark.org/review/18836
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>
Alexis La Goutte [Wed, 9 Nov 2016 18:58:34 +0000 (19:58 +0100)]
gsm_abis_pgsl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I2ad9621c632060fba1010ab5fed0b62557580dff
Reviewed-on: https://code.wireshark.org/review/18726
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>
novakji [Sun, 13 Nov 2016 19:20:17 +0000 (20:20 +0100)]
SDP: Payload type name for dynamic payload is wrong for reverse RTP channels
Bug: 13132
Change-ID: I61a2575f9d8da958ae2fb01c71f3c71c9643ddea
Reviewed-on: https://code.wireshark.org/review/18804
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Tue, 15 Nov 2016 23:56:57 +0000 (15:56 -0800)]
Double the fuzz testing memory limit.
Increase MAX_VMEM to
1000000 in order to accomodate a large capture file
in the menagerie and allow some breathing room for future large
captures.
Change-Id: I61d1a56d30d49af5c25785f8d43f104b6a300da5
Ping-Bug: 13049
Reviewed-on: https://code.wireshark.org/review/18838
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Pascal Quantin [Tue, 15 Nov 2016 21:27:48 +0000 (22:27 +0100)]
PER: add support for fragmented octet string
Change-Id: Ia649825c250fee89b6f9513df22c38cdb4669cf4
Reviewed-on: https://code.wireshark.org/review/18835
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>
Gerald Combs [Tue, 15 Nov 2016 18:30:31 +0000 (10:30 -0800)]
Add more information about UTF 8 in our source code.
Change-Id: I81d41fdc1aa66dd904160508c4a2e634337b5ba0
Reviewed-on: https://code.wireshark.org/review/18833
Reviewed-by: Gerald Combs <gerald@wireshark.org>
D. Ulis [Fri, 4 Nov 2016 19:50:25 +0000 (15:50 -0400)]
CIP: Properly handle EPATH attributes that do not specify path size
Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment.
This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity'
There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file.
I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling.
Ping-Bug: 12049
Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466
Reviewed-on: https://code.wireshark.org/review/18675
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
AndersBroman [Tue, 15 Nov 2016 13:14:51 +0000 (14:14 +0100)]
[SIP export-pdu] Don't export SIP messages from the body of another SIP message
Change-Id: I48336eb721ce730e3d09d4343a8d1170cb985214
Reviewed-on: https://code.wireshark.org/review/18829
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>
Alexis La Goutte [Sat, 12 Nov 2016 13:05:30 +0000 (14:05 +0100)]
OSPF: Enhance dissector of RI TLV
Update the list
Add dissection of SR Algorithm
use value string for TLV list
Change-Id: If3573320a182235b720620af949e540b3706f538
Ping-Bug: 13118
Reviewed-on: https://code.wireshark.org/review/18813
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Andre Puschmann [Tue, 15 Nov 2016 09:23:38 +0000 (10:23 +0100)]
MAC LTE: call LTE RRC dissectors for NB-IoT when respective flag is set
Change-Id: I678ea851d1afa3fd68fc75272dbc11814437d697
Reviewed-on: https://code.wireshark.org/review/18828
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>
dario [Tue, 15 Nov 2016 08:56:22 +0000 (09:56 +0100)]
per: add initializer.
Travis CI found the following errors:
wireshark/epan/dissectors/packet-per.c: In function ‘dissect_per_open_type_internal’:
wireshark/epan/dissectors/packet-per.c:193:24: error: ‘pdu_tvb’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
tvb_composite_append(pdu_tvb, tvb_new_octet_aligned(tvb, offset, 8*type_length));
^
wireshark/epan/dissectors/packet-per.c: In function ‘dissect_per_bit_string’:
wireshark/epan/dissectors/packet-per.c:2269:24: error: ‘fragmented_tvb’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
tvb_composite_append(fragmented_tvb, tvb_new_octet_aligned(tvb, offset, length));
Change-Id: Idfd8bfc20439485f53e906a46e0717fc6199071c
Reviewed-on: https://code.wireshark.org/review/18827
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
AndersBroman [Mon, 14 Nov 2016 16:38:24 +0000 (17:38 +0100)]
[SIP] Parse Via parameters for Overload Control RFC 7339
Change-Id: Iec22e947b3e52b406c380066a8e5e178f804d04a
Reviewed-on: https://code.wireshark.org/review/18819
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>
Pascal Quantin [Mon, 14 Nov 2016 20:55:25 +0000 (21:55 +0100)]
tshark: fix activation of heuristic dissectors by command line
Change-Id: I9499be0d0efd24ce1049513171c657795fa69250
Reviewed-on: https://code.wireshark.org/review/18823
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Dario Lombardo [Sat, 5 Nov 2016 23:43:14 +0000 (00:43 +0100)]
travis: improve test matrix.
Details:
- remove the original broken environments and create multi-variable ones
- remove old comments
- exclude some OSX builds
Change-Id: Iec98d13350444678823fa52bb3b9faefe02859d6
Reviewed-on: https://code.wireshark.org/review/18689
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Mon, 14 Nov 2016 07:09:06 +0000 (08:09 +0100)]
profinet (dcerpc pn io): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I5b7d97b6238c26dd8fa748aaa59a84eb4a03274c
Reviewed-on: https://code.wireshark.org/review/18814
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jan Spevak [Mon, 14 Nov 2016 07:54:39 +0000 (08:54 +0100)]
diameter_3gpp: add decoding of Sd feature list
Change-Id: I431cb2cb39328a7aa537eaa00b1cb1ab07723d3e
Reviewed-on: https://code.wireshark.org/review/18815
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: Roland Knall <rknall@gmail.com>
Pascal Quantin [Sun, 13 Nov 2016 21:52:06 +0000 (22:52 +0100)]
SABP: add support for messages >= 16KB
Because of the way PER specification encodes length determinant >= 16K,
we cannot get the PDU length from a fixed position at the beginning of
the message. So drop tcp_dissect_pdus() (that cannot work for this use
case) and manually request extra chunks until the full PDU is available.
Bug: 8221
Change-Id: I91e32160fc2180f74b3edb9699ba510798b46983
Reviewed-on: https://code.wireshark.org/review/18808
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>
Pascal Quantin [Sun, 13 Nov 2016 21:41:11 +0000 (22:41 +0100)]
PER: add support for fragmented open type
Change-Id: Ie4282cc859518977686da13f017ad79dfffa359b
Reviewed-on: https://code.wireshark.org/review/18807
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Uli Heilmeier [Sun, 13 Nov 2016 19:16:49 +0000 (20:16 +0100)]
DICOM: Reassemble only when "More Fragments" is set.
When a TCP frame contains more DICOM segments, make sure that
only segments with "More fragments" bit set gets reassembled.
Bug: 13110
Change-Id: Ie19c71285a00240a035ff92ce3183de4d9048cbd
Reviewed-on: https://code.wireshark.org/review/18805
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Sun, 13 Nov 2016 16:24:06 +0000 (17:24 +0100)]
OSPF: fix indent (use 4 spaces)
Change-Id: I3ba3fa626398718fefcc3430fffeaed2f4ea47b9
Reviewed-on: https://code.wireshark.org/review/18799
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sat, 12 Nov 2016 02:58:45 +0000 (21:58 -0500)]
packet-dtn.c break loop if evaluate_sdnv doesn't succeed.
Bug: 13097
Change-Id: If6128f5a3c940b4713c396e1a4a8f002a6bd03b8
Reviewed-on: https://code.wireshark.org/review/18764
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Sun, 13 Nov 2016 21:05:01 +0000 (22:05 +0100)]
tvbuff_composite.c: fix composite_get_ptr when length is over 2 segments
When storing a copy of the composite tvb in tvb->real_data, ensure to copy the full
data and not only the length currently requested by the call to tvb_get_ptr()
Change-Id: I6b42f3d46c4fba83fadf4d06f465c8d2486f4853
Reviewed-on: https://code.wireshark.org/review/18806
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>
Pascal Quantin [Sun, 13 Nov 2016 18:11:57 +0000 (19:11 +0100)]
PER: fixes for fragmented bitstring
Follow-up of g54c3df8:
- fix byte highlighting
- return correct offset
- return correct length
Change-Id: Ib689ea72706c2e1d697c0e8f619b1b846c088001
Reviewed-on: https://code.wireshark.org/review/18803
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>
Franklin "Snaipe" Mathieu [Tue, 8 Nov 2016 16:13:41 +0000 (17:13 +0100)]
lua: Allow proto:register_heuristic to be used on multiple list names
In the C API, one can register a heuristic for the same protocol on different
lists by specifying another unique short_name. This is impossible in the
lua API, as the protocol name is used as the short name itself.
This change fixes that by creating an unique shortname composed of the
protocol name and the target list name.
Change-Id: I2c30ce6e4f7a3b38879180c64cf8564f779163b4
Signed-off-by: Franklin "Snaipe" Mathieu <snaipe@diacritic.io>
Reviewed-on: https://code.wireshark.org/review/18711
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Gerald Combs [Sun, 13 Nov 2016 17:32:35 +0000 (09:32 -0800)]
[Automatic update for 2016-11-13]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: I83298430701c25aaba15cc5db02603bacd6d196a
Reviewed-on: https://code.wireshark.org/review/18798
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Birol Capa [Wed, 9 Nov 2016 08:22:10 +0000 (11:22 +0300)]
PROFINET: Add Asset Management Record Dissection
Identification and Maintenance (I&M) and AssetManagement (AM) functions
are to collect information about the assets of an automation plant
to cover the use cases such as
identification, configuration, commissioning, diagnosis etc..
PROFINET plugin should support the Asset Management Record (AMR).
Bug: 13112
Change-Id: I9c557b5f7f4f633fdd475c2c9e8900a8e6c2ba47
Reviewed-on: https://code.wireshark.org/review/18719
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
novakji [Sat, 12 Nov 2016 20:16:53 +0000 (21:16 +0100)]
Allocate transport_info->encoding_name from correct memory pool
Bug: 13127
Change-Id: I09893fadc6f64316a373ddb8ac72e07a6743e149
Reviewed-on: https://code.wireshark.org/review/18758
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Thu, 10 Nov 2016 15:51:41 +0000 (16:51 +0100)]
Qt: populate Bookmarks menu in capture options dialog
The bookmarks menu is populated for the main window when the
appInitialized signal is emitted, this ensures that any preferences are
applied.
For the Capture Options dialog however, the appInitialized signal is
never triggered since the GUI has already started. Just invoke it from
the constructor such the menu is populated at least once.
Bug: 12986
Change-Id: I04457fd25e52a25714ac471131b90e3a128515d8
Reviewed-on: https://code.wireshark.org/review/18734
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Bruno Verstuyft [Fri, 4 Nov 2016 15:30:55 +0000 (16:30 +0100)]
DOCSIS: Added dissector for type51 UCD
Change-Id: Ifb46b2bd0a6eeae3e641ebcb3ecc89fc4f74b3f9
Reviewed-on: https://code.wireshark.org/review/18673
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sat, 12 Nov 2016 15:29:30 +0000 (16:29 +0100)]
QUIC: Update error code
Change-Id: I797da3c55ecb1a8a61166d8fbf503c4bdeffc213
Reviewed-on: https://code.wireshark.org/review/18755
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sat, 12 Nov 2016 14:46:43 +0000 (15:46 +0100)]
fix no previous prototype for ‘capture_*’ [-Wmissing-prototypes]
Change-Id: Ie5bfe4d366a679ebcb561716f23d174e7b9bf487
Reviewed-on: https://code.wireshark.org/review/18754
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>
Martin Kaiser [Fri, 11 Nov 2016 18:15:09 +0000 (19:15 +0100)]
iso14443: dissect the TA(1) byte in the ATS
Change-Id: I17785d32ca1f5ef69731c5dfba04892aa09648a0
Reviewed-on: https://code.wireshark.org/review/18756
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Jaap Keuter [Sat, 12 Nov 2016 12:19:34 +0000 (13:19 +0100)]
Really return manufacturer name if it's known.
Bug: 13126
Change-Id: I56e935cea7aa323941ac612d4954875a01910684
Reviewed-on: https://code.wireshark.org/review/18752
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Harald Welte [Sat, 12 Nov 2016 12:31:10 +0000 (13:31 +0100)]
gsm_abis_om2000: Expand bit-width of CON CCP and CI fields
It seems more recent RBS2000 models have extended the range of the CON
Connection Point (CCP) by one bit, as I'm seeing CCP 1896 in protocol
traces. Similarly, the Contiguity Index can at least reach 96. Using
the full 8bit value to make sure IS and CON dissectors use the same
ranges for connection points and contiguity index.
Change-Id: Iece34106fc97a11dc8a01cf2578b5e4245a4c9e8
Reviewed-on: https://code.wireshark.org/review/18753
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Fri, 11 Nov 2016 21:20:07 +0000 (22:20 +0100)]
PER: add support for bit strings >= 16K
Bug: 13123
Change-Id: Ie20ef75393ea601d2702a024e0ade94b85adf9f2
Reviewed-on: https://code.wireshark.org/review/18748
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>
Guy Harris [Fri, 11 Nov 2016 22:37:06 +0000 (14:37 -0800)]
Dissect the checksum field as a string, as that's what it is.
Bug: 13125
Change-Id: Ib5d02e8841eb7e4d04e6a1df44a5eba5b925ce6c
Reviewed-on: https://code.wireshark.org/review/18749
Reviewed-by: Guy Harris <guy@alum.mit.edu>
AndersBroman [Fri, 11 Nov 2016 13:44:02 +0000 (14:44 +0100)]
[SIP]Parse out the individual feature cap(s).
Change-Id: Ie834da60a2d389d33e1a5b6cc897e13ae1522fb9
Reviewed-on: https://code.wireshark.org/review/18742
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>
Peter Wu [Fri, 11 Nov 2016 15:49:35 +0000 (16:49 +0100)]
ssl: fix next_protocol_negotiation id
NPN is a legacy extension (superseded by ALPN), but there was still a
capture with this value. However, the decimal number is wrong. Adjust it
to the one in the draft -03 (the hex number is still correct).
Change-Id: I80ce468bcb653bc8ec87432d76d478cb0423b46f
Reviewed-on: https://code.wireshark.org/review/18744
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Fri, 11 Nov 2016 09:30:57 +0000 (10:30 +0100)]
OSPF: Add LSA Type Flag (See RFC 5340 A.4.2.1)
* Display in dec the LSA Type (like IANA)
Bug: 13118
Change-Id: I78001b2066f186dcf2175153e539216437b1754e
Reviewed-on: https://code.wireshark.org/review/18740
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>