Commit Graph

37221 Commits

Author SHA1 Message Date
Harald Welte ea5c8435e4 GSUP: Add Supplementary Service relate ddecoding
There are some new information elements and message types in the GSUP
protocol which are used for transport of non-call-SS and USSD between
MSC/VLR and HLR.

Change-Id: Idd3bb7ed8d4ba3f958cffcb29c6042c047646f70
Reviewed-on: https://code.wireshark.org/review/28301
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>
2018-06-17 05:19:09 +00:00
Dario Lombardo 9055584dce rbm: improve fields layout and decode more types.
Change-Id: Ib16118e9c0ce5b612ae1dcb6c678224a79889a93
Reviewed-on: https://code.wireshark.org/review/28287
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-16 20:34:04 +00:00
Vadim Yanitskiy 580b2e13f1 GSUP: fix incorrect message types
In the reference libosmocore's implementation we have:

  OSMO_GSUP_MSGT_PURGE_MS_REQUEST	= 0b00001100, // 0x0c
  OSMO_GSUP_MSGT_PURGE_MS_ERROR		= 0b00001101, // 0x0d
  OSMO_GSUP_MSGT_PURGE_MS_RESULT	= 0b00001110, // 0x0e

while here we had:

  OSMO_GSUP_MSGT_PURGE_MS_REQUEST	= 0x0c,
  OSMO_GSUP_MSGT_PURGE_MS_ERROR		= 0x0e, // != 0x0d
  OSMO_GSUP_MSGT_PURGE_MS_RESULT	= 0x0f, // != 0x0e

Same problem with the 'OSMO_GSUP_MSGT_LOCATION_CANCEL_RESULT'.

Change-Id: Ie49fd2fca8298d97c21e03649935704309015324
Reviewed-on: https://code.wireshark.org/review/28297
Reviewed-by: Harald Welte <laforge@gnumonks.org>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-16 11:07:10 +00:00
J. Bruce Fields 1a8ed6fa28 Fix NFSv4.2 CHANGE_TYPE constants
See https://tools.ietf.org/html/rfc7862#section-12.2.3

As far as I can tell these were zero-based even in the earliest protocol
drafts, so this was just a mistake in the original wireshark submission
that nobody caught because change_attr_type hasn't been widely
implemented.

While we're here, move the defines before the array for better
readability.

Change-Id: Ie721250748fe77098aee4e2cc502ae43fc497a2d
Reviewed-on: https://code.wireshark.org/review/28271
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-06-16 10:21:27 +00:00
Guy Harris 2d4b50fc3d Put the entire server response into the Info column as is.
Don't assume that the 3-digit code we got was followed by a blank, and
display the code followed by a blank followed by the parameters..
Instead, just put the raw text of the entire line into the Info column.

Bug: 14878
Change-Id: I1e081366bf859723158a36f10e86614fe52f124d
Reviewed-on: https://code.wireshark.org/review/28292
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-15 22:04:27 +00:00
Alexis La Goutte 3d5b268323 dot11decrypt(crypt): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I33c6e456bc8c4bae47f4df1457799cb0d09b520f
Reviewed-on: https://code.wireshark.org/review/28289
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-15 15:19:33 +00:00
Alexis La Goutte 8c959c80e9 bthfp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I0d14e7a893d24b75955819286900ae007183168a
Reviewed-on: https://code.wireshark.org/review/28288
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-15 15:06:29 +00:00
AndersBroman 8b87a865d5 NAS 5GS: Add dissection of Security header.
Change-Id: I970ce077a44941e5835e8d0f6c1d9c74fb89053a
Reviewed-on: https://code.wireshark.org/review/28269
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:19:19 +00:00
Pascal Quantin 25d3c6270a MAC NR: fix dissection of single byte padding CE
Change-Id: Icff0ffb4600bd778946ca879995edf710cc38e48
Reviewed-on: https://code.wireshark.org/review/28284
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-15 09:43:43 +00:00
Joakim Karlsson 5ea2fe3844 pfcp: add handle of IEs with null length
Acccording to 3GPP TS 29.244
ch5.6.3   Modifying the Rules of an Existing PFCP Session
- updating the Rule including the IEs to be removed with a null length,
  e.g. by including the Update URR IE in the PFCP Session Modification Request
  with the IE(s) to be removed with a null length.

Change-Id: Ib8928edc24e72c25f6d608bee874c1d8603c8620
Reviewed-on: https://code.wireshark.org/review/28264
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 05:10:58 +00:00
Guy Harris 7f3d7199fb Convert NetMon comment titles to UTF-8 when reading the file.
Fix indentation, and note that the comment "description" (contents) are
RTF (as opposed to plain text).

Change-Id: I668a08c06e39a32318454d2ee73933083c5cb516
Reviewed-on: https://code.wireshark.org/review/28279
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-15 01:22:12 +00:00
Dario Lombardo 5b3ce0bf9e nas_5gs: fix ifdefs in nas_5gs_mm_message_type_vals.
The command tshark -G values gave the error:

** (process:26713): WARNING **: Extended value string 'nas_5gs_mm_message_type_vals' forced to fall back to linear search:

that caused regression tests to fail.

Fixes: v2.9.0rc0-947-g587b5a7.
Change-Id: I6c8b8c7e93838f407a363390ba2385603dc62338
Reviewed-on: https://code.wireshark.org/review/28270
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-14 17:30:48 +00:00
AndersBroman 587b5a756e NAS 5GS: Further updates according to 2.0.0
Change-Id: I427cda8b371e66ba00980509aa42bb12cd1c2d82
Reviewed-on: https://code.wireshark.org/review/28266
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-14 11:03:18 +00:00
AndersBroman 78ae936d6b ISUP: Add an expert entry for wrong optional parameter length.
Change-Id: I5be7854a7f135265f3994fe9fd62c016a7e9b480
Reviewed-on: https://code.wireshark.org/review/28267
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-14 10:21:36 +00:00
Vasil Velichkov 1bbbbdcf46 [GSM A RR]: Fix Feature Indicator (10.5.2.76)
In 3GPP TS 44.018 version 14.4.0 Release 14 both Immediate assigment
extended (9.1.19) and Immediate assignment reject (9.1.20) have Feature
Indicator (10.5.2.76) half octet right after the Page Mode (10.5.2.26)

The Feature Indicator is part of GSM_A_PDU_TYPE_RR and not
GSM_A_PDU_TYPE_COMMON so previously it was not decoded correctly in the
Immediate assigment extended

Change-Id: I117d1ee42d43d01d77da67eea506c28ca0ae3056
Reviewed-on: https://code.wireshark.org/review/28263
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-13 15:44:23 +00:00
Matej Tkac ee4d8c66d5 pfcp: corrected Graceful Release Period tree Header for better readability
For the 'Infinite value', tree header is now
    "Graceful Release Period: Infinite (<val>)"
    instead of
    "Graceful Release Period: <val> Infinite"

Change-Id: I130e997ffbb3503078e1364fd64c11ead28111b1
Reviewed-on: https://code.wireshark.org/review/28262
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-13 15:44:08 +00:00
Pascal Quantin e281ca6f83 HTTP2: prevent a segmentation fault if HTTP2 dissector was not called on first pass
With HTTP2 heuristics to identify the conversation, a packet can be
skipped on first pass and then decoded as HTTP2 on subsequent ones.
Check that header data is available before attempting header
decompression.

Bug: 14869
Change-Id: I8ef7669ca33835b509acb38d797e33d6167a1bd1
Reviewed-on: https://code.wireshark.org/review/28257
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-13 12:32:44 +00:00
Dylan Ulis 94bf85ad26 ENIP: Pull out CPF items to separate functions
dissect_cpf was huge and too hard to read and update.
This change pulls out item parsing into individual functions to make
it easier to read, help troubleshoot a bug related to ENIP TLS
connection filtering (Still investigating), and prep for future features.

There are no functional changes.

Main changes:
1. Pulled out the following code into separate functions:
    dissect_item_list_identity
    dissect_item_cip_security_information
    dissect_item_list_services_response
    dissect_item_sockaddr_info
    dissect_item_sequenced_address
    dissect_item_connected_address
    dissect_item_unconnected_message_over_udp
    dissect_generic_io
    dissect_cip_class01_io
2. More documentation. It was a little hard to follow before.
3. Corrected offset inside the while loop in dissect_cpf(). Previously,
offset pointed to 2 bytes *before* the item actually being processed.

Change-Id: I47894fd5c50b4c3d07f916f81e1b21f8890c8396
Reviewed-on: https://code.wireshark.org/review/28205
Reviewed-by: Dylan Ulis <daulis0@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-13 04:11:03 +00:00
Bruno Verstuyft 4059b56d3d DOCSIS: correct reassembly of UCD in REG-RSP-MP and DBC-REQ messages
Change-Id: I7c84b6cce113b71aea0c17741024916f9b17bdf9
Reviewed-on: https://code.wireshark.org/review/28202
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-13 04:10:14 +00:00
Michał Łabędzki 40f655392f Bluetooth: HFP: Implement some Apple-specific AT commands
AT-commands:
+XAPL
+IPHONEACCEV
+APLSIRI
+APLEFM

Add UUID128:
Apple Notification Center Service

Based on: https://developer.apple.com/hardwaredrivers/BluetoothDesignGuidelines.pdf

While adding new UUID remove also tabs from packet-bluetooth.

Change-Id: Ic29b028338a21464fe018f8145ade82297ccd146
Reviewed-on: https://code.wireshark.org/review/28222
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-06-13 04:09:02 +00:00
Guy Harris 69ad89caa9 Make sure *both* sides are unsigned.
Change-Id: Id25ea93aee888eda665f52da4c00d75970ee69e8
Reviewed-on: https://code.wireshark.org/review/28253
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-12 23:05:01 +00:00
Guy Harris 0cc092d4b1 Try again to fix the signed vs. unsigned comparison warning.
Change-Id: I97dae4b6325fe5fe952c579e1d1ab3f0b37f461a
Reviewed-on: https://code.wireshark.org/review/28249
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-12 22:38:59 +00:00
Guy Harris 96c4655ae0 Fix signed vs. unsigned comparison warning.
(In retrospect, signed offsets probably were the wrong choice; we
rarely, if ever, use them to signify offsets from the end of the packet.
Let's not do so any more in the future.)

Change-Id: I7ace539be8bf927e21148c34b71e9c2b7535581e
Reviewed-on: https://code.wireshark.org/review/28245
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-12 22:14:19 +00:00
Guy Harris 871e964627 Add some length checks, remove a DISSECTOR_ASSERT().
Do more checks to make sure we don't run past the end of the data we're
handed, and don't do a DISSECTOR_ASSERT(), as there may well be packets
that don't have enough data to pass the assertion - that was causing
some errors to show up in the 2.6 buildbot when doing 802.11 decryption
tests.  Those errors should instead be reported as "sorry, we can't do
decryption" errors by the decryption code.

(XXX - the 802.11 *dissector* should probably be extracting the relevant
fields and doing the relevant checks, and hand the data to the
decryption code, so that we don't duplicate 802.11 frame parsing with
code that might not do as much necessary work as the 802.11 dissector.)

Tweak some comments while we're at it.

Change-Id: I1d230e07cec2fca8c23f265b5875a0bf83f79432
Reviewed-on: https://code.wireshark.org/review/28240
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-12 21:31:35 +00:00
Pascal Quantin 169ff5a7f5 BT Common: fix btcommon.eir_ad.entry.le_role filter
Bug: 14868
Change-Id: Ia52764c45d509a27545e266328702b79db3985b7
Reviewed-on: https://code.wireshark.org/review/28226
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-12 18:39:01 +00:00
Guy Harris a03eacc7aa Clean up handling of counted blobs of bytes.
Don't treat the count+blob as itself a blob of bytes; use FT_NONE.
Create it with an unknown length (-1, meaning "to end of packet, for
now"), and set its length once we've finished dissecting it.  Dissect
the raw bytes of a prefixed-bytes item regardless of whether we're
building a protocol tree or not.

This means we do a better job of handling a too-large length; instead of
overflowing the offset, we throw an exception and stop dissecting, so we
don't run the risk of looping infinitely.

Bug: 14841
Change-Id: I593be9b6ba9aa15d8529f96458e53b85ace6402a
Reviewed-on: https://code.wireshark.org/review/28228
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-12 17:49:59 +00:00
Stig Bjørlykke 362576e107 gtpv2: Avoid possible misuse of comma operator warning
Change-Id: I514c86fafca0478713d73d7050fdf09fcf847b52
Reviewed-on: https://code.wireshark.org/review/28227
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-06-12 17:48:20 +00:00
Matej Tkac ac17c3fe14 GTPv2: updated Presence Reporting Area IEs
According to TS 29.212 v14.7.0
    8.108 Presence Reporting Area Action
    8.109 Presence Reporting Area Information

Change-Id: I4b73fb4cd47468aa4cf90ef9a7bee3e17f9b9485
Reviewed-on: https://code.wireshark.org/review/28219
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-12 16:40:11 +00:00
AndersBroman 16b04f59ed NAS-5GS: Update towards spec 2.0.0
Change-Id: I31b1dda0f06bf1b719dc949dfd1a44c151f452b9
Reviewed-on: https://code.wireshark.org/review/28217
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-12 14:51:33 +00:00
Robert Sauter 6825f47bd1 wisun: fix name of Netricity Frame Type IE
Change-Id: I8cafb3b6475991b223146dbe6fc59bfb915b1bf2
Reviewed-on: https://code.wireshark.org/review/28220
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-12 14:30:15 +00:00
Alexis La Goutte 9b03b6fc8e ber: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I9cab3c6e6308b8603dede34ccf907dd326c23957
Reviewed-on: https://code.wireshark.org/review/28211
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-12 14:21:11 +00:00
Pascal Quantin 1568ea952b BT Common: use bluetooth_address_type_vals with btcommon.eir_ad.entry.le_bd_addr.type
Bug: 14866
Change-Id: I087469dabe0cebc2a94e70953a7ec00c48d72862
Reviewed-on: https://code.wireshark.org/review/28218
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-06-12 13:06:03 +00:00
Alexis La Goutte 4f383c2b8c zbee nwk gp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I831047c30a55813b149bc331a63701568319c4b5
Reviewed-on: https://code.wireshark.org/review/28213
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: <atsju2@yahoo.fr>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-12 09:59:57 +00:00
Alexis La Goutte 7b6f351a05 inap: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I3f1edac3f9ff7ec26244dd119353beaa4854db51
Reviewed-on: https://code.wireshark.org/review/28215
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-12 08:17:46 +00:00
Alexis La Goutte bfba71c3b0 http: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: If24054d91a07724e687913c4f92861219bbb7dc6
Reviewed-on: https://code.wireshark.org/review/28212
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-06-12 06:50:12 +00:00
Adam Goldman 2047d68872 opa-fe: Add Support for Reassembly of FE TCP Packets
Used tcp_dissect_pdus API to reassemble FE TCP packets.

Change-Id: I82bb270bacbd3f5790c015c5a876981417e271fa
Signed-off-by: Adam Goldman <adam.goldman@intel.com>
Reviewed-on: https://code.wireshark.org/review/28203
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-11 20:24:54 +00:00
João Valverde 722d6b06f6 Rewrite make-{dissectors,taps} in Python
Having these build tools in machine code poses problems when cross-compiling.
The most significant being that we need to find the host and build GLiB
dependencies at compile-time.

There is no noticeable speed difference between the Python and C implementation.

Ping-Bug: 14622
Change-Id: Id13f823c7f4abf51edfa291e703028873748989f
Reviewed-on: https://code.wireshark.org/review/28130
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-11 17:01:05 +00:00
Martin Mathieson 3b5b7b4da9 dct2000: call LTE NAS dissector for r13 release
Change-Id: I35208b9bea8613468da53ae1541d0c5083cd27c0
Reviewed-on: https://code.wireshark.org/review/28201
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-06-11 13:02:12 +00:00
Guy Harris 0fbb5f84d0 Do bounds checking of the offset and length in proto_tree_add_string().
Throw an exception if they don't correspond to data available in the
packet - and do so even if the protocol tree argument is null, so that
we catch very long strings that could cause the offset to overflow.

Ask why we try to handle a null pointer passed as the string argument,
while we're at it.

Bug: 14738
Change-Id: I2fa79ad0dcd1f41608844a573e045197ac60aa62
Reviewed-on: https://code.wireshark.org/review/28179
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-10 01:12:31 +00:00
Guy Harris 33eb5e73dd Use FT_NONE, not FT_STRINGZ, for the field that covers the packet.
They're collections of binary data divided into subfields, not
null-terminated strings, so give them the right type.

Change-Id: If2685b9b41ca6711e12de6688ae51d5211767770
Reviewed-on: https://code.wireshark.org/review/28175
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-09 22:51:08 +00:00
Darien Spencer e12e6b79f9 RRC: Simplify private data creation
Change-Id: I4ecb82ab553631c47ffc1acf3a2cb84be913331b
Reviewed-on: https://code.wireshark.org/review/28173
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 21:43:46 +00:00
Darien Spencer 4ffca502cc NBAP: Simplify private data creation
Change-Id: Ief23e5675f74564a3b303b5a13b4fcbd9e814c90
Reviewed-on: https://code.wireshark.org/review/28172
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 21:43:32 +00:00
Darien Spencer 8f3ff1d24d RANAP: Simplify private data creation
Change-Id: Id6dd45789b7418143dc1046dc465a0e60ee87c91
Reviewed-on: https://code.wireshark.org/review/28171
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 21:43:15 +00:00
Vasil Velichkov d279713cf8 inap: Add Digits dissection
The following parameters are all defined as Digits
    calledAddressValue
    callingAddressValue
    assistingSSPIPRoutingAddress
    additionalCallingPartyNumber
    correlationID
    number
    dialledNumber
    callingLineID
    iNServiceControlCode
    iNServiceControlCodeLow
    iNServiceControlCodeHigh
    lineID
    prefix
    iPAddressValue
    digitsResponse
Add sub-tree for each parameter

Change-Id: I4e5a9b75ef357534d4ea669703f9b370c8595c67
Reviewed-on: https://code.wireshark.org/review/28166
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 19:30:48 +00:00
Darien Spencer bc2e185278 fp: Use add_item_ret for cfn control
Change-Id: I990021734186e80f49e5b0b0b21362b894ed7969
Reviewed-on: https://code.wireshark.org/review/28165
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 19:27:23 +00:00
Guy Harris 8c73874ef0 Fix handling of text headers with non-text values.
Determine the length of non-text values in the standard fashion for WSP,
and treat the value as having that length, rather than running to the
end of the packet.

Change-Id: If3501cf726df4d8338e86515906f67790a773b02
Reviewed-on: https://code.wireshark.org/review/28167
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-09 17:52:10 +00:00
Joerg Mayer e528602a64 A bit of fine tuning the stcsig dissector.
Change-Id: I388c4fa17e898284a3a1f7b97631e8d266fdf677
Reviewed-on: https://code.wireshark.org/review/28089
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-06-09 15:31:31 +00:00
Vasil Velichkov c8f070473a camel: Add Digits dissection
The following parameters are all defined as Digits
  calledAddressValue
  callingAddressValue
  assistingSSPIPRoutingAddress
  additionalCallingPartyNumber
  correlationID
  dTMFDigitsCompleted
  dTMFDigitsTimeOut
  number
  digitsResponse
Add sub-tree for each parameter
Reuse the AdditionalCallingPartyNumber implementation
Export dissect_isup_generic_digits_parameter from the isup dissector

Change-Id: Icdcbbab6969cf75c7c2cc0f98549fed41ff6891f
Reviewed-on: https://code.wireshark.org/review/28158
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 05:51:28 +00:00
Guy Harris 89540b9cba Make the string representation of the frame bitmap cover the frame bitmap.
Make it begin where the frame bitmap begins, and end where the frame
bitmap ends, rather than pretending it begins where the frame bitmap
*ends* and is as many bytes long as the generated string is.

Change-Id: Id62ba067116e3191646af764d3ae846474ac29c8
Reviewed-on: https://code.wireshark.org/review/28160
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-08 23:16:33 +00:00
Guy Harris 09a7e8e863 The string part of a NULL string is zero bytes long, not 4 bytes long.
There aren't 4 bytes of 'N', 'U', 'L', and 'L' in the packet, so the
length is *not* 4 bytes.

Change-Id: I81331ef3f307dc65458da37e7d46e299eb7e727a
Reviewed-on: https://code.wireshark.org/review/28149
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-08 21:05:49 +00:00
Pascal Quantin 3cfd2bf0b3 NGAP: fix compilation with gcc 8.1.1
Clean some unused variables while we are at it.

Change-Id: I3b88a99610637a269d059962574cf4cfe2c2ae6f
Reviewed-on: https://code.wireshark.org/review/28123
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-08 16:51:48 +00:00
Pascal Quantin ee88dc8196 BT Common: fix dissection of 32 bits and 128 bits UUID
They are in little endian, not big endian.

Bug: 14843
Change-Id: I1680e84bfce9a03eaeeda9e38c84b471fda2bd8e
Reviewed-on: https://code.wireshark.org/review/28116
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-08 16:38:22 +00:00
Paul Zander 650e379154 Show the names of the profile, device and cluster in the simple descriptor response.
Change-Id: I229909244011c99b37c6ad7fd96d0de17f95f9b5
Reviewed-on: https://code.wireshark.org/review/28118
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 15:37:34 +00:00
Ismael Mendez Matamoros d56e596fb9 rtps: Added data tags
Change-Id: If75d2457e07afd245a92b05b7884fc622def0213
Reviewed-on: https://code.wireshark.org/review/28114
Reviewed-by: Juan Jose Martin Carrascosa <juanjo@rti.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 14:23:47 +00:00
Lorand Jakab bd2c4deb72 LISP: Decode AFNUM_802 as AFNUM_EUI48
Some LISP implementations use the AFI value 6 (RFC 1700) for MAC
addresses instead of AFI value 16389 (RFC 7042). This patch allows
correct decoding of both.

Change-Id: I12c3d6b90fd8a85911f76dec5448e6a2e237e797
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/28115
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 13:28:29 +00:00
AndersBroman 20971b17e1 NGAP: New dissector for 3GPP TS 38.413
Change-Id: I87019b6f7b8f617128e7636c63bb3f2a49694ee8
Reviewed-on: https://code.wireshark.org/review/28086
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 12:54:17 +00:00
Dario Lombardo 7ae1c683f3 s101: add initializer.
../epan/dissectors/packet-s101.c: In function ‘dissect_S101’:
../epan/dissectors/packet-s101.c:279:53: error: ‘app_bytes_len’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
          ((*flags & 0xF) || (S101_DTD_GLOW != *dtd) || (APP_BYTES_LEN != app_bytes_len)))) {
                                                     ^
../epan/dissectors/packet-s101.c:241:12: note: ‘app_bytes_len’ was declared here
     guint8 app_bytes_len;
            ^
cc1: all warnings being treated as errors

Change-Id: Ibc7ab9206aeda2afe895a1813e7d4cb196b41817
Reviewed-on: https://code.wireshark.org/review/28105
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-08 07:08:26 +00:00
Gilles Dufour 1c7b101b35 New protocol support for Lawo EmberPlus which is Glow embedded in S101
Bug: 14718
Change-Id: I7ad6503634eb6bc98cee20ef069db3156a6a1e1e
Reviewed-on: https://code.wireshark.org/review/27247
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-08 06:30:56 +00:00
Guy Harris e020ccab49 Fix again.
Change-Id: I054df4458c7ef9f6e108c9d9a5f29e2546c28041
Reviewed-on: https://code.wireshark.org/review/28101
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-08 05:05:06 +00:00
Guy Harris 36c79feda8 Fix indentation.
Change-Id: Ib89cc2b7f416422868fb6f7c2f8f7bc1f9b347bf
Reviewed-on: https://code.wireshark.org/review/28097
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-08 05:02:58 +00:00
Guy Harris 0a9e92d585 Use proto_tree_add_expert{_format}() to report errors.
Don't create fake string items.

Have the item cover the part of the packet that has the issue, e.g. if
there's an unexpected identifier, or an invalid length, cover that
rather than the value; that 1) shows where the problem is and 2) avoids
throwing an exception.

Clean up the error messages and expert info items while we're at it.

Change-Id: If698db98158f7a5532a865be02f1028d92af262f
Reviewed-on: https://code.wireshark.org/review/28093
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-08 05:00:35 +00:00
Nicolas Bertin 0d25e3d11f ua3g: updated freeseating message decoding to support ipv6 address in maincpu0 and maincpu1 parameters.
Change-Id: Ia0731906e7daaabd9e159aa95db76f54345a927a
Reviewed-on: https://code.wireshark.org/review/28058
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 03:52:09 +00:00
Darien Spencer 37119e5da0 FP: Migrating some fields to add_item_ret
Started with header crc,frame type and cfn

Change-Id: I37409f82bbe63c2034cb87939c7722039ec104db
Reviewed-on: https://code.wireshark.org/review/28088
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 03:46:36 +00:00
Dario Lombardo 0ac8960b9f rbm: fix compilation with gcc-8.
Change-Id: If9ce8f6c4c2145f332be9e8a95d720e6fe0c6304
Reviewed-on: https://code.wireshark.org/review/28082
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-07 15:21:36 +00:00
Dario Lombardo 100d8ec970 add dissector for distributed ruby protocol.
Documentation: http://ruby-doc.org/stdlib-2.5.1/libdoc/drb/rdoc/index.html

Depends on If5d3bd2eaf261b4bc7a7df4ac15098503081dd9f.

Bug: 14731
Change-Id: I5ae9ffd3b017db0b8adc483ed093582508a3e225
Reviewed-on: https://code.wireshark.org/review/27765
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 08:20:48 +00:00
Dario Lombardo 500102c265 add file dissector for ruby marshal objects.
Documentation: https://ruby-doc.org/core-2.5.0/Marshal.html

Bug: 14730
Change-Id: If5d3bd2eaf261b4bc7a7df4ac15098503081dd9f
Reviewed-on: https://code.wireshark.org/review/27764
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 08:20:14 +00:00
Darien Spencer 27ce47ce83 FP: Decode T1,T2,T3
Converting the encoded value to milliseconds according to
TS 25.427 - 6.3.3.6

Change-Id: I0aa03351c2976782da9832d50c4f6792f864864a
Reviewed-on: https://code.wireshark.org/review/28074
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 04:57:10 +00:00
Darien Spencer 78cb5c7776 FP: Show sir target units in tree
Change-Id: Ica7fd6ab9372c55b41bdc0747f4be812567bd810
Reviewed-on: https://code.wireshark.org/review/28073
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 04:50:19 +00:00
Jaap Keuter 56a33b8093 MTP3: Have prototype parameter names match the implementation
Parameter names are diffferent (in name and order) in the prototype
found in the header file than in the implementation. Let these match.

Change-Id: I170d1d96631b1edbe613933663f746edb8c2e1fd
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/28075
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 04:05:33 +00:00
Gerald Combs 9031281672 CMake: Get rid of FULL_SO_VERSION
gd2e0724afc moved our library versions into their own variables named
FULL_SO_VERSION. They're no longer used and interfere with
tools/release-update-debian-soversions.sh so remove them.

Fix some shellcheck warnings in release-update-debian-soversions.sh
while we're here.

Bug: 14778
Change-Id: I0eb0bb4ab4c482bdb8a94f8c18aa04c6c83c781b
Reviewed-on: https://code.wireshark.org/review/28068
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-06-07 04:01:37 +00:00
Darien Spencer 79da59e31f FP: Only show 1 digit after the dot for UL SIR
Using %f was printing 6 digits after the dot.
The values for UL SIR TARGET are defined to the nearest 0.1

Change-Id: I02eb1b8edeaeee2574c4a92a3479490e1428a282
Reviewed-on: https://code.wireshark.org/review/28067
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-06 20:05:40 +00:00
Guy Harris f2dada0663 Make sure proto_tree_add_expert items are always added to the tree.
Make sure that proto_tree_add_text_internal() and
proto_tree_add_text_valist_internal() don't throw an exception, so the
indication always appears in the tree to indicate the issue.  Do the
"do the bytes exist" check *after* we've added all of the expert info to
the protocol tree, so we still throw the appropriate exception.

Change-Id: I4e0d2dcc48f9c8f4482550ae16284b9e021232cd
Reviewed-on: https://code.wireshark.org/review/28062
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-06 16:23:29 +00:00
Jaap Keuter e8493fa7c4 GTP: Don't test for the obvious
When rel_id is larger then 6 don't test for this again.

Change-Id: I20c6747b31758eadadfd746bdee2cc168c771799
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/28051
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-06 10:22:13 +00:00
Pascal Quantin d10f0a62b2 3GPP NAS: fix dissection of Linked TI IE
Change-Id: Idb5713e8ab9ef7c33110380516261f0202b8b599
Reviewed-on: https://code.wireshark.org/review/28047
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-06 08:44:20 +00:00
Jeff Morriss ae759a4777 VXLAN: hang undissected data off the top-level tree.
... rather than hiding it below the VXLAN tree.

This makes the separation between the VXLAN header and the data clear.

Change-Id: Ifd5a3e4750b68455108f1e282e34a7b2e31f4efd
Reviewed-on: https://code.wireshark.org/review/28041
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 21:31:17 +00:00
Tobias Rasmusson 8cead5ed74 UDS: Add Transfer Data Block Sequence Counter
The first byte of a Transfer Data request/response is the
block sequence counter. This change will show that counter.

Change-Id: I87c240bd12f1f897e298d2fcfae8f75058aa4392
Reviewed-on: https://code.wireshark.org/review/27956
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-06-05 19:03:17 +00:00
Joerg Mayer c23f352064 Spirent Test Center Signature decoding support including FibreChannel
Change-Id: I11d5e13b041a747045d90e93f1c8e8d572a6ef67
Reviewed-on: https://code.wireshark.org/review/28001
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-06-05 15:26:00 +00:00
Pascal Quantin 896049f68f SYNC: make sync.length_of_packet filter usable
Change-Id: I9f72e589d8bb7f6d0fc2270082d0b5cec1d23049
Reviewed-on: https://code.wireshark.org/review/28033
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-05 09:31:16 +00:00
Pascal Quantin ecc9b011c5 SYNC: fix decoding of PDU type 3 format
Bug: 14823
Change-Id: I143c57d9d81ff8510d60b8a0d9f2daea78c33e0b
Reviewed-on: https://code.wireshark.org/review/28032
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-05 09:17:43 +00:00
Joerg Mayer 6327a86981 We were telling the FibreChannel dissector to decode the last 8 bytes twice
Once as CRC + EOF and once as payload. Don't pass the bytes to payload
dissection any more.

Change-Id: I21eb95a4f42dbd40ccf5910934c00f58f5564454
Reviewed-on: https://code.wireshark.org/review/28023
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-06-05 08:50:32 +00:00
Ivan Nardi cbffd8c646 gtp, gtpv2: improve request/reply matching algorithm
GTP tunnel endpoints (MMEs, GSNs...) will eventually reuse sequence number
values. When handling long capture files this may lead to wrong request/reply
pairs: a message may be considered as a reply to an old request
sharing the same reused seq number

Add an heuristic to the matching algorithm that involves timestamps:
request/reply pair matches only if their timestamps are closer than a
configurable threshold. If such value is 0 (default), timestamps are not
used and only seq number values are evaluated (i.e. fall-back to old behavior)

Note that a wrong match might lead to wrong (gtp-)association/session

While at it, extend messagge list explicitly used by the algorithm

Change-Id: I021e6e1ce1651a64d24b0664d6e27c9ba39c735c
Reviewed-on: https://code.wireshark.org/review/27500
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-06-05 07:30:34 +00:00
Guy Harris 94c92f2492 Remove a now-unused field.
Change-Id: I5e85632bd901687b815cf76d7e25e082a9cb3657
Reviewed-on: https://code.wireshark.org/review/28028
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-05 04:40:37 +00:00
Julien Staub 6440a33fdf ZBEE-NWK-GP:add support for some ZGP commands
the new dissected commands are:
manufacturer specific attribute reporting
multicluster reporting
manufacturer specific multicluster reporting
read attribute and request attribute (have same format)
read attribute response
write attribute

Change-Id: I3125f6acbfb35a72771186f933b0db0798e409f2
Reviewed-on: https://code.wireshark.org/review/27892
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-05 04:18:03 +00:00
Jaap Keuter 447ffdf042 Correctly handle the PPI GPS timestamp fraction
The timestamp and timestamp fraction are processed in one step,
since this creates a proper timestamp interpretation. There are
two fixes to this code to deal with erroneous packets.
One is that when taking into account the timestamp fragment the
available data must be 8 bytes in total, not just 4.
The other is that when the mask indicates that there's only a
timestamp fraction, nothing was shown.

Change-Id: I4a0a65229f322ad56673a26ff6b3e769e994062d
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/28007
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-05 04:16:24 +00:00
Guy Harris 8e7396edb4 Don't use FT_STRING fields for non-strings.
If you're reporting an error, use an expert info item.

If you're putting a structure into the protocol tree, use FT_NONE for
the structure as a whole.

Change-Id: Ie89b552576b15195acb0a9108d33430115d99f00
Reviewed-on: https://code.wireshark.org/review/28024
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-05 03:38:56 +00:00
Joerg Mayer 63ded3e9df Move a comment where it belongs
Minor whitespace fixes

Change-Id: I6431a04d90a5898d46bdc67a02afa6998a4ff38d
Reviewed-on: https://code.wireshark.org/review/28021
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-06-05 00:23:45 +00:00
Pascal Quantin e253c18400 PDCP NR: add SDAP header presence indication and dissection
Change-Id: I8e868e7c969bcd8d57925cd51271801cdc6e2351
Reviewed-on: https://code.wireshark.org/review/28017
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-04 21:23:41 +00:00
Joerg Mayer b9e8b7cb24 When using the NEW_PROTO_TREE_API, the proto_tree_add... functions are
"redefined" to handle the same way as before.

In dissectors using the new API, add all currently used proto_tree_add_xxx
functions to the list of functions that take care of NEW_PROTO_TREE_API changes.

Modify the dissectors that worked around the missing change.

Change-Id: Ib6d6ec2c225d96c98c2a8f507648d7ad4bfb6c68
Reviewed-on: https://code.wireshark.org/review/28002
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-06-04 20:33:36 +00:00
Anders 6addd9602b gtpv2: Fix timestamps in GTPv2 Secondary RAT Usage Data Report IE
Bug:14818
Change-Id: Icf6116a51c586626d6dc058e5ce5148e1f1340fd
Reviewed-on: https://code.wireshark.org/review/28012
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-04 16:15:13 +00:00
dishadaniel 236af95178 Added support for new proprietary fields (private extensions) for Ericsson.
Change-Id: Ie97289527dbcef7e5d18e5e152659ebb5de9bc19
Reviewed-on: https://code.wireshark.org/review/27940
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-04 12:17:18 +00:00
Darien Spencer ceeff7db4d MAC: Use PINFO_FD_VISITED macro
Change-Id: I08dfb457d4964a1051b87ecf458774e8a418088e
Reviewed-on: https://code.wireshark.org/review/27985
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-04 06:56:01 +00:00
Darien Spencer 3542b22ba7 RLC: Use PINFO_FD_VISITED macro
Change-Id: I0db66647876cc57a4c88957ebc00dffde0a18177
Reviewed-on: https://code.wireshark.org/review/27984
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-04 06:55:43 +00:00
Darien Spencer f6e3ed7e87 RRC: Use PINFO_FD_VISITED macro
Change-Id: Ica32ffc5f150451dba42a531d1661df4325b5c02
Reviewed-on: https://code.wireshark.org/review/27983
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-04 06:55:15 +00:00
Darien Spencer 79a024337d NBAP: Use PINFO_FD_VISITED macro
Change-Id: I1436a8840f5b771583876b988f94e43363f7984a
Reviewed-on: https://code.wireshark.org/review/27982
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-04 05:10:23 +00:00
Harald Welte 6be2fa34e7 RSL: Fix bug in dissector for RELEASE REQUEST
The RSL RELEASE MODE IE is two bytes long, so we cannot call
proto_tree_add_subtree() with a length of 4.

Change-Id: I7ee3cfd7a7d64d14704b1f6b11ab7631ff9b0939
Reviewed-on: https://code.wireshark.org/review/27993
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-04 04:43:49 +00:00
Stig Bjørlykke 5767118ec9 Free dynamic header fields on exit
Put routine to free all dynamically registered header fields in the
UAT reset callback to avoid ASAN report for memory leaks on exit.

Handle duplicated entries without leaking memory.

Call proto_free_deregistered_fields() in proto_cleanup() and move
this after prefs_cleanup() to free the memory used in UATs.

Change-Id: I96545177b5b23b9c20ad8e7751a0d5621c9ca10f
Reviewed-on: https://code.wireshark.org/review/27907
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-03 20:18:05 +00:00
Guy Harris 5c51008ef0 Fix handling of guintvars.
1) A value that fits in a 32-bit unsigned integer may take more than 4
octets - the uppermost bit of the octet is a "more octets follows" flag,
so 4 octets contain only 7*4 - 28 bits of value, so a fifth octet
preceding that with the upper 3 bits zero could result in a value that
fits in 32 bits, and further octets of 0x80 just add further leading
zeroes.

We should, instead, check for *overflow*, meaning that if we add more
bits at the bottom, the result is *less* than the previous value.

2) When the result overflows, we should clamp it a UINT_MAX, rather than
setting it to zero, and should keep accumulating octets, so that we
return the correct octet count.  That prevents infinite loops where the
item's length, and the item itself, are considered zero-length.

This should fix bug 14738.

Bug: 14738
Change-Id: I1d1b60e22f169959c1573b1fcb7e010e027b5132
Reviewed-on: https://code.wireshark.org/review/27986
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-03 17:14:07 +00:00
Dylan Ulis de6f6056f1 CIP: Remove extra tree level from path segments
There was an extra level of indentation in the tree structure that didn't
add any value.
This tree node just displayed the same text that it's parent tree did.

Just remove this to make things easier to navigate.

See feature_cip_all_segments.pcap from
Bug: 12049

Change-Id: Ia51f0f66b1ea0aefaa4d016335c0d5e8515a2c30
Reviewed-on: https://code.wireshark.org/review/27958
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-03 05:56:27 +00:00
Guy Harris 2f9c61f03f Name update.
With the name change from Ethereal to Wireshark, asn2eth was renamed
asn2wrs.

Change-Id: I5bdfa2362ca7de81b0bda6ec9faa78cdb0ba10b4
Reviewed-on: https://code.wireshark.org/review/27968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-02 22:11:52 +00:00
Darien Spencer 05b7f6e52c FP: Use PINFO_FD_VISITED macro
Change-Id: I50b073083702f95101ca50909c76d7e81e9a50cc
Reviewed-on: https://code.wireshark.org/review/27953
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-02 20:12:37 +00:00