Commit Graph

31268 Commits

Author SHA1 Message Date
Alexis La Goutte 54f0159950 srt: fix not a Doxygen trailing comment [-Wdocumentation]
Change-Id: I78de1d2fc55ac64542d7d031c33c3b4bc58b10ff
Reviewed-on: https://code.wireshark.org/review/31199
Reviewed-by: Maxim Sharabayko <maxim.sharabayko@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30 12:41:39 +00:00
Andrii Vladyka 235c5027b0 docsis: enhancements and additions for DOCSIS TLVs 5.20 and 5.40
Change-Id: If819d1f7e75b458d5fc28e23b28fa260637491fb
Reviewed-on: https://code.wireshark.org/review/31240
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29 09:10:36 +00:00
Atli Guðmundsson 46e7148461 Fixed ASTERIX 6bit callsign decoding
The callsign was being truncated to 7 letters.
This affects the following fields:
- I004/100#01.AN
- I004/170#08.MS1
- I004/170#08.MS2
- I025/020.SD
- asterix.AI, which is included in:
-- I021/170
-- I048/240
-- I062/245
-- I062/380#02
-- I062/380#03_v0_17

Change-Id: Idbbb3891d96e906053fc1f0c447e37bae87d207a
Reviewed-on: https://code.wireshark.org/review/31230
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28 21:27:12 +00:00
Christophe GUERBER 1afe11f099 Correct PsId dissection in WSMP
Get rid of length determinant in the value returned for psid. Length
determinant is not part of the value.
This helps comparison with other protocols possibly containing a psid
also.

Change-Id: I2bd93bd6849f8bfa686f0574f05b0a65f587e4ad
Reviewed-on: https://code.wireshark.org/review/31235
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28 21:12:22 +00:00
Michael Mann c456c34cd6 DNS: Use seconds as resolution for stat response time.
This keeps it in the same resolution as the dns.time field.

Ping-Bug: 15382
Change-Id: Ibacf8761819c0fac2e87fa147f7381336ce5cb39
Reviewed-on: https://code.wireshark.org/review/31223
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28 14:51:40 +00:00
Michael Mann c10c7737cc Allow floating point values for stats_tree
Bug: 4234
Change-Id: Ibd59809b2dd9890a7851eb57ef7af384e280a74b
Reviewed-on: https://code.wireshark.org/review/31222
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28 14:50:45 +00:00
Pascal Quantin 6180d0fdaa GTPv2: fix dissection of APN IE
The total maximum length of the APN with Network Identifier and Operator
Identifier is 100 bytes.

Bug: 15383
Change-Id: Ib74eac1f18f2235c2788e58370f50eeb9a678357
Reviewed-on: https://code.wireshark.org/review/31225
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>
2018-12-28 14:08:53 +00:00
Pascal Quantin 4b3cd73de2 NAS EPS: upgrade dissector to v15.5.0
Change-Id: I3464365a821e92f02e601304552823d24cf11c35
Reviewed-on: https://code.wireshark.org/review/31227
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-28 13:48:14 +00:00
Pascal Quantin 825de369d3 3GPP NAS: upgrade dissector to v15.5.0
Change-Id: I8cd60558ef6fb80d916f30aa79028cd87542d956
Reviewed-on: https://code.wireshark.org/review/31226
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-28 13:48:08 +00:00
Craig Jackson 52b7c8929a Z39.50: Implementation of Z39.50 Information Retrieval protocol
NISO Z39.50 is a protocol used by libraries and library vendors for information retrieval and catalog manipulation. It is defined using ASN.1 using BER encoding. It has an assigned TCP port of 210. This is an initial implementation.

Features:
- The Z39.50 standard OIDs are defined.
- The bib-1 attribute set is decoded.
- The bib-1 diagnostics are decoded.
- Some OCTET STRINGs which are nearly always printable ASCII are special-cased.
- The MARC (MAchine Readable Cataloging) format is decoded. Only the MARC21 variant is
  currently handled, but this is one of the most common variants. The most common tags
  are decoded. The MARC dissector is included in the Z39.50 dissector, but the code is
  structured in such away that it could be pulled out.

Todo:
- Add information to the Wiki about Z39.50.

As part of this work, the definition of isdigit_string() was fixed to avoid const complaints.

Change-Id: I29a7db53375ef8be83738a1ab98707761d878717
Reviewed-on: https://code.wireshark.org/review/31209
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-28 09:28:17 +00:00
Michael Mann ffbd46ce7b DNS: Use microsecond resolution for request/response statistics.
The stat tree API only supports 32-bit integers and if nanosecond resolution
is used correctly it's easy to hit integer overflow issues on even a fairly
small capture file trying to sum up response times.

Bug: 15382
Change-Id: I15d2cfbdbec7b0bef2bcfe1afe4f6eb6fc1d2456
Reviewed-on: https://code.wireshark.org/review/31217
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-27 22:41:45 +00:00
Jaap Keuter c9cfae7fec ISAKMP: Fix a crash when no decryption data block is there
Don't try to (re)set parameters in a struct when its pointer
points to NULL.

Bug: 15374
Change-Id: I953e82795990fde5fce2ad6d955781b372a9e405
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31189
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-27 16:53:34 +00:00
Graham Bloice 3f8c3e6415 packet-http: Fix whitespace issues
Change-Id: I33b13b576bd69d5c89a5028cc691a5617746e5a5
Reviewed-on: https://code.wireshark.org/review/31216
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-12-27 09:18:06 +00:00
Guy Harris 7eb3e47fa4 Try to squeeze some bytes out of the frame_data structure.
Make the time stamp precision a 4-bit bitfield, so, when combined with
the other bitfields, we have 32 bits.  That means we put the flags at
the same structure level as the time stamp precision, so they can be
combined; that gets rid of an extra "flags." for references to the flags.

Put the two pointers next to each other, and after a multiple of 8 bytes
worth of other fields, so that there's no padding before or between them.

It's still not down to 64 bytes, which is the next lower power of 2, so
there's more work to do.

Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe
Reviewed-on: https://code.wireshark.org/review/31213
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 04:34:29 +00:00
Guy Harris c3a7986b86 Don't allocate per-frame data if we don't have an F5 trailer.
The F5 trailer dissector is called before the taps are called, so there
is no reason why the taps should attach information to the frame if
there isn't any information attached - if there's an F5 trailer, there
will be information attached to the frame, so there's no need to attach
one, and if there's no F5 trailer, there's no analysis to be done, so
there's no need to attach one.

That way, we don't waste memory that we aren't going to use (about 100MB
for a large capture I have that has almost 3 million packets).

Change-Id: I471b6c9b0fc6eb36f3aff35d6fba2f73c3a0eb90
Ping-Bug: 15385
Reviewed-on: https://code.wireshark.org/review/31210
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-26 21:03:59 +00:00
Alexis La Goutte 52d22b25ab gcsna: fix no previous prototype for function 'proto_[register|reg_handoff]_gcsna' [-Wmissing-prototypes]
Change-Id: I5b5a627f9d75c2b9aa1ceb3a43c7991833dce751
Reviewed-on: https://code.wireshark.org/review/31195
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-26 20:17:48 +00:00
Alexis La Goutte 7ec16dc50d Declare register and register-handoff functions.
This squelches -Wmissing-prototypes warnings.

Change-Id: I49feace8796c9786e09183e8dcf82d08e06996a2
Reviewed-on: https://code.wireshark.org/review/31193
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-26 07:42:44 +00:00
Alexis La Goutte 3c9ac18bd5 Make dissect_oer_not_decoded_yet() static.
It's not used outside this file.

Change-Id: I1eead997dbd4d3b58498192a0aec73094a49a067
Reviewed-on: https://code.wireshark.org/review/31202
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-26 07:40:44 +00:00
Alexis La Goutte 1ef9889a80 No need to export a dissector for UUS1-Content_PDUs.
Nothing else uses it.

Change-Id: I1de8ced2ceeaf02f2c9eeeef9b6680d5ad7f4794
Reviewed-on: https://code.wireshark.org/review/31201
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-26 07:38:37 +00:00
Alexis La Goutte 767089c200 Make dissect_srt_control_packet() static.
It's not used outside this file, and isn't declared in any header file.

Change-Id: I5b2e7600188bd25333fb85eed21ac41737794988
Reviewed-on: https://code.wireshark.org/review/31200
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-26 07:37:42 +00:00
Alexis La Goutte 90faa6bb25 Make routines used outside this file static.
Change-Id: I2129cf613e7a89c8d56f069d5d4367c2fdde74ab
Reviewed-on: https://code.wireshark.org/review/31196
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-26 07:35:07 +00:00
Alexis La Goutte d58c21ed8d Fix Doxygen comment to match function parameter names.
Change-Id: I9aa8c14b7d02d1ca6749be9a9cdb7cf049ed46b4
Reviewed-on: https://code.wireshark.org/review/31192
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-26 02:25:51 +00:00
Dario Lombardo e152cfe933 imap: remove unused value (CID: 1441962).
Change-Id: Iae7697ba1cdeb06d3ef38a5079e3e8ea1bef649c
Reviewed-on: https://code.wireshark.org/review/31205
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-26 00:57:29 +00:00
Alexis La Goutte 34eb1d37d3 ieee1609dot2: fix no previous prototype for function 'proto_register_ieee1609dot2' [-Wmissing-prototypes]
Change-Id: I977639e9623445ae9683689a1564e294ab15589c
Reviewed-on: https://code.wireshark.org/review/31197
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-25 21:26:11 +00:00
Alexis La Goutte 8d2df4d887 cdma2k : fix no previous prototype for function 'proto_[register|reg_handoff]_cdma2k' [-Wmissing-prototypes]
Change-Id: I0870e40e1f98bfd1d277b4812924e49970a24e98
Reviewed-on: https://code.wireshark.org/review/31194
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-25 21:23:29 +00:00
Graham Bloice 7facbfdaa5 packet-http: Fix indentation issues
Change-Id: I7f3c2bf550f51d303b199ab385e1e3578aebc1e7
Reviewed-on: https://code.wireshark.org/review/31188
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-12-24 18:21:01 +00:00
Graham Bloice 4fb2449b82 http: Add request URI to response
Add the request URI to the response to allow filtering of
responses by request URI in a single pass.

Bug: 15344
Change-Id: I89bf675dccaed37f54a4d13956223cbdde601e7d
Reviewed-on: https://code.wireshark.org/review/31184
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-12-24 16:50:28 +00:00
Dario Lombardo 35569d89f3 geonw: use glib uint64 modifier.
Fix compilation on OSX:
../epan/dissectors/packet-geonw.c:1248:164: error: format specifies type 'unsigned long' but the argument has type 'guint64' (aka 'unsigned long long') [-Werror,-Wformat]
        proto_tree_add_uint64_bits_format_value(subtree, hf, tvb, (start << 3) + (*offset) - start, (((*offset) - start) << 3) - ((*offset) - start),tmp_val,"%lu",tmp_val);
                                                                                                                                                              ~~~  ^~~~~~~
                                                                                                                                                              %llu
While here, minor indentation issues have been fixed.

Change-Id: I5fc37d337fc302a16210c784e75cf39085ef622e
Reviewed-on: https://code.wireshark.org/review/31186
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-23 22:22:10 +00:00
Christophe GUERBER 73774198c5 Update definitions from ETSI TS 102 965 v3
Change-Id: Id51e46795fea3f20421ff94346e501bcf2af17b8
Reviewed-on: https://code.wireshark.org/review/31183
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 21:53:38 +00:00
Dario Lombardo c88bef54a9 quic: comment out unused function.
The use of this function has beed discontinued in
v2.9.1rc0-109-gee439bb82d.

Change-Id: I0106b0812ebabbe7fc754be6dc0e636c8088c835
Reviewed-on: https://code.wireshark.org/review/31181
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-12-23 19:49:59 +00:00
Christophe GUERBER bd5e5ce93c Secured messages dissector for GeoNetworking
Dissects secured messages from GeoNetworking protocol as per
ETSI_TS_103_097 (v1 or 2). Msg_id or application id is used to determine
subdissector: "geonw.sec.v1.msg_type" and "geonw.sec.v2.app_id".
Unsecured and signed payloads are subdissected, encrypted payload is kept
as data.

Version 3 secured message dissection calls ieee1609dot2 dissector. No
subdissector is provided in this case.

Use Application ID as defined in ETSI_TS_103_965.

Change-Id: Iff90a0e433d7774790cda50a557631d65c6de2ce
Reviewed-on: https://code.wireshark.org/review/31164
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 13:43:10 +00:00
Alexis La Goutte 8bf91750df QUIC: Remove unused field quic.odcil_draft13
Forget when remove draft13 support...

Change-Id: Id8d65e0ea35618185931fb1d35314e8ededae172
Reviewed-on: https://code.wireshark.org/review/31179
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-23 12:10:58 +00:00
Alexis La Goutte ee439bb82d QUIC: remove draft-14 support
Change-Id: Ib8a5698abfea4c3cab32b0018ef2bcadcc9e4e08
Reviewed-on: https://code.wireshark.org/review/31178
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-23 12:10:43 +00:00
Atli Guðmundsson 5eacb25bec Updates and bugfix of ASTERIX 063
Updated I063 to v1.4
Fixed incorrect spelling of I063/090.PRG
Fixed I063 Capitalisation inconsistencies

Change-Id: I241fc15829d1ef2eddd4f68cf37b58d9f16f2aa8
Reviewed-on: https://code.wireshark.org/review/31174
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 08:07:33 +00:00
Atli Guðmundsson 70e3a48bc6 Updates and bugfix of ASTERIX 065
Added I065 v1.4
Added I065 v1.4 field (STTN)
Added I065 RE fields (SRP, ARL)
Fixed I065/000 message mappings
Fixed I065 Capitalisation inconsistencies

Change-Id: Id28c7214817654a2a1f18c8d54f0fd271eb44107
Reviewed-on: https://code.wireshark.org/review/31173
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 08:06:50 +00:00
Uli Heilmeier ee7e414ac5 BGP: Decode next hop BGP MP_REACH_NLRI for MCAST-VPN saf
Ref: https://tools.ietf.org/html/rfc6514#section-9.1.1

Bug: 15376
Change-Id: I60aaeadb4a58f2b16630ba184d3ad9841bc32436
Reviewed-on: https://code.wireshark.org/review/31171
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 06:48:17 +00:00
Dario Lombardo 8ea015258a knxip: fix no previous prototype for function 'proto_register_knxip'.
Change-Id: Ibb5454fd568745ace4335b3365fe7862b5e48b70
Reviewed-on: https://code.wireshark.org/review/31172
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-23 06:45:56 +00:00
Alexis La Goutte 75afb548eb QUIC: Remove draft-13 support
Change-Id: I98e9e53a031929ea9b9ac047166a961c2c30908e
Reviewed-on: https://code.wireshark.org/review/31170
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-22 21:40:05 +00:00
Alexis La Goutte 0964b04ee3 QUIC: Add draft-16 support
Editor change (No packet change)

Also update link to spec

Change-Id: I7b64edc1db85d6092858eab98098692ae5c69eb4
Reviewed-on: https://code.wireshark.org/review/31169
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-22 18:32:22 +00:00
Andrii Vladyka c8b68f004d docsis: SF TLV 23 is applicable to both US and DS; added SF TLVs 24.25 and 24.26
Change-Id: Id52d6e7c08c5e8d516ca8e80543f33a1e61cf907
Reviewed-on: https://code.wireshark.org/review/31166
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-22 09:21:57 +00:00
Atli Guðmundsson 68b2eb2129 Added dissector for ASTERIX I019
Change-Id: I438f1224283f1a4b8300c73345d8e8f4ce3c7160
Reviewed-on: https://code.wireshark.org/review/31081
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-21 06:31:25 +00:00
Nardi Ivan 5feb326312 ip, tcp: add expert info for invalid header length
Change-Id: I58c1b20304aabcff144667cfbbcc774010fc2a16
Reviewed-on: https://code.wireshark.org/review/31148
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-21 06:31:12 +00:00
Colin Foster 8b652fe948 HDCP: Add support for HDCP 2.2 commands
AKE_Transmitter_Info and AKE_Receiver_Info commands now supported

Change-Id: I01b6c4811665023b60e26538c4678562eb217c1a
Reviewed-on: https://code.wireshark.org/review/31135
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-21 05:26:01 +00:00
Dario Lombardo 16a1768ca5 ansi_map: remove trailing spaces.
Change-Id: I4f91bc8df31d20315a50c944109b6670b3bf34ca
Reviewed-on: https://code.wireshark.org/review/31151
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20 20:39:26 +00:00
Joakim Karlsson 9d552b83e7 pfpc: update Failed Rule ID IE with clearer append text
Failed Rule ID : FARDynamic by CP 3
to
Failed Rule ID : FAR: Dynamic by CP 3

Change-Id: Ib8383ec4f298c423bed38ffda36f0a0ebac65dc7
Reviewed-on: https://code.wireshark.org/review/31147
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20 20:27:10 +00:00
Anders Broman 31e38c312b ANSI MAP: borderCellAccess parameter coded as tag 50 but should be 58.
Bug: 15372
Change-Id: I11886649dbd390655505d93e4378fe38dff8fb64
Reviewed-on: https://code.wireshark.org/review/31144
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20 10:55:29 +00:00
Stig Bjørlykke 47ae705f39 snort: Fix a memory leak on error
Change-Id: Icb90e749ec9ee4e6575e77519744b43bce6235a6
Reviewed-on: https://code.wireshark.org/review/31143
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20 10:55:17 +00:00
Stig Bjørlykke eb3066d64b tibia: Use wmem for decrypted buffer
Use wmem_alloc() for decrypted buffer.

Change-Id: I6cbdcc621a9d93cc95f24050b93ae04211164f56
Reviewed-on: https://code.wireshark.org/review/31142
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20 10:09:21 +00:00
Pascal Quantin c18fcc6c17 ITS: regenerate dissector
Change-Id: If7f6e35b84183afe6be782cdd6e594f30f9f5b50
Reviewed-on: https://code.wireshark.org/review/31141
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-20 08:35:12 +00:00
Steve Osselton 3cd661d6e0 Thrift: Update to distinguish between map key and value types
Change-Id: I153d906ed7b464a961d2e8f061135d06b9088cb7
Reviewed-on: https://code.wireshark.org/review/31122
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20 08:09:50 +00:00
Joakim Karlsson 8d23cdd0fa http2: add Header unescaped presentation
This will present the Header in unescaped format, without percent-coding.

ex.
&requester-plmn=%7B%22mcc%22%3A%22240%22%2C%20%22mnc%22%3A%2201%22%7D&

to
&requester-plmn={"mcc":"240", "mnc":"01"}&

Change-Id: I44296bf564a9dd75bf172503a277d48f116d26fd
Reviewed-on: https://code.wireshark.org/review/31119
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-20 05:41:18 +00:00
Anthony Coddington f1d8b22fec erf: Add support for attribute and sensor Provenance tags
Add temperature and power tags, represented using millidegrees/milliwatts.
Add attribute tag, allows generic reprsentation of dynamic path like key-value pairs in the format namespace.path.to.name=value where value can be a JSON-escaped string or an integer/float number.
Also fix a few implicit floating point conversions (confirmed values are the same).

Change-Id: Id8a858abfa8a56b44e9e7200b11adc562e67fb3b
Reviewed-on: https://code.wireshark.org/review/31136
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-20 05:13:44 +00:00
Steve Osselton 003cba974b Thrift: Update to use guint32 for iterator to eliminate cast
Change-Id: Ida45d01f8349bbd61f31bea0edb16024193c8e69
Reviewed-on: https://code.wireshark.org/review/31116
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19 12:27:34 +00:00
Vadim Yanitskiy 9b882af449 GSUP/SMS: add READY-FOR-SM message decoding
According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is
used between the MSC and VLR as well as between the VLR and the
HLR to indicate that a subscriber has memory available for SMS.

This change replicates this service in GSUP as READY_FOR_SM_*.
The only mandatory IE for this service (excluding Invoke ID) is
'Alert Reason' that is replicated by OSMO_GSUP_SM_ALERT_RSN_IE.

For more information, please see:

https://git.osmocom.org/libosmocore/commit/?id=f9ee8da0cda6a8989c706e618915d09c9cffd0f4
https://git.osmocom.org/osmo-gsm-manuals/commit/?id=d1596fe75aba94e485b1dfcee32328086bf54e22

Change-Id: Ie7591066af7446b2df8bfdb03ef790b4478d2bc9
Reviewed-on: https://code.wireshark.org/review/30587
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19 12:27:24 +00:00
Stig Bjørlykke d749beafb9 rfc7468: Fix a memory leak
Read the base64 decoded data into a wmem_alloc memory to avoid
a memory leak for each opened file.

Change-Id: I4cbb2c15dea43183ed741d54ae7c6ea2e83e46c0
Reviewed-on: https://code.wireshark.org/review/31112
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19 11:40:57 +00:00
Steve Osselton 9132725ab0 Thrift: Update to support Set types
Change-Id: I8d513c005b6c6221364b695a584267fd57c5f8b8
Reviewed-on: https://code.wireshark.org/review/31094
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19 11:40:12 +00:00
Taisuke Sasaki 5bef36f153 ISIS: Add Prefix Attribute Flags TLV (rfc7794)
Fix according to review 31069

Change-Id: I03552eaba434597386d8bf386117a3366f2c3446
Reviewed-on: https://code.wireshark.org/review/31101
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19 06:11:50 +00:00
Vadim Yanitskiy 94bc8f1276 GSUP/SMS: add MO-/MT-FORWARD-SM message decoding
According to 3GPP TS 29.002, there are two services:

  - MAP-MO-FORWARD-SHORT-MESSAGE (see 12.2),
  - MAP-MT-FORWARD-SHORT-MESSAGE (see 12.9),

which are used to forward MO/MT short messages.

This change replicates both services as GSUP messages:

  - OSMO_GSUP_MSGT_MO_FORWARD_SM_*,
  - OSMO_GSUP_MSGT_MT_FORWARD_SM_*.

For more information, please see:

https://git.osmocom.org/libosmocore/commit/?id=c2628317cc3482262c80b93cbfb2cbe960772558
https://git.osmocom.org/osmo-gsm-manuals/commit/?id=f26967aad547e8f79e6726aefe9fe8a69ae2ba4b

Change-Id: Ia46aabc74c00c89c4da53c2ed4b9fd2200a485a0
Reviewed-on: https://code.wireshark.org/review/30586
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-19 04:46:11 +00:00
Stig Bjørlykke 01c8397fd1 coap: Add request/response arrows
Change-Id: I72393548f5a51e60f516c0999c8a779e75d0c14a
Reviewed-on: https://code.wireshark.org/review/31093
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-12-18 13:15:13 +00:00
Christophe GUERBER c7f7b60c6b ITS facilities message dissector
Dissector for Intelligent Transport System facility messages:
 - Cooperative Awareness Message (CAM)
 - Decentralized Environmental Notification Message (DENM)
 - Infrastructure to Vehicle Information Message (IVIM)
 - MAP (topology) Extended Message (MAPEM)
 - Signal Phase And Timing Extended Message (SPATEM)
 - Signal Request Extended Message (SREM)
 - Signal request Status Extended Message (SSEM)
 - Electric Vehicle Charging Spot Notification (EVCSN)
 - Electric Vehicle - Recharging Spot Reservation (EVRSR)
 - Tyre Information System (TIS) and Tyre Pressure Gauge (TPG) interoperability

Subdissectors:
 - ITS version if ever the ITS PDU header is changed
 - Version << 16 | MessageID to register new message dissectors
 - RegionId << 16 | type to register regional extensions
   AddGrpC regional additions already provided

TAP:
 - its TAP with ItsPduHeader fields provided

Bug: 15148
Change-Id: I4c71d4dfa1d5d63cb57f61a4e1436a60a3482205
Reviewed-on: https://code.wireshark.org/review/31049
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-18 12:31:48 +00:00
Christophe GUERBER c0a28448a5 Provide data to inner dissector for PER open type
When an open type is decoded in ASN.1 PER, one can define a dissector
for the content of the open type. Providing data to the inner dissector
is only possible through packet info private data or global vars.

Use the private_data field from ASN.1 context as the data for the inner
dissector. This avoids using packet info private data to communicate
with the inner dissector, especially if the data to be provided are only
"local" matter.

Ping-Bug: 15148
Change-Id: I8fd2cb69d52e371e7d713afe2cc4b2856fb39f7c
Reviewed-on: https://code.wireshark.org/review/31087
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-18 09:25:45 +00:00
Pascal Quantin cd0e13d764 XnAP: remove a useless variable from private data
Change-Id: Ie485067ff6a75841850da84c24f6d3d939b815c1
Reviewed-on: https://code.wireshark.org/review/31089
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-18 06:49:31 +00:00
Christophe GUERBER 04b8558f7d Do not create a tvbuff on zero-length open type
When decoding an open type in ASN.1/PER and the content length is zero,
do not try to create a buffer. Doing so triggers an error in tvbuff.c.

Ping-Bug: 15148
Change-Id: If892e8c6a84cdfb268e3f6c50af0f7e30a89c59b
Reviewed-on: https://code.wireshark.org/review/31088
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-18 06:23:06 +00:00
Pascal Quantin eb4bf22de3 X2AP: fix dissection of MeNBtoSgNBContainer in SgNBModificationConfirm message
Bug: 15368
Change-Id: I99307f6af961e91059111e699c7d43fa364f28f0
Reviewed-on: https://code.wireshark.org/review/31080
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>
2018-12-18 05:19:04 +00:00
Joakim Karlsson 495a6204a4 gtpv2: Update Security Capability in MM Context
According to TS 29.274, ch8.38. the UE NR security capability coding
is specified in clause 9.9.3.53 of 3GPP TS 24.501

Change-Id: I4e5352bf7a5c75a3766b2d1162d8d85c3566da86
Reviewed-on: https://code.wireshark.org/review/31074
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-18 05:17:12 +00:00
Joakim Karlsson 0ba97f9a45 pfcp: correction of name QFII
QFFI -> QFII

Change-Id: Iff0d4977620b2c98f25fe5cd0390043968659ccf
Reviewed-on: https://code.wireshark.org/review/31073
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-12-17 20:47:33 +00:00
Pascal Quantin 7af85e07be GSM A DTAP: add UMTS EVS to supported codecs list IE
Change-Id: I248bf8722beebda5007a542323d4b188ed50ae52
Reviewed-on: https://code.wireshark.org/review/31072
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-17 17:51:35 +00:00
Taisuke Sasaki e6fdc37c2f ISIS: Add Prefix Attribute Flags TLV (rfc7794)
Also add the below minor fixes/enhancements:

- Fix O-bit in MT TLV (rfc5120)
- Add IPv4/IPv6 prefix string in a parent subtree
- Modify the IPv6 Reachability TLV dissector so that it would dissect in TLV format order
- Add a new SR Local Block TLV dissector (draft-ietf-isis-segment-routing-extensions-21)
- Fix offset in SID/Label sub-TLV

Change-Id: Ie317f094ff8f2ed3352e844c212eb59a677e18c6
Reviewed-on: https://code.wireshark.org/review/31069
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-17 06:06:59 +00:00
Dylan Ulis ba25ec205f CIP: Minor code cleanup
dissect_cip_cm_data() was getting hard to read so:
1. Pull out some some logic into separate functions
    dissect_cip_cm_unconnected_send_req
    dissect_cip_cm_fwd_close_req
    dissect_cip_cm_fwd_close_rsp_success
2. Reduce the scope of some variables.

No functional changes

Change-Id: I40c3dd5d2505b29991589ede4752c383348006ec
Reviewed-on: https://code.wireshark.org/review/31051
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-12-15 07:43:21 +00:00
Christophe GUERBER b22da8bc5d IMAP: Reassemble message elements and add request/response tracking
1. Reassemble TCP segment so that IMAP dissector is called on message elements.
Content of fetched messages are parsed by IMF dissector. Dissected fields
are available to "Export Objects" menu item.

2. Request/Response tracking with timestamp between request and response in response frame.

Bug: 15090
Change-Id: Icdbef8c237965d2a59aa7726c5e6a681602c71ce
Reviewed-on: https://code.wireshark.org/review/30876
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-14 22:58:57 +00:00
Michael Mann 2289cd49c1 packet-geonw.c: Add #include <stdlib.h> to fix Debug build on Windows
Change-Id: I22450f09490f3d508f3865984d710469a8d119f0
Reviewed-on: https://code.wireshark.org/review/31050
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-14 22:50:06 +00:00
Anders Broman d9a201d039 PFCP: Calculate the length of Network Instance.
In IE User Plane IP Resource Information. If Associated Source Interface is present the length of Network Instance
is 1 octet less than the remaining length.

Change-Id: I4fc74f8ab69d0c441947d3d0149fe9e2106a2bc7
Reviewed-on: https://code.wireshark.org/review/31046
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Andreas Schultz <andreas.schultz@travelping.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 14:41:14 +00:00
Martin Mathieson 18c737c2a6 DCT2000: Pass NR NAS payload to dissector with S1AP framing
Change-Id: I2aa7a7f347e897b1a455ff3eb8ae126982ecc681
Reviewed-on: https://code.wireshark.org/review/31045
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-12-14 14:07:10 +00:00
Anders Broman b430ac31af GeoNetworking: Change cast to guint8 to fix win32 build.
Change-Id: I6692bfc0beecb7d023b5b69bd58729147a72d3f3
Reviewed-on: https://code.wireshark.org/review/31042
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-14 12:46:19 +00:00
Jonathan Fleming 98e74957b0 Added multiple new field dissectors for the BACnet-APDU protocol.
Replaced global vars with fPresentValue and wrapper functions.
Split bacapp.present_value dissector based on datatype for filtering.
Replaced char array buffers with wmem api calls.
Rebased commit onto latest master branch.
Removed date and time present_value field dissectors.

dissectors added:
	bacapp.object_name
	bacapp.to_state
	bacapp.from_state
	bacapp.notify_type
	bacapp.error_code
	bacapp.error_class
	bacapp.event_type

present_value dissectors added:
	bacapp.present_value.null
	bacapp.present_value.boolean
	bacapp.present_value.uint
	bacapp.present_value.int
	bacapp.present_value.real
	bacapp.present_value.octet_string
	bacapp.present_value.char_string
	bacapp.present_value.bit_string
	bacapp.present_value.enum_index

Change-Id: I3ba9327ee22787da59190204e808f8c10dc8fabd
Reviewed-on: https://code.wireshark.org/review/30847
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 04:59:20 +00:00
Christophe GUERBER a87e56aa79 GeoNetworking, BTP dissectors (ITS-V2X)
Implements V2X protocol dissectors:

 * Geonetworking (network layer):
Dissector is registered on top of Ethernet (ethertype=0x8947).  Secured
Packets are dissected up to the basic header, the rest is shown as data.
GN_ADDR address type is registerd and provides resolution of station
type and country code in the address. MID is shown as an ethernet address.
All the fields are dissected for non Secured Packets.
A subdissector table named "geonw.ch.nh" is provided on the next header
field. IPv6 is automatically registered. Heuristic dissectors is not
supported. If no dissector is foundd, payload is shown as data.
A preference boolean allows to enable/disable sequence number checking.
Tap "geonw" gets headers of all packets (with most fields).
Expert info tests if and provide feedback on:
 - version is zero (no other version possible),
 - reserved fields are zeros,
 - payload_len matching with reported length of buffer,
 - Remaining Hop Limit is 1 for Beacon and SHB,
 - low RHL or RHL > Max Hop Limit,
 - country code is less than 999 (3 digits ITU-T E.164),
 - latitude, longitude, heading and angle limits,
 - (suspected) duplicate packets,
 - LS_REQUEST/LS_REPLY matching.

 * Basic Transport Portocol:
BTP-X (X=A or B)  dissectors are registered on top of Geonetworking.
Subdissector tables "btpx.port" allow to register for a given port,
while heuristic dissector can register to "btpx.payload". Decode as
capability is supported.
"btpx" taps get headers of all packets with ports/@ infos.
"btpx_follow" taps get the payload.

Bug: 15148
Change-Id: Iab5f4486d4c38068d9ad4361e77296b747f9b1bb
Reviewed-on: https://code.wireshark.org/review/30992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 21:39:12 +00:00
Martin Mathieson b6e13a3d84 DCT2000: Call nas-5gs dissector
Change-Id: Iddca3571097210a7a0e090b506538bbf8ec64c07
Reviewed-on: https://code.wireshark.org/review/31040
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-12-13 21:11:31 +00:00
Joakim Karlsson c3eb293048 diameter: Added Secondary-RAT-Type
Group RAN-Secondary-RAT-Usage-Report and decoding of Secondary-RAT-Type

Change-Id: I33c1a0e21be64b5b5b4b9a4a40e9e718d89c9943
Reviewed-on: https://code.wireshark.org/review/31036
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 18:27:23 +00:00
Martin Mathieson 2d589df127 DCT2000: skip optional carrier type in LTE RRC primitive header
Change-Id: I495e5b2da1b7c9a066294564837df471e25fbb73
Reviewed-on: https://code.wireshark.org/review/31037
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-12-13 18:20:27 +00:00
Anders Broman 2754d4d80f SIP: Add the generated Call Id to the tree.
Change-Id: I0fd5aff70452062d24cc777c002b6d02f7c5a691
Reviewed-on: https://code.wireshark.org/review/31032
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 14:11:57 +00:00
Olaf Flaschel dae1c31351 IEEE802.11: Prevent BoundsError for packets with captured len < packet len
This fix prevents that a BoundsError is thrown in function try_decrypt for
packets with captured length less than packet length. Otherwise, some data
is not dissected.

Change-Id: I0dcd89b85b959f5712ff58b184bfa2e064746d0b
Reviewed-on: https://code.wireshark.org/review/31026
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 11:21:39 +00:00
Olaf Flaschel 236e7e89ad IEEE802.11: Fixed dissector bug with wlan.ext_tag.ess_report.ess_info.thresh
Type of field wlan.ext_tag.ess_report.ess_info.thresh
must be FT_INT8 instead of FT_UINT8.

Change-Id: Icd1a121832d6a660550023a91d0b732385f68b60
Reviewed-on: https://code.wireshark.org/review/31016
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 11:21:09 +00:00
Anders Broman 0a0439bd61 E164: Add a valuestring with the country name abbreviated ISO3166.
Change-Id: Ib39cc33e84a4ee70fbc2f3ebdccf84391a556b2f
Reviewed-on: https://code.wireshark.org/review/31030
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 11:20:14 +00:00
Anders Broman 0b476966b9 GeoNetworking: Add ethertype 0x8947
Change-Id: I6205bf865827c1b6f26e07d8ad2fc97bc7efe28d
Reviewed-on: https://code.wireshark.org/review/31022
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 09:41:23 +00:00
Uli Heilmeier d2d7da1f5c sFlow: Dissect output interface according to spec
v5 of sFlow has another bitmask for output interface
as v2 and v4.
This commit dissects v5 output interface according to
https://sflow.org/sflow_version_5.txt

Bug: 15325
Change-Id: I1c0f1958e5491a7683c716538e103a5d6b49869e
Reviewed-on: https://code.wireshark.org/review/30999
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 09:34:15 +00:00
Luis Rosa 07a22c7bad pcomtcp: new built-in dissector for PCOM protocol
New built-in dissector for PCOM protocol (ASCII and binary modes included)

Bug: 15315
Change-Id: Ie13da6bfd7fefefbc5bb5df3461c7fc18261df81
Reviewed-on: https://code.wireshark.org/review/30823
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 05:29:10 +00:00
Peter Wu 4803390686 Add new "rsa_keys" UAT for storage of RSA private keys
This should eventually replace the "ssl_keys" UAT which additionally
contains a useless address, port and protocol field. This prepares for
HSM support through PKCS #11.

Change-Id: I59409c98aeedf260d19266d18e14ef7d9b40b582
Reviewed-on: https://code.wireshark.org/review/30977
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 05:28:02 +00:00
Pascal Quantin 144d481c20 GSM A: detect buffer overrun when decoding MS Classmark 3 IE
Change-Id: I12d372afd8a50b9a04f92c53077e79116db6c255
Reviewed-on: https://code.wireshark.org/review/31024
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-12 21:47:44 +00:00
Sergey Rak 9711abc9f5 HPAV: Expanding support for HPGP
Added support for different OUI: ST/IoTecha and Qualcomm-Atheros

Signed-off-by: Sergey Rak <sergrak@iotecha.com>
Bug: 15348
Change-Id: If71479339b95b5c26e84ffceb2f00307b3de680c
Reviewed-on: https://code.wireshark.org/review/30969
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>
2018-12-12 14:05:05 +00:00
Taisuke Sasaki 094beb1755 ISIS: add dissection of Node/Link MSD (rfc8491)
Revert a wording Sub-TLV back to SubCLV according to review 30985.

Change-Id: I1f7a2a586d45fe8548c1589baa2803616cf5bd20
Reviewed-on: https://code.wireshark.org/review/31008
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-11 21:59:24 +00:00
Graham Bloice 47d5a92364 DNP3: Fix events with relative time
The calculation for relative times incorrectly converted ms to ns.

Change-Id: I4357d89e45b3f31a5c222e4b8f82edc720766a6e
Reviewed-on: https://code.wireshark.org/review/31009
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-12-11 20:37:53 +00:00
Uli Heilmeier 0a49561e96 BGP: Decode MCAST-VPN safi for IPv6
Bug: 15351
Change-Id: Iaac74d6e1e78a4dde2a2f807b909177c733fd05f
Reviewed-on: https://code.wireshark.org/review/31007
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>
2018-12-11 16:29:09 +00:00
Sergey Rak 3ca382911d HPAV: fix whitespaces in dissector
Changed modelines: c-basic-offset: 4 to keep consistency between files
Also added style for emacs as it is the most common for this file

Signed-off-by: Sergey Rak <sergrak@iotecha.com>

Change-Id: I62b6e16d614ebe2bacce330e3aaa12796d6b248b
Reviewed-on: https://code.wireshark.org/review/30988
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-11 11:39:10 +00:00
Anders Broman 9035a131e5 ASNI MAP: AnalogRedirectRecord is OPTIONAL in QualificationRequest
Bug: 15350
Change-Id: Ibe7f085daa2981168b3c5201256d674feb4cb7e5
Reviewed-on: https://code.wireshark.org/review/31004
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-11 09:49:40 +00:00
Dylan Ulis 11c4b31fc9 CIP: Show more unparsed data
Extra data could be an indicator of a problem, or it could be that we
haven't added support in Wireshark for it yet. Either way, it's helpful
to show it, instead of hiding it.

Changes:
1. Show unparsed data in the CIP CM dissector
2. Clean up some offsets

Change-Id: Ieebe208aab1f293f97a8774a6a4de5d5dbd3df67
Reviewed-on: https://code.wireshark.org/review/31003
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-11 04:42:47 +00:00
Dylan Ulis 3757db3148 ENIP: Add more error checking
1. Added a check that the Common Packet Format Item Length < remaining
  data for that layer.
2. Added a check that there should always be at least 4 bytes available
  for each Common Packet Format item (Type ID + Length)

Change-Id: Ie6f2b7904d52d8699c06cfef6844cf0032293d97
Reviewed-on: https://code.wireshark.org/review/31002
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-11 04:41:13 +00:00
Dylan Ulis 14dc9a390a CIP Safety: Minor additions
1. Add 2x new Safety Supervisor services
2. Add more enum types for Device Status
3. Match field names to current spec
4. Add some BASE_UNIT_STRING units

Change-Id: I8fedb7cea55fb44eccf641ca60ab849847db2620
Reviewed-on: https://code.wireshark.org/review/31001
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-11 04:40:14 +00:00
Bruno Verstuyft cb8c791f07 DOCSIS: Added some additional tlvs
TLV 26.13 PHS Dynamic Bonding Change Action
TLV 48.4.2 Receive Module Adjacent Channels
TLV 64.3 Static Multicast CMIM Encoding

Change-Id: I3a48e0092e7fe523adfdff5b155dcdbb88720f41
Reviewed-on: https://code.wireshark.org/review/30997
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-12-10 23:35:03 +00:00
Pau Espin 3f09bf685f packet-rsl: Add Establishment Cause from Channel Request to proto tree
Change-Id: I41709466bdb8427b759d236406505081d7d6f283
Reviewed-on: https://code.wireshark.org/review/30996
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-10 19:01:46 +00:00
Jim Walker 781e371a7d couchbase: Add durable DCP commands
Adding DCP prepare, seqno-ack, commit and abort

Change-Id: Ife7726c91962ab7fc41bc981ee98418474d33385
Reviewed-on: https://code.wireshark.org/review/30989
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-10 14:45:56 +00:00
Dylan Ulis 39ac1a6694 CIP: Add Connection Index
Add cip.connection. This works just like tcp.stream, but for CIP
connections. This is added to CIP connected messages and the Forward
Open/Close messages.

Change-Id: Ib358c00dc0a4fd61065cb22b0e9b574ac43a44a4
Reviewed-on: https://code.wireshark.org/review/30984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-10 14:42:31 +00:00
Taisuke Sasaki ab37ce009a ISIS: add dissection of Node/Link MSD (rfc8491)
Also add Strict SPF in SR-Algorithm Sub-TLV (draft-ietf-isis-segment-routing-extensions-21)

Change-Id: Icc564f093075d2d6edf5b25ac90e41c987ea71e8
Reviewed-on: https://code.wireshark.org/review/30985
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-10 08:50:06 +00:00
Stig Bjørlykke 3cccd4ec5b p_mul: Detect Data PDU sequence number 0
Data PDU sequence number 0 is illegal, add an expert info for this.
Don't include this packet in SEQ/ACK analysis.

Bug: 15337
Change-Id: I476088531e8a3605393ee1dedf1e8b159dac342b
Reviewed-on: https://code.wireshark.org/review/30980
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-10 04:40:15 +00:00
Peter Wu a621fde383 enip: rearrange struct member to avoid -Wmissing-braces warning
Fix false positive warning:

    epan/dissectors/packet-cipsafety.c:1960:37: warning: suggest braces around initialization of subobject [-Wmissing-braces]
       enip_conn_val_t eip_conn_info = {0};

This is a Clang bug: https://bugs.llvm.org/show_bug.cgi?id=39931

Change-Id: I9f3040ae6bd4d5a2fafe21a37ac4b504933eabcf
Reviewed-on: https://code.wireshark.org/review/30979
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dylan Ulis <daulis0@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-09 21:20:56 +00:00
Gerald Combs 86bd968662 [Automatic update for 2018-12-09]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I29aca5c44e8371ffede8b66eebbb366aac7ac4f9
Reviewed-on: https://code.wireshark.org/review/30973
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-09 08:23:06 +00:00
Dylan Ulis 5762fc617a CIP: Improve connected data information
1. For each connected data message, display generated connection
   information including:
    a. Connection Path from the initial connection
    b. API values
    c. Forward Open packet number. (This already existed, but moving it to a
       consistent place in the tree)
2. Display O->T or T->O in the Info column depending on the direction of data.
3. Remove cip.conn_path_class filter. This was originally added to show
   which type of data is in a given packet. But, it's not really needed
   anymore because we have the generated connection path in each connected
   data packet now.
4. Ensure dummy structs used for Decode As menus are zeroed out.
5. memset -> zero initialization

pcaps from the following bug reports are good examples:

Bug: 14939
Bug: 6617
Bug: 14916
Bug: 14958
Change-Id: I63885a5ca41f95e04f855a1e1dcd9ab3684f7eec
Reviewed-on: https://code.wireshark.org/review/30808
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-09 07:19:01 +00:00
John Bankier 98f5470352 packet-nfs.c: Bugfix NFSv4 ACCESS reply
Both NFSv3 and NFSv4 ACCESS reply dissection will be
sensible when the ACCESS request is not available (because the packet
containing the request was either not capture or truncated).

Bug: 15343
Change-Id: I5bf7b9905e85b1c1eb30e2949b9b246b54f9ec68
Reviewed-on: https://code.wireshark.org/review/30965
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-12-09 07:18:27 +00:00
Lee Serin 0b79b9c2db BitTorrent:Add Fast Extension Message(Bep06) analysis
Add message type named 'fast extension' to analyze unprocessed messages

Bug: 15345
Change-Id: I62fce2b753899cb4f2ba833a58388906c9f0d2d3
Reviewed-on: https://code.wireshark.org/review/30954
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-09 07:14:22 +00:00
Martin Kaiser ac4c11f26e cattp: use the version bits in the heristic check
The CAT-TP specification says explicitly that the version bits must be
zero. Fail the heuristic check if they aren't.

I checked ETSI TS 102 127 V15.0.0 from
https://www.etsi.org/deliver/etsi_ts/102100_102199/102127/15.00.00_60/ts_102127v150000p.pdf

Bug: 15342
Change-Id: I05a886ccd5811f367abdb9faead4983d137c12c6
Reviewed-on: https://code.wireshark.org/review/30970
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-12-08 16:35:16 +00:00
Bruno Verstuyft d7bcc52f02 DOCSIS: bugfix: correct dissection of encrypted Mac Specific frame
Change-Id: Id7e300cafe90c965f5eb94f035e872ff6a8231b7
Reviewed-on: https://code.wireshark.org/review/30960
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-07 20:25:17 +00:00
Jim Walker e914a5a377 couchbase: Improve key decoder
Using the recent updates occasional 'trailing' byte warnings
occur if the key encodes a collection-ID, with these changes
we now get much better key decoding, without the warnings
with and without collections.

Change-Id: I9fc1e0d807c8054065a7346a09b0ce99d05f1e63
Reviewed-on: https://code.wireshark.org/review/30956
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-07 20:24:15 +00:00
Anders Broman 27187536e6 RTP: Check that we have p_conv_data before accessing it.
Bug: 15346
Change-Id: Ia6ad53423e674832ebb3ccd7c755dd60fecc2cb1
Reviewed-on: https://code.wireshark.org/review/30962
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-07 15:35:22 +00:00
Bruno Verstuyft 08a2a4d473 DOCSIS: better decoding for unknown tlvs
Previous decoding showed "Unknown TLV: <TLV value>". This was confusing, because people interpreted the value as the type of the unknown TLV.

Change-Id: Ia9259db547fca393c248f78ea7c758969b69548e
Reviewed-on: https://code.wireshark.org/review/30959
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-07 14:55:24 +00:00
Peter Wu f618fcd3af dof: remove unnecessary uat_load calls
UATs are loaded at startup, no need to do it again. Call chain:
epan_load_settings -> read_prefs -> init_prefs -> uat_load_all.

Change-Id: I57caabafb16b0b46fcb6d1621dd6b503154c805c
Reviewed-on: https://code.wireshark.org/review/30958
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-07 14:05:02 +00:00
Anders Broman 1d1915f6e9 GTP: Use correct length for gtp.cgi_ci, gtp.sai_sac and gtp.rai_rac
Change-Id: I405bdac11283b83672433995285988c43766e4ab
Reviewed-on: https://code.wireshark.org/review/30957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-07 14:04:07 +00:00
Gerald Combs 0dfa4e8253 WSMP: Make sure our PSID is initialized.
Fixes a scan-build warning.

Change-Id: I5e6b94240e87684fc41ef1a4daf4272d429f00d4
Reviewed-on: https://code.wireshark.org/review/30952
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>
2018-12-07 04:57:00 +00:00
Bruno Verstuyft 247e729d9e DOCSIS: Added Partial Service Downstream Channels TLV 49.6
Change-Id: Iac09d71a56024440a826ff9ca870c05eeee3a77b
Reviewed-on: https://code.wireshark.org/review/30942
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-12-06 20:47:11 +00:00
Richard Sharpe 9df987d2a4 ieee80211: Fix the handling of A-Control and improve AP Tx Power.
1. Correctly print out the AP Tx Power level.
2. The A-Control UL MU Response field was renamed to the TR Response field.
3. Handle padding correctly in the A-Control field.

Change-Id: I33000aa28b9e00ab97ca30d53907685e302c49c2
Reviewed-on: https://code.wireshark.org/review/30918
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-06 14:55:56 +00:00
Bruno Verstuyft 6a8ca2fed5 DOCSIS: Added Modem Capabilities 54-62 and TLV 49.8
Change-Id: I24815d5ec5dc288066712318e12f75a9cc6a9495
Reviewed-on: https://code.wireshark.org/review/30938
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-06 14:53:37 +00:00
Pau Espin cc4d7ffda0 packet-rsl: Show cause value string of Cause IE
Related: https://osmocom.org/issues/3705
Change-Id: Ib7f985c2107d33b01640f31673c23d7fb4e54627
Reviewed-on: https://code.wireshark.org/review/30934
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-06 11:22:33 +00:00
Pau Espin 488f12f422 packet-rsl: Move rsl_class_vals into its correct spec section
Change-Id: Ia7554ed4d9926159ab3dbcdc6fd64d5bd09efc67
Reviewed-on: https://code.wireshark.org/review/30933
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-06 11:22:19 +00:00
Pau Espin f3c30dc366 packet-rsl: Parse missing Cause IE in ip.access specific messages
Related: https://osmocom.org/issues/3705
Change-Id: I4c05387a952dd07344d373f4abe0f03b456439a5
Reviewed-on: https://code.wireshark.org/review/30932
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-06 11:22:08 +00:00
Pau Espin d89cdf7661 packet-rsl: Fix parsing values of some IE in ip.access specific messages
Those IEs have specific dissect methods that expect offset to point to
the IE type, not to its value. Furthermore, those methods already add a
subtree, so no need to create it for them.

Related: https://osmocom.org/issues/3705
Change-Id: Ia63253b95678b799f59ed945d1381f4eb01be636
Reviewed-on: https://code.wireshark.org/review/30931
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-06 11:21:57 +00:00
Pascal Quantin b455d8fcee HI2Operations: update auto generated file and remove unused template
Change-Id: If31c0fdfac9c450871accba53715dc4d0e6468a6
Reviewed-on: https://code.wireshark.org/review/30939
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-06 10:41:14 +00:00
Anders Broman f948444531 SIP: Try to fix ASAN build crash.
Bug: 15328
Change-Id: Iefc057c74f234592adca1f7816a3e9fac99b48be
Reviewed-on: https://code.wireshark.org/review/30937
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-06 09:52:34 +00:00
Gerald Combs 5adda736f7 OER: Always initialize a variable.
Always initialize our length in dissect_oer_length_determinant. Its
callers assume that this happens and doing so should fix some scan-build
warnings.

Change-Id: I67abc19417e6437b9302b880164140fb8a773204
Reviewed-on: https://code.wireshark.org/review/30935
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>
2018-12-06 05:39:45 +00:00
Pau Espin 56b255dcbd packet-rsl: Use defines for ip.access value_string
Change-Id: I447a30068e5a4b9a510abec75498691e17cbaa32
Reviewed-on: https://code.wireshark.org/review/30927
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-05 21:16:37 +00:00
Gerald Combs 8c22c5bade Fix some spelling errors found by Lintian.
Change-Id: If6fc3aab7ad4fc634567121f7b9541bc6f6c5766
Reviewed-on: https://code.wireshark.org/review/30926
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>
2018-12-05 18:58:19 +00:00
Anders Broman 54847d43a6 HI2Operations: Remove the not needed .h file.
Change-Id: Iabb24aae94814d4a10fdfa998f870b5e2cd3a8d8
Reviewed-on: https://code.wireshark.org/review/30921
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-05 15:57:20 +00:00
Anders Broman ff0193f07f SIP: Use differtent hf variables for the "real" and generated Call-id
It's not allways good to pick up frames for related call legs when
filtering.
Make different hf:s for the two use cases.

Change-Id: I33c640636a76173f3a7952f4a740491ccfac276d
Reviewed-on: https://code.wireshark.org/review/30922
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-05 15:15:56 +00:00
Anders Broman bd8cfad8b8 Add dissection of HI3CCLinkData
Change-Id: I002c31972c4bcc231527eeaa2c6b21c3b1a9636a
Reviewed-on: https://code.wireshark.org/review/30920
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-05 13:38:55 +00:00
Anders Broman 3b1c0f5e2e Hart-ip: Add simple heuristic.
To stop accepting SIP messages on the
hart-ip port.

Change-Id: Ifc653f4a3defb823336914e8be6f20453aedb6fe
Reviewed-on: https://code.wireshark.org/review/30914
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-05 04:04:28 +00:00
Pascal Quantin 011ca1ed9b KRB5: update auto generated file
Change-Id: Ie78cc2609cd117622eb0e0e900d6e4e1a29efd2b
Reviewed-on: https://code.wireshark.org/review/30915
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-04 17:45:49 +00:00
Bruno Verstuyft cadc404400 DOCSIS: Added QAM modulation support tlvs
Change-Id: I18dc306b23a042e137c703cc8b14c45c66de10d2
Reviewed-on: https://code.wireshark.org/review/30912
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-04 14:46:31 +00:00
Isaac Boukris c43e310d79 krb5: fix asn1 error when dissecting PA-FX-FAST in TGS request
Change-Id: If42e54b05def7a09e37f7c0283103bb6db8126db
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reviewed-on: https://code.wireshark.org/review/30910
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-04 10:42:12 +00:00
Isaac Boukris 453e72299c krb5: do not dissect PA-S4U-X509-USER inside encrypted-pa-data
According to MS-SFU 2.2.2 PA_S4U_X509_USER checksum section;
PA-S4U-X509-USER may be returned inside encrypted-pa-data, but
it contains just the checksum data so do not try to dissect it.

Quote:
The padata of type 130 in the encrypted-pa-data field contains
the checksum value in the S4U request concatenated with the
checksum value in the S4U reply.

Change-Id: Ia124f56914ef2fefd5b0a64fccd176911321f246
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reviewed-on: https://code.wireshark.org/review/30908
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-04 07:49:26 +00:00
Jim Walker 9cba325fc8 couchbase: Update for recent collection changes
Add support for decoding a collection-ID from the
key-bytes.

Update DCP as collection_len is no longer in the
protocol and the system events have changed.

Change-Id: Ib910083d929a906729e2bba2b0f07ba23e093cf5
Reviewed-on: https://code.wireshark.org/review/30895
Reviewed-by: Dave Rigby <daver@couchbase.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-04 07:48:01 +00:00
ismaelrti 5cf08cd574 RTPS: Added dissection of Support Type Object LB
Added dissection of Support Type Object LB type.

Change-Id: I7e654faed4874a87865f1d94a372eb8f00dde412
Reviewed-on: https://code.wireshark.org/review/30903
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-04 06:06:03 +00:00
Jim Walker 13e3063848 couchbase: Update FlexFrame dissector to include requests
Update the couchbase packet dissector with some re-factoring of the
FlexFrame dissector and then extra functionality for:

* FlexFrame on requests (magic 0x08)
* Durability
* Out-Of-Order requests
* DCP Stream ID

Additional checks are added to warn/error for invalid frame lengths and
for the case where the FlexFrame byte0 is 0xff, which is not defined by
the protocol.

Change-Id: I5f1fec8293284dadbdef717d02fa1eef27da7a0c
Reviewed-on: https://code.wireshark.org/review/30894
Reviewed-by: Dave Rigby <daver@couchbase.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-04 06:05:03 +00:00
Thomas Wiens e60cb857de s7comm: fix using wrong offset variable
Change-Id: I9cfd8394e6cbb3f627f7f312fa19fc5baa62f6fc
Reviewed-on: https://code.wireshark.org/review/30905
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>
2018-12-03 22:18:03 +00:00
ismaelrti d8c1c22837 RTPS: Acknack analysis hidden when dissecting GAP field.
GAP field dissection shows an acknack analysis. This analysis doesn't
make any sense in the GAP field.

Change-Id: I9c4cca2b722390112b6a350bd2310b48874e5c9d
Reviewed-on: https://code.wireshark.org/review/30897
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-03 17:02:26 +00:00
Jaap Keuter 1bd99df353 CDMA2000: Improper offset handling
Somewhere in the code the handling of the offset goes wrong.
Instead of incrementing the offset it's the pointer to the offset
which is being incremented, leading to all sorts of problems.
Add a dereference to these few statements which lack them.

Bug: 15322
Change-Id: If575711a5b120f25f0172e0efb26e01f07244e8b
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30899
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-03 17:02:05 +00:00
Anders Broman 228da02fda RTP: Restructure call id handling.
Change-Id: Id5471ad6e7051a7e00fd82d25d58912ef8ad886e
Reviewed-on: https://code.wireshark.org/review/30898
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-03 17:01:03 +00:00
Anders Broman 8bd0616621 SDP: Show callid from all call legs with the same RTP cpnversation.
Change-Id: If17732c2bd0b23e7f62b7464b9f154c317019f16
Reviewed-on: https://code.wireshark.org/review/30893
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-03 07:37:29 +00:00
Martin Kaiser 850af6011a nl80211: dissect the mac attribute as address
use an hf variable of type FT_ADDR

Change-Id: Ice88965825d05ee10825b1a7dc91475ffaa75cb2
Reviewed-on: https://code.wireshark.org/review/30890
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-02 22:58:06 +00:00
Pascal Quantin 67720f7fc3 RTP: ensure that _rtp_conversation_info strcuture is fully initialized
Bug: 15318
Change-Id: Ie430ae8704a3dc842dbdb974982568a4fb2f978d
Reviewed-on: https://code.wireshark.org/review/30889
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-02 19:13:44 +00:00
Christophe GUERBER bf88197d94 Fixes IMF dissector
When no content is provided, creating the tree with empty content leads
to malformed IMF.

Ping-Bug: 15090
Change-Id: Idf521c26f69638a94300792e50dba29645a45a68
Reviewed-on: https://code.wireshark.org/review/30874
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-02 15:57:22 +00:00
Isaac Boukris a1cee1d2ad krb5: dissect PA-S4U-X509-USER padata
The asn1 is based on [MS-SFU] 2.2.2 PA_S4U_X509_USER

Change-Id: Ic072b7c4eca5c924da8833f85529098f6a93f436
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reviewed-on: https://code.wireshark.org/review/30871
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-02 13:17:33 +00:00
Kenneth Soerensen 82ebab607e ZigBee: Correct unsolicited nwk update notify
- Correct cluster ID
- Parse ZDP Status
- Move from client to server
- Classify as notify instead of request

Change-Id: Idb3d26d3212af2762465d7ec02efcb8978830af3
Reviewed-on: https://code.wireshark.org/review/30859
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-02 02:49:50 +00:00
Kenneth Soerensen 5267fc7777 ZigBee: Classify mgmt_nwkupdate as notify instead of request
Change-Id: Ic559133086f4529f8dcc7b99cce6dbb97c11e197
Reviewed-on: https://code.wireshark.org/review/30860
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-02 02:48:12 +00:00