Commit Graph

33654 Commits

Author SHA1 Message Date
Guy Harris 7c014c044e Update comment, clean up identation.
Change-Id: I30812657e3fa5dc21e64ed2fb7605e5f2a36ab03
Reviewed-on: https://code.wireshark.org/review/19770
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-25 00:40:55 +00:00
Erik de Jong 1ee1e14a78 Dissector: IndigoCare nursecall protocols support
Adds support for IndigoCare nursecall protocols

Bug: 13241
Change-Id: I83098c15d467ea42da8301c6b6a5568d9892fc60
Reviewed-on: https://code.wireshark.org/review/19224
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>
2017-01-24 14:01:29 +00:00
Adam Mitz 4e2b2d4292 RTPS: avoid errors when encountering empty sequences of strings
Change-Id: Ida9d2e6d632104ec3c6594f5ec500fec49a971a4
Reviewed-on: https://code.wireshark.org/review/19754
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>
2017-01-24 14:00:38 +00:00
Adam Mitz 87f24a78e6 RTPS: updated ContentFilterProperty field names to match the spec
Change-Id: I17a8b51dbcb502624a83177135b31fdbe72fa118
Reviewed-on: https://code.wireshark.org/review/19753
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-24 13:58:51 +00:00
Dario Lombardo d284cfd4a6 dvbci: add shutdown routine.
Change-Id: I3f950ce227818b6dae11ac89e4a8ec636294a6ec
Reviewed-on: https://code.wireshark.org/review/19740
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
2017-01-24 11:26:24 +00:00
Guy Harris 7b69c8702b Add a comment talking about the dictionary file format.
Point to the FreeRADIUS man page for the dictionary file format, and
mention features we don't support - including features *not* documented
in the man page.

Change-Id: I08085062a6abcafb9dd0abe5b1edee53187ea23f
Reviewed-on: https://code.wireshark.org/review/19762
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-24 09:19:46 +00:00
Gerald Combs 57894f741f DHCPv6: Avoid integer overflows.
Count using ints instead of guint16s.

Make sure dissect_packetcable_ccc_option and
dissect_packetcable_cccV6_option return positive values while we're
here.

Bug: 13345
Change-Id: Ic303ddc266f46ee3144e079731742c85808faf37
Reviewed-on: https://code.wireshark.org/review/19747
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-23 19:21:42 +00:00
Gerald Combs 781f03580c ASTERIX: Avoid an integer overflow.
Count using a guint instead of a guint8.

Bug: 13344
Change-Id: Ic7d337dbb29b92ebb8332f50fd47b5ba2aa3f41e
Reviewed-on: https://code.wireshark.org/review/19746
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-23 18:51:43 +00:00
MustBeArt 110ffacdb3 DVB-S2-BB: Support all four MA modes
Support all four mode adaptation input and output interfaces defined in
SatLabs reference document sl_561, "Mode Adaptation Input and Output
Interfaces for DVB-S2 equipment", instead of only the two modes that use
a sync byte.

There is nothing in the packet format that specifies which format is in
use, so we have to guess based on the possible occurrence of a sync byte
and the CRC-protected BBHEADER that follows the mode adaptation header,
which is a different length for each format. This is a heuristic dissector,
so if none of the four formats match, we just return.

Unfortunately, the BBHEADER CRC is only 8 bits, so there can be false
matches rather often. We detect when the packet matches more than one format,
and issue an expert info diagnostic. It is also possible for a UDP packet
that isn't DVB-S2 at all to match spuriously, with probability around 1%
(assuming random data). This is acceptable for a heuristic dissector,
especially one that is initially disabled.

Standardize spelling per sl_561: adaption -> adaptation

Change-Id: Iffc73ed01c72d1247e2378d648ffe0d7c1f21612
Reviewed-on: https://code.wireshark.org/review/19708
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-23 01:31:06 +00:00
Alexis La Goutte 936ebfe2ed ISAKMP: Add Fortigate (Fortinet) Vendor ID
Display also release (and build)

Change-Id: Ib97f47a0b0179712a82f0aee0ca079a05b8b590c
Reviewed-on: https://code.wireshark.org/review/19730
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>
2017-01-22 20:48:27 +00:00
Alexis La Goutte 308e1de5eb DNS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ib376127546aa15806ed37a7c26fe29b0fa80225c
Reviewed-on: https://code.wireshark.org/review/19722
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-22 20:47:39 +00:00
Benoît Canet 59d2081cbb CQL: Add support for prepared batch statement
This portion of the code was never completed.
Complete it.

Change-Id: Iaa139b8c6d50a5ce3a7039000e9af38fab3d6124
Signed-off-by: Benoît Canet <benoit@scylladb.com>
Reviewed-on: https://code.wireshark.org/review/19725
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>
2017-01-22 20:11:45 +00:00
Volodymyr Khomenko 73182229a0 SMB2: better RSVD flow
Fixed FSCTL_QUERY_SHARED_VIRTUAL_DISK_SUPPORT dissector
to show fields of response properly - see
https://msdn.microsoft.com/en-us/library/dn409282.aspx

Mapped few SMB2 IOCTL codes related to RSVD to names
(like FSCTL_STORAGE_QOS_CONTROL that is defined by MS-SQOS
as a helper for RSVD protocol)

Added RSVD-specific SMB2 status codes
(used in SMB2 transport when RSVD is in use or inited)
See https://msdn.microsoft.com/en-us/library/dn392518.aspx

Change-Id: I04d80df234505e8b32773ac95cf0b73f07cc5581
Reviewed-on: https://code.wireshark.org/review/19693
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-22 19:17:26 +00:00
Alexis La Goutte 013125af03 reassemble: fix no previous prototype for ‘reassembly_table_free’ [-Wmissing-prototypes]
Change-Id: Idb4b821e013a79777897d2f837cb8c3861e3c85f
Reviewed-on: https://code.wireshark.org/review/19724
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-22 17:12:52 +00:00
Gerald Combs 73d3f7965e [Automatic update for 2017-01-22]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I75ec9ed3b0ef02d18dee79f629291e7bc1c81467
Reviewed-on: https://code.wireshark.org/review/19726
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-22 16:11:59 +00:00
Michael Mann 21a3b8cc71 Internalize struct preference
Move "struct preference" into prefs.c, essentially creating a "private"
structure to handle preferences. The 2 motivating factors were:
1. Better memory management so that clients/users of API don't have to worry
about it.
2. Hide the ugliness of the union stuff and make it transparent to the API.

A few bugs related to preference <-> Decode As integration were fixed
while in the neighborhood.

Change-Id: I509b9a236235d066b139c98222b701475e0ed365
Reviewed-on: https://code.wireshark.org/review/19578
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>
2017-01-22 10:43:57 +00:00
Jaap Keuter 4ff9bddc46 wmem: fix rb-tree data printer feed
When using a data printer for the red/black tree it is fed with the
nodes of the tree. But nodes can be either subtree or data nodes.
Don't feed the subtree nodes to the data printer. The data printer can't
recognize it as such, can't handle it, or worse, could break stuff.

Change-Id: Ibbc1311d901c0d0c52e710f951dd53620f2c3d0f
Reviewed-on: https://code.wireshark.org/review/19652
Reviewed-by: Evan Huus <eapache@gmail.com>
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>
2017-01-22 10:40:34 +00:00
Jim Young b83bbd92b5 packet-frame: Make interface_name a filterable field.
Change-Id: I1cc180abd7e73e5aea55b1b7eef9dc4b0e66e164
Reviewed-on: https://code.wireshark.org/review/19692
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-22 10:39:31 +00:00
Pascal Quantin 7722003908 DNS: use formatted text in add_rr_to_tree() and add_opt_rr_to_tree
Since the fix for bug 13289, an empty string can be returned by get_dns_name.
Ensure that:
- a malformed encoding with no characters and a length > 1 triggers an exception
- the formatted version is used to add info in tree.

Bug: 13339
Change-Id: I88125a351904eabb5cededfbfe1d5ef14ea61ecc
Reviewed-on: https://code.wireshark.org/review/19714
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>
2017-01-22 08:13:25 +00:00
Dario Lombardo 317649f949 reassemble: add cleanup routine.
Change-Id: I948d342a29aacc2212076359e5b073113c50c5de
Reviewed-on: https://code.wireshark.org/review/19697
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-21 00:28:28 +00:00
Dario Lombardo d020990f03 conversation_table: add cleanup function.
Change-Id: Icea963384c16b1ad5387a885219d0621b470181b
Reviewed-on: https://code.wireshark.org/review/19699
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-21 00:27:25 +00:00
Dario Lombardo fecf0d847e dissector_filters: add cleanup function.
Change-Id: I9694a8e817e357061a60c425fb5881d525ed8143
Reviewed-on: https://code.wireshark.org/review/19695
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-21 00:26:50 +00:00
Dario Lombardo 7e03647c9d dcerpc: add shutdown routine.
Also use g_hash_table_new_full to ease the free procedure.

Change-Id: I0a411cccbd651cca18e94a048722bf5520903deb
Reviewed-on: https://code.wireshark.org/review/19691
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-21 00:25:56 +00:00
Dario Lombardo 5c7b0b9687 decode_as: clean memory on exit.
Change-Id: Ifbbfc1ff71c32c2e9b758b55d32bff9a1ccd1576
Reviewed-on: https://code.wireshark.org/review/19689
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-21 00:25:15 +00:00
Dario Lombardo 5235c2ec72 atalk: add check in shutdown routine
Change-Id: I52c00fa143c8562cdb195679f28590d7f2bb30c8
Reviewed-on: https://code.wireshark.org/review/19709
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-20 21:48:08 +00:00
Dario Lombardo d6b19f59b7 packet: add post_dissectors cleanup.
Change-Id: I9924425f1754c151552f41e23d20c7d4e6f1bf29
Reviewed-on: https://code.wireshark.org/review/19696
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 21:03:18 +00:00
Chris Bontje 76d9d3dc5a Identify Ethertype 0x892B (Schweitzer Engineering Labs layer 2 traffic).
Change-Id: I5479ed21116dd8f91f231ebd1ec230892df9a404
See: http://standards-oui.ieee.org/ethertype/eth.txt
Reviewed-on: https://code.wireshark.org/review/19707
Petri-Dish: Michael Mann <mmann78@netscape.net>
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>
2017-01-20 20:01:13 +00:00
Dario Lombardo d6282d59a7 infiniband: add shutdown routine.
Change-Id: I3e7c1b8f589662a81c665b8b43056f20c17428ca
Reviewed-on: https://code.wireshark.org/review/19704
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:37:17 +00:00
Dario Lombardo 3cf4f8a823 corosync-totemnet: add shutdown routine.
Change-Id: Ib2e93c012ec0547d4eb5968d1bf47b0e1489f3df
Reviewed-on: https://code.wireshark.org/review/19649
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:35:02 +00:00
Dario Lombardo cc30ba1d70 gssapi: add shutdown routine.
Change-Id: If4d474b3c94019c6ef46f4ed5753a6a90625b1b1
Reviewed-on: https://code.wireshark.org/review/19650
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:32:53 +00:00
Dario Lombardo f7392323ef giop: add shutdown routine.
Change-Id: I954dd66d38390a1f67e8a0604bfdebb062a6f644
Reviewed-on: https://code.wireshark.org/review/19682
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:32:13 +00:00
Dario Lombardo 712d2aef72 ber: add shutdown routine.
Change-Id: Idc494f6be0f2fd2187f21bccb870d24655ce1da5
Reviewed-on: https://code.wireshark.org/review/19647
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:31:29 +00:00
Dario Lombardo 81cbd4c5d1 aim: add shutdown routine.
Change-Id: Ide2f6f55902a42baa3c36f9c3ad6fd392b6a48c3
Reviewed-on: https://code.wireshark.org/review/19698
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:31:13 +00:00
Dario Lombardo d865d98465 zvt: add shutdown routine.
Change-Id: Ied5ab457a372a74c1a7216002f5ea615ea2a5252
Reviewed-on: https://code.wireshark.org/review/19701
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:30:46 +00:00
Dario Lombardo 83d83dfdd4 zbee: add shutdown routine
Change-Id: I12ed488a26bde3a85cd75f61dad8f78412cd52ac
Reviewed-on: https://code.wireshark.org/review/19700
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:30:31 +00:00
Dario Lombardo 98718aa107 6lowpan: add shutdown routine.
Change-Id: I1e324f9d7fdf4d96d8d9d53cbf1932458a2ea1a5
Reviewed-on: https://code.wireshark.org/review/19703
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:30:16 +00:00
Dario Lombardo 6afcb1133a atalk: add shutdown routine.
Change-Id: Ie35e457ba69fccc3ff45df76a21c747249788a20
Reviewed-on: https://code.wireshark.org/review/19702
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 18:30:02 +00:00
Dario Lombardo db8b81b7a4 rpc: add shutdown routine.
Change-Id: Ic00dae4b73ef89d6108c8c3085b7ce5a99d88574
Reviewed-on: https://code.wireshark.org/review/19690
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 15:59:39 +00:00
Pascal Quantin 132cd6dbac DNS: update name_len variable when replacing name string
Bug: 13334
Change-Id: I07248747f678d4f89bbde33280b4d596462a4429
Reviewed-on: https://code.wireshark.org/review/19688
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>
2017-01-20 10:12:25 +00:00
Dario Lombardo 5c0003a980 disabled_protos: add cleanup function.
Change-Id: I7d585404463691946e2aa67e14e53edb813d9be8
Reviewed-on: https://code.wireshark.org/review/19681
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: Dario Lombardo <lomato@gmail.com>
2017-01-20 08:49:00 +00:00
Dario Lombardo f2c0248c28 follow-stream: add cleanup function.
Change-Id: Icfe7de118bc49da57f537601c2f256e4a028b4e2
Reviewed-on: https://code.wireshark.org/review/19680
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 04:12:50 +00:00
Michal Labedzki 6bf8e5bf9e Bluetooth: HCI_EVT: Implement "LE Direct Advertising Report"
It is part of Bluetooth Core 4 specification.

Change-Id: I7a1e542285d65452d99f753b27777fff80ad1c59
Reviewed-on: https://code.wireshark.org/review/19646
Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-20 02:36:52 +00:00
Pascal Quantin 069a532988 LDAP: fix wrong use of g_strlcpy introduced in gc397add
Last parameter is the destination buffer size, not the number of bytes to copy.

Bug: 13332
Change-Id: I9a6f5231d2d7a94fd5e692e8bbf4f5dba30b7c1a
Reviewed-on: https://code.wireshark.org/review/19677
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-20 00:28:18 +00:00
Dario Lombardo 5df8d09cdc packet: clean shutdown routines.
Change-Id: I620c683d77c724181a506e10f9d06a3944878690
Reviewed-on: https://code.wireshark.org/review/19679
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-19 23:57:46 +00:00
Ashish Shukla 27960cc6ab Always display vht mcs data rate, but mark invalid assuming BCC encoding.
Bug: 12859
Change-Id: Iaf2242b0dcf16f211d5a7565b96099cc44e8bf3d
Reviewed-on: https://code.wireshark.org/review/17899
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-19 21:41:38 +00:00
Dario Lombardo 07541f1f68 epan: add shutdown function for dissectors.
Dissectors can register shutdown functions, that will be called
just before program exit. Those function will free the memory
allocated during the init function.

Change-Id: Id88228af2cc916bfb316fe7b36d46499f6e4f8d4
Reviewed-on: https://code.wireshark.org/review/19282
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-19 21:40:46 +00:00
MustBeArt 86c4808518 DVB-S2-BB: Obey frame format from BB Header fields
Interpret packet contents according to the descriptive fields contained
in the BB header. Instead of always assuming a Generic Stream frame format,
use the TS/GS field to detect Generic Stream, Generic Packetized, Transport
Stream, or (reserved) frame formats and decode accordingly.

In the case of Generic Stream frames, check the validity of header fields
ISSYI, NPD, and UPL, and issue expert info if they are invalid for Generic
Stream frames. Then dissect as GSE (as before).

For other frame formats, just dump them as bytes for now.

Change-Id: I6b040207f83369110eb704c543861c887f77baa7
Reviewed-on: https://code.wireshark.org/review/19634
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>
2017-01-19 21:38:56 +00:00
Radhashyam Behera af073d45cd IEEE80211: Updated VHT Group ID Management
Detailed decode of Membership status & User Position in GroupID Mamagement frame.

Bug: 13322
Change-Id: I74b1d93757e3e10a2a0d4423fcfdcd2265e1bd62
Reviewed-on: https://code.wireshark.org/review/19564
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>
2017-01-19 12:54:46 +00:00
Dario Lombardo c397adda8a dns: change get_dns_name to return consumed bytes + actual name len.
Because of the DNS name encoding, the consumed bytes in the tvb and
the length of the string of the dns name can be different. We need
to handle them separately for the purpose they are. Moreover the
name string can contain null bytes, then we can't rely on strlen()
but we need the actual length.

Subsequent calls to proto_tree_add_string() will require to pass
the string to format_text() in order have non-printable characters
printed.

Bug: 13289
Change-Id: I6d0b295867ece265f8995f82da2c629992aeb703
Reviewed-on: https://code.wireshark.org/review/19539
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-01-19 09:31:37 +00:00
Simon Zhong a056b68576 pcep: Add support of draft-ietf-pce-pcep-service-aware-13
update support of draft-ietf-pce-segment-routing-08

Change-Id: I4d25268bb331462fbe219f242ff8278b017de37b
Reviewed-on: https://code.wireshark.org/review/19642
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>
2017-01-19 05:00:49 +00:00
Alexis La Goutte 755ccae9bf QUIC: fix dissection of ACK Frame
First Ack Block is always present in ACK Frame (don't depend of present of NACK)

Change-Id: I702151a6ccb236272ace9dfdf0f4b507a549871e
Reviewed-on: https://code.wireshark.org/review/19627
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>
2017-01-19 04:58:00 +00:00
Volodymyr Khomenko 7f52ff06a4 RSVD dissector: added RSVD v2 verbs
Improved operation_code map to resolve RSVD v2 codes.
Changed GET_FILE_INFO -> GET_INITIAL_INFO for spec conformance.
See https://msdn.microsoft.com/en-us/library/dn392322.aspx

SMB2 IOCTL FSCTL_SVHDX_ASYNC_TUNNEL_REQUEST must be handled in the same way as FSCTL_SVHDX_SYNC_TUNNEL_REQUEST:
RSVD dissector must be used (new async flow used by RSVDv2).
See https://msdn.microsoft.com/en-us/library/dn366375.aspx

Ping-Bug: 11232
Change-Id: Ie51773fc2199a7674538101b87cec398354bd97a
Reviewed-on: https://code.wireshark.org/review/19657
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>
2017-01-19 04:55:53 +00:00
Martin Kaiser b3432de4cf packet.c: use call_routine() for all lists
For running through the postseq cleanup and final registration lists, we
can use the same dummy function call_routine() that is used for the init
and the cleanup lists. We don't need our own copies.

Change-Id: Ia1ea647d5831adda26dab86eceba8fcf704ce122
Reviewed-on: https://code.wireshark.org/review/19668
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-19 04:39:32 +00:00
Michael Mann d04b5cd362 Use dissector tables for PPP protocols' options.
Create pinos for all of the PPP protocols options and a dissector table to store
them all.  Adapt a new version of dissect_ip_tcp_options, (now ppp_dissect_options)
that uses the dissector tables for name of options and dissection function.
Also standardize the dissectors for all protocols so that all include type and
length in the dissection.

Change-Id: I0033574e2831789040a1ce2857bf0e825d791cbe
Reviewed-on: https://code.wireshark.org/review/19656
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-19 04:32:49 +00:00
Dario Lombardo 37f4e42e98 packet: free postseq_cleanup_routines list.
Change-Id: Ic1972399b706407ce8f15a3e554f1304a36d1009
Reviewed-on: https://code.wireshark.org/review/19663
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-01-18 20:55:11 +00:00
Sandeep Dahiya 3138dad728 Gigamon Trailer support for new chassis types
Change-Id: Ib24cd2c701c0e158c07eff4dffe0bbf9937d132b
Reviewed-on: https://code.wireshark.org/review/19660
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-18 10:27:55 +00:00
Alexis La Goutte e021f74ed2 OpenFlow (v5/1.4): Add complete dissection of error messages
Like for OpenFlow (v4/1.3) (g4b7c2781fb)

Change-Id: I61cfea015e548e5eaa37856df86e96bd0ba21795
Ping-Bug: 13221
Reviewed-on: https://code.wireshark.org/review/19644
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>
2017-01-18 09:44:47 +00:00
Dario Lombardo fe89424160 stat_tap_ui: add cleanup function.
Change-Id: I0275a6e0d5d151f086d96c6388b9fa647ea0085c
Reviewed-on: https://code.wireshark.org/review/19654
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: Dario Lombardo <lomato@gmail.com>
2017-01-18 08:25:33 +00:00
Michal Labedzki ae03fc7353 Bluetooth: HCI_EVT: Implement some commands from Core 4
Now all unimplemented commands are in /* TODO */

Change-Id: I53c8dd0a660b62403214a3c75297e627337ed5fb
Reviewed-on: https://code.wireshark.org/review/19645
Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-17 21:04:22 +00:00
Dario Lombardo 57f530a7fe packet: free init/cleanup functions lists.
Change-Id: Ia28ceef189f8fe16105da88c01e1a159d5029c0a
Reviewed-on: https://code.wireshark.org/review/19655
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-17 15:40:15 +00:00
Dario Lombardo baaff60b3b exported_object: add cleanup function.
Change-Id: If4c35d18db1dc982e981004838e0eabbf4479e78
Reviewed-on: https://code.wireshark.org/review/19653
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-17 15:39:58 +00:00
Dario Lombardo baf2612d9e exported_pdu: add cleanup function.
Change-Id: Iafc9f1c4b2a0210d8098b37eefc095e740182258
Reviewed-on: https://code.wireshark.org/review/19648
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-17 03:26:04 +00:00
Volodymyr Khomenko 93df6be934 RSVD: fix TUNNEL_SCSI_REQUEST
Length of CDBBuffer must be always 16 bytes
If CDBLength is less than 16, add padding bytes

Change-Id: I241a10325ebe17b32469eaf7dc530fc7fe2105de
Reviewed-on: https://code.wireshark.org/review/19628
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>
2017-01-16 16:05:59 +00:00
Alexis La Goutte fb0d51aa66 802.11(ad): not longer need to use p_add_proto_data/p_get_proto_data for pass isGrant to beamforming control function
Change-Id: I719ff48a1992904c80c602f9706697e71b93ccba
Reviewed-on: https://code.wireshark.org/review/19640
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>
2017-01-16 16:03:02 +00:00
Parav Pandit 5f76627ef2 packet-nvme-rdma: Support Dissecting connect cmd & inline data.
This patch adds support to dissect data of the connect command which
comes along with the cmd in same packet.

It also removed unwanted tvb addition for rdma fabric commands,
completion and nvme commands.

Bug: 13201
Change-Id: I33062f67a69cdca4b909ed8c08201dea5e0aa095
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/19632
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>
2017-01-16 13:33:14 +00:00
Alexandr Savca f27734f3a2 packet-tns.c: Add Version2 (SQLNET_RETURN_OPI_PARAM)
I've tested with pcaps from SampleCaptures (wiki).

Change-Id: Ifa1b628fbc675843c54dfd4b993809fd072dc69c
Reviewed-on: https://code.wireshark.org/review/19636
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>
2017-01-16 13:30:18 +00:00
Alexis La Goutte b8ae1b1492 xml(.h): fix indent (use spaces) and modelines
use same indent like packet-xml.c

Change-Id: I687b0306ba1d3559ce4a299a0e66c55e3f04fdfd
Reviewed-on: https://code.wireshark.org/review/19641
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-01-15 21:17:14 +00:00
Gerald Combs 024cf942c6 [Automatic update for 2017-01-15]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ia487718c34913b5bb8297184fedb6c7ecaf604e6
Reviewed-on: https://code.wireshark.org/review/19637
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-15 16:12:14 +00:00
MustBeArt 990d2a9a4a DVB-S2-BB: Use proto_tree_add_bitmask()
Change-Id: I1a4b50873a183c0f6051dc0db3fecf5e62c92cbb
Reviewed-on: https://code.wireshark.org/review/19633
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-14 04:14:36 +00:00
Dario Lombardo dc647f115e geoip: free resources to avoid leak.
Change-Id: Ia4a938e8a6b3856959c375f4bfcdf565a21eabef
Reviewed-on: https://code.wireshark.org/review/19629
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
2017-01-13 16:40:30 +00:00
MustBeArt 15deb60734 DVB-S2 BB: Handle GSE Padding in BB frames
GSE Padding is outside of any GSE Packet and continues to the end of the
Baseband Frame, per 4.2.1 of ETSI TS 102 606-1.

Added dvb-s2_gse.padding as an integer representing the length in bytes
of the padding field.

Change-Id: I9ed22c37a1969059a09ba44d9e3473cb9d0a1880
Reviewed-on: https://code.wireshark.org/review/19579
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>
2017-01-13 12:50:36 +00:00
Pascal Quantin c2ddc300f3 X2AP: replace non ASCII characters in ASN.1 source files
Change-Id: I114ba3fc68dccf9f791488920f602906d2d8c124
Reviewed-on: https://code.wireshark.org/review/19626
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-13 12:48:05 +00:00
Pascal Quantin b357353f35 LTE RRC: upgrade dissector to v13.4.0
Change-Id: I5f7de78f0be320781091e17ec8c471a3fd482b14
Reviewed-on: https://code.wireshark.org/review/19625
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>
2017-01-13 12:40:37 +00:00
Pascal Quantin b34d93ad0e SSL: fix compilation without libgcrypt or gnutls
Change-Id: I785db404969f89a3f90eddbda5542ee6b676ddb8
Reviewed-on: https://code.wireshark.org/review/19623
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-13 08:13:59 +00:00
Guy Harris c303679d99 Decode TBCD strings in GSM MAP as per the GSM MAP spec.
Hex digits 0xa through 0xe are '*', '#', 'a', 'b', and 'c',
respectively.

Constify the dgt_set_t argument to tvb_bcd_dig_to_wmem_packet_str(),
while we're at it.

Bug: 13316
Change-Id: I7586f35d23fd262453779d99946e7ccad4b6ffab
Reviewed-on: https://code.wireshark.org/review/19620
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-13 07:16:30 +00:00
Parav Pandit a4bbd3cc77 packet-infiniband: Pass read request packets to ULP dissectors
This patch passes RDMA read request packets to ULP dissectors similar to
other RDMA packets so that ULP dissector can have opportunity to show as
upper layer protocol instead of IB or RRoCE.

Change-Id: I594d8eada858b7f77fc94be44e3639526789779e
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/19619
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-13 02:56:04 +00:00
Dario Lombardo aa76d58dd5 uat: fix build error without libgcrypt/gnutls
Change-Id: I00fea4d2e8c4d7fc8fc54627ced21796d40b854a
Reviewed-on: https://code.wireshark.org/review/19616
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>
2017-01-12 21:02:42 +00:00
Jan Spevak d6d5168881 Diameter: decode Emergency-Indication AVP (1538)
Change-Id: Ie40d61944fd47eb532b759cb122367c18840feff
Reviewed-on: https://code.wireshark.org/review/19615
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>
2017-01-12 15:43:49 +00:00
Dario Lombardo 805ddd1add uat: add a reset callback.
This function will free the resources allocated by the caller.

Change-Id: Ib486c14e4fd3c321662fb71f7fd06733ce9a64a4
Reviewed-on: https://code.wireshark.org/review/19375
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>
2017-01-12 12:39:15 +00:00
Pascal Quantin 01c8028add X2AP: upgrade dissector to v13.6.0
Change-Id: Ie312d354cadadba693ea5320c5bbc0957bde6514
Reviewed-on: https://code.wireshark.org/review/19613
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>
2017-01-12 05:46:31 +00:00
Pascal Quantin 9414f56152 S1AP: upgrade dissector to v13.5.0
Change-Id: Ic65ae88af37f0e82207c093827755f93934d9424
Reviewed-on: https://code.wireshark.org/review/19612
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>
2017-01-11 19:43:47 +00:00
Michael Mann d8be254a51 packet-btatt.c: Use protocol information from dissector handle instead of pinfo data for attributes.
Instead of using a dissector function placed in a dissector table, just use the
protocol information registered with the dissector table to create the desired
dissector tree.

Change-Id: Ic32b15e3c05d73df6e8f69890c47172e991bda6f
Reviewed-on: https://code.wireshark.org/review/19509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-11 12:55:30 +00:00
Alexis La Goutte 2d6f87623b OpenFlow (v4/1.3): rename dissect_openflow_payload_v4 to dissect_openflow_message_v4
Like OpenFlow (v5/1.4) dissector
and include dissect_openflow_header_v4

Ping-Bug: 13221
Change-Id: I123fad871bcb1c9d54946500505525d55a81f8f3
Reviewed-on: https://code.wireshark.org/review/19602
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>
2017-01-11 07:16:14 +00:00
Martin Kaiser 97b3f75c0f iso14443: use proto_tree_add_checksum()
replace our own function for dissecting the CRC with
the generic proto_tree_add_checksum()

Change-Id: I569c877836a7b771b01a37b57b6c50fc0183e9a7
Reviewed-on: https://code.wireshark.org/review/19601
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>
2017-01-11 05:39:20 +00:00
Guy Harris 0ecfc7280c Use tvb_new_subset_remaining() rather than tvb_new_subset_length_caplen().
Any call of the form tvb_new_subset_length_caplen(tvb, offset, -1, -1)
should instead be tvb_new_subset_remaining(tvb, offset).

Change-Id: I4bc95b028103ea4fc82453ef3460c147d7ccabd6
Reviewed-on: https://code.wireshark.org/review/19598
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:40:45 +00:00
Guy Harris 7cd6906056 Rename tvb_new_subset() to tvb_new_subset_length_caplen().
This emphasizes that there is no such thing as *the* routine to
construct a subset tvbuff; you need to choose one of
tvb_new_subset_remaining() (if you want a new tvbuff that contains
everything past a certain point in an existing tvbuff),
tvb_new_subset_length() (if you want a subset that contains everything
past a certain point, for some number of bytes, in an existing tvbuff),
and tvb_new_subset_length_caplen() (for all other cases).

Many of the calls to tvb_new_subset_length_caplen() should really be
calling one of the other routines; that's the next step.  (This also
makes it easier to find the calls that need fixing.)

Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
Reviewed-on: https://code.wireshark.org/review/19597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:19:37 +00:00
Alexis La Goutte 2a3b2360e1 ieee80211: Add Extreme (Zebra) Vendor Specific TLV
Only decode subtype 1 : AP Name with unknown data (7 bytes)

Change-Id: I4fc0c6fff1a931075ab333a8527251f12acb2827
Reviewed-on: https://code.wireshark.org/review/19586
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>
2017-01-10 00:06:22 +00:00
Guy Harris 8604ed2ef8 Consistently use tvb_reported_length_remaining().
That's the amount of data left in the packet; perhaps not all of it was
*captured*, and using tvb_reported_length_remaining() will throw an
exception, but that's what *should* happen ("packet cut short"
notification and all).

Use tvb_new_subset_remaining() to get a tvbuff with everything after a
certain point in the packet.

Change-Id: I2512e58e23600f7e7bbce0126732b05997692a65
Reviewed-on: https://code.wireshark.org/review/19596
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-09 23:14:10 +00:00
Guy Harris 2b482cd0c3 Use tvb_new_subset_length(); no need to do its work ourselves.
Change-Id: I581e14af2981c723a81e9c0340de0229b832e51a
Reviewed-on: https://code.wireshark.org/review/19595
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-09 22:27:18 +00:00
Jaap Keuter 49b2a1cdb7 Restore FCoIB frame marker handling (CID 1397701)
It seems that somewhere in the last few years the changes for FCoIB
have caused it to loose its frame marker processing. This change puts
that back.
Also there is an ambiguity in EOF handling, which is solved.

Change-Id: Iefbb42726e4e5491a50d7ce96626c906fb5ea857
Reviewed-on: https://code.wireshark.org/review/19594
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>
2017-01-09 19:13:33 +00:00
Alexis La Goutte 21c203e154 802.11(ad): Add reserved field of Grant ACK frame
Change-Id: I0bb982403fb7f36ad166234b16dbe8ad9b8b8eb8
Ping-Bug: 13244
Reviewed-on: https://code.wireshark.org/review/19592
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:26:01 +00:00
Alexis La Goutte f2f8f6ac82 802.11(ad): Remove comment about clang warning and set directly the value
Change-Id: Ie64608597c7d6a5b9a2fec9de8e8983233e0e10e
Reviewed-on: https://code.wireshark.org/review/19591
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:24:45 +00:00
Alexis La Goutte cbb5068b00 802.11(ad): Fix SSW Feedback dissection when Sector Sweep Direction = Responder
For the Sector Sweep Frame in which the Sector Sweep Direction = Responder, the format of the Sector Sweep Feedback Field should be the one in the standard (Figure 8-431d—SSW Feedback field format when not transmitted as part of an ISS) i.e. similar to the one in Sector Sweep Feedback Frame and Acknowledgement.

Issue reported by Hany ASSASA

bug: 13244
Change-Id: Ic8c6d83fc32d017fb73116a54759608498f99452
Reviewed-on: https://code.wireshark.org/review/19590
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:23:23 +00:00
Alexis La Goutte 9a1dfcca60 802.11(ad) fix typo : ambiguous assignment (CID 1398212)
Introducte in g62a54cb77

Ping-Bug: 13244
Bug: 13309
Change-Id: I2e3411cfd38685c08fd669fad1313663ba879936
Reviewed-on: https://code.wireshark.org/review/19589
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:20:13 +00:00
Peter Wu 86a5bf5abe TLS(1.3): update PSK extension for draft -18
Removed ke_modes and auth_modes fields, add
identity.obfuscated_ticket_age and binders fields. (Note that binders
field is not dissected further at this moment due to the lack of a pcap
for verification.)

Ping-Bug: 12779
Change-Id: I9af7d93feb2352a494be2d5bda66d124267cf464
Reviewed-on: https://code.wireshark.org/review/19462
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:18:26 +00:00
Gerald Combs ffa239950a [Automatic update for 2017-01-08]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I91668647c50e78b29bbb28f2348dc8e52c3a66c5
Reviewed-on: https://code.wireshark.org/review/19585
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-08 16:14:21 +00:00
Michael Mann 3952052426 Restore some MPLS registered dissectors.
Per https://ask.wireshark.org/questions/58532/missing-dissector-pw_eth_cw
it appears some MPLS dissectors are still referenced by name and
not just for the dissector table created in
I1e0c3ae784b71c0145b1f1730a97feae8e9f488f.

Change-Id: I27be132f56c879be16f78f76ac0e9688673a47c1
Reviewed-on: https://code.wireshark.org/review/19582
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>
2017-01-08 08:15:41 +00:00
Guy Harris 082ba063ef Comments on the first nibble stuff.
If you don't have control words - and several MPLS pseudo-wire RFCs say
"in these cases, a control word isn't necessary, and isn't useful, so
you might want to leave it out" - the first nibble values of 0, 1, 4,
and 6 could just be part of the packet header.

Explain some other stuff as well.

Change-Id: I2f1aae2ab8653bdd7f8b3b52ef450f6d43a1afcd
Reviewed-on: https://code.wireshark.org/review/19583
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-08 02:33:53 +00:00
Eliot Lear 03a8884989 Add MUD-URL manufacturer usage description certificate extension.
See draft-ietf-opsawg-mud for details.  File changes include addition
of new asn1 directory and associated files, as well as edits to various
other files to support the change.

Change-Id: Ib910980e1ddcafaa31aa07cf049562520b61a3aa
Reviewed-on: https://code.wireshark.org/review/19505
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-07 20:11:39 +00:00
Michael Mann 165c8b0422 Refactor range preference.
Refactored so that all handling of ranges in struct preference
can be internal to prefs.c

Change-Id: I68577909f9c07b23a16ab3443a523355d4645314
Reviewed-on: https://code.wireshark.org/review/19577
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07 15:35:18 +00:00
MustBeArt fb9ac503c1 DVB-S2 BB: Fix BB header CRC checks
Fix problem with baseband header CRC check that caused almost all
baseband frames to show a spurious CRC error, introduced with
proto_tree_add_checksum.

Change-Id: I6b2f9680507eeb79e59b825f3ac9e4cee1033976
Reviewed-on: https://code.wireshark.org/review/19567
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-01-07 12:05:16 +00:00
Noel Power 0dcbfab426 Make column size sanity check more sensible.
The existing sanity check on column_size makes incorrect assumptions
about the size of the CTableColumn structure (which is an internal
dissector structure that contains optional data). The sanity check
test *always* fails. This change uses the minimum size of CTableColumn
structure instead which should prevent excessive allocation during fuzz
testing.

Bug: 13299
Change-Id: Id9fcbc15a4df4c74bb7576c6fdca1000890947fd
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-on: https://code.wireshark.org/review/19566
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>
2017-01-07 07:05:15 +00:00
Jeff Morriss ae5dbe1b63 Add support for RROCE(v2) over IPv4 (without UDP).
This isn't standard but has been seen in the wild, see:
https://ask.wireshark.org/questions/58521/cannot-decode-rocev2-traffic

With this change users can Decode-As an IP Protocol as RROCE (by selecting
Infiniband (IB) as the protocol).

Change-Id: Iec865478d056f687f2f66124d6e936f67707d2c4
Reviewed-on: https://code.wireshark.org/review/19572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-07 06:57:55 +00:00
Parav Pandit ea7440481e packet-nvme: Dissect read/write cmd and SGL
1. Added support to dissect read and write commands.
2. Added support to dissect SGL fields addr, len, key.
3. Changed long reserved fields to decimal presentation.
4. Fixed typo for cqe reserved field.

Change-Id: I63c674c68143c9c61610bada0410b49a134361d4
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/19565
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>
2017-01-07 00:58:08 +00:00
Peter Wu 4dc983d648 packet: fix memleak of "short_name" for heuristics dissectors
Change-Id: I3b954e3623473899b6039f0ff572eb56defe14cc
Fixes: v2.3.0rc0-1841-ga8b68205a4 ("packet: duplicate short_name to fix UAF in wslua")
Reviewed-on: https://code.wireshark.org/review/19571
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>
2017-01-07 00:46:29 +00:00
Michael Mann 6a6d7ea34f Convert range API to always use wmem memory.
This is mostly to address memory leaks in range preferences (the biggest
user of range functionality) on shutdown.
Now range preferences must use epan scoped memory when referencing
internal preference structures to keep consistency.

Change-Id: Idc644f59b5b42fa1d46891542b53ff13ea754157
Reviewed-on: https://code.wireshark.org/review/19387
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07 00:44:10 +00:00
Alexis La Goutte 29a7fce272 802.11(ad): Enhance dissection of Beacon Interval Control (BIC)
You can now use bitmap on 64bits (or 48bits)

and also add a reserved field

Ping-Bug: 13244

Change-Id: I2ec9412f6cfebd3a8ca5c082af5e8481e2646eaf
Reviewed-on: https://code.wireshark.org/review/19561
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>
2017-01-06 14:12:13 +00:00
Michael Mann 79fc411936 Convert some easily identifiable pinos.
grepping for "Decode As" comments reveals exactly was pinos were
created for - distinguishing multiple dissection functions in a
single dissection table.

Change-Id: Iaa9294045e9d0633563e7d763cb585c0e6dc598f
Reviewed-on: https://code.wireshark.org/review/19490
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 12:48:47 +00:00
John A. Thacker f0b1099f81 VLAN: Support IEEE 802.1Q-2005 and -2011 changes
Supports the recommended meanings of the priority field as
changed by 802.1Q-2005, and the change from the CFI to DEI
in 802.1Q-2011. A preference is added to use the older
(non-compatible) spec version. Note that 802.1Q-2011 is
consistent with 802.1ad and ah, which got rolled up in 802.1Q,
but ends up removing support for bridging Token Ring and FDDI
over Ethernet.

Bug: 13294
Change-Id: Ieeadb0f6dda2758750f9e6649f1390609d78c50e
Reviewed-on: https://code.wireshark.org/review/19548
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 12:43:38 +00:00
Alexis La Goutte cea1063af1 802.11(ad): add reserved fields for Beam Forming
Change-Id: I486c883b27059eb55e9fe11fcc372fc31c1e56ca
Ping-Bug: 13244
Reviewed-on: https://code.wireshark.org/review/19560
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 03:38:17 +00:00
Alexis La Goutte 3871df544a 802.11(ad): align length of Beam Forming
use UINT16

Change-Id: I7f7c4e847ed6ccb6ced446d493aa27f76cc8db61
Reviewed-on: https://code.wireshark.org/review/19559
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 03:37:39 +00:00
Alexis La Goutte b4176fdaa5 802.11(ad): fix typo
Wrong field name for Dynamic Allocation

Issue reported by Hany ASSASA

Bug: 13244
Change-Id: Idec2cb48c5b3d22d75880325d2aec0083d89ca95
Reviewed-on: https://code.wireshark.org/review/19558
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 03:36:04 +00:00
Jeff Morriss a8d4051e69 Update the preference help text to indicate the correct default RROCE port.
I97b82fb53fd63d9107ee5d4c64b94840e743fc72 changed the default but not the
help text.

Change-Id: I05375c44c01703e36686d0a16a094cb8d6b3dcd2
Reviewed-on: https://code.wireshark.org/review/19557
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>
2017-01-05 22:26:08 +00:00
Pascal Quantin ee5ade8fc5 NAS EPS: NAS message container in Control Plane Service Request can be ciphered
Change-Id: I026fc63e09c54807604c5d5a112c36dd41759c00
Reviewed-on: https://code.wireshark.org/review/19556
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>
2017-01-05 12:30:50 +00:00
Alexis La Goutte 3f176f94e7 QUIC: fix typo on ACK num revived field description
Found in https://ask.wireshark.org/questions/58396/some-question-about-quic-decode-result

Change-Id: Ic7fc2c2318186eabb5047f816987d2553a6fd449
Reviewed-on: https://code.wireshark.org/review/19547
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-04 23:28:43 +00:00
Juanjo Martin 15ad25ecb5 RTPS: Added dissection for Parametrized user data
Before we were showing an expert warning saying that it was not
supported. Now we show the parametrized data dissected in the form

sequence of (id, length, value)

Added also filters so it is possible to filter on the ids (useful
in RTPS)

Bug: 13278
Change-Id: I8569830305bc303febe6f3460221e7a52867a34d
Reviewed-on: https://code.wireshark.org/review/19458
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>
2017-01-04 05:23:43 +00:00
Pascal Quantin 6609801357 RRC: upgrade dissector to v13.5.0
Change-Id: I95323ed8aabff7a20442c848fa0dc39854297584
Reviewed-on: https://code.wireshark.org/review/19527
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>
2017-01-04 05:12:54 +00:00
Guy Harris a2d6fb94fc No reason not to use etype_vals for an Ethertype field.
Maybe there was an issue on Windows back in the old days, when 1) we
didn't have a shared libwireshark library from which to import functions
and data variables and thus you couldn't get variables such as
etype_vals in a plugin and 2) the Infiniband dissector was a plugin, but
neither of those are the case any more.

Change-Id: Id8b82886317bd36a32ad1e1591673623696d4808
Reviewed-on: https://code.wireshark.org/review/19530
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 02:10:24 +00:00
Martin Mathieson ab286246dc Ensure that tcp.reassembled_in is added to the tree for first segment.
Bug: 3264
Change-Id: I9fa8cfaf1e21a8a984941ee40e2e404ae21e55c9
Reviewed-on: https://code.wireshark.org/review/19528
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-04 00:47:49 +00:00
Dario Lombardo 564051df5e infiniband: remove offset variable.
Change-Id: Ie86c2aece05ebbc35eb15a54d8c3f2c455ff53cf
Reviewed-on: https://code.wireshark.org/review/19516
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-03 15:02:41 +00:00
Dario Lombardo 8c86f3b0a3 infiniband: fix error for clobbered variable.
Given by gcc-4.9.2 on arm:

epan/dissectors/packet-infiniband.c:2708:9: error: variable ‘offset’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
     int offset = 0;
         ^
cc1: all warnings being treated as errors

Change-Id: I12066031093c1fa638792ff8be8f3f5457e3feda
Reviewed-on: https://code.wireshark.org/review/19515
Petri-Dish: Dario Lombardo <lomato@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>
2017-01-03 13:31:07 +00:00
Mirko Parthey 13851f331c ISAKMP: add Reserved fields
Add Reserved fields as defined by:
* RFC 7296 for IKEv2
* RFC 2408 for IKEv1
* draft-ietf-ipsec-isakmp-mode-cfg-05 for the IKEv1 Attributes Payload

Change-Id: I0c25de6e543aa5461650fb4cd2c103a6a3a8c392
Reviewed-on: https://code.wireshark.org/review/19480
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>
2017-01-03 12:38:38 +00:00
Michael Mann ab075d3563 Use g_slist_find_custom instead of g_slist_nth when just looking for item in list.
Change-Id: Ida3c5d5826f0ca01a25052a67f1460ff4686008f
Reviewed-on: https://code.wireshark.org/review/19513
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-02 23:16:34 +00:00
Mirko Parthey 6f9c4c807e ISAKMP: Fix size of ID in IKEv1 Attributes Payload
Fix the size of the Identifier field in the IKEv1 Attributes Payload.
Reference: draft-ietf-ipsec-isakmp-mode-cfg-05, section 3.2

Change-Id: I30bfde9caa6750b342f7dfbad39e63341614a45b
Reviewed-on: https://code.wireshark.org/review/19502
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: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-01-02 20:23:46 +00:00
Mirko Parthey 6af7425cee ISAKMP: fix dissection of IKEv2 ID Payload
Fix dissection of the IKEv2 Identification Payload.
Unlike IKEv1, it does not have Protocol and Port fields.

References:
* RFC 2407, section 4.6.2
* RFC 7296, section 3.5

Change-Id: I968e378abd49363785dd7308a4f27908c1c05a8a
Reviewed-on: https://code.wireshark.org/review/19497
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-01-02 13:17:08 +00:00
Martin Mathieson b358b870b3 Snort: without explicit disable, expand preference to switch off
Change-Id: I5fd3b0cc6f19c4c873aaaae8c9e257a8b53a8419
Reviewed-on: https://code.wireshark.org/review/19489
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>
2017-01-01 21:00:05 +00:00
Gerald Combs b380013051 [Automatic update for 2017-01-01]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I397e20ffbc5227cb22d838c9eec68fae0e216162
Reviewed-on: https://code.wireshark.org/review/19492
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-01 16:10:33 +00:00
Alexis La Goutte 4b7c2781fb OpenFlow (v4/1.3): Add complete dissection of error messages
Bug: 13221
Change-Id: Ide3e734fca280a294a993afade2503cd751d78a2
Reviewed-on: https://code.wireshark.org/review/19459
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>
2017-01-01 15:08:00 +00:00
Guy Harris 4e5408cda9 Fix backwards #if defined.
Left over from some stuff I was fiddling with.

Bug: 11785
Change-Id: Ifb06e8b65db65037b336c46e5e180012ae5b7a59
Reviewed-on: https://code.wireshark.org/review/19487
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-01 05:46:37 +00:00
Guy Harris a6ce00feb3 Squelch a compiler warning from Xcode 8 clang.
Unless I'm missing something, that code can't be reached, so local_proto
should always be set.

Change-Id: Idf765552d66cce684eb0de8dc8da57382aaf8444
Reviewed-on: https://code.wireshark.org/review/19486
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-01 05:44:21 +00:00
Guy Harris 8909dff721 Always use the Windows time zone code on Windows.
We *have* to use the Windows code on Windows for the reasons given in
the comment.  However, some versions of Visual Studio have a time.h that
CMake thinks defines tzname[] (which the header will do under some
circumstances), so HAVE_TZNAME gets defined on Windows.  We check for
Windows *before* checking for HAVE_TZNAME - or HAVE_STRUCT_TM_TM_ZONE.

Bug: 11785
Change-Id: I61360daf08203dbd9d109a87c05727b4dbecea66
Reviewed-on: https://code.wireshark.org/review/19483
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>
2017-01-01 05:19:49 +00:00
Michael Mann f30b1e3b3b Make TCP options into a dissector table.
This provides external access for dissectors and plugins to provide their
own implementation of TCP options.

Bug: 13141
Bug: 4452
Change-Id: I2fa6290616a4d8a8b421dd6daf98a23ce55479b9
Reviewed-on: https://code.wireshark.org/review/19461
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-31 13:09:28 +00:00
Michael Mann a0be5ad6f1 Add interface for "pinos" (Protocols in name only)
This is for dissectors that need distinguishing names either for registering
multiple dissection functions in a single dissector table or for "internal"
dissectors whose just need a name associated with the dissection function.
Features like enable/disable are handled by the "parent" protocol.
This avoids clutter in the "official" protocol list.

Change-Id: I69e7d27d332ae85286f254e95e8d79920da7a9e2
Reviewed-on: https://code.wireshark.org/review/19464
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-31 13:08:41 +00:00
Alexis La Goutte 6a5fcc5a38 TLS(1.3): Add PSK Key Exchanges Modes (45) hello extension
Ping-Bug: 12779
Change-Id: Ie797a437240e5530d74e3039f12a60a6f0395d0a
Reviewed-on: https://code.wireshark.org/review/18916
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-31 07:36:57 +00:00
Michael Mann f4b0abc729 Dissectors don't need a journey of self discovery.
They already know who they are when they register themselves.  Saving the
handle then to avoid finding it later.
Not sure if this will increase unnecessary register_dissector functions
(instead of using create_dissector_handle in proto_reg_handoff function)
when other dissectors copy/paste, but it should make startup time
a few microseconds better.

Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43
Reviewed-on: https://code.wireshark.org/review/19481
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>
2016-12-31 07:31:42 +00:00
Michael Mann 13964595ad Add BASE_NO_DISPLAY_VALUE to allow field value to not be shown.
There are times when byte arrays don't want to show their value
in the packet tree or there is a field that is the "header" of
a subtree where showing the field value distracts from the tree
display.  For these cases, BASE_NO_DISPLAY_VALUE can be used
to not display the value.

Change-Id: I8c9f1f57cd2e663dbee07e2289e7f5e1f22d1e32
Reviewed-on: https://code.wireshark.org/review/19479
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-30 20:03:03 +00:00
Pascal Quantin 2d8615948e ENC: fix parsing of header broken by gee242bd
From the code before change, it appears that only SPI field is in network byte order.

Bug: 13279
Change-Id: Ia157b43a9da30d61dc9cb7607c66d44c8f607498
Reviewed-on: https://code.wireshark.org/review/19477
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-30 17:53:35 +00:00
Paul Williamson 0acd5034ac Revert "Support all MA modes, fix BB CRC and frag edge cases"
Supporting all MA modes this way makes the dissector useless as a heuristic dissector; it always matches. I just didn't understand about heuristic dissectors, and will look for a better solution.

The fragmentation edge cases were also misunderstood. On closer reading of the spec, these are not valid edge cases to be handled smoothly, but packet formatting errors to be diagnosed.

The BB CRC fix is valid AFAIK, and will be resubmitted separately.

This reverts commit 2563503301.

Change-Id: I842f4eca59193b24f41a67ce7d081c681b70f449
Reviewed-on: https://code.wireshark.org/review/19449
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>
2016-12-30 12:44:29 +00:00
Роман Донченко 2f096100f5 cms: don't assert if eContent fails to be dissected
If eContent is not an octet string, content_tvb will be null, and
attempting to use it will trigger an assertion. Besides ill-formed
files, this can also occur in old-style PKCS #7 files, since in PKCS #7
the corresponding field has the ANY type, rather than OCTET STRING.

Change-Id: I9a5bce983aa82107a9602317737c183461cac7f3
Reviewed-on: https://code.wireshark.org/review/19448
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>
2016-12-30 12:43:36 +00:00
Alexis La Goutte e7a4c82b85 QUIC: Add SMHL (Support Max Header List Size) tag
Change-Id: I093f71d3ca409e048211fedf671551721b94d535
Reviewed-on: https://code.wireshark.org/review/19474
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>
2016-12-30 12:04:19 +00:00
Alexis La Goutte f1fb896e58 QUIC: fix link to error code
Change-Id: If5a0e547c1fb952584f7e661ae5ad1abfdf4bec3
Reviewed-on: https://code.wireshark.org/review/19473
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-30 10:18:48 +00:00
Alexis La Goutte 5c356aaa83 enc (openBSD): Add reserved/unused field for flags
and fix also bitmap (32 bits)

Change-Id: I04b7cb64bf7d593648131c09d05eb8e9b1eca8ca
Reviewed-on: https://code.wireshark.org/review/19471
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>
2016-12-30 10:18:20 +00:00
Alexis La Goutte b4afbb24a5 enc (openBSD): fix flags field description
Change-Id: I5b17d4bfea82770458b002aacfca0fc941639899
Reviewed-on: https://code.wireshark.org/review/19470
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-30 09:29:53 +00:00
Jaap Keuter 931253800a UDLD: Use correct flag bits
Assigned flag bits are the least significant bits of the flags field,
not at the most significant end.

Bug: 13280
Change-Id: Ie568df6ca137c491fedb32cf2316a0240270b3d6
Reviewed-on: https://code.wireshark.org/review/19463
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-30 04:53:42 +00:00
Alexis La Goutte 7f576aab36 zvt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I0f7a620e5fbdab4a4c6b62b1b7bc884073bc0f45
Reviewed-on: https://code.wireshark.org/review/19447
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29 11:29:08 +00:00
Martin Kaiser 763d7f3012 zvt: mark some functions as inline
Change-Id: I2637fc18b1eeda5e567ee62c8ed53c6757c259bd
Reviewed-on: https://code.wireshark.org/review/19457
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29 11:26:45 +00:00
Martin Kaiser d05be43a89 zvt: dissect card type and result code bitmaps
Change-Id: I26a7821642224c707dc4542a35b2b5b5aee159d5
Reviewed-on: https://code.wireshark.org/review/19456
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29 11:26:33 +00:00
Martin Kaiser 4eb5836a2c zvt: dissect the text lines TLV data object
Change-Id: I3d54b4568b883b95294e29347bde0736b78157e1
Reviewed-on: https://code.wireshark.org/review/19455
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29 11:26:20 +00:00
Martin Kaiser af1a148065 zvt: dissect the status apdu, add some more bitmaps
Change-Id: If74221dd55d61c5794f570daf38c88771f4a2f38
Reviewed-on: https://code.wireshark.org/review/19454
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29 11:26:04 +00:00
Martin Kaiser 8f28a52812 zvt: add some more tag names
Change-Id: If181a22f2794fb9fe812719593f8a7eb642bce42
Reviewed-on: https://code.wireshark.org/review/19453
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-12-29 11:25:27 +00:00