Commit Graph

71999 Commits

Author SHA1 Message Date
Matej Tkac 24a2e2d52f Diameter: added AVPs 2845 and 2846 to 'dictionary.xml'
According to 3GPP TS 29.212 v14.7.0

Change-Id: Ia1020e5ea04280f6435a4fb737368f6e6b2111df
Reviewed-on: https://code.wireshark.org/review/28216
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-12 10:22:56 +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
Gerald Combs 53a1840626 Windows: HiDPI-ify our native print dialogs.
Call set_thread_per_monitor_v2_awareness and
revert_thread_per_monitor_v2_awareness when showing native print
dialogs.

Change-Id: I295540953e50547ee0bb0b162c805f2d568d88ba
Reviewed-on: https://code.wireshark.org/review/28208
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-11 19:36:37 +00:00
Guy Harris 2f64ec0844 Give more detailed information about capture permissions on Debian.
Indicate what you're supposed to do when running dpkg-reconfigure
wireshark-common, and indicate that you have to run it as root using
sudo.

Emphasize in README.Debian, and indicate in the permission failure
secondary message, that you have to add users to the "wireshark" group
after doing that, and that a user may have to log out and log in again
to make this change take effect.

Bug: 14847
Change-Id: Ia83ff8e92bd2f00b6c3779272322a40201416da0
Reviewed-on: https://code.wireshark.org/review/28206
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-11 18:41:11 +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
Gerald Combs bfb7028ba9 More shellcheck fixes.
Change-Id: Iee9e464b3935d4c8a09fa9954f73496eae33f30f
Reviewed-on: https://code.wireshark.org/review/28092
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-11 16:35:08 +00:00
Peter Wu 0e3901d82f debian-setup: fix GnuTLS installation for Ubuntu 14.04
Ubuntu 14.04 ships with gnutls28 3.2.11 which might be
license-incompatible with GPL 2.0 and should thus not be used. Fallback
to the older gnutls-dev package in that case.

Change-Id: I39824a5aee08de1df3790a1a8ff84c9769afd158
Reviewed-on: https://code.wireshark.org/review/28200
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-11 15:03:01 +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 deddb545b8 Offer a permissions suggestion for macOS.
If the user installed from the wireshark.org package, perhaps they chose
not to install the "Set capture permissions on startup" item.  Suggest
that they choose otherwise.

Change-Id: Ic5053da9cb6e54e7a7b1aa5a9dd59a1a84ddee16
Reviewed-on: https://code.wireshark.org/review/28197
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-11 01:38:13 +00:00
Guy Harris dd87f2018a Fix names in declarations to match definitions.
Change-Id: I7b3dd147b523fd3251d93dd1917d2e2c47433207
Reviewed-on: https://code.wireshark.org/review/28195
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-11 01:28:17 +00:00
Guy Harris 5ecbcaf483 Improve the secondary error messages for pcap errors.
On Windows, if WinPcap isn't installed, warn about that for errors other
than failed attempts to start capturing.

On HP-UX, if we appear to have an old version of libpcap, warn about
that for errors other than failed attempts to start capturing.

If we know the error is a permissions problem, don't make suggestions
appropriate to other problems.

If we know the error is *not* a permissions problem, don't make
suggestions appropriate to permissions problems.

For permissions problems, or possible permissions problems, on Linux,
suggest doing dpkg-reconfigure wireshark-common if you've installed from
a package on Debian or a Debian derivative such as Ubuntu.

Change-Id: If4aac0343095ac0b984eebc21853920c3b6d3c63
Ping-Bug: 14847
Reviewed-on: https://code.wireshark.org/review/28189
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-10 14:26:37 +00:00
Gerald Combs e0b8837d9a [Automatic update for 2018-06-10]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I11da626692a0aedff9e58256e0e326fd1cb33123
Reviewed-on: https://code.wireshark.org/review/28190
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-10 08:16:13 +00:00
Guy Harris 3c9c2c6534 If device->active_dlt = -1, show "Unknown" rather than "DLT -1".
It means we don't know the active link-layer header type - probably
because the device can't be opened, so we can't get the default linktype
or the list of available linktypes - so show it as "Unknown".

Bug: 14847
Change-Id: I5a1ad360d2ae461e8db57e387679700a566b0949
Reviewed-on: https://code.wireshark.org/review/28185
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-10 02:43:15 +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
Dario Lombardo 1aff175b1c gitlab-ci: add opensuse build.
Create RPM as well.

Change-Id: Id84df19c6fa27eb576d29884299f771224328dba
Reviewed-on: https://code.wireshark.org/review/28122
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 19:33:16 +00:00
Dario Lombardo edcad2c3f5 gitlab-ci: add centos build.
Create RPM as well.

Change-Id: Iaedbd0fbe2b7c00f07ea833aef261351c78b6985
Reviewed-on: https://code.wireshark.org/review/28113
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 19:33:05 +00:00
Dario Lombardo df1b07cc62 gitlab-ci: add tshark --version test after all jobs.
Change-Id: I7d82587b26dd1636c437fc07934f5ca941ab052c
Reviewed-on: https://code.wireshark.org/review/28108
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 19:31:35 +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
Dario Lombardo e088fcd84c gitlab-ci: make ubuntu steps a module.
This will make room for more modules to be used by new jobs.

Change-Id: I0dff41d18c8027cb4d929acf5ab808a64f0277a4
Reviewed-on: https://code.wireshark.org/review/28107
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 05:52:30 +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
Dario Lombardo b296168874 rpm: fix compilation on centos (uses cmake3).
Change-Id: Ia0319658a0e8c9d8e13595d6773dcd6438228bda
Reviewed-on: https://code.wireshark.org/review/28112
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-09 05:08:09 +00:00
Gerald Combs 43a88c230f Fixup a couple of shellcheck "fixes".
Change-Id: If3e6acf28c22cbc98a26c7e12c449e27fdc1321e
Reviewed-on: https://code.wireshark.org/review/28164
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-08 23:18:57 +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 99aeec08d0 Diameter: Add enum value to 3GPP AVP 614 Server-Assignment-Type.
Bug:14853
Change-Id: I177dc89cd5ac092c7750dee2f3e971d999cf4c78
Reviewed-on: https://code.wireshark.org/review/28117
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 13:20:44 +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 2b1741ecd0 rpm-setup: add rpmbuild package.
Change-Id: Ic0041e150992c64a0b86614cf2d3c2a68abd5ab2
Reviewed-on: https://code.wireshark.org/review/28111
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 11:23:21 +00:00
Dario Lombardo e2ada3e687 rpm-setup: add support for opensuse non-interactive mode.
Change-Id: I3d32854c958d1369f5d475ce67c3932b9357a23f
Reviewed-on: https://code.wireshark.org/review/28110
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 11:22:58 +00:00
Dario Lombardo 63c62a2212 tools: update rpm-setup.
Add cmake3, ninja and g++ (required in docker).

Change-Id: I1ff4b09648cce0354d1fe60bd796d40348f284b7
Reviewed-on: https://code.wireshark.org/review/28109
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 11:22:39 +00:00
ruengeler e7c6576b51 SCTP: Add a checkbox to show relative TSNs
Change-Id: I296cc5801e8a5184aea6bdc7fb841cce0c4f7b1d
Reviewed-on: https://code.wireshark.org/review/28056
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 10:23:34 +00:00
Gizem Yurdagül 9932f496e2 PROFINET: ErrorCode2 is updated
According to specification, pn_io_error_code2_pnio_64
is expanded with new error codes.

Change-Id: I1faf6e8f86a075057520ba4615d1d4f07032931d
Reviewed-on: https://code.wireshark.org/review/28106
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08 08:25:50 +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