Commit Graph

36316 Commits

Author SHA1 Message Date
Anders f71b148edd [BTMESH] Dissect more of Upper transport Layer.
Change-Id: I5d33c64a57689939c9915336701accba8b893415
Reviewed-on: https://code.wireshark.org/review/25115
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03 10:10:20 +00:00
Anders 9b4c96334d [NAS-EPS] 5G NAS EPS network feature supported and capability info update.
Change-Id: I243b52e8c448541636f3f94007ee3d850a5811ab
Reviewed-on: https://code.wireshark.org/review/25111
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 13:35:11 +00:00
Robert Grange ea60ed427e packet-mq: Fix after change 25009
Fix for unused variable mq_MQPRI_vals
Fix test when displaying unique MQ Segment (vs multi MQ segment)
Changed my name in AUTHORS

Change-Id: I8ffa5523dbf8469d2814d2a90348eea61a05823a
Reviewed-on: https://code.wireshark.org/review/25106
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-02 12:14:40 +00:00
Stig Bjørlykke 3d846aceab btatt: Remove custom UUID dissectors from btatt.handle DecodeAs
Do not add custom UUID dissectors to the DecodeAs "btatt.handle"
table because it does not work to DecodeAs this attributes using
the "BT ATT Handle" field.

This removes some of the artificial protocols which is generated
from BT attributes, and avoids adding new ones when extending
the custom UUID dissection support.

Change-Id: I8384a56b49cac2ea64508470d67c67b6ec7cd13e
Reviewed-on: https://code.wireshark.org/review/25107
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 11:48:11 +00:00
Alexis La Goutte 5bb763a918 QUIC: use varint for all type (draft-08)
Bug: 13881
Change-Id: Ia68659fed9b884bd99de8179e4a320089920df4d
Reviewed-on: https://code.wireshark.org/review/25088
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 09:33:43 +00:00
Stig Bjørlykke 4ac11e0fa1 mq: DEF_VALSB(MQPRI) is still unused
Change-Id: I269c2f367d1d65b006ad881976085dbdf983c407
Reviewed-on: https://code.wireshark.org/review/25105
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-01-02 08:48:58 +00:00
Stig Bjørlykke 7a2fae2b79 nxp802154: Remove unused code
The IEEE 802.15.4 dissector is built-in and will never be not present,
and if disabled then call_dissector() will call data handle.

Change-Id: Ie8d2a1bed1ba540df1a5bc239b57e475b346c8f1
Reviewed-on: https://code.wireshark.org/review/25103
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 07:41:24 +00:00
Alexis La Goutte d383e34408 QUIC: Add new ACK type (0x0e) of draft-08
Bug: 13881
Change-Id: I7340c6cf2c149cbc547133ea89083c75a5ad05f1
Reviewed-on: https://code.wireshark.org/review/25084
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 07:40:07 +00:00
Alexis La Goutte 8c87af9880 QUIC: Add decrypt Handshake Packet
From/to Server/Client

Store the port destination to found key need to be used

Change-Id: If7f2edcdb21f5b5aa9de28431db8dc3ec6d76602
Reviewed-on: https://code.wireshark.org/review/25083
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:34:23 +00:00
Alexis La Goutte 1a7d65d085 TLS(QUIC): update TransportParameter to draft-08
not longer negotiated version on Client Hello but on encrypted extensions

Missing add new TransportParameterId (ack_delay_exponent and initial_max_stream_id_uni)

Bug: 13881
Change-Id: I5d76662b8c7767c48fdec460e2249d49c6693f18
Reviewed-on: https://code.wireshark.org/review/25018
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:32:55 +00:00
Alexis La Goutte c8c268626c QUIC: Add new STREAM type (0x10 to 0x17) of draft-08
using varint for Stream ID/Offset/Length

Bug: 13881
Change-Id: I9c9524e494e6cb8785d919fee596f94401b12fed
Reviewed-on: https://code.wireshark.org/review/24991
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:31:41 +00:00
Alexis La Goutte 0bde3e96f0 Add ENC_VARINT_QUIC
Used to support variable length in QUIC protocol

Bug: 13881
Change-Id: Ia274b1530152376c5fb4e364fc4cf5ab246be1b3
Reviewed-on: https://code.wireshark.org/review/24990
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:29:39 +00:00
Merlin Chlosta af6dee3571 Add columns (_ws.col) to output formats json, ek, pdml
Bug: 13020
Change-Id: Ia83797a4e390be7cc59a9718735edc1c7f9a5712
Reviewed-on: https://code.wireshark.org/review/24928
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:27:51 +00:00
Robert Grange 487eae3507 packet-mq: Improve display of ID Struct + Segmented Msgs
Improve display of ID Struct for FAP Lvl 13
Improve display for Segmented MQ Mesages
Add also the ReasonCode of the ASYNCH_MESSAGE in column and tre node
Added various new CONST for display

Change-Id: I458296e466d0744627e0b4f645d634b0c6d930de
Reviewed-on: https://code.wireshark.org/review/25009
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 05:26:31 +00:00
Michael Mann 4b7700db4b LNET: Fix gcc 7 compiler complaints
Change-Id: Idad6411139226cb6694b8dad5cb2107882f90848
Reviewed-on: https://code.wireshark.org/review/25102
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-02 04:28:47 +00:00
Dario Lombardo 9aa42e89c3 dmp: rework build_national_strings() to avoid read/write overrun.
CID: 1417455
CID: 1417459

Change-Id: Idb63e21608825562f61c445309c1b95bb5b3692c
Reviewed-on: https://code.wireshark.org/review/25075
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-01 21:15:05 +00:00
Uli Heilmeier 404d004907 IPv6: Add segmentation offload (TSO) support
When capturing on hardware with segmentation offload enabled IPv6
payload size can be reported as zero.

This commit adds a preference to dissect such frames.

Heavily based on the TSO code of packet-ip.c

Bug: 14155
Change-Id: Ibec3c35c739d8673fa655bde4f66198a22f567c4
Reviewed-on: https://code.wireshark.org/review/24900
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-01 21:12:27 +00:00
Alexis La Goutte 3d58a16038 TDS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I3345246de63781decc1046834f82f60f02ad54c0
Reviewed-on: https://code.wireshark.org/review/25101
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-01 20:38:40 +00:00
Alexis La Goutte 296f1f35d8 QUIC: fix build when don't have libgcrypt with AEAD (< 1.6.0)
Change-Id: Ic77d12ac07f82ea315734782f97b035376b8b2e8
Reviewed-on: https://code.wireshark.org/review/25099
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-01 20:23:33 +00:00
Lee Mitchell 25a0583ec8 Add dissector for NXP's 802.15.4 sniffer server messages
Change-Id: I360bc4f802e28e9fc64cbd5cc06e514cbaf3b25f
Reviewed-on: https://code.wireshark.org/review/25091
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-01 19:04:19 +00:00
Uli Heilmeier 077124097d ICMP: Resolve Extension Object Class value
Resolve ICMP Extension Object Class value to name as defined at
https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-ext-classes

Ping-Bug: 6632
Change-Id: I73ce9dbef5b09aa49f16c73a04ce474cd46f5695
Reviewed-on: https://code.wireshark.org/review/25098
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-01 17:42:26 +00:00
Graham Bloice 9b5e568023 nfapi: Fix spurious checkAPI warnings
Uppercase a lot of "index" words in strings to quieten checkAPI.
Removed some redundant double spaces.

Change-Id: Ica5915095037ec3da1d7c92d05c3a4d155bb302c
Reviewed-on: https://code.wireshark.org/review/25092
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 20:02:36 +00:00
Graham Bloice 1fa22c2ee9 btmesh: replace\convert g_warning
Replace g_warning with ws_g_warning, add expert info.

Change-Id: I54ae5959f89ee85bdd821f07af8cf4ec3172748e
Reviewed-on: https://code.wireshark.org/review/25090
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 18:15:43 +00:00
Graham Bloice 3c35f278b9 nfapi: fix typo, correct expert info message
assignmnet => assignment
update message to show its the length value in error

Change-Id: Ic320dafb00d4e6ceb7b3b7addaf2bff25739851f
Reviewed-on: https://code.wireshark.org/review/25089
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 16:41:09 +00:00
Graham Bloice b9210c72f5 DNP3: Add support for new Group 0 variations
Add support for new objects g0v196-210
Rework handling of g0 objects

Change-Id: I64c46cf4709799711a7cc6ca77fe356e47dced62
Reviewed-on: https://code.wireshark.org/review/25086
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-12-31 16:02:12 +00:00
Alexis La Goutte a8088cce88 QUIC: Add decrypt of Initial Packet
Missing Handshake and need to fix dissection of payload with varint change...

Bug: 13881
Change-Id: Ib8fb6321436d72c8c4dba172dd43ef31288615d9
Reviewed-on: https://code.wireshark.org/review/24962
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-31 14:28:33 +00:00
Nathaniel Clark 1fcc10c17e [lnet] Initial Lustre Network Support
Add Lustre Networking layer LNET.

Change-Id: I36eb9eac7e0f5e40dece0ef2ad7c038fab10e192
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/24795
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-31 14:26:49 +00:00
Gerald Combs f930710585 [Automatic update for 2017-12-31]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I38b0274b93baf3e2d307827f04960f4bf7407842
Reviewed-on: https://code.wireshark.org/review/25080
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-31 08:16:15 +00:00
Kenneth Soerensen 5daead33ae ZigBee: Add remaining attributes from Smart Energy Price cluster
Change-Id: I365e40d1e0c287ecfcee30fb72538d360926b827
Reviewed-on: https://code.wireshark.org/review/25068
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-30 12:40:34 +00:00
Thomas Chen 3b4aabe818 websocket: All decompressed payloads are same when more than one compressed data payload in a TCP PDU.
Change-Id: Ie31721a34518dd87a99621ea6f0234f2cd7d9e85
Reviewed-on: https://code.wireshark.org/review/25066
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-30 07:27:04 +00:00
Thomas Chen 998507d327 proto_data.c: Fix bug in p_remove_proto_data.
Change-Id: I44654b1aa6f513a0bccb88cba3181f5c52073832
Reviewed-on: https://code.wireshark.org/review/25065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-30 07:25:56 +00:00
Alexis La Goutte ea8d0c51b3 proto(.h): fix indent (align...)
Change-Id: Ie3f41b76719a5e91c27b5ae2805f23cd26f1fa11
Reviewed-on: https://code.wireshark.org/review/25059
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 20:39:33 +00:00
Dario Lombardo 0b124bff9b cip: initialize variable (CID: 1403067).
Change-Id: I65c1b59f8dd6adb471872b74ec9963066053ec66
Reviewed-on: https://code.wireshark.org/review/25071
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 20:26:31 +00:00
Dirk Römmen 0c4a307ee5 Corrected gcc-7 compilation warning "implicit fallthrough" in BACnet dissector.
Change-Id: I28c1d2b811209f9e3e606244cf420356af1ddecf
Reviewed-on: https://code.wireshark.org/review/25060
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 14:15:48 +00:00
Jakub Zawadzki f31e9b3154 Use gcry_strerror() to get crypt error description.
It seems using gcry_strerror() should be correct,
it also fix building when --without-gnutls (when -lgpg-error is not added):
  /usr/bin/ld: epan/.libs/libwireshark.a(packet-ipsec.o): undefined reference to symbol 'gpg_strerror@@GPG_ERROR_1.0'

Change-Id: I142e2e553fd7da501bd57635b8826ff42e114085
Reviewed-on: https://code.wireshark.org/review/25064
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 14:14:59 +00:00
Alexis La Goutte 95bb65ff25 QUIC: Initial draft-08 support
Add new Long and Short Packet type
Set version field before packet number

Bug: 13881
Change-Id: I894bc5ada0d5d0269c8d12749533eaa07c553635
Reviewed-on: https://code.wireshark.org/review/24961
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 14:12:27 +00:00
Stig Bjørlykke b60a60717f btatt: Skip Units and Members UUIDs in decode-as
Change-Id: I926c2abdfb6620236fabd6ae5aa1aa35d1fa79d2
Reviewed-on: https://code.wireshark.org/review/25050
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-29 07:53:47 +00:00
Stig Bjørlykke c693522e33 bluetooth: Update Assigned Numbers
Change-Id: I1565d8fa8983c36a6efe6ffbdb97b1e874632891
Reviewed-on: https://code.wireshark.org/review/25049
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-29 06:13:03 +00:00
Dario Lombardo 26222c96bb nvme-rdma: check return value of find_conversation() (CID: 1398218).
Change-Id: I091471cbc59170f21f55aee0b29f1733f269cd05
Reviewed-on: https://code.wireshark.org/review/25042
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 01:41:49 +00:00
Dario Lombardo fb8b28005f amqp: check return value of conversation_get_proto_data().
CID: 1325720.
CID: 1325721.

Change-Id: Ia781c70a3580fbd534b470664451e4838948dce4
Reviewed-on: https://code.wireshark.org/review/25045
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-29 01:34:29 +00:00
Pascal Quantin 456c3ff4a3 3GPP NAS: upgrade dissector to v14.6.0
Change-Id: If8d0ab933285f8398b0e8625e7c6e2ef0345fc95
Reviewed-on: https://code.wireshark.org/review/25040
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-28 19:07:59 +00:00
Dario Lombardo 02f7c44469 rtps: remove unused ei entry.
Change-Id: I3bb1470e6c5225a431bc49de9e6032e2016a1824
Reviewed-on: https://code.wireshark.org/review/25020
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 15:30:43 +00:00
Dirk Römmen 6aa3502306 Enhanced BACnet dissectors supporting BACnet revision 19.
Bug: 12448
Bug: 12453
Bug: 12457
Change-Id: Ia8ed69ae1014f01ae246b31f6bb5aaedfc4656d2
Reviewed-on: https://code.wireshark.org/review/25010
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 11:31:48 +00:00
Dario Lombardo 538f0883f7 dcerpc-spoolss: remove unneeded check (CID: 1158734).
Change-Id: Ie4f827835b9d59838d90d00e57f729c6a8004b19
Reviewed-on: https://code.wireshark.org/review/25015
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 07:30:19 +00:00
Dario Lombardo 9b9f3098ac rtps: remove unneeded check (CID: 1158869).
Change-Id: Ib9b2902c56fb569366e62a1d85b173862d29e61f
Reviewed-on: https://code.wireshark.org/review/25019
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 07:29:29 +00:00
Uli Heilmeier ccc931b0a7 Netflow: Updated IEs (RFC8038, RFC8158, et al.)
Updated InformationElements as defined at
https://www.iana.org/assignments/ipfix/ipfix.xhtml

Includes updates for RFC8038 and RFC8158.

Change-Id: I66411428d0faee4290b5134b1c31c84b49996f2e
Reviewed-on: https://code.wireshark.org/review/25013
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-28 07:22:14 +00:00
Martin Kaiser bdccb597fe ltp: don't assign a gint64 value to a guint64 variable
evaluate_sdnv_64() returns gint64 and does indeed return -1 for errors.
Use a gint64 variable to hold the return value, cast to guint64 if necessary.

Change-Id: I2aa6f95302cf20f758a872c00c3d49857f2faea4
Reviewed-on: https://code.wireshark.org/review/24989
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 04:36:15 +00:00
Dario Lombardo a094154abe scsi-smc: remove dead code (CID: 1159071).
Change-Id: I1ecee4343b46da01ec60a8db76f19ca4c1996b34
Reviewed-on: https://code.wireshark.org/review/25022
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 04:29:11 +00:00
Dario Lombardo 3a2773c9ef nlsp: remove logically dead code (CID: 1158979).
Change-Id: I2a6c6bb78a165f7fbc3864c4b721c0bf9064d12b
Reviewed-on: https://code.wireshark.org/review/25021
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-28 04:27:54 +00:00
Krishnamurthy Mayya 4b1bd4742c LTP : Header and Trailer extension Corrections.
This patchset involves the changes done to decode header and trailer
extensions correctly. There were places where the frame offset was
not handled properly leading to the improper decoding of the subsequent
fields.

Also, the subtree name for Trailer extension was not proper.

Change-Id: Ia38ddddbcd83435ce8aaa73791a2f5a14918b48f
Reviewed-on: https://code.wireshark.org/review/24140
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-27 08:11:14 +00:00
Martin Mathieson 137ab7d568 potential buffer underflow in File_read_line function in epan/wslua/wslua_file.c
Putting up for review, though I am not completely convinced that
file_gets() can return an empty line.

Bug: 14295
Change-Id: If36761ea511b66c01a9f167809a218a7eadbfcc5
Reviewed-on: https://code.wireshark.org/review/24997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-26 20:21:04 +00:00
Guy Harris 9578e70d72 Handle DLT_ENC files *not* written on the same OS and byte-order host.
Some fields in the header are in the byte order of the host that wrote
them; one of them is a 32-bit AF_ value, and those are not likely ever
to be > 65535, so they should never have any of the upper 16 bits set,
and are also unlikely ever to be AF_UNSPEC, i.e. 0, so they should have
at least one of the lower 16 bits set.  This means that they will have
at least one of the upper 16 bits set iff the host that wrote the file
has the opposite byte order of the host that's reading the file; use
that to determine whether to byte-swap the address-family or flags
fields.  (The SPI field is in *network* byte order.)

Change-Id: I2d483c75d5c6bbab8fd16c5dc0a800f8710f764c
Reviewed-on: https://code.wireshark.org/review/24998
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-26 18:08:08 +00:00
Dario Lombardo 62f06b7196 epl: remove dead code and corresponding ei.
Due to mask EPL_ASND_SDO_SEQ_CON_MASK, scon and rcon can't be > 3.

Change-Id: Iaa2e8bae657ad57e4548a3f4749feda19ffaaf52
CID: 1220185.
CID: 1220186.
Reviewed-on: https://code.wireshark.org/review/24995
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-26 09:27:18 +00:00
Dario Lombardo 588bcb1723 epl: remove unreachable case (CID: 1412051).
Change-Id: I0caa56ecfb2327dd9da55eb8a53d0c075061e8a2
Reviewed-on: https://code.wireshark.org/review/24992
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-26 09:24:32 +00:00
Alexis La Goutte e0ccf38585 QUIC: Add decrypt Cleartext
Implements decryption of the four cleartext messages from
https://tools.ietf.org/html/draft-ietf-quic-transport-07#section-5.4

Change-Id: I9d656613433251bd52d8614fdae5bbe37d4194ff
Reviewed-on: https://code.wireshark.org/review/24504
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-25 19:49:48 +00:00
Peter Wu 56f1feb678 TLS13,QUIC: prepare for QUIC decryption
Add interface to expand the QUIC cleartext secrets
    (quic_derive_cleartext_secrets),
an interface to create the cleartext ciphers
    (quic_create_cleartext_decoders),
an interface to decrypt messages using this cipher
    (quic_decrypt_message).

Change-Id: Id546150be2964959388b7ef69984b891521e5caa
Reviewed-on: https://code.wireshark.org/review/24435
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-25 19:49:20 +00:00
Ahmad Fatoum 5a3addd8eb Fix possible signed overflow
Shouldn't have led to problems so far, assuming sane overflow behavior
and sizeof (int) == sizeof (guint32), but better safe than sorry.

Change-Id: I1e154b311b9f0e3113bc9c7b4d8456ede16804ef
Reviewed-on: https://code.wireshark.org/review/24930
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-12-25 10:25:38 +00:00
Nick James 5f0f2d610f RRC: Spot more UE transitions
Adding support for URNTI mapping when UE is moving from PCH/FACH to DCH

Change-Id: Iad67d7a88aac619171886cf35285e03d848146ae
Reviewed-on: https://code.wireshark.org/review/24963
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-25 08:42:28 +00:00
Alexis La Goutte 8bc43e66a9 fpp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ia396355d706f08772a597ecc45746d8d4bb0b0c1
Reviewed-on: https://code.wireshark.org/review/24952
Reviewed-by: Anton Glukhov <anton.a.glukhov@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-25 03:39:14 +00:00
Alexis La Goutte 7ca62cc815 ipsec: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I5364e3deed22f98b77e2a6390e4cce6de3a9c7bd
Reviewed-on: https://code.wireshark.org/review/24918
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-25 02:49:37 +00:00
Guy Harris 5f6571913b Note that the HE information is not yet a defined radiotap field.
Warn that it is subject to change, although there is an experimental
Linux patch using it, so it's probably *unlikely* to change.

Update another comment while we're at it.

Change-Id: I4d5eb1461a83b990b75312ebab9471c2fe4749af
Reviewed-on: https://code.wireshark.org/review/24985
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-24 21:16:17 +00:00
Peter Wu bad83f249f Fix build and thread runtime compat with older GLib
CentOS 6 ships with glib 2.28.8 which do not support
g_ptr_array_new_full (make-taps/make-dissectors) and need to link with
wsutil for glib-compat.

g_thread_new was only introduced with GLib 2.32 (not 2.31), so adjust
the check accordingly. Abort in case thread creation fails (as
documented). Properly initialize threads or it will abort on runtime
(this also requires linking epan with gthreads in CMake, autotools
already includes it with GLIB_LIBS).

Change-Id: Ie81d6df7b3b26aaa4eb25e23719a220755e2c13c
Reviewed-on: https://code.wireshark.org/review/24978
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 20:22:58 +00:00
Uli Heilmeier 8642d72f36 Netflow: Fix typo for ntop_radius_acct_in_pkts
Change-Id: If531189c0409050bf7213d3488ab32ccc0ee1000
Reviewed-on: https://code.wireshark.org/review/24979
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 20:22:09 +00:00
Richard Sharpe f5e7f273c9 ieee80211: Fix an unused variable error I introduced yesterday.
Some compilers are more picky than others and I eliminated the use of a
value_string array that I should not have in reorganizing the Extended
Capabilities info.

Change-Id: I1dcb09bf9f8df69445ebde8b88897482ddd1fa82
Reviewed-on: https://code.wireshark.org/review/24984
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-12-24 19:22:22 +00:00
Peter Wu f8b67cb931 Rename dissectors.c.in and fix CMake on removals
"dissectors.c.in" is an input file for "make-dissectors" which outputs
"dissectors.c", but does not contain C code. Rename it to
"dissectors.in.txt" instead.

When a dissector is removed from the list, the dissectors.c file was not
properly generated even if CMake was re-run. Fix this by adding an
additional dependency on the input file. autotools likely suffers from
the same problem with removed files, I have not tried to fix that.

Restore's João's original approach using file(GENERATE) to avoid using
configure_file, this requires CMake 2.8.12.

Change-Id: Id07cd8ef502186a90d41b3bb77ed0d9c94845af9
Fixes: v2.5.0rc0-1763-gfe0c2b0485 ("Rewrite make-dissector-reg.py in C")
Reviewed-on: https://code.wireshark.org/review/24659
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-12-24 13:30:06 +00:00
Martin Mathieson 28b463649f ieee80211: hide unused value_string variable
packet-ieee80211.c:2326:27: error: ‘vht_max_mpdu_in_amsdu’ defined but not used [-Werror=unused-const-variable=]
 static const value_string vht_max_mpdu_in_amsdu[] = {

Change-Id: If4cc416b7fe92dc7915e26d2d89abaa17b081c09
Reviewed-on: https://code.wireshark.org/review/24977
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-12-24 09:12:18 +00:00
Alexis La Goutte 5bb5158b2e QUIC: fix 'num_ts' may be used uninitialized in this function [-Werror=maybe-uninitialized]
with some old (and buggy) compiler (gcc 4.8.5)

Change-Id: Ie5e4f71d3f4a12f786f2c8b139bba7a0688a8d29
Reviewed-on: https://code.wireshark.org/review/24973
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 07:41:03 +00:00
Michael Mann 386f354f87 Add Service Response Time dialog for SCSI.
SCSI requires parameter data to be passed into the tap.  Provide
a new dialog that can handle SCSI commands.

Bug: 14144
Change-Id: I4561f251ec38753a28befee33b8b994b04b92230
Reviewed-on: https://code.wireshark.org/review/24955
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 06:53:41 +00:00
Richard Sharpe 5fcb223263 ieee80211: More support for IEEE802.11 2016 around Extended Capabilities.
This change handles both 8-byte and 9-byte extended capabilities fields
by handling them as an 8-bit field if there are only 8 bytes, but handling
them as a 16-bit field if there are 9 bytes. This is because one field
straddles the bytes, but I have seen captures where only 8 bytes are
present.

Change-Id: I624fe34dd9c8ba7f25a451a172048897d867fcb5
Reviewed-on: https://code.wireshark.org/review/24971
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 06:51:18 +00:00
Richard Sharpe 8d6202df45 ieee80211-radiotap: Add definitions for HE information and dissect it.
Now that HE Information is starting to be used in radiotap headers we need to
start defining and showing these. More will be comming, especially the dissection
of the header itself and carrying info in the ieee_802_11_phdr structure.

Change-Id: I94c2184e83243656764147029295ad4ce4254416
Reviewed-on: https://code.wireshark.org/review/24945
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 06:50:54 +00:00
Dario Lombardo e30374d169 airpdcap: check return value for gcry_mac_read (CID: 1420699).
Change-Id: Ifdf044d99e912ac90044aca7be503fdf39b4fe74
Reviewed-on: https://code.wireshark.org/review/24967
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 06:39:38 +00:00
Peter Wu b1a2bef8bd mip: properly advance offset if !tree
The offset must be advanced or else dissection of the following
extensions will result in a malformed packet exception.

Bug: 14292
Change-Id: I8b5cb2f377c8d3e01677b76f5bb6c3126dea64f9
Reviewed-on: https://code.wireshark.org/review/24970
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 06:34:32 +00:00
Alexis La Goutte 13a9c636a5 QUIC: STOP_SENDING error code is now application error code (with 2 bytes)
Change-Id: I14ce4dc790da6d0b59514a5dcf28504d780934ea
Reviewed-on: https://code.wireshark.org/review/24434
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23 19:31:18 +00:00
Alexis La Goutte 5f1ed2b221 QUIC: RST_STREAM error code is now application error code (with 2 bytes)
Change-Id: I2f5702069d494f535e4b1b8743e76a9e0a3e5945
Reviewed-on: https://code.wireshark.org/review/24433
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23 19:30:57 +00:00
Alexis La Goutte 7d88ca5cf9 QUIC: not longer Timestamp Section/block with draft07
Change-Id: I37061bfc49324a1c621c9211571c7bbc26c26474
Reviewed-on: https://code.wireshark.org/review/24432
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23 16:41:05 +00:00
Alexis La Goutte 5e202c0268 QUIC: Update Error Code (and not it is only 16 bytes)
and update FT_CONNECTION_CLOSE

Change-Id: I2758fb5b2b036d01c4fce3ef90bcafa0b000ee7d
Reviewed-on: https://code.wireshark.org/review/24431
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23 15:25:25 +00:00
Alexis La Goutte 22d791d0aa QUIC: Add APPLICATION_CLOSE (0x03) from draft07
Change-Id: Ief1a569659cfd4f2aeae5fd46d2de9548df5124a
Reviewed-on: https://code.wireshark.org/review/24430
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23 15:16:59 +00:00
Alexis La Goutte 04685ac8fc QUIC: Add conversation support (to store version)
and not for draft >= 07, display Cleartext Protected Payload (don't decrypt Cleartext AEAD yet...)

Change-Id: I7f581d58371710c50d7d4631ad1c55da41e57444
Reviewed-on: https://code.wireshark.org/review/24425
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23 14:23:46 +00:00
Craig Jackson d41d0f7148 TDS: Dissect TDS4/5 login packet
Add dissection of the TDS_BUF_LOGIN (aka TDS4/TDS5 login) packet.
Add some support routines to remember the endian nature of each connection.
Dissecting the TDS5 login requires dissecting the TDS_CAPABILITY token as well.

Change-Id: Id92dedeaf4b5d192bab7ec99775e371f229db3e3
Reviewed-on: https://code.wireshark.org/review/24831
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23 07:11:06 +00:00
Pascal S. de Kloe 14009cefe8 IEC104: add section 7 [security] cause of transmission & type identifiers
Change-Id: I960c1e1860bf4ec80260a105b7a5abbf5d8db386
Reviewed-on: https://code.wireshark.org/review/24958
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-23 03:08:07 +00:00
Alexis La Goutte 56cca5bd58 coap: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ib23241887ef91ef44a31703445a0ce6d31104b8e
Reviewed-on: https://code.wireshark.org/review/24951
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-22 21:59:10 +00:00
Justin J. Novack 7099a833be Added ArtTrigger dissection
The ArtTrigger packet is used to send trigger macros to the network. The
most common implementation involves a single controller broadcasting to
all other devices.

Please see page 41 of the referenced PDF for the packet definition of
the ArtTrigger OpCode.

https://www.artisticlicence.com/WebSiteMaster/User%20Guides/art-net.pdf

Change-Id: Iec2e749732e5462cf04b9c6942df7379e4247255
Reviewed-on: https://code.wireshark.org/review/24936
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-22 20:45:56 +00:00
Mališa Vučinić 40415fffa3 CoAP: Various improvements
1. Add Object-Security option handling to CoAP.
2. Add RFC8132 defined codes.
3. Fix indentation.
4. Use macros for masks.

Change-Id: I48c71513db14e79133fe323578123f99946cbaa9
Reviewed-on: https://code.wireshark.org/review/24913
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-22 14:17:53 +00:00
Andreas Schultz e3be49a0f5 [PFCP] Fixed User Plane IP Resource IE
* TEIDIR should use the UINT8 type (its only 3 bit really)
* Network Instance length needs to take the already decoded
  bytes into account

3GPP TS 29.244 Section 8.2.82

Change-Id: I6772ca726f5e5d65c68a6d3dae8eff43e72196e0
Reviewed-on: https://code.wireshark.org/review/24940
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-22 14:09:22 +00:00
Andreas Schultz 68d431e1e3 [PFCP] Fixed decoding length of Vendor Specific IEs
The Enterprise ID is included in the length. Don't skip it twice.

3GPP TS 29.244 Section 8.1.1.

Change-Id: If601309c0008775268e399bbedf7ab956ae0ec6b
Reviewed-on: https://code.wireshark.org/review/24939
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-22 13:29:03 +00:00
Andreas Schultz 9306a044ce [PFCP] Fixed length of CSID entry in FQ-CSID
PDN Connection Set Identifier is two bytes.

3GPP TS 29.244 Section 8.2.43

Change-Id: I6ac1dab341e4ae54cbbdcbcbe8583a6a49293269
Reviewed-on: https://code.wireshark.org/review/24938
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-22 13:28:52 +00:00
Andreas Schultz 70e16734d2 [PFCP] Fixed length of DNS labels in Node ID IE
Node ID is encoded as DNS label according to RFC 1035. That RFC
states that a label can have maximum length of 63 characters.

3GPP TS 29.244 Section 8.2.38 and RFC 1035 Section 2.3.4.

Change-Id: I54ba4a204e2bf010b5b61b4be7f6ca483d7210b9
Reviewed-on: https://code.wireshark.org/review/24937
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-22 13:28:45 +00:00
Matej Tkac 5631bdbac6 [PFCP] Fixed Usage Report Trigger and Reporting Trigger IEs
Adjusted bitmask in both IEs to correct order of bytes

3GPP TS 29.244 Sections 8.2.19 and 8.2.41

Change-Id: Ia9409c0d33b8821d459faf1d502f833883416b40
Reviewed-on: https://code.wireshark.org/review/24929
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Matej Tkac <matej.tkac.mt@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-21 17:03:52 +00:00
Matej Tkac 1046867878 [PFCP] Fixed header field info for CP Function Features
HF is related only to single -5th- octet
3GPP TS 29.244 Section 8.2.58

Change-Id: Id0d4dd644cc4f94dec2a7ab73cea7b02bff1fc9f
Reviewed-on: https://code.wireshark.org/review/24926
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-21 12:36:35 +00:00
Matej Tkac b9f0f55cf7 [PFCP] Fixed order of IPv4 and IPv6 in PDI IE
In accordance with 3GPP TS 29.244 Section 8.2.62

Change-Id: Id3663817f64cab60713e02ca9e9a26349fe1a29a
Reviewed-on: https://code.wireshark.org/review/24925
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-21 12:36:21 +00:00
AndersBroman a5c2259257 [BSSAP] Fix mandatory IEs in Uplink Tunnle request(add IMSI)
Bug: 14289
Change-Id: I720b31a6275b4b9a9eeff34b5fd0554cd6fcb7d3
Reviewed-on: https://code.wireshark.org/review/24924
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-21 11:51:19 +00:00
Marouen Ghodhbane af0c46fb92 ieee1722: Add dissectors for Compressed Video format (H264 and MJPEG)
This dissector is implemented according to "IEEE Std 1722-
2016 Parag 8: Compressed Video Format"

Change-Id: I39668e7b8665f6b11461d55f16b40bf3942c9c8d
Signed-off-by: Marouen Ghodhbane <marouen.ghodhbane@nxp.com>
Reviewed-on: https://code.wireshark.org/review/24914
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-21 11:39:42 +00:00
Anton Glukhov 00974e1dc4 Add IEEE 802.3br Frame Preemption Protocol dissector
Bug: 14280
Change-Id: I25444b069af4bb78db6ae5ff649596599eba2a0c
Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24881
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-21 11:39:24 +00:00
Sergey Avseyev 2b0a1ec2cb couchbase: uncompress snappy payloads
Change-Id: I70de47512dfe8ff1a390a243688ef13f012561fa
Reviewed-on: https://code.wireshark.org/review/24921
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-21 05:05:56 +00:00
Paul Thomas 530fd0a4d0 DNP3: Fix timestamps on command event objects
Before if (al_obj & 0x02) was incorrectly being used to test if it was a
variation with a timestamp.
Now it is done in the same manor as Object 21 with a switch statement
that falls through if it isn't a timestamp variation.

Change-Id: I9adaf9c0be3ad01f1cf87ba09f47257daeadb47c
Reviewed-on: https://code.wireshark.org/review/24915
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-21 00:08:44 +00:00
Alexis La Goutte 798b937d97 ipsec: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ic599195cbbcdbf229b126a7f95ef5a4de8aea0ec
Reviewed-on: https://code.wireshark.org/review/24919
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-21 00:05:46 +00:00
Richard Sharpe 4a94cb640f ieee80211: Make Extended Capabilities bits more in line with 802.11 2016.
A number of the bits have become reserved and what were reserved fields now
have meaning.

I will have to deal with bytes 8 and 9 differently because there is a 2-bit
field that spans those two bytes now, but it is clear some STAs don't include
byte 9. If not included those two bits probably have no meaning.

Change-Id: I5ea17d7d6710a693f9153a3370813dbb3ae01fa1
Reviewed-on: https://code.wireshark.org/review/24887
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-20 20:01:41 +00:00
Nathaniel Clark bbc44b7763 Infiniband: Fix number of bytes exported if ip_cm_sid
If parse_CM_Req parses a IP_CM_Req_Msg, export just the payload,
instead of the ip_cm_sid and the payload.

Change-Id: I67258d2f6d240885e48ea537906d2769eafe3bae
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/24796
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-20 14:12:35 +00:00
Gerald Combs d0d15ef5df Avoid ASN.1 frame.protocols duplication.
Some of the ASN.1 dissectors process their data indirectly through
dissector tables. Add dissector_try_string_new so that they can do so
without appending duplicate entries to frame.protocols.

Change-Id: If9e12d81f9d0cc5b3bf19816e675a0fb79d904a6
Reviewed-on: https://code.wireshark.org/review/24886
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-19 21:03:04 +00:00
Stig Bjørlykke c9b6887d84 wslua: Fix logger after g6a5e90f2
The Qt log output changes in g6a5e90f2 changed the Qt message handler
to use g_log.  Lua logging already used g_log.  The Qt variant of
funnel logger, which is used by Lua as g_log backend, is currently
using qDebug and this gives recursive calls to g_log and thus an assert.

Rewrite the lua logging to not use g_log.

Change-Id: Icf4f0022a11cb32d2b4f413f76d946f2506e283d
Reviewed-on: https://code.wireshark.org/review/24888
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-19 12:18:20 +00:00
AndersBroman 5b596fa871 [SIP] Add dissection of oc-seq as time stamp.
Change-Id: I0273f8bff7693a7dc7416932649c083c360bc098
Reviewed-on: https://code.wireshark.org/review/24890
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-19 12:16:39 +00:00
Michael Mann 0d6eb9631f Convert Enabled protocols dialog to use model.
Change-Id: I618df2f2608adcd1be5da02262c5296e4d86cfba
Reviewed-on: https://code.wireshark.org/review/24866
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-19 08:21:19 +00:00
AndersBroman 09ad845690 [SIP] Make a filter for Overload Control Value.
Change-Id: I8ee552d331388a1fa748bff765afe5b53508f63f
Reviewed-on: https://code.wireshark.org/review/24878
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18 09:46:58 +00:00
Marko Hrastovec b37aedb47a asterix: special processing for field item I021/150
There is a problem where one field decodes differently
depending on another fields content.

A code has been added to save information for 021_150_IM field.
When the next field 021_150_ASPD is decoded, the
stored information determines how it shall be scaled.
This is a special case for I021/150 only.

The same way as this change, other changes shall be done for
fields that are dependent on other fields.

Bug: 14076
Change-Id: I51f2c8f79bc6bde9efc0429e54fbea36818e9b36
Reviewed-on: https://code.wireshark.org/review/24734
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18 09:03:11 +00:00
Florian Bezold 786a73b80d Fix SOCKS5 state machine for authentication, two-pass dissection
1. SOCKSv5 dissection was broken if authentication was used since the
used state machine states were initialized, but not saved correctly, and
the first server state transition was wrong.
I also fixed the GSSAPI variant analogously, but could not verify this
since I have no traces of this.

2. SOCKSv5 actually has a different "subnegotiation field" for the
authentication messages. This is added, and the original SOCKS version
is added as a generated field (i.e. for filtering).

3. Info column setting is moved to the *_display_socks_* routines to fix
two-pass dissection (as used by GUI Wireshark), since only here the
correct per-packet state is used. The hash_info (as used by the
*_state_machine_* functions) is already fully populated on second pass.

Change-Id: Ib39434dafce08188cd2da347118d0509a7613915
Reviewed-on: https://code.wireshark.org/review/24712
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18 04:33:02 +00:00
Gerald Combs 3c87991c28 -1 is a valid tree_type value.
Adjust tree_expanded and FieldInformation::treeType accordingly.

Change-Id: I9b12c28550ba2639f636531a7ea1841df0638b5e
Reviewed-on: https://code.wireshark.org/review/24844
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18 04:28:06 +00:00
Richard Sharpe 67a49eb2ec ieee80211: Remove notices about D3.1 of IEEE802.11ac.
These items are now in 802.11 2016 so they are no longer draft items.

Change-Id: I89b694f30700e08d9edc2e3707f36f8cf30dd0f2
Reviewed-on: https://code.wireshark.org/review/24877
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-18 04:26:32 +00:00
Richard Sharpe b1f558ae27 ieee80211: Bring VHT Capabilities IE into conformance with IEEE802.11-2016
IEEE802.11-2016 standardized those bits, so it's no longer a draft standard.
I am slowly getting these things correct as I prepare for support for
IEEE802.11ax D2.0.

Change-Id: I3fc4497f2b85bae78043b9fd997379a44898f3db
Reviewed-on: https://code.wireshark.org/review/24860
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-17 08:01:19 +00:00
Uli Heilmeier 18c42e1dca Kerberos: Update and fix KDCOptions and TicketFlags
Fix and update KDCOptions and TicketFlags.
Used references:
* https://github.com/heimdal/heimdal/blob/master/lib/asn1/krb5.asn1#L330
* https://msdn.microsoft.com/en-us/library/cc246090.aspx
* https://tools.ietf.org/html/rfc8062#section-3

Bug: 14261
Change-Id: I0e34425fc35e0eba14c700f82cbf2441365b139d
Reviewed-on: https://code.wireshark.org/review/24863
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-17 02:28:30 +00:00
Uli Heilmeier 2b4322ceba BGP: add Open message error/unsupported capability
According to RFC 5492 [1], paragraph 5, Data field of BGP
notification for Open message error/unsupported capability must
list the set of unsupported capabilities

Bug: 14274
Change-Id: Iacd33b5c83bc234652d2a5444f0029640d33e1c5
Reviewed-on: https://code.wireshark.org/review/24829
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-16 08:23:48 +00:00
Stig Bjørlykke 3d086e638d wslua: Fix crash in Dir.open()
Do not give an uninitialised error pointer to g_dir_open(), this
will give a crash if g_dir_open() fails.

Remove wslua_dir.dummy because it is not used by anyone.

Change-Id: I044eee021393f2ea2aa022138bbf6fd099eb0908
Reviewed-on: https://code.wireshark.org/review/24840
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16 04:03:41 +00:00
Andrei Cipu 6210773095 Rework address matching to work with string input.
Currently, the function assumes the input is represented as
a string representation of the hex string of the addresses.
Instead, the parameters are sent as plain text IPs.
We reactivate the helper functions that convert the addresses
from the latter to th former representation and add support
for handling masks in the input.

Bug: 14229
Change-Id: I750a546b39404a1fbc86cee604a33e506f7240d8
Reviewed-on: https://code.wireshark.org/review/24469
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16 03:44:06 +00:00
Robert Grange 03375e0c28 packet-mq: Improve some display by adding CONST values
Change-Id: I66f9dc050735fd0a73b9938a9db0c5978cec40a4
Reviewed-on: https://code.wireshark.org/review/24834
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16 03:33:08 +00:00
Stig Bjørlykke 28ba566675 wslua: Fix memory leakages
Free some variables in error handling.

Change-Id: I0d0653962b11f760c31872aa7e5b5f1d20c54dcb
Reviewed-on: https://code.wireshark.org/review/24842
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16 03:12:00 +00:00
Pascal Quantin 183b9119dc 6LowPAN: always build IPv6 address whatever the tree state
Bug: 14277
Change-Id: I320def755076ef8c52d4e5e0dbedf06ea88f25a7
Reviewed-on: https://code.wireshark.org/review/24848
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-16 03:08:05 +00:00
Matej Tkac 2acaf0a47a [ISAKMP] Added support for new Notify EMERGENCY_CALL_NUMBERS Payload
In accordance with the latest 3GPP TS 24.302 (Section 8.2.9.8)
                                  3GPP TS 24.008 (Section 10.5.3.13)

Bug: 14273
Change-Id: Ib5a24fa33633764f6bfb034250c309c1f4af9914
Reviewed-on: https://code.wireshark.org/review/24793
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-15 20:59:36 +00:00
Stig Bjørlykke 774a986ec0 epan: Add default type handling for custom column
Add default type handling in proto_custom_set() to prevent crashes when
trying to use FT_IPXNET, FT_AX25 or FT_VINES items as custom columns.

This will also work as a safeguard when adding new types.

Change-Id: Iaf3b48aec72f0e5c10332b0e6d5f7221b0196e15
Reviewed-on: https://code.wireshark.org/review/24836
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-15 20:59:04 +00:00
Richard Sharpe 0909580a7e ieee80211: Add handling of the ANQP Neighbor Report.
Change-Id: I857cdcc3a15cd01c3b5cc7e31be043048ef5f1ed
Reviewed-on: https://code.wireshark.org/review/24784
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-15 19:36:12 +00:00
Stig Bjørlykke 1651371d17 epan: Whitespace fixes
Change-Id: I859c7bf5cfaf23b46d2cda7ff9c7e1ddd164832a
Reviewed-on: https://code.wireshark.org/review/24838
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-15 18:57:28 +00:00
Gerald Combs 90102ad12e Remove a plugin_if_gui_cb type conversion.
We always pass a GHashTable * to plugin_if_gui_cb so don't cast it to a
gconstpointer. This should fix the following and related warnings:

main_window.cpp: In function ‘void plugin_if_mainwindow_apply_filter(gconstpointer)’:
main_window.cpp:121:44: warning: cast from type ‘gconstpointer {aka const void*}’ to type ‘GHashTable* {aka _GHashTable*}’ casts away qualifiers [-Wcast-qual]
     GHashTable * data_set = (GHashTable *) user_data;

Fix another const warning while we're here.

Change-Id: Ia9225188bfb913feb4fef4369f10fd5791fc8dc9
Reviewed-on: https://code.wireshark.org/review/24830
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-14 23:43:38 +00:00
João Valverde db140dd500 Add new dissector callback signature with data pointer
This is useful to implement language bindings (Lua, Python, etc) and
good practice in general.

Non-breaking change to the API.

Change-Id: I8d16c14880e5aa53212af8418c468a6ec3aa8954
Reviewed-on: https://code.wireshark.org/review/24814
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-12-14 22:12:47 +00:00
João Valverde cebb8ea20e Add new plugin type for libwireshark
Allow epan itself to be extended by plugins. Adds the following new plugin
interfaces:

  void plugin_epan_init()
  void plugin_epan_dissect_init(epan_dissect_t *)
  void plugin_epan_dissect_cleanup(epan_dissect_t *)
  void plugin_epan_cleanup()
  void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL]
  void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL]

Any one of these can be an empty function but the first four must be
present.

The motivation for the change is a better way to implement a language binding
other than registering a fake protocol and stuffing everything into a single
dissector call (and maybe require an extra packet_info field) but I expect
there would be other interesting use cases.

Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785
Reviewed-on: https://code.wireshark.org/review/24813
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-12-14 22:12:38 +00:00
Derick Rethans 4cf7cd3ed2 Register the MongoDB dissector as SSL capable.
Bug: 14275
Change-Id: Ia0d8d0b333f69e59ba54b0d788587484dfae950e
Reviewed-on: https://code.wireshark.org/review/24827
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14 18:45:52 +00:00
Alexis La Goutte fe4cf449c9 fp_mux: fix 'data' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: Ieac1b7a19d50c35d565421e1012dfb4001b6dd44
Reviewed-on: https://code.wireshark.org/review/24826
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14 18:45:21 +00:00
AndersBroman 11a948dd12 [ISUP] Update value strings from specification amendment.
Change-Id: Ib3dff9c438b9adbec4533f1a66f1bf07f51dbd07
Reviewed-on: https://code.wireshark.org/review/24821
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14 11:36:30 +00:00
João Valverde 995812c5f1 Refactor plugin registration and loading
Put different types of plugins (libwiretap, libwireshark) in different
subdirectories, give libwiretap and libwireshark init routines that
load the plugins, and have them scan the appropriate subdirectories
so that we don't even *try* to, for example, load libwireshark plugins
in programs that only use libwiretap.

Compiled plugins are stored in subfolders of the plugin folders, with
the subfolder name being the Wireshark minor version number (X.Y). There is
another hierarchical level for each Wireshark library (libwireshark, libwscodecs
and libwiretap).

The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}.

Currently we only distribute "epan" (libwireshark) plugins.

Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb
Reviewed-on: https://code.wireshark.org/review/23983
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-12-14 08:43:57 +00:00
Pavel Moravec a9821caab8 Add dissector for ActiveMQ Artemis Core Protocol
So far decode just packet headers

Change-Id: I7a01f3c83b97882f4c669122ad94b2bdab0ab251
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Reviewed-on: https://code.wireshark.org/review/24583
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14 06:10:33 +00:00
Stig Bjørlykke 862a0b6472 epan: Make expert info summary text mandatory
This will make the code easier and removes the use of a generic
"Expert Info" as name.

Change-Id: I57ad2adb851726106ddc5009f3c6ca61721f647a
Reviewed-on: https://code.wireshark.org/review/24792
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14 06:06:47 +00:00
Richard Sharpe a9f5016429 ieee1905: Fix an incorrect flags dissection.
Change-Id: Iebb434875eac08aeabab6b9179a882817149012c
Reviewed-on: https://code.wireshark.org/review/24820
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-14 05:04:35 +00:00
Richard Sharpe c662615ab4 ieee1905: Fix for a malformed packet with a Steering request.
If the mode bit is zero, we have to do different things than if
it is 1.

Change-Id: I5ed8bec1d350c02b736818cad5ab864748145686
Reviewed-on: https://code.wireshark.org/review/24775
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-12-14 04:58:53 +00:00
Guy Harris 6af7b9a63a Register the UDS dissector by name.
See

    https://ask.wireshark.org/question/891/use-uds-dissector-inside-doip-dissector/

Change-Id: I608b4ffb90e65fd31e9f3e421f4c473f4e66bebd
Reviewed-on: https://code.wireshark.org/review/24818
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-14 03:17:02 +00:00
Stig Bjørlykke f945b85391 epan: Use expert info summary text as field name
Change the expert info registry to use summary text as field name instead
of blurb to show the correct column header tooltip in custom columns.

Preserve backward compability by not use empty summary text.

Change-Id: Ibbaf142165be0d9f42d1e2476f39f8d251ea0593
Reviewed-on: https://code.wireshark.org/review/24788
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-13 10:35:36 +00:00
Stig Bjørlykke e4750105b2 epan: Show a check mark in custom columns for FT_NONE types
This is valuable when adding a expert info field as custom column,
but will also make sense for other FT_NONE types.

Change-Id: Ib1a14c59a5450f2e713f190aecf3484586d116c4
Reviewed-on: https://code.wireshark.org/review/24787
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-13 10:00:29 +00:00
Stig Bjørlykke 158d929884 epan: Use check mark in protocol custom column
Change from the text "Yes" to a utf8 check mark to indicate the
precense of a protocol in custom columns.

Change-Id: I9510333fc12148bf1f61aa2ddea2c6d390a9491a
Reviewed-on: https://code.wireshark.org/review/24783
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-12 22:36:20 +00:00
Stig Bjørlykke 16e5d73ecc nfapi: Add missing expert info summary
Change-Id: Iba6330f9c7f27e82adfa967fe9b082920a5b0afa
Reviewed-on: https://code.wireshark.org/review/24785
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-12 20:37:28 +00:00
Richard Sharpe 5aa50639ac ieee80211: Add additional ANQP IEs defined in IEEE802.11-2016.
Dissect the Venue URL element. More to come.

Change-Id: I64330b3f90f9f6222df0fb00d3ea277f59424e98
Reviewed-on: https://code.wireshark.org/review/24776
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-12-12 06:29:25 +00:00
Martin Mathieson 10e9846252 SIP statistics: use flipped indices for tables when incrementing stats
Change-Id: I22ed38b1c2d7849e8930149fb39ee14fa198a6e1
Reviewed-on: https://code.wireshark.org/review/24771
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-12-11 22:34:15 +00:00
Martin Mathieson faa4a6a5f1 SIP statistics: fix problems with invalid items
Change-Id: Ide21489cad66e4bebaafe5ef813a000db2956a2e
Reviewed-on: https://code.wireshark.org/review/24759
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-11 04:25:12 +00:00
João Valverde 5fc43fe63a Rewrite make-tap-reg.py in C
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a
Reviewed-on: https://code.wireshark.org/review/24756
Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11 02:52:28 +00:00
Pascal Quantin 224e24884a NTP: fix authenticator dissection when padding is used
Bug: 14269
Change-Id: Ifdc9af7524a0566e33acbedff3757cff416ce8fb
Reviewed-on: https://code.wireshark.org/review/24758
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-11 02:22:53 +00:00
Pascal Quantin 7d38363786 NTP: fix parsing of multiple comma separated identifiers
Bug: 14268
Change-Id: Id1d6040052d34d3f8bdfe49d20f4f3f8efbe001b
Reviewed-on: https://code.wireshark.org/review/24755
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-11 02:03:22 +00:00
Derick Rethans 8225159e33 Add support for MongoDB OP_COMPRESSED packets
Bug: 14259
Change-Id: Iab6b494bebaa913267f94d41b7950b67dd406cb6
Reviewed-on: https://code.wireshark.org/review/24705
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10 02:06:51 +00:00
Uli Heilmeier 22a7d8fa8d SOCKS: Display right version in pseudo header
Use the previous recorded version as version and set field as generated.

Bug: 14262
Change-Id: I0872ed826ccd8a5a1b75b071d810404d08ddc7b3
Reviewed-on: https://code.wireshark.org/review/24741
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10 02:04:16 +00:00
Marko Hrastovec 8cb9a094bf asterix: wrong presentation of fields I009/080 in CAT009.
Fields I009/080 were wrongly represented for CAT009. 8 and 16 bit
long fields were represented as 24 bit.

Change-Id: I5bd1c1f006292f58d0290ced80dde22324cb4002
Reviewed-on: https://code.wireshark.org/review/24746
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10 01:09:05 +00:00
Anton Glukhov abd703c4b8 LLDP: Add 802.3 TLV Additional Ethernet Capabilities (Subtype 7)
Bug: 14267
Change-Id: I23eb82a2f9bb2d57952f71870cc0fc8f12f036df
Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24735
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-10 00:47:06 +00:00
João Valverde c79fb9d028 make-dissectors: Indent and cleanup #include
Change-Id: I395d0c168a6ba2fc8fad85598e6355493b897a7a
Reviewed-on: https://code.wireshark.org/review/24748
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09 23:51:15 +00:00
Matej Tkac 514e607dd9 [MIPv6] Fixed IPv4 Home Address Option
Change-Id: I1c09ac390d5a40c92fc30cf114a3a13359b46eee
Reviewed-on: https://code.wireshark.org/review/24738
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09 20:31:53 +00:00
Marko Hrastovec f8203771ec Typing error correction for CAT002 settings selection.
Two settings had the same string "Select the CAT001 version".
One should be CAT002.

Change-Id: Iee6204a1064af786338d1b53c7b983763b985a0c
Reviewed-on: https://code.wireshark.org/review/24745
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-08 19:45:04 +00:00
AndersBroman 5d6315fefe [SCTP] Export of reassembled PDU uses wrong tvb.
Change-Id: I87ff6ef54dff5900a4a92406c87693fec6d9f692
Reviewed-on: https://code.wireshark.org/review/24737
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-08 15:40:00 +00:00
Guy Harris 8aa14236f8 Have the frame_tvbuff.c routines not use the global cfile.
Have the routines that create them take a pointer to a struct
packet_provider_data, store that in the tvbuff data, and use it to get
the wtap from which packets are being read.

While we're at it, don't include globals.h in any header files, and
include it in source files iff the source file actually uses cfile.  Add
whatever includes that requires.

Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229
Reviewed-on: https://code.wireshark.org/review/24733
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 08:31:41 +00:00
Guy Harris 48e65c4af4 Hand the packet provider functions to epan_new().
Have separate packet_provider_data structures and packet_provider_funcs
structures; the latter holds a table of functions that libwireshark can
call for information about packets, the latter holds the data that those
functions use.

This means we no longer need to expose the structure of an epan_t
outside epan/epan.c; get rid of epan/epan-int.h.

Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4
Reviewed-on: https://code.wireshark.org/review/24732
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:55 +00:00
Guy Harris 797d2f6a87 Move the frame_set stuff back into the capture_file structure.
libwireshark now expects an epan_t to be created with a pointer to a
"packet provider" structure; that structure is opaque within
libwireshark, and a pointer to it is passed to the callbacks that
provide interface names, interface, descriptions, user comments, and
packet time stamps, and that set user comments.  The code that calls
epan_new() is expected to provide those callbacks, and to define the
structure, which can be used by the providers.  If none of the callbacks
need that extra information, the "packet provider" structure can be
null.

Have a "file" packet provider for all the programs that provide packets
from a file.

Change-Id: I4b5709a3dd7b098ebd7d2a7d95bcdd7b5903c1a0
Reviewed-on: https://code.wireshark.org/review/24731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 03:32:25 +00:00
Gerald Combs be8a400053 Qt: Use QTextLayout in ByteViewText.
Use QTextLayout to draw each line in ByteViewText instead of drawing
fragments ourselves. Build our pixel-to-byte-offset map when we draw our
first line, which should hopefully make it more accurate. This should
fix layout and hover issues on some systems.

Start moving common code to DataPrinter.

Mark prefs.gui_hex_dump_highlight_style GTK+ only.

Bug: 11844
Change-Id: Ifda16ae7dc1a5ea22570c0bfd0eb20cee621bfc9
Reviewed-on: https://code.wireshark.org/review/24717
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-07 19:00:35 +00:00
Alexis La Goutte 024e7dc8af mongo: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I60ee2a37ff166b80ce11cf1c12e9c575bba85529
Reviewed-on: https://code.wireshark.org/review/24722
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Derick Rethans <github@derickrethans.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-07 11:47:34 +00:00
Jakub Zawadzki b59c39b271 frame user comments: move to epan, add support for user comments in sharkd.
Change-Id: Id15edc60177b160fd09cae99de1c9e01e17d9421
Reviewed-on: https://code.wireshark.org/review/24714
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-06 19:54:30 +00:00
Kevin Cernekee 2a385334ea netlink-netfilter: Add NFQA_CT and NFEXP conntrack dissectors
Add support for the netlink messages used by userspace conntrack
helpers.

Change-Id: I37d3829399834f578a0ab0f08eab99f119445ff5
Reviewed-on: https://code.wireshark.org/review/24695
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-06 12:52:50 +00:00
Guy Harris a7603a1f68 Fix loop bounds check.
Fix indentation while we're at it.

Change-Id: If8acaa944fd4c1aae848faa3a99f7566e003e801
Reviewed-on: https://code.wireshark.org/review/24707
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04 21:44:49 +00:00
AndersBroman 585a57ea1e [decode_as.c] Use g_list_prepend() insted of g_list_append, it's faster.
Change-Id: I56c4a7948da48d02c81c5cf30187a6eeb973db77
Reviewed-on: https://code.wireshark.org/review/24700
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04 11:58:55 +00:00
João Valverde 72c2256633 make-dissectors: Fix null pointer dereference for error condition
Found by scan-build.

Change-Id: I89b56bac951ccb7054d494592928306a860f9e5e
Reviewed-on: https://code.wireshark.org/review/24697
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04 09:11:08 +00:00
Pavel Strnad d3a3b0ba27 tshark: fix pdml export for LUA cases
- bug fix for wrong level introduced in SHA-1:b8ead953
- fix indent for Close off fake wrapper protocol

Change-Id: Iccb10af8f3ac1604fc5582d730f2fd39ffaeb1c0
Reviewed-on: https://code.wireshark.org/review/24681
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-04 08:47:35 +00:00
Guy Harris 7a957952dc Let a "past the on-the-network length" exception terminate dissection.
Don't make sure we have the full server entry before trying to dissect
it; that way, a malformed frame that was really too short on the network
(as opposed to being cut short by a snapshot length) will get reported
as such.

Change-Id: Ib7f0d909645a698162ebcd9b3fe8dd2d520983b7
Reviewed-on: https://code.wireshark.org/review/24696
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04 06:13:00 +00:00
Juanjo Martin 3944f881f4 RTPS: Added new PIDs to Security
Change-Id: I91ffb48ac5435d4eb45b60f8083762b2151de2c3
Reviewed-on: https://code.wireshark.org/review/24671
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04 05:53:26 +00:00
Martin Mathieson e5f884c8b0 Show retx prev and next framenum types as chevrons
Change-Id: I1641c70130a7562db9ea099770d8b5a7fe6e5532
Reviewed-on: https://code.wireshark.org/review/24676
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04 05:51:55 +00:00
Guy Harris ccc55bc80c Put the structure of a capture_file back in cfile.h.
The split isn't necessary now that epan no longer uses the capture_file
structure.

Change-Id: Ia232712a2fb5db511865805518e8d03509b2167f
Reviewed-on: https://code.wireshark.org/review/24693
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04 05:35:36 +00:00
Guy Harris 1834dca365 Move the parts of a capture_file used by libwireshark to a new structure.
Embed one of those structures in a capture_file, and have a struct
epan_session point to that structure rather than to a capture_file.
Pass that structure to the routines that fetch data that libwireshark
uses when dissecting.

That separates the stuff that libwireshark expects from the stuff that
it doesn't look at.

Change-Id: Ia3cd28efb9622476437a2ce32204597fae720877
Reviewed-on: https://code.wireshark.org/review/24692
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-04 05:02:18 +00:00
Guy Harris dc64ce8671 Clean up dissection of server entries in SAP responses.
Have the top-level protocol tree item for a server entry cover the
entire entry, rather than just the server name.  Have the server name be
just another entry under that top-level item.

Change-Id: I8089f3e132a0f388c87ba04caa3d15f5146c2303
Reviewed-on: https://code.wireshark.org/review/24688
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03 20:19:57 +00:00
Guy Harris eb8ffb74e2 Use cfile.h to define the capture_file type.
Have cfile-int.h declare the structure, and use it in files that
directly access the structure.

Have cfile.h just incompletely declare the structure and include it
rather than explicitly declaring it in source files or other header
files.

Never directly refer to struct _capture_file except when typedeffing
capture_file.

Add #includes as necessary, now that cfile.h doesn't drag in a ton of

Change-Id: I7931c8039d75ff7c980b0f2a6e221f20e602a556
Reviewed-on: https://code.wireshark.org/review/24686
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-03 18:54:37 +00:00
Gerald Combs 114c989fb3 [Automatic update for 2017-12-03]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I4a3a5f62e5024a4df19c12296ddd67012c9ff5c7
Reviewed-on: https://code.wireshark.org/review/24683
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-03 16:56:48 +00:00
Uli Heilmeier 0455040c0e LDP: Add support for MP2MP FEC
As stated in https://tools.ietf.org/html/rfc6388#section-3.2
MP2MP uses the same structure as the P2MP FEC element.

Bug: 13171
Change-Id: Ia619deac6075f5eb27dff2144edbbb60b440cc46
Reviewed-on: https://code.wireshark.org/review/24677
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-03 00:15:06 +00:00
Alexis La Goutte c4af29ceb2 MPLS: Add Media Access Control (MAC) Address Withdrawal over Static Pseudowire (RFC 7769
Bug: 14208
Change-Id: I80beda971b3727566c107dba0efdee0291529c42
Reviewed-on: https://code.wireshark.org/review/24560
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01 21:14:13 +00:00
Gerald Combs 28b6616ea0 Get rid of some void pointers.
Explictly struct _capture_file * in epan_session and its callbacks.

Change-Id: I63703015c661a08f3350a7448a7bcdaf98f119dc
Reviewed-on: https://code.wireshark.org/review/24675
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01 21:09:24 +00:00
Craig Jackson 219c5463d1 TDS: Improve TDS7 Prelogin request/response handling
- Fix detection of TDS7 Prelogin responses to have fewer false positives.
  This was causing regular responses to be recognized as Prelogin responses if they
  happened to begin with a DONEINPROC token.
- Define symbolic constents for the Prelogin options.
- Apply the version_convert processing to the relevant prelogin options as well as
  to the loginack_progversion.
- Correct the display of the program version in version_convert.
- Factor out the setting of tds7_version so it can be called from the dissect_tds7_login
  as well as dissect_tds_login_ack_token. This is needed to correctly handle tokens
  which come before the loginack token in the login response.
- Fix the wording of a comment in my last commit.

Change-Id: I57615bbb1e780db37cda25d8d5d7f964f68b337e
Reviewed-on: https://code.wireshark.org/review/24664
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-01 20:20:41 +00:00
Kenneth Soerensen c9348e1a70 ZigBee: Correct Smart Energy Publish Block Thresholds and endianess
Change-Id: I1007fdff01b370c06a8ccfb1145fd162ffde9a94
Reviewed-on: https://code.wireshark.org/review/24674
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-01 15:42:19 +00:00
Juanjo Martin 5320bdd00e RTPS: Fixed a quick typo in a hf item
Change-Id: I71315900a4fd5130ab051854bc70dbc4ba9afc2b
Reviewed-on: https://code.wireshark.org/review/24672
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01 15:04:42 +00:00
Darien Spencer 1683dd11e7 RRC: Improve C-RNTI resolving
Now also trying to resolve C-RNTIs in FACH from the global RNTIs map

Change-Id: If9ce5b73d6855271c15001fd73d8acaaaf9d1864
Reviewed-on: https://code.wireshark.org/review/24665
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30 23:49:51 +00:00
Pau Espin a3a906d663 packet-rsl.c: Use value-string in RXLEV and RXQUAL fields
RXLEV and RXQUAL fields in RSL "Uplink Measurements" use same scale
format (0-63, 0-7) as RXLEV and RXQUAL in RR. RXQUAL value-string is
moved to packet-gsm_a_common.c in order to use it in both protocols.

Change-Id: Idadd9505225353fec76b9605e2045a5222669475
Reviewed-on: https://code.wireshark.org/review/24663
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-30 16:28:39 +00:00
Darien Spencer 48e68367d9 rrc: Remove unused GTree
Change-Id: I137ac55cd99e659db9d9a496cc82f4427300765d
Reviewed-on: https://code.wireshark.org/review/24662
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-30 15:24:25 +00:00
Pascal Quantin a6d0ffca86 RRC: reset strbuf pointer after its use
While we are at it, let's add a partial dissection of
PLMN-IdentityWithOptionalMCC-r6 IE.

Bug: 14248
Change-Id: I20b76bc74c248914db21629f8ce77799fccb1612
Reviewed-on: https://code.wireshark.org/review/24661
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30 12:17:48 +00:00
Peter Wu 6a00fa767f http2: select fields from Decompressed header tab when possible
The "Decompressed header" tab contains some human-readable text, but no
field was associated with it. Instead, the fields were attached to raw
compressed headers which, all with the same offset and length.

Ensure that each byte in the decompressed header tab is accounted for.
The only fields that are still pointing to the raw compressed buffer is
the http2.header field (covering a full raw header), the representation
type (a few bits, at most 1 octet) and the index length (guessed length,
an exact value is probably not worth the cpu cycles).

Change-Id: Ic0118e9ed583841a2d353f8b8c28dcafea3401f2
Reviewed-on: https://code.wireshark.org/review/24660
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30 05:37:54 +00:00
Michael Mann 3d6da018e7 CIP Safety: base packet length can be used
Slight adjustment to I394fa91a5cfa1700fb12441d4884c0367b39df8b

Change-Id: Id097a39265f49a79f3d39855ef6b5c95ffe8c4f1
Reviewed-on: https://code.wireshark.org/review/24654
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30 01:06:21 +00:00
Juanjo Martin f6521b295d RTPS: Added link to the DCPSPublicationData frame number
Added a link inside the Topic Information feature so users can
quickly go to the discovery data associated with the writer sending
this submessage.

Change-Id: I3a89630a275e5d857e8bbf86dc5171c9f0921d5b
Reviewed-on: https://code.wireshark.org/review/24646
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30 00:38:44 +00:00
Juanjo Martin aeb864e685 RTPS: Added new endpoints for the Security spec
Change-Id: Ia827c43b161a2b64804b0eac220b428eb853d255
Reviewed-on: https://code.wireshark.org/review/24647
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30 00:37:59 +00:00
Gerald Combs ec0ffc043f RRC: Fixup wmem_strbuf usage.
Instead of calling wmem_strbuf_finalize, which frees the strbuf
structure and makes it unsuitable for reuse, call wmem_strdup +
wmem_strbuf_truncate. This fixes a heap-use-after-free.

Bug: 14248
Change-Id: I498e10ed9f9afa7fa72b607eb43f68c710de777e
Reviewed-on: https://code.wireshark.org/review/24650
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30 00:15:39 +00:00
Gerald Combs b59dc97dfe NetBIOS: Don't write past the beginning of a buffer.
Make sure process_netbios_name doesn't write past the beginning of its
buffer.

Bug: 14249
Change-Id: Idb294ba2362e48b879bc4c0c0ddaf64fcf1b5d72
Reviewed-on: https://code.wireshark.org/review/24651
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30 00:04:14 +00:00
Martin Mathieson 52365a55e4 LTE L2 protocols: add FT_FRAMENUM_TYPE for most FT_FRAMENUM fields.
Missed out some that would probably result in too many links.
Added FT_FRAMENUM_RETRANS_PREV and FT_FRAMENUM_RETRANS_NEXT to enum,
these display as arrows like REQUEST and RESPONSE do.

Change-Id: I6e8d222955f2ba59a713e8a389837b55a1c7f262
Reviewed-on: https://code.wireshark.org/review/24600
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-11-29 21:21:09 +00:00
AndersBroman d1a6742d9b [L2TP] Enhance info col layout.
Change-Id: Ib16b71b47f97516db55412f1881d995706e723b1
Reviewed-on: https://code.wireshark.org/review/24645
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 09:06:49 +00:00
Peter Wu 140282cbf0 cmake: fix build with cmake 2.8.11.2
"file(GENERATE ...)" is only supported since 2.8.12, since the list of
sources is fixed at cmake time, just use "file(WRITE ...)".

Change-Id: If4a547803ab536cf8d131045692d3e58301b0cd2
Fixes: v2.5.0rc0-1763-gfe0c2b0485 ("Rewrite make-dissector-reg.py in C")
Reviewed-on: https://code.wireshark.org/review/24638
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 09:04:03 +00:00
AndersBroman d7bab0b46e [packer-ehdlc.c] Mark some fields as generated, enhance info col.
Change-Id: I10241389dbd3c463b36c5dfcd7a4fa929a1bbf6a
Reviewed-on: https://code.wireshark.org/review/24644
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 09:02:56 +00:00
Peter Wu e1850de294 autotools: remove unnecessary include directory for epan
Since v2.1.0rc0-2202-g6b54fbf3bf, wslua is also not necessary in the
include path, so remove that too.

Change-Id: Ib227b71b08da9fc397d6618b60100ab819570b86
Reviewed-on: https://code.wireshark.org/review/24640
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-29 06:58:34 +00:00
Peter Wu 3c6cb2f856 cmake: match include directories with autotools
Match closer the behavior of autotools which does not include epan in
its include paths by default.

Change-Id: I885bc7942490a5674c6ac75f9a8ea221555e3784
Reviewed-on: https://code.wireshark.org/review/24639
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-29 06:58:22 +00:00
João Valverde 952dc3ae32 make-dissectors: Use g_file_set_contents()
Also add some more errors checks, we only pass valid files to make-dissectors.

Change-Id: I9c068e47f35ee6c3da0112ee9ce905af35030475
Reviewed-on: https://code.wireshark.org/review/24625
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 06:11:56 +00:00
Juanjo Martin 9cd82c3753 RTPS: Added DataWriter QoS to topic information feature
Change-Id: Ib8d9c4f75543ed05c1bf69589069ed2425e3394e
Reviewed-on: https://code.wireshark.org/review/24555
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 04:51:26 +00:00
Juanjo Martin f10237f0a5 RTPS: Added locator and product version to Micro DDS
Change-Id: Icfb1c505865f5a32152cc056173baae8f7d01f36
Reviewed-on: https://code.wireshark.org/review/24603
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 04:49:52 +00:00
Gerald Combs 67ffa3cf7d Threads: Set lifetimes and add a compatibility routine.
Join the protocol registration threads so that they call g_thread_unref
which in turn detaches/terminates the thread. This gets rid of many TSan
and DRD errors here. The remaining ones appear to be false positives.

Add g_thread_new to glib-compat (untested).

Change-Id: I4beb6746ed08656715cf7870ac63ff80cf1ef871
Reviewed-on: https://code.wireshark.org/review/24619
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 04:43:41 +00:00
Pascal Quantin 041e3e7c27 CIP Safety: check packet length before dissecting
Otherwise we can call CRC functions with a negative value, leading to
a segmentation fault.

Bug: 14250
Change-Id: I394fa91a5cfa1700fb12441d4884c0367b39df8b
Reviewed-on: https://code.wireshark.org/review/24621
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 04:35:19 +00:00
Guy Harris e74800d347 Use a separate Boolean to indicate whether we have a duration.
Reserved values are a bit of a hack.  (If this were Swift....)

Change-Id: I243e8f497345f44d94af6106287556b8831fba92
Reviewed-on: https://code.wireshark.org/review/24633
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-29 01:29:30 +00:00
Kenneth Soerensen e73135a9f1 ZigBee: Add remaining attributes from Smart Energy Metering cluster
Change-Id: I7ca67ceaf72a1e4cc1c7b3ccc8fed79fafefe575
Reviewed-on: https://code.wireshark.org/review/24614
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-28 20:37:12 +00:00
Peter Wu d35ed012ce TLS13: update for draft -22 (Server Hello, HRR, CCS, NST)
Draft -22 moved the server version to an extension and makes HRR look
like a SH. SH is now interpreted as TLS 1.2. Detecting TLS 1.3/HRR
requires scanning SH extensions before parsing the message, so do that.

Changes:
 - Add draft 22 version identifier.
 - Recognize special Server Hello magic for HRR.
 - Dissect SupportedVersions for SH/HRR, rename the field to match spec.
 - Recognise new Server Hello format (including legacy fields).
 - Move version detection up to handshake message dissection to allow
   HRR (disguised as SH) to be detected as such. DTLS does not have HRR
   and fragmentation makes it harder, so use its version as usual.
 - Ignore ChangeCipherSpec again for draft 22 (do not add expert info).
 - Allow NST ticket_nonce to be empty.

Change-Id: I9d5f7dba173e1b5c901bf9a6917c65520ee60a2f
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/24340
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-26 15:55:46 +00:00
Guy Harris 7eb2c7dbc7 *Always* set pinfo->p2p_dir from the wtap_pkthdr.
Don't just do it if we're actually creating protocol tree information
for the "Frame" protocol; that information is used even when we're *not*
creating protocol tree information for "Frame".

Bug: 14245
Change-Id: Ie3754e15754fb6a73529e20d8fa68956e206a994
Reviewed-on: https://code.wireshark.org/review/24593
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-26 09:32:31 +00:00
Peter Hamilton 78ed5f34f5 NBAP: Always map NB-CC to CRNC-CC
Now maps for all channels and not only E-DCH

Change-Id: I51099e887830e5142b58fd624775d395e354b012
Reviewed-on: https://code.wireshark.org/review/24572
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-26 08:48:57 +00:00
Erwin Rol 076fee6e63 artnet: Fix ArtPollReply spare/style field order
In the ArtPollReply the field order of the style and 3 spare bytes
was wrong, according artnet spec 1.4 page 25 the order should be
spare, spare, spare, style.

Change-Id: I5683e5a8e97643a7bb1962178178c175d485098c
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
Reviewed-on: https://code.wireshark.org/review/24584
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-26 03:09:21 +00:00
Michael Mann f23a6e193f packet-iwarp-mpa.c: Stop FPDU dissection if the ULPDU_LENGTH field does NOT contain what is expected
Bug: 14236
Change-Id: I15f1bc70978d1e5ae3b4bba1ff87b590726cfaa1
Reviewed-on: https://code.wireshark.org/review/24578
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-25 09:04:00 +00:00
Martin Heusse d2a7a806ff Re-sync with osmocom version of the file with new types
Change-Id: Iae231de172eabe135ca3acd7f82b1683eebaee38
Reviewed-on: https://code.wireshark.org/review/24574
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-24 19:33:05 +00:00
Craig Jackson 1392b92d7c TDS: Fix packet reassembly for TDS 4.x/TDS5.x streams.
The existing TDS "netlib" packet reassembly code only handles situations where the
netlib header has a valid non-zero packet number. This does not always occur for older
clients, in particular when TDS 7 is not in use.

This has been tested with:

DB-Library 4.6 talking to Sybase
CT-Library 5.0 talking to Sybase
jConnect 5.0 talking to Sybase
.NET 4.5 talking to SQL Server with TLS login
Freetds CT-Library talking to SQL Server with unencrypted login
- I'm not sure of the version of this, in the protocol it appears as 8.0.341.

Change-Id: I1690ba191ba3f4bd10569ab1a26dae82c5bbf260
Reviewed-on: https://code.wireshark.org/review/24470
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-24 05:24:29 +00:00
Peter Wu 0074855364 DTLS: fix decryption with EMS and client auth
Similar to the TLS fix in v2.5.0rc0-1805-gd790c524b4, ensure that the
correct master secret is calculated when extended_master_secret is
enabled with client auth and a decrypted RSA premaster secret.

Bug: 14243
Change-Id: I3d8cecef0f0cc3ec73537053489adc2d0d45c947
Reviewed-on: https://code.wireshark.org/review/24564
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-24 05:22:12 +00:00
Peter Wu 9ac02f18c9 packet: ensure consistent layer number for heuristics dissector
DTLS decryption works for single-pass dissection, but breaks in the
second pass. Turns out that "curr_layer_num" has decremented in the
second pass, resulting in a failure to lookup the decrypted data.
This decryption issue was triggered by v2.3.0rc0-3740-ge1f84f985e
("Fix Decode As for protocols that may use tunneling.").

The first time the UDP dissector invokes "dissector_try_heuristic", the
second time "call_heur_dissector_direct". The first one increments
"curr_layer_num", so do the same in the second case.

Change-Id: I62679b817b02f42d073cfc07b88ec36d5bec5f04
Bug: 14243
Fixes: v1.11.4-rc1-468-g2cfda31ff0 ("Change the signature of dissector_try_heuristic() to return hdtbl_entry")
Reviewed-on: https://code.wireshark.org/review/24565
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-24 05:20:49 +00:00
João Valverde cb80d6c97b make-dissectors: Use more shell for build recipe
Change-Id: Ib7b5c74c0cca5bd6b9036a36a2df85ed0d0dcabb
Reviewed-on: https://code.wireshark.org/review/24562
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-24 00:18:17 +00:00
Ivan Ermakov cd6e56e03a ZigBee ZCL Price Cluster dissector
Added Price cluster payload dissectors.

Change-Id: I4771221e1260e446a7708adb9c862cddb8755d59
Reviewed-on: https://code.wireshark.org/review/24549
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-23 21:03:28 +00:00
Alexis La Goutte ea6204cab6 BGP: display ESI 10bytes value (and not a decoded value)
Bug: 14200
Change-Id: I6d8ac6aae952db21e69fa323fb1e74782d95d1c4
Reviewed-on: https://code.wireshark.org/review/24362
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-23 19:47:39 +00:00
Michael Mann ef17ead772 BGP: Add Path Identifier to IPv6 NLRI
Bug: 14241
Change-Id: I5e66b034cf5cd14e2557e5b7bfa3045c2232d1ae
Reviewed-on: https://code.wireshark.org/review/24553
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-23 17:51:47 +00:00
AndersBroman 6cc3abfc55 [make-dissectors] Need to link with wsutil
Change-Id: I033352dfb1836d646db5a3db04b125d2058867c9
Reviewed-on: https://code.wireshark.org/review/24556
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-23 17:51:19 +00:00
João Valverde 0780975703 make-dissectors: Another attempt to use newlines instead of spaces
Change-Id: I7ff5a0ea3eb3f7f56debc54aee6d5147815acc1b
Reviewed-on: https://code.wireshark.org/review/24552
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-23 16:59:52 +00:00
João Valverde 3a80970f12 make-dissectors: Fallback to the newly introduced glib-compat replacement
Change-Id: Ieb7ea23d8109a60dce7dd0c848438e93d671a3c9
Reviewed-on: https://code.wireshark.org/review/24546
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23 16:19:44 +00:00
AndersBroman 243fa8c441 [glib-compat] g_async_queue_timeout_pop() needed for older glibs
(2.31.18)

Change-Id: I727c8548c29b3409fab819dce072e86153232911
Reviewed-on: https://code.wireshark.org/review/24550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23 14:46:20 +00:00
João Valverde b6f5ee68f6 make-dissectors: Don't use stdout
This will prevent the file from being created with shell redirection
in case of error and allow printing informational messages to stdout
instead of stderr.

Also improve dissectorc.c Makefile recipe to abort on errors.

Change-Id: I64722927721887b57a7dbe69fd2625c2e4648ad4
Reviewed-on: https://code.wireshark.org/review/24545
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-23 12:09:55 +00:00
AndersBroman fe76be0b5b [make-dissectors] g_ptr_array_new_full() is glib 2.30.0 which we do not
require.

Add alternate code to fix the build for our minimum required version.

Change-Id: Ia0911c5a6be3af68330ac41a3336d7d47b87b7a9
Reviewed-on: https://code.wireshark.org/review/24535
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23 06:14:38 +00:00
Peter Wu d790c524b4 TLS: fix decryption with EMS and client auth
When extended_master_secret is enabled with client authentication,
decryption using an RSA private key file would fail because the wrong
master secret is derived. This happens due to an excess
CertificateVerify message in the handshake hash.

Bug: 14243
Change-Id: I02f8302ac4a85422f7df52a234bdddfcb5fe3307
Reviewed-on: https://code.wireshark.org/review/24543
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23 05:37:29 +00:00
Michael Mann b4419eacce zbee_parse_uint -> proto_tree_add_item[_ret_uint]
We don't need to unnecessarily wrap proto_tree_* functions.

Change-Id: Id2853cfb9059cd90af81e529bcec57eba10e6ab3
Reviewed-on: https://code.wireshark.org/review/24540
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23 05:36:24 +00:00
João Valverde c369db08ea Add comment with motive for dissectors.c.in
Change-Id: I825d4654aa76fee7288dc98eb7a92fe136d7542e
Reviewed-on: https://code.wireshark.org/review/24542
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-23 01:18:11 +00:00
João Valverde 2add5e701f make-dissectors: Print the number of functions successfully parsed
Change-Id: I7364571ddc9b86efd41dcade97f843037e09f0ac
Reviewed-on: https://code.wireshark.org/review/24541
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-23 01:18:02 +00:00
Juanjo Martin f5bc86df04 RTPS: Topic Information feature now available for all the submessages
Before, the topic information feature showed the topic information
only for DATA submessages. Now it is working for all the submessages.

Change-Id: Ic2fe0ac1de2377a1db627f6498ac6d5159c9cb13
Reviewed-on: https://code.wireshark.org/review/24442
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-23 01:01:00 +00:00
Alexis La Goutte a55a96a13a ssl(-utils.h): fix parameter 'src' not found in the function declaration [-Wdocumentation]
Change-Id: I922a1a12d2b562594354a18af5f92b21df3ce906
Reviewed-on: https://code.wireshark.org/review/24539
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-23 00:57:28 +00:00
Alexis La Goutte 053b41dda3 wisun: fix no previous prototype for function 'proto_register_wisun/proto_reg_handoff_wisun' [-Wmissing-prototypes]
Change-Id: I44751363b2e1f16a2463d7e798bedb6f59995e13
Reviewed-on: https://code.wireshark.org/review/24538
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-23 00:56:46 +00:00
Alexis La Goutte 5e17502d39 802154: fix no previous prototype for function 'ieee802154_create_psie_tree' [-Wmissing-prototypes]
Change-Id: I7755753aab9737967c355f4969cefc7871406b9c
Reviewed-on: https://code.wireshark.org/review/24537
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-23 00:56:32 +00:00
Ivan Ermakov 462048b2d3 ZigBee ZDP cluster display
Added cluster names to binding requests and match descriptor. Cluster IDs now display in HEX.

Change-Id: I1be4339e324ba4c98ce65016f5a2e60590235d71
Reviewed-on: https://code.wireshark.org/review/24437
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-22 19:02:46 +00:00
Ivan Ermakov bceae3cff2 ZigBee ZCL Calendar Cluster dissector
Added dissectors for payloads of Calendar cluster.

Change-Id: I5c71078714521e25ad4db82b7ffe5166965d5280
Reviewed-on: https://code.wireshark.org/review/24201
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-22 19:02:37 +00:00
João Valverde 871f75ce85 make-dissectors: Remove dependency on GNU Make >= 4.0
The $(file ...) function is only available since version 4.0.

Until something breaks or someone complains use the shell to
write dissectors.c.in.

Change-Id: Icfe260004ca04d825c370bb642fcdc4b4be8516f
Reviewed-on: https://code.wireshark.org/review/24532
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-22 11:44:31 +00:00
Michael Mann 2f2c2b06e2 Add Zigbee encoding, ENC_ZIGBEE
Add the "special handling" of length = 0xFF for single byte or 0xFFFF
for uint16 value means size of field to follow is 0.

Ping-Bug: 14138
Change-Id: I0baa40f63152b9420a6569ca6cc5eba638fbc790
Reviewed-on: https://code.wireshark.org/review/24428
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-22 09:10:05 +00:00
Michael Mann 8d5726dccc Add support to handle DNS retransmissions
Add a preference to the DNS dissector to specify how many seconds can
elapse before a DNS query is considered a retransmission because the
transaction ID is shared with a previous request.

If retransmission is found, add expert info and hf_ field linking to
the original request.
If a retransmission of a response is found, add expert info and hf_ field
linking to the original response.

Bug: 14178
Bug: 13313
Change-Id: Idd77ab7f7638f5056d5690633c787a4d52285aee
Reviewed-on: https://code.wireshark.org/review/24525
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-22 09:07:30 +00:00
Michael Mann a501321cbb Enable TCP Calculate Conversation Timestamp by default
It doesn't appear to be too expensive of a calculation, so
have preference enable it by default.

Bug: 14182
Change-Id: I330dc99d871424d17c60ab8cff59ba0828dd069a
Reviewed-on: https://code.wireshark.org/review/24529
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-22 05:13:19 +00:00
Ivan Ermakov 86919416ee ZigBee ZCL DRLC Cluster dissector
Added DRLC cluster dissector: cluster, attribute and command names.

Change-Id: Ic678052aaecffce3a4b8fd99d4e2b1eb91051f11
Reviewed-on: https://code.wireshark.org/review/24440
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-22 04:18:29 +00:00
Ivan Ermakov 1ae4145994 ZigBee ZCL Energy Management Cluster dissector
Added Energy Management cluster dissector: cluster, attribute and command names.

Change-Id: If6985ca59c314de4eb3d439999ea31fe167bb3e7
Reviewed-on: https://code.wireshark.org/review/24441
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-22 04:18:16 +00:00
Derick Rethans 641e2fc573 Add support for MongoDB 3.6's OP_MSG to dissector
Bug: 14230
Change-Id: I008a0fb60c441c5f71788d695b398b73b76c0d69
Reviewed-on: https://code.wireshark.org/review/24450
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-21 23:52:00 +00:00
João Valverde 454a7647f5 CMake: Remove duplicate PIDL files from CMakeLists.txt
Change-Id: I108a95aa4da80de6c96bf83d083b5ac4acd1a6ab
Reviewed-on: https://code.wireshark.org/review/24528
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-21 23:04:46 +00:00
Alexis La Goutte 9a1a8f77e9 BGP: enhance display
Display LACP Port Key/root Bridge Priority in Dec and Hex
mSTP => MSTP

Change-Id: I7079250da134e4bb60d2d5373bfdf2f31235f07a
Ping-Bug: 14200
Reviewed-on: https://code.wireshark.org/review/24401
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-21 21:17:23 +00:00
João Valverde 7540ac6938 Move the protocol registration routines back into libwireshark
Follow-up to b695b3e2f7.

Change-Id: I7e36519f2c3806c1205d05437671325080974257
Reviewed-on: https://code.wireshark.org/review/24524
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-21 20:21:50 +00:00
Guy Harris 3cf73671d1 From looking at the OpenAFS source, the RX abort code is signed.
Change-Id: I79f578ee5fe4e63d5bb6adc9d90f24fac5f82b02
Reviewed-on: https://code.wireshark.org/review/24520
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-21 08:44:36 +00:00
Stig Bjørlykke 4a08c63e88 mqtt: Add sanity checks for MQTT v5.0 Reason Codes
Check if mqtt_msg_type is within boundaries of hf_rcode and gives
a valid hfindex.

Change-Id: Ib8ea710d7cd6c61ec493e218d64b50f6faa720c4
Reviewed-on: https://code.wireshark.org/review/24509
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-21 07:42:17 +00:00
Guy Harris fdc3023bec OpenAFS always puts out 3 bytes of padding in an ack packet.
Change-Id: Ia956ac7df43c307a8d5adac5c78c894017f7f7ec
Reviewed-on: https://code.wireshark.org/review/24513
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-20 18:07:23 +00:00
João Valverde 4fbb2df3cd Revert "make-dissectors: Be more resilient with whitespace"
This reverts commit ed9d085520.

It's causing a segfault on our Windows buildbots.

Change-Id: I3cdd31955bdec7be3ad91cff4af8dc3efdc9e8b7
Reviewed-on: https://code.wireshark.org/review/24510
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20 14:48:05 +00:00
Flavio Santes c26ad500ec dissector/mqtt: Add the MQTT v5.0 Reason Codes
RCs and their text descriptions are added by this
patch. We use defines for the values and descriptions
because they are shared by many Control Packets, so
in this patch we parameterize them to avoid writing
the descriptions multiple times.

Change-Id: I0afc2cbe69e8cfffa4f65df0b72f09045bb9b3a1
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24263
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-20 13:48:23 +00:00
João Valverde ed9d085520 make-dissectors: Be more resilient with whitespace
Preemptively try to be more resilient for files with spaces in them
(for Windows).

Use newlines to separate file list. Clean up duplicate PIDL file entries.

Change-Id: Ib506cca785836e05e4665e911de0d45ab4da1165
Reviewed-on: https://code.wireshark.org/review/24507
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20 12:44:49 +00:00
Alexis La Goutte 496797f0dc ieee1905: fix typo bandwith => bandwidth
found by lintian

Change-Id: Id9b113eddae5bcbcfb0c9b3d1dfb6008aa3d7269
Reviewed-on: https://code.wireshark.org/review/24502
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-11-20 09:18:04 +00:00
Alexis La Goutte 93e7bed24e ieee1905: fix typo addres => address
found by lintian

Change-Id: Idb5ee47b709e10d53192ac966b638e160cec60ea
Reviewed-on: https://code.wireshark.org/review/24501
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-11-20 09:17:53 +00:00
João Valverde fe0c2b0485 Rewrite make-dissector-reg.py in C
The output compares equal to make-dissector-reg.py and the regex
should be more robust (multiline, complete start of function definition).

The primary motivation is to clean up the python script. This small
binary results in much cleaner code. The python script is used only
to generate plugin code, therefore it is renamed.

Also in my casual measurements the C code is much faster (without cache)
than the python script with the cache.

Change-Id: Id4e8cac3c836d56775aba4819357a95ef19bcb85
Reviewed-on: https://code.wireshark.org/review/24497
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-20 06:03:08 +00:00
João Valverde 129cb60f56 Remove unused dissector registration prototypes, fix typo
Change-Id: Ide5d7f2241db4ac87ed516f91f0bcaca347bb546
Reviewed-on: https://code.wireshark.org/review/24496
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-20 05:34:00 +00:00
Michael Mann d17633892c packet-tds.c: Correct encoding for hf_tds_colmetadata_maxbytesize
It's just a FT_UINT16, not need for 2 encodings.

Change-Id: I502a61a2ff2a1fd05f1efa48912119f98d10e636
Reviewed-on: https://code.wireshark.org/review/24498
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-20 02:26:45 +00:00
Dario Lombardo 51ff1df443 file-elf: remove unuseful check (found by Clang 6).
error: comparison 'guint32' (aka 'unsigned int') <= 4294967295 is always true [-Werror,-Wtautological-constant-compare]

Change-Id: Id1f6a0a01dd897d263f7133a0d95aaecfba31e14
Reviewed-on: https://code.wireshark.org/review/24495
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-20 00:19:04 +00:00
João Valverde 262a84c384 Fix (and chop) static build option
This sets the scope of the static build option to Wireshark support
libraries only.

Before the patch:

Static plugins don't work with CMake and autotools.

autotools static build is broken, and most likely will always be, as
building Wireshark all-static is difficult and time-consuming.

After the patch:

For CMake Wireshark will be built with static or shared libraries and
dynamic plugins. Everything just works. CMake apparently doesn't want
you building static and shared libraries at the same time.

For autotools Wireshark will be built with shared libraries by default.
--disable-shared and --enable-static options work as usual. Dlopened
plugins are not built if --disable-shared is given to configure (to
disable shared libraries). This is a limitations imposed by libtool.

Tested on Linux. This removes broken support for building plugins
statically.

Change-Id: Ib8e8176976f136eea93a2ce8f9857b6cf9bec64c
Reviewed-on: https://code.wireshark.org/review/24241
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-19 20:16:50 +00:00
Michael Mann e9d8eba416 packet-h223.c: Ensure conversation data exists
There is more potential for conversation data than previous circuit data
so ensure h223 conversation data exists in retrieved conversation.

Bug: 14233
Change-Id: I7074b1c110d40b4727812d0ef4f5391b6d2c0c33
Reviewed-on: https://code.wireshark.org/review/24492
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-19 15:52:44 +00:00
Michael Mann bb47a68e09 Move dissect_leb128 to file-elf.c
This allows for the removal of epan/dwarf.[ch]

Functionality could probably be handled by an encoding (like dissect_uleb128),
but for now keep it in file-elf.c as that's the only functionality
currently using it.

Change-Id: I84cf6af02abb3d53ea7d9b774e3313d77a1ff497
Reviewed-on: https://code.wireshark.org/review/24486
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-19 05:14:57 +00:00
Michael Mann 752d0ef753 dissect_uleb128 -> tvb_get_varint/proto_tree_add_item_ret_length
Also update ENC_VARINT_PROTOBUF documentation while we're at it

Change-Id: I72e1f9175adc0c6a8bb03ceddba04ffd4844a12e
Reviewed-on: https://code.wireshark.org/review/24485
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-19 05:14:27 +00:00
João Valverde 1097e8020a autotools: Library build products don't need explicit cleaning
Change-Id: I5d68c05f2844d6c9ae486531b189dbf10bc09cff
Reviewed-on: https://code.wireshark.org/review/24484
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18 22:29:41 +00:00
João Valverde f902981b2d Fix indentation
Change-Id: I558f23572dc36ba96fd1c2f904b1ac6b6c343297
Reviewed-on: https://code.wireshark.org/review/24482
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18 21:54:23 +00:00
Ivan Ermakov 23234ac872 ZigBee ZCL Device Management Cluster dissector
Added Device Management cluster dissector: cluster, command names.

Change-Id: I1ed9c53a09aed10584cd372630fbec5e661cacd8
Reviewed-on: https://code.wireshark.org/review/24449
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Boye Petersen <mbpflonidan@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18 21:50:25 +00:00
Guy Harris adc1aff0a5 The header is host-endian, not little-endian. Note that.
Change-Id: I7fc2874026430c3d7e8633c48ee0558ad69d5c9a
Reviewed-on: https://code.wireshark.org/review/24480
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-18 18:37:34 +00:00
Guy Harris c42878bea8 Reformat comment giving Kerberos 4 specification.
Change-Id: I06350d56aeedf0c0cb1c72f3597a093a6f97847c
Reviewed-on: https://code.wireshark.org/review/24479
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-18 18:27:53 +00:00
Guy Harris 241008c861 URL for the document.
Change-Id: I9b381f923599f7b4750b21053cdfb3b1d72bce22
Reviewed-on: https://code.wireshark.org/review/24478
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-18 18:23:23 +00:00
João Valverde b695b3e2f7 Begin cleanup of make-dissector-reg.py
Move registration code to a new register.c file so it is readable.
Dissector load points are stored in a generated function pointer
array instead.

Simplify python script somewhat by not interleaving the plugin and
dissector logic.

Change-Id: I5ec21270f4e1550a5c911efa7f0dc4fc7fcb13a5
Reviewed-on: https://code.wireshark.org/review/24474
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18 14:43:10 +00:00
Richard Sharpe 925214a3e7 ieee1905: Fix the incorrect dissection of radio operation restriction
The dissection was really wrong. Fixed now I have seen captures.

Change-Id: I038fbf8786306fad9c65c87aa5d58c155113c442
Reviewed-on: https://code.wireshark.org/review/24476
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18 07:33:21 +00:00
Cedric Izoard a398a9573d ieee80211: Complete fixed size fields for SAE authentication
SAE authentication (used for mesh-point) introduced new non IE
fields (aka fixed size fields) that require explicit parsing.

The tricky part is that some of those fields don't have a fixed size...
- 'scalar' and 'finite field element' size depend of the group used.
  Retrieve size of all groups supported by wpa_supplicant.
- 'anti-clogging token' size is not specified.

Bug: 14222
Change-Id: Id0aa8790c55b21b2797ba131de9e46c32519e2cc
Reviewed-on: https://code.wireshark.org/review/24446
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18 07:31:18 +00:00
Pascal Quantin ed68e05014 IEEE 802.11: fix an infinite loop
Presumably the element length is unsigned, otherwise it can be negative
and reincrement tag length.

Bug: 14231
Change-Id: I26d339aea7588a489b4252b67c212810029bff0e
Reviewed-on: https://code.wireshark.org/review/24472
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-18 00:42:25 +00:00
Darien Spencer 584c478751 fp: Fix mac TVB for edch t1
Using the '_caplen' function with length of -1 leads to a "truncated RLC" error.

Change-Id: I5a5f650b244de1167ff7110558ad0559d0422103
Reviewed-on: https://code.wireshark.org/review/24462
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17 14:02:12 +00:00
Pascal Quantin 7f327cc580 3GPP NAS: fix dissection of PCO MSISDN container ID
3GPP 24.008 is not very explicit regarding the encoding, but after
rereading 3GPP 23.003 and 3GPP 29.272, it is most likely the E.164
number in TBCD encoding (so without TON/NPI byte).

Change-Id: Iae58ccc2919d28cb802015205b3b5fb97a1c4abe
Reviewed-on: https://code.wireshark.org/review/24463
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-17 13:01:10 +00:00
AndersBroman 2114923ec1 [Juniper ST] Dissect the "known" parts of the Juniper header.
Ping Bug: 14195

Change-Id: I7ab05857c054a0d914db9373d182008215d67367
Reviewed-on: https://code.wireshark.org/review/24461
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17 11:29:43 +00:00
Darien Spencer 848cd4e291 rrc: fixed incorrect constants
The macinf->content field should be compared to MAC_CONTENT_* and not MAC_*

Change-Id: I0dee7855938095c5d1c53f4db13003b90cf7ba91
Reviewed-on: https://code.wireshark.org/review/24460
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17 11:29:30 +00:00
Alexis La Goutte 00e217a732 ieee80211: Add dissection of BSS Transition Query
Bug: 14220
Change-Id: Iec155a6fbb179bd0e0aaf8b10fd7d420dc1a69bb
Reviewed-on: https://code.wireshark.org/review/24453
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17 09:40:31 +00:00
Joakim Karlsson d9f8ddd780 [PFCP] add port 8805
Port assigned by IANA

Change-Id: Ic04bc41878561239c83025ff2d5573daf7947b5b
Reviewed-on: https://code.wireshark.org/review/24451
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-16 18:37:12 +00:00
Martin Peylo 8ee4920c76 Registering CMP PKIMessage as BER dissector
Decoding ASN.1 BER as PKIMessage enables to examine a CMP (RFC 4210) message
which was saved as file.

Along the way, improving dissect_cmp_pdu function parameters to match required
API for register_ber_syntax_dissector(), factoring in creation of asn1_ctx.

Change-Id: I3284e6de9255e2b3cbf142c2904226b7e45b31f8
Reviewed-on: https://code.wireshark.org/review/24445
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-16 06:08:45 +00:00
João Valverde 9b93e7e5b2 Explain where GeoIP_free comes from
Change-Id: I0a354cde4587a041bdb1fa4147bd88eed24ceb76
Reviewed-on: https://code.wireshark.org/review/24356
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-15 20:39:37 +00:00
Stig Bjørlykke ca8e9a84a9 kerberos: Don't generate unused _vals tables
Put PA-FX-FAST-REPLY and PA-FX-FAST-REQUEST in .NO_EMIT ONLY_VALS

Change-Id: If0476c6d2bb78a15e3b984a7edafc3a7800fa490
Reviewed-on: https://code.wireshark.org/review/24436
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-15 08:32:04 +00:00
Alexis La Goutte 256622cb71 QUIC: fix STOP_SENDING length
Change-Id: I954425bb54f9511ba2cea50adfa8c69ea322267c
Reviewed-on: https://code.wireshark.org/review/24429
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-15 08:09:27 +00:00
Gerald Combs 435a8fb79c JXTA: Remove some assertions.
g4d2e653901 in 2009 removed some "if (tree)" checks, which in turn
exposed some DISSECTOR_ASSERTs which trigger on short packets. Add an
expert info field for truncated media data and comment out the
assertions.

The jxta-spec.dev.java.net specification link is dead. Add what appears
to be the current location.

Change-Id: Ic669c6631c6058a853d69ecd38ef4d2065c7eb24
Reviewed-on: https://code.wireshark.org/review/24426
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-15 04:29:27 +00:00
Gerald Combs 21d96b0444 JXTA: Simplify some expressions.
The sizes of guint8, guint16, and guint32 are always 1, 2, and 4 bytes
respectively. Just use 1, 2, and 4.

Change-Id: I857d33873cc5831ba23544475f721e485b8bd817
Reviewed-on: https://code.wireshark.org/review/24427
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-15 03:41:22 +00:00
Anders 1810801a68 Handle LINKTYPE_JUNIPER_ST 200.
Bug: 14195
Change-Id: Ic6be8e1f8169968c48376984c0d1a1a69c67f32a
Reviewed-on: https://code.wireshark.org/review/24415
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-15 03:40:10 +00:00
Michael Mann 5d1328c528 Kerberos - Add support for RFC 6113
Bug: 8974
Change-Id: I43998a64fc34dfeb1c0a8d702d5bdc5aa74d57de
Reviewed-on: https://code.wireshark.org/review/17879
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-14 20:20:22 +00:00
Stig Bjørlykke f2ee064bbb mqtt: Copy UAT match_criteria value
Change-Id: Ifdb743bcf1f644d412d1ac35801347b5355d1754
Reviewed-on: https://code.wireshark.org/review/24410
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-14 18:07:19 +00:00
Alexis La Goutte a595d7326b MPLS: use directly proto_tree_add_item for display PW ACH Channel Type
Ping-Bug 14208
Change-Id: Idefa2611fd6725b65c1994ef1f4ff4b00fcf67c7
Reviewed-on: https://code.wireshark.org/review/24403
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13 22:45:15 +00:00
Erwin Rol 0bba9fb60f RDM: Add ACK timer and ACK overflow handling
Change-Id: I1531e84b91becba97300cf30f8bbfd12290ced61
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
Reviewed-on: https://code.wireshark.org/review/24396
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13 11:33:46 +00:00
Joakim Karlsson 65bab716be [PFCP] minor corrections
Change-Id: I981c7bb9b601a38abeeb21d67ff4f7af824c234e
Reviewed-on: https://code.wireshark.org/review/24398
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13 11:32:24 +00:00
Michael Mann 800b26edbe Remove circuit API
Replace with conversation API that limits the "endpoint" to a single
uint32 value.

The intention is to eventually have "layered" endpoints, because circuit_id
was used in cases where src/dest port have already been populated (and
are used for layers above).  Those src/dest ports should just be treated
as just another endpoint, but we currently only have support for one.

Change-Id: Ic6aa7ef0241275aa4dfde9459194369b48c72960
Reviewed-on: https://code.wireshark.org/review/24369
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13 05:21:36 +00:00
Stig Bjørlykke 7deb2b432b mqtt: Use proto_tree_add_item_ret_uint()
Change-Id: Iccbbb007b4d733b812e2a2cb528477b1417bed6e
Reviewed-on: https://code.wireshark.org/review/24394
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Flavio Santes <flavio.santes@1byt3.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-12 21:45:03 +00:00
Alexis La Goutte 2b03b41bd0 ssl-utils: Add export ssl_data_alloc
For reuse on QUIC dissector

Change-Id: I005fc3fe7a559fdb7a62e3d40450a4a6b25bf2f5
Reviewed-on: https://code.wireshark.org/review/24383
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12 17:47:32 +00:00
Uli Heilmeier d283939303 Fix "might be clobbered by 'longjmp' or 'vfork' warning
Change-Id: I51ec17b5eabe7b0f9fc68f4cf599ca55b8e4631d
Reviewed-on: https://code.wireshark.org/review/24385
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12 17:46:37 +00:00
Joakim Karlsson 3d77e1bbcd [PFCP] Update to 3GPP TS 29.244 V14.1.0 (2017-09)
Change-Id: I69ad8c9a852f400e2918c4eca7365c719df734f5
Reviewed-on: https://code.wireshark.org/review/24380
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12 17:45:18 +00:00
Richard Sharpe bd130e9273 ieee1905: Use BASE_UNIT_STRING and &units_dbm rather than appending
the string 'dBm'.

Change-Id: I5f4ddcf98902c53f6f014e64b51eb4c3c263e7e1
Reviewed-on: https://code.wireshark.org/review/24368
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-12 03:42:50 +00:00
Stig Bjørlykke 95d6217193 mqtt: Whitespace and indent fixes
Change-Id: Ie6470cd20871b0aac17d19c67aba4b7229f906e6
Reviewed-on: https://code.wireshark.org/review/24367
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-11 20:18:47 +00:00
João Valverde fa6dc7b3fb autotools: Be more consistent with variable names
Change-Id: I644fbe7796a83c98861a4ebb9200ee41de27c897
Reviewed-on: https://code.wireshark.org/review/24350
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 19:12:54 +00:00
Owen Kirby 3f11c2f7c5 Wi-SUN Protocol dissection and IEEE 802.15.4 IE cleanup.
This patch adds dissection for the Wi-SUN Field Area Network standard. Wi-SUN
packets are encoded as a collection of IEEE 802.15.4 information elements. This
required a bit of refactoring in how the IE dissector table is handled so that
external protocols could supply their own dissectors.

While I was working with the IEs, I also added support for the TSCH Timeslot and
Global Time IEs from the IEEE 802.15.4 standard in addition to some general
cleanup.

Change-Id: I2858e4ab577756568e33b86adfe282967899abd5
Reviewed-on: https://code.wireshark.org/review/24331
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 19:11:44 +00:00
Alexis La Goutte 499ae4ab57 address(.h): fix commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
Change-Id: Ibfc95e085b2712f7a71f6559ae205de87aab12f6
Reviewed-on: https://code.wireshark.org/review/24365
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 19:10:30 +00:00
Alexis La Goutte 2092b66a0b WPS: no previous prototype for ‘proto_reg_handoff_wps’ [-Wmissing-prototypes]
Change-Id: Icb5220af362a25f081f0b5d33f92a9013723bca9
Reviewed-on: https://code.wireshark.org/review/24364
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 19:08:12 +00:00
Alexis La Goutte 81805717de RIP: no previous prototype for ‘proto_reg_handoff_rip’ [-Wmissing-prototypes]
Change-Id: I49e6ecec2e3998ff212069e88618bea36935c894
Reviewed-on: https://code.wireshark.org/review/24363
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 19:08:01 +00:00
Joakim Karlsson fea67da276 [PFCP] OHC: fix Port number field present
Port number should only be included with UDP/IP header

Change-Id: Ie2655d2b6f1b755bff47e74723f36b1ee87170f9
Reviewed-on: https://code.wireshark.org/review/24361
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-11 17:16:45 +00:00
Joakim Karlsson 13581e6aca [PFCP] display changes
For readability, DEC<->HEX and "IE length"

Change-Id: I753d8f6cba43a6b34fd06b49b1ffa96f13790c67
Reviewed-on: https://code.wireshark.org/review/24360
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-11 17:16:39 +00:00
Joakim Karlsson bb69464e4c [PFCP] F-TEID: add missing TEID
Change-Id: I4668208b5bf1d2cc168c7aa8f593510d55f27c23
Reviewed-on: https://code.wireshark.org/review/24359
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-11 17:16:31 +00:00
Joakim Karlsson ac41b0a941 [PFCP] IPv4, IPv6 address present
Change-Id: I4efedb43a8a3688931c4815ea5fa82bd01248b98
Reviewed-on: https://code.wireshark.org/review/24358
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 15:49:20 +00:00
Alexis La Goutte 29c32812b4 RTLS: Add link to doc about this protocol
Change-Id: Ib0207bb10c948637359f4afb853003065e3ca1bd
Reviewed-on: https://code.wireshark.org/review/24344
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 15:46:09 +00:00
Alexis La Goutte 92be91f57a [o|t]wamp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Idfa33bb194a491e2b97cc7e4a95f4da8c30a5f58
Reviewed-on: https://code.wireshark.org/review/24349
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 15:44:56 +00:00
Alexis La Goutte 1cf6d365b2 mqtt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ibd0041e0031c92073c89a1535677167e4fc90443
Reviewed-on: https://code.wireshark.org/review/24348
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 15:44:42 +00:00
Alexis La Goutte fdc8845803 ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I67b2d6f7d6e12f541780dfb17f5bbfe20bae3cf4
Reviewed-on: https://code.wireshark.org/review/24347
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 15:44:13 +00:00
Alexis La Goutte ff302a283d btmesh: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I7218d74e1dc4d014dadd86f55b7805ba1581f9c3
Reviewed-on: https://code.wireshark.org/review/24346
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 15:43:49 +00:00
Pascal Quantin 73329d786b DVB-CI: ensure that conversation_t stucture exists before using it
Bug: 14202
Change-Id: Ie0cad9c1cd1d0ea1392a61194567e80bb2b5a566
Reviewed-on: https://code.wireshark.org/review/24345
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-11 15:25:33 +00:00
Stig Bjørlykke eaee0678ce mqtt: Use guint for offset
Change-Id: Ie7b4a540e68121dbe5cd14a9aac80a1f9aae90b3
Reviewed-on: https://code.wireshark.org/review/24342
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-11 10:55:04 +00:00
Flavio Santes f35aa91c1a dissector/mqtt: Dissect the UNSUBACK payload
MQTT v5.0/UNSUBACK includes a payload conformed
by a list of reason codes. There is no length
field for this payload, so it must be computed
as the difference between the full message size
and the current offset.

Change-Id: Ibf7ef4131408e26e2389c3ab89107c22c16412a1
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24337
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 09:33:48 +00:00
Flavio Santes d337f4c5b7 dissector/mqtt: Payload length computation
This patch modifies how the payload length is
computed. With this patch we want to simplify
and reduce the number of operations.

Change-Id: Ie1c9a3f26c689e92fbbd57c34e4f68abd3ea7d02
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24336
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11 09:33:37 +00:00
Helmut Buchsbaum 0c382106f8 dissector/amqp: fix TLS/SSL payload dissection
To enable TLS/SSL payload dissection for AMQPS traffic add the
AMQP handle as SSL dissector for the actual AMQPS port.

Thus we have successfully decrypted our AMQPS traffic using
a pre-master-key file.

Change-Id: I63dec2217fb5645007da010f651846834abacdbc
Reviewed-on: https://code.wireshark.org/review/24335
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-10 18:41:33 +00:00
Matej Tkac 6ef9538770 [PFCP] PDN Type Dissection and minor fixes
Added PDN Type dissection (3GPP 29.244 Section 8.2.79)
       Fixed bit order in dissect_ue_ip_address
       Added "Encoding error" message if MBR or GBR has different format than specified in doc.

Change-Id: I3b8b096fa490a2b4a16b3e6e9a640f92e389be1f
Reviewed-on: https://code.wireshark.org/review/24334
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-10 12:07:08 +00:00
Michael Mann fd46a58581 packet-twamp.c: General improvements
1. Always wait for Greeting packet, otherwise packet must not be TWAMP control
2. Dissect packets on first pass
3. Use value_string for control state

Ping-Bug: 14171
Bug: 14196
Change-Id: I642c6fd61d29744ac4fd4185a9081eba27138c0a
Reviewed-on: https://code.wireshark.org/review/24329
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-10 02:57:08 +00:00
Richard Sharpe e935e902d6 ieee802.11: Fix the display of the Cisco Aironet DTPC value.
The DTPC value is in dBm, so make it so.

There is a second byte that we are looking for a spec on.

Bug: 14193
Change-Id: I69f0af295954958fde38b74e965f6fb66063513b
Reviewed-on: https://code.wireshark.org/review/24322
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-10 00:08:18 +00:00
Pascal Quantin 19a46ba774 RIP: do not register proto_reg_handoff_rip() callback
Bug: 14197
Change-Id: Ib6a46e09622d85fabbf8465a9234af3a959b9663
Reviewed-on: https://code.wireshark.org/review/24327
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-09 21:31:36 +00:00
Flavio Santes 645dff11e1 dissector/mqtt: Replace proto_tree_add_uint64 by proto_tree_add_uint
Change-Id: I51d5dfdcbf13cca79ca354d0a63bf7dc328e5dc9
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24312
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-09 18:41:27 +00:00
Matej Tkac 2ebc41050e [PFCP] Dissect Node ID and minor fixes
Fixed FQDN Field in Dissect Node ID according to 3GPP 29.244 Section 8.2.38
        Added "Encoding error" message if the value in field is in dotted form contrary to the doc.

        Minor fix: Decreased F-TEID Flags spare bits (fix of dc269fcd6f)

Change-Id: I7e9ba53a7deed7af1305f5c445bf4b2a9212e115
Reviewed-on: https://code.wireshark.org/review/24321
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 15:49:24 +00:00
bat e7e4dc5d98 gvcp:
- Added support for new registers:
 - GVCP_IEEE_1588_EXTENDED_CAPABILITY (0x00000974)
 - GVCP_IEEE_1588_SUPPORTED_PROFILES (0x00000978)
 - GVCP_IEEE_1588_SELECTED_PROFILE (0x0000097C)
- Added support for missing/new error codes (0x8013 - 0x8017)
- Added dissector code for 'current link configuration' part of device mode register
- Added support for proper event dissection with the length field in event commands is used as recommended by the GEV 2.1 specification
- Added dissector code for new capability/configuration bits (iee1588 profile, multi-part, large leader/trailer, ieee extended capabilities)
- BUGFIX: In multi-zone mode, zone directions where decoded as 'Receiver' and 'Transmitter' instead of 'Bottom Up' and 'Top-Down'
- BUGFIX: Commands that received at least one 'PENDING_ACK' before the final acknowledge where always reported with '(Failed)' in the Wireshark main window
- Fixed some typos
gvsp:
- Added full multi-part dissection support
- Replaced some hard-coded numbers by numerical constants
- Added support for missing/new error codes (0x8013 - 0x8017)
- BUGFIX: In multi-zone mode, zone directions where decoded as 'Receiver' and 'Transmitter' instead of 'Bottom Up' and 'Top-Down'
- Combined 'AddressOffsetHigh/Low' for multi-zone/part into a single more readable 64-bit value

Change-Id: I55862204ef71f69bc88c79fe2259f7cb8365699a
Reviewed-on: https://code.wireshark.org/review/24299
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-09 13:57:06 +00:00
Richard Sharpe 74936320a4 802.11: Correctly handle Wi-Fi Alliance Multi-AP subtype decoding.
Introduce a dissector table and fix a bug so that it now works
by calling through a dissector table.

Change-Id: Ifa3f01b3f306101b3144604a51806eaccc436373
Reviewed-on: https://code.wireshark.org/review/24319
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 12:06:35 +00:00
Matej Tkac dc269fcd6f [PFCP] Improvements to Dissect F-TEID function
Added Bit 4 - CHID as described in 3GPP 29.244 Section 8.2.3.
    Added "Encoding error" msg if documentation conditions aren't met.

Change-Id: Ia5e6d8bb2bf635fa695a2bfcba3877c2ecf52d87
Reviewed-on: https://code.wireshark.org/review/24318
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 11:39:02 +00:00
Anders f2727b571a TWAMP dissector for RFC 5357
From https://github.com/demirten/twamp-dissector cleaned up a bit.

Change-Id: I3736e2ef09bd84ba30a63fee8bf07771f07bfe6c
Reviewed-on: https://code.wireshark.org/review/24283
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 11:38:50 +00:00
Flavio Santes 4367855163 dissector/mqtt: Rewrite the SUBSCRIBE payload size computation
- FIX: subtract the property length from the message length
- Replace the 'for' loop by a 'while' loop, now that the
  arithmetic is done before.

TODO: It's a protocol error (v5.0)/violation (v3.1.1) not to
include the payload in the SUBSCRIBE control packet. It would
be nice to display a "malformed packet legend" in such that
case.

Change-Id: I99ef3862aa19b3a31ea03d1c194e54f489674115
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24313
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-09 08:45:04 +00:00
Michael Mann afb252355b ISDN: Convert circuit API to conversation API
Change-Id: I8752123a740c47f9328e0144624d4fbf4e200165
Reviewed-on: https://code.wireshark.org/review/24314
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 07:50:09 +00:00
Michael Mann 78665f5211 ISO 14443: Convert circuit API to conversation API
Change-Id: Id007a3df5442cf4d21263acb17303b6d735aaa7d
Reviewed-on: https://code.wireshark.org/review/24311
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 07:48:38 +00:00
Michael Mann 82891e37e9 DVB-CI: Convert circuit API to conversation API
Add the few necessary conversation APIs to make conversion possible.

Change-Id: I775f23005c48cacd2be342bdc704af4738f0789c
Reviewed-on: https://code.wireshark.org/review/24310
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-09 07:47:41 +00:00
Stig Bjørlykke 1c25b71c7b mqtt: Rename mqtt_conv to mqtt_conv_t
This will clarify that it's a type.  Also remove unneeded init values.

Change-Id: If61b32a264ff60a26e775dc99f1c06d0aa555a4d
Reviewed-on: https://code.wireshark.org/review/24307
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 22:01:09 +00:00
Stig Bjørlykke 428b354f0d btmesh: Remove a debug g_warning
Change-Id: Ifc822efccfff5de32a54ca1f148a09ac3be4d0e3
Reviewed-on: https://code.wireshark.org/review/24308
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 21:04:30 +00:00
Flavio Santes 87431fef28 dissector/mqtt: Add 'Subscription Options/Retain Handling' text descriptions
Change-Id: I6dea2e9c190095105dc1441197ad00c9b3a66f89
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24272
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 17:26:47 +00:00
Flavio Santes af285603ee dissector/mqtt: Dissect the User Property field
Change-Id: I0a0e484a814a11b785d20fda6eba5c251db98188
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24269
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 16:50:32 +00:00
Flavio Santes 9f67e0a0d6 dissector/mqtt: Dissect MQTT v5.0 String/Binary Properties
Add routines to dissect the following MQTT v5.0 String/Binary Data
Property fields:

- Content Type
- Response Topic
- Correlation Data
- Assigned Client Identifier
- Authentication Method
- Authentication Data
- Response Information
- Server Reference
- Reason String

Change-Id: Ia0ad0597d32bacc58228376bb738b7092f4a1ad6
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24268
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 16:27:18 +00:00
Flavio Santes d5759b72e6 dissector/mqtt: Add the 'Subscription Options' dissector
Change-Id: I400430ca59c7492ae64dba6c4cca2485553988b9
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24271
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 16:26:27 +00:00
Richard Sharpe 2125275c7c smb2: Fix bug 6027 to correct SRT computations.
Fix a problem where SMB2 cancel and break messages
are included in SRT computations when it should not be.

Bug: 6027
Change-Id: I690fe6d9e14f26d85fe5c71830869780046d5d12
Reviewed-on: https://code.wireshark.org/review/24295
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-08 14:55:45 +00:00
Flavio Santes 3f189bed2f dissector/mqtt: Dissect the Subscription Identifier Property
Change-Id: Ia60b9c344fd572193374f57299b1829f17dfa24e
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24267
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 14:45:47 +00:00
Anders ca7bffbfc3 [Diameter 3GPP] Sub dissect AVP Code: 1677 Group-PLMN-Id.
Change-Id: I69ac8210dfcb43f9fc15e49c75dfb917976f0770
Reviewed-on: https://code.wireshark.org/review/24294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 12:56:16 +00:00
Matej Tkac 6565923eb3 [PFCP] Fixed apply action flags bits referenced in register info.
In accordance with 3GPP 29.244 8.2.26 Apply Action.

Change-Id: Icef9bc9807efc255ece8fbde5e4c244d5f1fc525
Reviewed-on: https://code.wireshark.org/review/24301
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 12:41:38 +00:00
Stig Bjørlykke 1a3bd52e91 btmesh: Fix building without gcrypt
Change-Id: If77b36d764c07acd87a553134cebff246b8368fe
Reviewed-on: https://code.wireshark.org/review/24296
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-08 10:56:36 +00:00
Pascal Quantin 465f75b529 MQTT: add a missing break
Change-Id: I0a17fd44607a5a7452a7c2789140cce7cdcbd17b
Reviewed-on: https://code.wireshark.org/review/24298
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 10:52:18 +00:00
Flavio Santes bf8d8ebfa4 dissector/mqtt: DISCONNECT and AUTH may not include the Property field
From the spec:

3.14.2.2.1 Property Length: The length of Properties in the DISCONNECT
packet Variable Header encoded as a Variable Byte Integer. If the
Remaining Length is less than 2, a value of 0 is used

In this commit we also assume that AUTH may not include the Property
field, given that DISCONNECT and AUTH share the same structure.

Change-Id: I5f55151df6b2066d924b2c16fb08a63b0903ef46
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24288
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 08:32:52 +00:00
Flavio Santes 76eab87c7d dissector/mqtt: Dissect MQTT v5.0 Four Byte Properties
Add routines to dissect the following MQTT v5.0 Four Byte
Property fields:

- Publication Expiry Interval
- Session Expiry Interval
- Will Delay Interval
- Maximum Packet Size

Change-Id: Ie902f679c5424f85f98c9ed113951ed0ee6411be
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24266
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 08:24:20 +00:00
Flavio Santes 9e7cfd32dd dissector/mqtt: Dissect MQTT v5.0 Two Byte Properties
Add routines to dissect the following MQTT v5.0 Two Byte
Property fields:

- Server Keep Alive
- Receive Maximum
- Topic Alias Maximum
- Topic Alias

Change-Id: I90b43cd315f31a34b10bf6065ea51549307e95f3
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24265
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 08:20:41 +00:00
Flavio Santes 458f97b1eb dissector/mqtt: Dissect MQTT v5.0 Byte Properties
Add routines to dissect the following MQTT v5.0 Byte
Property fields:

- Payload Format Indicator
- Request Problem Information
- Request Response Information
- Maximum QoS
- Retain Available
- Wildcard Subscription Available
- Subscription Identifier Available
- Shared Subscription Available

Change-Id: I28b95174ce811a92d8f22bf51c331169b5e4b925
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24264
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-08 07:54:34 +00:00
Michael Mann 371b5c526b Have circuit functionality more closely mirror conversation functionality
This will allow for a smoother transition for refactoring because circuit
functionality can now be represented as a strict subset of conversation
functionality.

Change-Id: I323d7facad707c81b8e35b33143fa1102d6b5976
Reviewed-on: https://code.wireshark.org/review/24290
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-08 07:25:25 +00:00
Pascal Quantin f8a1878202 proto.c: fix field display test in hfinfo_number_value_format_display64()
While we are at it, let's use the FIELD_DISPLAY() macro everywhere.

Bug: 14169
Change-Id: I685cb7eb4b9c52f836762c92baeb636570a6d12f
Reviewed-on: https://code.wireshark.org/review/24285
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-08 06:59:40 +00:00
Jeff Widman 0e85c0ad1e Fix typo: Heatbeat --> Heartbeat
Change-Id: I864850b29f9c816a4d1592cd5bba2b9d0159b139
Reviewed-on: https://code.wireshark.org/review/24289
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 03:31:25 +00:00
Dario Lombardo 0c1ea1cee1 fcp: create conversation if it doesn't exist.
Change-Id: I0bcc17900a9379d9f9d1828b834c2116e1199bf6
Ping-Bug: 14168
Reviewed-on: https://code.wireshark.org/review/24277
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07 15:52:31 +00:00
Jaap Keuter 5dd6a9cef9 isobus-vt: make sure to close the id file (CID-1413873)
Part of dissector init is reading the object ID file.
This file should be closed afterwards to not leak the resource.

Change-Id: Icf5e229315a2c1c61a169e576ec51d38a1c350a1
Reviewed-on: https://code.wireshark.org/review/24275
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2017-11-07 13:45:56 +00:00
Simon Barber 99a53b2b95 packet-ieee80211: all frames have address 1 = RA
Change-Id: Ie4785376eae278713e998e23c96d8435e4dc07f2
Reviewed-on: https://code.wireshark.org/review/23526
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07 13:38:09 +00:00
Martin Kacer 3593f0953f Fix Elasticsearch hex dump
Removing duplicated double quote.

Bug: 12958
Change-Id: I17f443efd8572e1d17ced5b8ec8f743253be859b
Reviewed-on: https://code.wireshark.org/review/24273
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-11-07 13:22:05 +00:00
Flavio Santes 1344e707b7 dissector/mqtt: Disconnect and Auth variable header
Apply 'Disconnect' (3.14.2) and 'Auth' (3.15.2-1) notes to simplify
and fix the variable header :).

Change-Id: I169a69a0da5b2d5ee338c0f45af978217986f37a
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24274
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-07 12:30:32 +00:00
Flavio Santes 19b2ddcce1 dissector/mqtt: Update license notice
Change-Id: Iefd0bead04cc54c55d39b682b7879620c022afb1
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24262
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07 06:14:35 +00:00
Flavio Santes e2179a2ac5 dissector/mqtt: Add partial support for MQTT v5.0
This patch adds partial support for the MQTT v5.0 protocol.
The relevant changes are:

- A new MQTT control packet: AUTH (15)
- The Variable Header is extended with a new section: 'Properties'

Currently, the 'Properties' section is not dissected although
its length is parsed.

Change-Id: I059b91304e953d69e4781b170e61057cb38dde19
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/24261
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-07 06:13:53 +00:00
Michael Mann ea97b3364c Add AMR WB pino to make Decode As happy.
Change-Id: I7150db30ce52ab4398ed977197f200070fca1d8c
Reviewed-on: https://code.wireshark.org/review/24270
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-07 03:58:50 +00:00
Anders 1e707e33fa [BT Mesh] Add Bluetooth Mesh dissector.
Bug: 14161

Change-Id: Ia76d283c6c8e00526948a0ee9cda9e35b4ca0e2a
Reviewed-on: https://code.wireshark.org/review/24216
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-06 23:36:10 +00:00
Guy Harris 4405c5d769 Fix white space.
Change-Id: I8a50391dcfb113c251f24f64486828d5d8a1d0c0
Reviewed-on: https://code.wireshark.org/review/24260
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-06 21:27:14 +00:00
Dario Lombardo 9705f653da print: add fi check.
Change-Id: Ica20efe7122476af55b70c72d8af40244c25f902
Reviewed-on: https://code.wireshark.org/review/24259
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-06 16:09:20 +00:00
Michael Mann 147e491025 Convert PT_EXCHG into using conversation endpoints
Change-Id: Id5857a58513c38dd0ab5b30b61113bcc14e1ecee
Reviewed-on: https://code.wireshark.org/review/24258
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-06 15:19:15 +00:00
Richard Sharpe 0dfff8c4b4 IEEE1905: Add a break to fix a malformed packet issue and dissect Multi-AP
Extension types in EAPWPS.

Change-Id: Ib7dca0f83897839072eaaeb9c95f406f6ad5c8e6
Reviewed-on: https://code.wireshark.org/review/24256
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-06 14:03:11 +00:00
Richard Sharpe 8b79187b66 ieee802.11: Add support for the Measurement Pilot Interval IE and
fix dissection of the actual measurement pilot interval. It is an
8-bit field according to IEEE802.11 2016.

Change-Id: I44c9a732ae3074e865f7ad63b554f7a031542e5a
Reviewed-on: https://code.wireshark.org/review/24257
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-06 13:33:37 +00:00
João Valverde ba6dd97081 Remove epan win32 x86 assembly
Not used. Remove also weird pre-hash hash optimization in proto.c.

Change-Id: Ibebc12dbe90ac1d05fb1ba601d32fe98797fbd56
Reviewed-on: https://code.wireshark.org/review/24254
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-05 23:20:20 +00:00
Michael Mann 93bda0b18d Add conversation/endpoint statistics for Linux SLL
Bug: 14048
Change-Id: I320380c492b83f0e45bfbf20505deb3c5f11ae67
Reviewed-on: https://code.wireshark.org/review/24243
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-05 23:18:47 +00:00
Michael Mann 23afd28daf Convert TIPC to use endpoint conversations
Change-Id: Iab03ebbfc982bf7182851f63c17fa59bc71d7709
Reviewed-on: https://code.wireshark.org/review/24219
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-05 23:17:32 +00:00
Alexis La Goutte 08bf89f487 zbee zcl se: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I169f7815eecfcdfbbdca78d4ab038fb032c3b691
Reviewed-on: https://code.wireshark.org/review/24250
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 14:46:33 +00:00
Darien Spencer 10cc91f83d RLC: Replaced g_malloc with tvb_memdup
Also updated some comments and a string

Change-Id: Ib8c079a34f21614047262900b0a4c1547d5df0b3
Reviewed-on: https://code.wireshark.org/review/24237
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 14:45:30 +00:00
João Valverde 2ef00337c4 CMake: Remove "compress" remnant
Change-Id: I6feeb2f5873562a09159cf55446652628aa97e78
Reviewed-on: https://code.wireshark.org/review/24255
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 14:17:52 +00:00
Hal Rosenstock dc18da434b packet-infiniband: Proper parsing of ClassPortInfo attribute
ClassPortInfo is a common attribute for general service (GS)
management classes.

SA ClassPortInfo is currently parsed as PortInfo although
these are different attributes.

Also, added support for PerfMgt ClassPortInfo.

Bug: 14164
Change-Id: I652ba8ed2e0222db41ce2eb2e01a9c4b446e5bd4
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24235
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 13:34:37 +00:00
João Valverde f891603a47 autotools: Eliminate spurious libwireshark_asmopt library
Change-Id: I96e03f136efd90892fbcf812ea37e36a2bed5ab9
Reviewed-on: https://code.wireshark.org/review/24253
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 13:31:29 +00:00
Alexis La Goutte ff3bd8c7ce conversation_table(.h): fix parameter 'ptype/port_type_val' not found in the function declaration [-Wdocumentation]
Oups not good fix last time...

Change-Id: I55f565a8d4dde83304a8437be3dc35c2fad1fb07
Reviewed-on: https://code.wireshark.org/review/24249
Tested-by: Petri Dish Buildbot
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-05 13:30:25 +00:00
João Valverde 72c2e53981 autotools: Use pkg-config to configure Libsmi
Change-Id: Icecea743739aa7e1a65753f623f311514260d373
Reviewed-on: https://code.wireshark.org/review/24252
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 13:02:11 +00:00
João Valverde 62f705e844 autotools: Try to be clearer about --with-ssl and remove cruft
Change-Id: Iaf8c8a83ead1d6671bb9cadb6add56481ed98aaa
Reviewed-on: https://code.wireshark.org/review/24242
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-05 10:39:38 +00:00
Uli Heilmeier 7e6f6562fa TCP: cleanup Riverbed option
Remove duplicate length field to adjust to the other options.
tcp.options.rvbd.probe.len has already reported by tcp.option_len

Add missing space between "Transparency" and IP address.

Change-Id: I8b4260b34d760b73ee529a687418c4b6adcfaa0e
Reviewed-on: https://code.wireshark.org/review/24239
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 23:43:59 +00:00
Uli Heilmeier d11f5dff8e TCP: Fix Riverbed probe option tvb handling
With commit f30b1e3b3b TCP options are handled
in an own dissector table. Therefore we can't read ahead or behind to get
the SYN flag or the CFE flag.

Bug: 14150
Change-Id: Ibbf1836104d32216ddfa2d4e07dccbcf948bb26c
Reviewed-on: https://code.wireshark.org/review/24181
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 12:28:27 +00:00
Hal Rosenstock 802517e917 packet-infiniband: SM class does not support ClassPortInfo or InformInfo attributes
Change-Id: I1fbe7a93e8a208a1a4abaf0b64e674536b642733
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24229
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-04 07:45:07 +00:00
Hal Rosenstock 834c65a1f8 packet-infiniband: Make unknown GS class attributes show up in wireshark Info column
The following GS classes are now displayed there:
BM
DEV_MGT
SNMP
VENDOR
APP
RESERVED

Change-Id: I94822784a7027afa1d5e99ca20467721a98cfe0a
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24234
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-04 07:44:53 +00:00
Hal Rosenstock 0cd40887d4 packet-infiniband: Better variable naming
Rather than use PERF_header_item for all classes,
use acronym for class appended with _header_item

Change-Id: I52ac46000c20b7f51c87c8dc4a8dfc85c20f31f3
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24233
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:21:32 +00:00
Hal Rosenstock b4856927eb packet-infiniband: DETH Queue Key should be hex rather than decimal
as it is in other places where there is Q_Key

Was:
    DETH - Datagram Extended Transport Header
        Queue Key: 2147549184
Now:
    DETH - Datagram Extended Transport Header
        Queue Key: 0x0000000080010000

Change-Id: I64d4b485e2a511c30b0e4a2849f529438591a122
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24232
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:20:45 +00:00
Hal Rosenstock 002133c606 packet-infiniband: Make unknown PerfMgt attributes show up as PERF in wireshark Info column
Change-Id: I9f6a60adaa0744d13d6c000d1a4e20f3b526355b
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24231
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:20:24 +00:00
Hal Rosenstock b70429427f packet-infiniband: Fix commentary typo (for consistency)
Change GuidInforecord -> GuidInfoRecord
Also, change VLArbitrationTableRecord comment to be consistent

Change-Id: Ia7cc844779a8751bd7675354b71239922327d0e8
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24230
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:19:33 +00:00
Hal Rosenstock 3c2f217940 packet-infiniband: Add missing SA methods into mad_method_str
so they are not indicated as Method: Unknown under
MAD Header - Common Management Datagram

Change-Id: I8e8fe918eea86e7095967d0b82772a813eafe2a5
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24228
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:18:27 +00:00
Hal Rosenstock 9b82c6b21e packet-infiniband: Fixed some PortInfo:CapabilityMask bit names
to be consistent with IBA volume 1 spec

IsOptionalIPDSupported
IsCommunicationManagementSupported

Change-Id: I55b29b7f291f49a9d0c3e104bda4d7d7aa78b42b
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24227
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:18:05 +00:00
Hal Rosenstock c04c92fbf9 packet-infiniband: Add first and last to RMPP_Flags
RMPP flags 7 indicates that packet is both first and last
packet in transfer

Change-Id: Idf0e8783372296a7c276c8c0c80e4905afbe6c9a
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24226
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:17:36 +00:00
Hal Rosenstock b3f4ca6077 packet-infiniband: Fix some SM class attribute IDs
LinkSpeedWidthPairsTable is 0x001C
SMInfo is 0x0020
VendorDiag is 0x0030
LedInfo is 0x0031

Change-Id: I93197590930a97c8538ef69d08213b1076a9f66a
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24225
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 07:17:17 +00:00
Hal Rosenstock 92dc84cff9 packet-infiniband: Fix SA MCMemberRecord attribute name
rather than MCMembersRecord

Change-Id: I96bf3ac45255295cf85b9faf0547df4df26f11c3
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24222
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 06:48:11 +00:00
Hal Rosenstock 8894195a47 packet-infiniband: Use SA rather than SMA as Subnet Administration header
SMA is acronym for Subnet Management Agent not Subnet Administration
so change this from SMA to SA

Change-Id: I1a293fff5de4796fe337daa133943bfa059cc9ff
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24224
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 06:47:46 +00:00
Hal Rosenstock b9c5601dd8 packet-infiniband: Removed erroneous MadHeader comments
as it is not parameter in these APIs

Also, fixed commentary typo

Change-Id: I1ce53b9aae9837688e756b2e665f3b1df74b572c
Signed-off-by: Hal Rosenstock <hal.rosenstock@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24223
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-04 06:46:25 +00:00
Michael Mann 71389177e4 Add Decode As support for RTP payload
Change-Id: I568c0e6980d7649f9cd82ac46420e7db70722fc6
Reviewed-on: https://code.wireshark.org/review/24150
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-04 03:24:02 +00:00
Pascal Quantin b227943e66 Exported PDU: apply EXP_PDU_TAG_COL_PROT_TEXT whatever the next_prot_type tag
The include file suggests that it will always fill the protocol column if
present. Let's make that happen.

Change-Id: I265e2f4d1c2dcd7cf2ff121499694cde14a595f3
Reviewed-on: https://code.wireshark.org/review/24220
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-03 17:46:23 +00:00
Michael Mann e00162301b Ensure endpoint members of packet_info structure are initialized in packet.c
Change-Id: I4c7a4f9888c8bdc87ded88fa997aa2aad9530fd7
Reviewed-on: https://code.wireshark.org/review/24218
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-03 13:59:29 +00:00
Stig Bjørlykke f6edbcd643 mqtt: Simplify message decode matching
Change-Id: I93da46808de8a978d49ad0aa3f78c4a1790e7952
Reviewed-on: https://code.wireshark.org/review/24210
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-03 05:19:58 +00:00
Christoph Wurm be625b9be7 Fix Elasticsearch hex dump
Change-Id: I5b2006a74e95759afce518aaadfe47c54978476a
Reviewed-on: https://code.wireshark.org/review/24215
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-02 20:49:45 +00:00
Pascal Quantin 78ee8c419f Do not register proto_reg_handoff_XXX callback when not required
None of those protocols need to be notified of a preference change and
their proto_reg_handoff_XXX functions do not differentiate the initial
call from susequent ones, leading to an assert

Bug: 14157
Change-Id: Iac4d88ebef7688bced8daae857eb5c836a6babd6
Reviewed-on: https://code.wireshark.org/review/24211
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-02 14:57:50 +00:00
Ivan Ermakov dd1f75a53e ZigBee ZCL Sub-Ghz Cluster dissector
Added Sub-Ghz cluster dissector.

Change-Id: I6d189400298def693969004b6fc2942fd8b70ba0
Reviewed-on: https://code.wireshark.org/review/24199
Reviewed-by: Martin Boye Petersen <mbpflonidan@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-02 13:03:34 +00:00
Anders c571e69208 [GTPv2] Add dissection of 8.127 Header Compression Configuration.
Change-Id: Iace27ebf536cad73d9aaf4abceb6d235f34d68f6
Reviewed-on: https://code.wireshark.org/review/24208
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-01 16:24:28 +00:00
Ivan Ermakov dd4f8d08b2 ZigBee ZCL Keep-Alive Cluster Dissector
Added Keep-Alive Cluster dissector.

Change-Id: I5a2c24a4f13171b26efc860470b4d9c42f54ef89
Reviewed-on: https://code.wireshark.org/review/24198
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-01 08:56:58 +00:00
Ivan Ermakov 062ca10cff ZigBee ZCL MDU Pariring Cluster dissector
Added dissectors for commands and payloads of MDU Pairing cluster.

Change-Id: I842ddf50f91d0ecc46605325048971d1eeba6df6
Reviewed-on: https://code.wireshark.org/review/24200
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-01 08:54:46 +00:00
Martin Mathieson 93c358cb5d FTP: links between setup and command frames
Change-Id: I8a231f8616952ed119b85126d6d25af7512e6cd8
Reviewed-on: https://code.wireshark.org/review/24194
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-01 08:47:45 +00:00
Michael Mann 66b441f3d6 Add ability to create endpoints through conversations
Add endpoint information to the packet_info structure for dissectors
to potentially use as their data to create conversations.

This patch includes a simple "example" of using conversation_create_endpoint
with TDMoP.  The assignment of the PT_TDMOP "port type" has been replaced by
setting ENDPOINT_TDMOP within the endpoint structure.  Then when subdissectors
of TDMoP call find_or_create_conversation(), it implicitly picks up the
conversation information set by TDMoP

Change-Id: I11dc29989cccd3b0f0349ee901babb455ca02d19
Reviewed-on: https://code.wireshark.org/review/24190
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Andrew Chernyh <andrew.chernyh@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-01 02:41:45 +00:00
Stig Bjørlykke 50c337f40a mqtt: Add message decoding
Add support for configuring message decoding based on topic.
Matching criteria is equal-to, contains, starts-with, ends-with
or regular expression.

Change-Id: I677d869716eb1d2798974e2c65605a454421a66c
Reviewed-on: https://code.wireshark.org/review/24196
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-10-31 19:00:04 +00:00
Thomas Wiens e8c7975b6f s7comm: Several minor improvements
This patch includes several minor improvements:
- Special (only for Sinumerik NC): allow NCK address description in
  data-part
- Userdata parameter part: add text definition for second req/res
- Don't add data tree in userdata telegrams, when there is no data in
  there
- Cyclic functions: add new subfunction
- Alarming: add SCAN message decoding
- Improve info column display when there are multiple PDUs in one frame

Change-Id: Ib9afd0c6b14cf97ed645084e095f79fb40b07f43
Reviewed-on: https://code.wireshark.org/review/24170
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31 18:39:33 +00:00
Uli Heilmeier 5bea387c2c HTTP: Update status codes
Updated status codes to include "103, Early Hints".
s. https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml

Change-Id: Ic00285c0ffafeb689bbc30533fcbdeb688528c62
Reviewed-on: https://code.wireshark.org/review/24203
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31 18:37:19 +00:00
Alexis La Goutte c5165f325b conversation_table(.h): fix parameter 'ptype/port_type_val' not found in the function declaration [-Wdocumentation]
Change-Id: Iea18cc73d28af68e14f7b9516b630b0987fe5731
Reviewed-on: https://code.wireshark.org/review/24195
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31 09:27:35 +00:00
Christoph Wurm ec43b0faa6 Deduplicate Elasticsearch output
Collects multiple values of the same field into an array.
Empty protocols are now written as empty objects to not conflict
with the same protocols in other packets.
Remove _score since it has no effect.

Bug: 12958
Change-Id: Ibe8ea9bc1e3e63dea1fe4eaf522fa38cad88a17f
Reviewed-on: https://code.wireshark.org/review/24171
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-31 04:57:51 +00:00
Christoph Wurm 6d8661ceef Fix segfault in Elasticsearch output
When using the Elasticsearch output but only printing the packet
summary with -P a segfault will occur because the empty packet
tree is not properly handled in this case.

Change-Id: I0c91314ae013785ae6dceabd6af33db4b836d1b2
Reviewed-on: https://code.wireshark.org/review/24153
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-31 03:28:10 +00:00
João Valverde 3a1f958cf8 Remove unused netdb.h #includes
Change-Id: Ia46903586219ee79210a980a04024af02acb0db0
Reviewed-on: https://code.wireshark.org/review/24189
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-31 00:11:08 +00:00
Anders d887d76f27 [BSSMAP-LE] Correct dissection of 10.20 Positioning Data.
Change-Id: Ia0c3b688dfdcd9fdad4f65df12ef97db99bdb095
Reviewed-on: https://code.wireshark.org/review/24192
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-31 00:10:15 +00:00
Anders 90867dd8e3 [BSSGP] Add PEI
Change-Id: I64d1924aba3c11fa72fbb12121bd09bcf21d598d
Reviewed-on: https://code.wireshark.org/review/24193
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-30 22:06:18 +00:00
Anders d21eb05eba [BSSGP] Fix IE numbering in PERFORM-LOCATION messages.
Change-Id: If767d905177b8d78f6b5d3c4e7b8d32a9e8a596a
Reviewed-on: https://code.wireshark.org/review/24191
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-30 21:13:21 +00:00
Guy Harris 0de8c6f4c7 FT_IPv4 fields' values are 4-byte integers, not structures with a pointer.
Fix a tpyo while we're at it.

Change-Id: I1bde763ec2bd188c0f8afd1069db5a9f23963e8e
Reviewed-on: https://code.wireshark.org/review/24186
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30 18:29:00 +00:00
Guy Harris bbae1d25c2 Fix indentation.
Change-Id: I0cc9d31cbe5dc7a95908a43c093f62e13b969eec
Reviewed-on: https://code.wireshark.org/review/24185
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30 18:00:33 +00:00
Anders e73571117c [BSSGP] Fix decoding of Paging Attempt Information in PAGING PS.
Change-Id: I46770e4e50c34f13eaf6244de0ac6345b12646b5
Reviewed-on: https://code.wireshark.org/review/24182
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-30 13:06:26 +00:00
Pascal Quantin 9008d7f867 Fix assert when trying to display an IPv4 address
Follow-up of gdd1c18dd

Change-Id: Ifa6fc2e68f866540184a29a5fb61c3b7033bc8b2
Reviewed-on: https://code.wireshark.org/review/24180
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-30 09:42:58 +00:00
Michael Mann d597b5d61e Remove port_type values not set in pinfo->ptype
NCP and SBCCS values used for conversation (endpoints) and not
to pass "type" to subdissectors.

Change-Id: I56a13d2bb7d718b340e9b5a102c43f6e0012bfb9
Reviewed-on: https://code.wireshark.org/review/24174
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-30 02:26:59 +00:00
Guy Harris 39ba9d4e7f Add wsutil/inet_ipv4.h.
It defines a ws_in4_addr type, which is intended to hold IPv4 addresses
in network byte order, and some macros to test for IPv4 addresses in the
local network control block and multicast IPv4 addresses.

Use those macros in places where dissectors had their own code for that
purpose.

Change-Id: I4252b410e37207157be85119a332e2a6913b332f
Reviewed-on: https://code.wireshark.org/review/24178
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30 02:11:22 +00:00
Guy Harris dd1c18dd03 Make FT_IPv4 a bit more like FT_IPv6.
FT_IPv6 doesn't expose the prefix, which is used only for values in
filter expressions, not values in protocol fields; do the same for
FT_IPv4, hiding the netmask, and using fvalue_get_integer() to get the
value, having it return a network-byte-order value for the address.

(This also makes it opaque whether the address and netmask are stored in
host or network byte order.)

Change-Id: I4285a87f6ccef2c0ccec040490ddcd15d787326e
Reviewed-on: https://code.wireshark.org/review/24177
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30 01:40:13 +00:00
Guy Harris 734c5b35a5 Get rid of ipv4_get_net_order_addr() and ipv4_get_host_order_addr().
Just directly use the addr field, converting from host to network byte
order if necessary.

Change-Id: Ie1cd9ea5527b7824014dc315225ad2a6adb61c38
Reviewed-on: https://code.wireshark.org/review/24176
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-30 00:50:06 +00:00
João Valverde bebd79aae9 parlay: Add another pragma to disable warning
Use our DIAG_OFF macros instead while at it.

Change-Id: I01d8d71a42fb108be156a68f8552ce537a1e2484
Reviewed-on: https://code.wireshark.org/review/15467
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29 21:09:37 +00:00
Michael Mann 63966ec5d5 Use endpoint_type in conversation tables and hostlists
Follow up to having conversions use endpoint_type instead of
port_type.

Change-Id: Ifd59a33bd8b9a013c242bce5fcceb09533f02c17
Reviewed-on: https://code.wireshark.org/review/24172
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-29 20:17:03 +00:00
Michael Mann 765a67b68a "Hardcode" the port types used by Export PDU functionality
The "internal" port type has been serialized by export PDU functionality
and nettrace_3gpp_32_423 wiretap.  To better support "endpoint" functionality
the port types will be removed/updated and that changes the implicit values
from the port_type enum.

Take a snapshot of the current port_type values and use those specific values
when reading/writing export PDU data and provide conversion functions that can
be modified when port_types are removed.  Do the same for nettrace_3gpp_32_423
wiretap.

Change-Id: I770bd0cab22e84f3cf49032fc86c5927bf85263f
Reviewed-on: https://code.wireshark.org/review/24169
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-29 19:55:24 +00:00
Michael Mann abfb644117 Add conversation endpoint type
For the moment this mirrors the port_type enumeration (PT_XXX), but the
intent is to move away from using "port types", eliminating most (if not
all)

Added conversation_pt_to_endpoint_type() so that conversations deal with the
correct enumeration.  This is for dissector that use pinfo->ptype as input
to conversation APIs.  Explicit use of port types are converted to using
ENDPOINT_XXX type.

Change-Id: Ia0bf553a3943b702c921f185407e03ce93ebf0ef
Reviewed-on: https://code.wireshark.org/review/24166
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-29 16:53:57 +00:00
João Valverde fe8d897e25 sizeof(buf) is not what you want here
Change-Id: Iaf3463006b93c9acdc27f59fcbbea92df1d2fd7d
Reviewed-on: https://code.wireshark.org/review/24164
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29 15:15:41 +00:00
João Valverde 7507b11ec4 Improve our ip6_to_str_buf() implementation
Change-Id: I02b5d01797e526299a6dc5a031662cb78e4f8423
Reviewed-on: https://code.wireshark.org/review/24163
Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29 15:15:31 +00:00
Guy Harris a25af02ef7 Clean up processing of encoded addresses.
Allocate the buffer at the point we fill it in, and pick the appropriate
size or let the wmem_strXXX routine do it for us.

If we aren't using an address table, just fetch the value as an IPv4
address and hand it to ip_to_str_buf() - don't fetch it in host byte
order and then *fix* it by byte-swapping (hint: on a big-endian machine,
host byte order *is* network byte order and you don't want to swap it;
not all the world's an x86).

Change-Id: I966b107271ba166ff76a5600fbc4922808e7ead1
Reviewed-on: https://code.wireshark.org/review/24159
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29 08:26:11 +00:00
João Valverde 78f9a07f0a Remove unused epan/compress/ source code
Change-Id: I8f3bd41ff35f00b7a423751bc312725b7e7ae316
Reviewed-on: https://code.wireshark.org/review/24152
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-10-29 06:48:09 +00:00
Guy Harris e1ef732c11 Get rid of MAX_IP_STR_LEN and MAX_IP6_STR_LEN.
We have WS_INET_ADDRSTRLEN and WS_INET6_ADDRSTRLEN; use them.

Change-Id: Idade0da9fae70d891901acd787b06d21e2ddbc5f
Reviewed-on: https://code.wireshark.org/review/24156
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29 05:51:25 +00:00
João Valverde 0527747e23 Retire use of getprotobynumber()
Dead weight. If this feature is wanted getprotobynumber()
should be called once on startup.

Change-Id: I0358bacdc60466f676fa1aab7f4b7c9e588d8d74
Reviewed-on: https://code.wireshark.org/review/24045
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29 00:20:47 +00:00
Michael Mann 7dbc520d57 Privatize the conversation_key structure
The intention is to make it more transparent when making a switch
to an "endpoint" over address/port combination.

Change-Id: Ic424c32095ecb103bcb4f7f4079c549de2c8d9c4
Reviewed-on: https://code.wireshark.org/review/24148
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 19:22:24 +00:00
Nikolai Ipatyev 051dcd1086 Fix bug in FMPUX heuristic dissector
The variables in the check were reversed

Change-Id: Idc7fc2b88ac1cde699b76423890918ce4b0ac086
Reviewed-on: https://code.wireshark.org/review/24149
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 17:38:27 +00:00
Michael Mann 7df5fcdc51 Share use of conversation_hash_exact
It was duplicated in GTK, so just make it public (at least for now)

Change-Id: I89d985b2d42f0edb1c535a65a97b132920dedbcd
Reviewed-on: https://code.wireshark.org/review/24146
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 16:00:46 +00:00
Michael Mann 23afd9a184 Convert to using find_conversation_pinfo where appropriate
This makes it easier to identify the simpler/common conversations

Change-Id: I7094f23e49156ee27f5f72c8e130308470f3e462
Reviewed-on: https://code.wireshark.org/review/24145
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 14:33:11 +00:00
Michael Mann 27c10ed72e AMQP: Add dissector table for versions so they can be dissected with Decode As
Bug: 14113
Change-Id: I73c4962597d8f8bab83f089c9821269e0b7b1568
Reviewed-on: https://code.wireshark.org/review/24109
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Magnus Henoch <magnus.henoch@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 14:01:15 +00:00
Alexis La Goutte 5907d17b9a QUIC: Display Connection ID (CID) on hexa
Ping-Bug: 13881
Change-Id: I7b97e27b6d2091a18e5fc3fd27251523a446cfde
Reviewed-on: https://code.wireshark.org/review/24020
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 13:53:03 +00:00
Alexis La Goutte b0edc623b1 IEEE 1905.1a: fix an infinite loop (CID 1420355)
Change-Id: Iaa8e82cb5dc9f32e5c9dbf1db1068868d6fd3f18
Reviewed-on: https://code.wireshark.org/review/24144
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 12:01:22 +00:00
Guy Harris 695d8fc318 MOAR PRE-ALLOCATED FIELDS.
Do what the errors in the master buildbots say to do.

Change-Id: I2b926bd9a75a1490390c42b8080f29e48096a3b4
Reviewed-on: https://code.wireshark.org/review/24143
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28 05:25:46 +00:00
Guy Harris 2b615cf322 Also display the protocol with -G dissector-tables.
Change-Id: If5c61195ad6bfb86c8e047428abaa6b0d48e7d74
Reviewed-on: https://code.wireshark.org/review/24142
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28 04:26:19 +00:00
Guy Harris 985c0594a5 Indicate Decode As support in the -G dissector-tables output.
Change-Id: I95535ba11fdcac37057d1441e850ddf5455d32cf
Reviewed-on: https://code.wireshark.org/review/24141
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28 04:18:22 +00:00
Guy Harris a1218446d9 Put all the 11n vs. 11ac stuff together.
Also, there's no need to zero out the NSS values for 11ac - we zero out
the entire pseudo-header at the beginning.  We only need to set them if
we *have* them.

Change-Id: I9ebda7e246c24941ca77314bba6f86dea41e5992
Reviewed-on: https://code.wireshark.org/review/24135
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28 03:29:59 +00:00
Guy Harris 7c9ec1d13c Don't add for "Decode As" if the dissector table doesn't support it.
While we're at it, consistently use "name" as the name of the argument
giving the dissector table name.

Change-Id: Ied54c88d0d3dd467fe9067b008b49ead754c31a2
Reviewed-on: https://code.wireshark.org/review/24131
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-28 02:44:19 +00:00
Michael Mann 89e40fad29 packet-knxnetip.c: Fix bitmask
Bug: 14115
Change-Id: I836ee337f4727b0592cda074975c20a68fe7a27d
Reviewed-on: https://code.wireshark.org/review/24124
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 02:31:58 +00:00
Michael Mann c6c709490c Q931: Fix Q931_ISO_IEC_STANDARDIZED_CODING value
It's typically masked with 0x60 without any bit shifting,
so make the value reflect it

Bug: 14116
Change-Id: I677c609a8e19a66ee557ac24c721ecb2312131a5
Reviewed-on: https://code.wireshark.org/review/24123
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-28 01:13:42 +00:00
Thomas Wiens 86302a7622 s7comm: Syntax-id decoding of frequency inverter parameters
Add Syntax-id decoding for accessing frequency inverter parameters.
Moved the decoding of all other syntax-ids to separate functions.

Change-Id: Iba41f0631c4aeaf31a4ec6f73ffc42ca0b76f00d
Reviewed-on: https://code.wireshark.org/review/24102
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 23:47:41 +00:00
Nicolas Darchis 86cb152b2f peekremote: Support properly 11ac MCS rates.
The spatial streams amount support is still to be added.

Bug: 14136
Change-Id: I58b4ff4febcbd871c063a7add6a1e6b79ef23683
Reviewed-on: https://code.wireshark.org/review/24079
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 23:31:55 +00:00
Michael Mann 3a6552744f Add find_conversation_pinfo
Convenience function to add the same parameters to find_conversation as
find_or_create_conversation.

Change-Id: I3a92541cb9c1e827a9de8248825636debbd989cd
Reviewed-on: https://code.wireshark.org/review/24118
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 21:51:49 +00:00
Michael Mann f24651493d OSPF: dissect_ospf_bitfield -> proto_tree_add_bitmask
Change-Id: Iaaa76ac8a5aad457258de3c23828cf3738f612c2
Reviewed-on: https://code.wireshark.org/review/24110
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-27 21:43:47 +00:00
Magnus Henoch 4c8dfe6f6e Autodetect more AMQP 0-9 captures
When an capture file containing AMQP 0-9 traffic is missing the
protocol header, and the first packet contains more than one AMQP
frame, we'd fail to detect the protocol version properly, since we'd
check for the frame size being equal to the PDU size.  Fix this case
by checking if the frame fits within the PDU instead.

While it's possible that 0-10 and 1.0 captures could be misdetected as
0-9, this seems highly unlikely.  See details in comment in
packet-amqp.c.

Bug: 14113
Change-Id: I98978ed3919be3daf7fe9a972b87e09f27ba20e3
Reviewed-on: https://code.wireshark.org/review/24108
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 21:34:30 +00:00
Jeff Dyer 398dc81127 Change NewCo to new Company name, Aliv
Change-Id: I84c06a7f168da0f65b7c76360f38f39ecf1024d0
Reviewed-on: https://code.wireshark.org/review/24112
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 20:47:25 +00:00
João Valverde 764431f882 autotools: Fix LN_S usage
"cp" always takes two arguments.

Change-Id: I6183988a24a38b1091d31a4e533b329f89f35dac
Reviewed-on: https://code.wireshark.org/review/24113
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-10-27 19:55:52 +00:00
Pascal Quantin 42f5aa4566 IEEE 1905.1a: fix an infinite loop (CID 1420356)
Change-Id: I39b75acbf3598ad4e32e268f4b4378f16ca273c6
Reviewed-on: https://code.wireshark.org/review/24107
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 16:20:23 +00:00
AndersBroman 33d28030b1 [AMR] Change the Payload type preference to a range and have separate
ranges for AMR and AMR-WB.

Change-Id: If5dca10b226a09168f1b1f834d97b826f8b777d6
Reviewed-on: https://code.wireshark.org/review/24105
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 15:47:24 +00:00
AndersBroman 395c54c489 [BSSGP] Fix decoding of PERFORM-LOCATION-REQUEST.
Change-Id: I5039c93bd4f572599386a314a16230d7c1aaaf23
Reviewed-on: https://code.wireshark.org/review/24104
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-27 14:49:45 +00:00
AndersBroman bb7511bccf [BSSMAP-LE] Add dissection of 10.18 Location Type.
Change-Id: I54900e13eca61cd1f190934a77cb0e704c877dfe
Reviewed-on: https://code.wireshark.org/review/24103
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-27 14:36:12 +00:00
Taisuke Sasaki 4ee492e910 OSPFv2 Segment Routing extention support with RFC7684.
- RFC7684
- draft-ietf-ospf-segment-routing-extensions-20

Bug: 12297
Change-Id: I3acafe95ae2ef44a433c38c2495169d77e3c955d
Reviewed-on: https://code.wireshark.org/review/24070
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-27 14:25:15 +00:00
Marius Paliga 545f200224 PFCP: Dissect Node ID: Fix length of FQDN Node Id Type
Octet 5 (Spare Node/ID Type) is included in the IE length
and FQDN uses just remainding length

Change-Id: I9c6e1de850bda0af315cbf801e757af6b25ed33e
Reviewed-on: https://code.wireshark.org/review/24101
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-27 13:51:18 +00:00
Pascal Quantin 0a033cdc65 IEEE 1905.1a: remove an unused hf variable
Change-Id: I03d37495937020407783d366d01e3ad353889e80
Reviewed-on: https://code.wireshark.org/review/24098
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-27 08:52:57 +00:00
Pascal Quantin b085418501 IEEE 1905.1a: add what seems to be missing breaks
Change-Id: I60b41e503bc8933fb2efb2016b565caa0ec3bb97
Reviewed-on: https://code.wireshark.org/review/24097
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-27 08:52:37 +00:00
Richard Sharpe db41ccd009 Device provisioning protocol: Fix a last issue with DPP and Configuration
commands not being searchable.

Change-Id: I28cf212b3eacb16572ce9d1ff2dbf45040046b00
Reviewed-on: https://code.wireshark.org/review/24069
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-27 04:22:45 +00:00
Guy Harris 4e4f1debb7 Fix typo.
Change-Id: I27373dd3823d3527ad3ebf272169feb7323b1a83
Reviewed-on: https://code.wireshark.org/review/24094
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-27 01:27:41 +00:00