Commit Graph

71847 Commits

Author SHA1 Message Date
Gerald Combs f8092f96b3 Qt: Move wireshark-qt.cpp back to ui/qt/main.cpp.
The Qt UI's main module started out as ui/qt/main.cpp but was moved to
the top-level directory in order to appease Autotools. We don't need to
do that any more, so move it back.

Change-Id: Ic5bc0ed5b754e36cc2b9e682f2ca097781233dfd
Reviewed-on: https://code.wireshark.org/review/28090
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-08 03:50:22 +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
Gerald Combs f76f9a51b8 Fix a comparison.
Change-Id: Ibecdf6be6c6957afc176e6eb97f60f19b090b40c
Reviewed-on: https://code.wireshark.org/review/28091
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07 21:25:39 +00:00
Jaap Keuter 8f664a746c Preincrement iterators for better performance
Change-Id: I26853080bd0294a9058db99a30d1c06d6aac8e16
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/28083
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07 18:18:04 +00:00
Gerald Combs 4905983845 More shellcheck checks and fixes.
Remove a libtool check while we're here.

Change-Id: I813add2031480f34ce89f268b541f8939016c2c7
Reviewed-on: https://code.wireshark.org/review/28066
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07 18:11:12 +00:00
Gerald Combs 0882e94cff Qt: Set the ByteViewText field and protocol foreground.
Set a foreground color when we add a field and protocol format range. On
some systems the highlight background is darker or lighter than the
normal background, and we need to adjust the foreground to match.

Add a note about correctly handling our hover rect color.

Change-Id: Ib6b50403dec889280eb3d27f3deb10150d22a599
Reviewed-on: https://code.wireshark.org/review/28076
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07 15:38:53 +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
Dario Lombardo 24713511eb wiretap: add support for ruby marshal object files.
Change-Id: Iefba3b15c907966bb0b8d5c0ff9b6bb7097d326e
Reviewed-on: https://code.wireshark.org/review/27763
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 04:54:49 +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
Stig Bjørlykke 6bb5a7af66 lemon: Make it build with __clang_analyzer__ defined
The static function handleswitch() is not compiled with __clang_analyzer__
defined, but it's used in OptInit() without any checks. Change to have
an empty implementation for __clang_analyzer__.

Change-Id: I73da2042ec64fdfa6910c02c059d36db491dc538
Reviewed-on: https://code.wireshark.org/review/28059
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 03:58:04 +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 c99e9d6aa4 Add COMMON_ARGS to the "Command and args" message.
Change-Id: I286b7727a7b92ecbc913f55b8e77a505df4a7d5e
Reviewed-on: https://code.wireshark.org/review/28069
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-06-06 19:36:13 +00:00
Gerald Combs a5d6ccc50d Shellcheck fixes.
Fix some issues reported by shellcheck.

Change-Id: I17e280b2845bb75982788744750fc5404df38b4d
Reviewed-on: https://code.wireshark.org/review/28045
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-06 17:48:55 +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
Peter Wu c82883c1d6 cmake: fix DTD, Diameter and radius dependencies
Ensure that source files are copied whenever these change.

Change-Id: I77e1ebdac3567fe69f5236f4469355a7182ef159
Fixes: v2.5.0rc0-2471-g99b7776d5f ("CMake: Copy multiple data files at a time.")
Reviewed-on: https://code.wireshark.org/review/28057
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-06-06 13:56:40 +00:00
Stig Bjørlykke 26be931810 extcap: Fix a potential leak of memory pointed to by 'toolbar_entry'
Initialize toolbar_entry after error checking is done to avoid a
potential memory leak when exiting early from cb_load_interfaces().

Change-Id: I925d9296085964c6d5c3a9ccae85137285bf9220
Reviewed-on: https://code.wireshark.org/review/28060
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-06-06 12:39:17 +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
Jaap Keuter 16cd981151 Tweak cppcheck to test with better settings
c99 is probably a better standard to check against.
Also try to cut down on ASN.1 template and config file testing,
since these fail anyway, not being full source files yet.

Change-Id: I289c35498cf9eba757e46601b4610f085ec4ba77
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/28019
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-06 05:20:43 +00:00
Gerald Combs fc4de96fe7 Docs: Update the Configuration Profiles section of the User's Guide.
Fix an image width.

Change-Id: Icdc5a7d46c4e50346137bc271e97f3448ad4e2d2
Reviewed-on: https://code.wireshark.org/review/28046
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 23:28:03 +00:00
Jeff Morriss ba3dfd5f4b Fix rpm-setup.sh so it works when you're not installing the optional pkgs.
Looks like this has been broken since Ie46d56aff91694a3b8c4c62b4b03e38d3fb1e68a

Change-Id: Idd6cfc3e8d7f66160157eed393e8528ada7786d4
Reviewed-on: https://code.wireshark.org/review/28040
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 21:32:29 +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
Gerald Combs 5138f6b8c3 WSUG: Update the profiles dialog image.
Change-Id: I4f96cc09d4ec6618087af29bd5119d6307dd3ccf
Reviewed-on: https://code.wireshark.org/review/28043
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 20:02:55 +00:00
Gerald Combs 446b22ba25 Debian: Add missing symbols.
Change-Id: Ie7cc03154c6afcb6ab18b87d73c35be9f79a5f41
Reviewed-on: https://code.wireshark.org/review/28044
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 20:02:43 +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
Gerald Combs 836e2bfe55 Debian: More GNUTLS updates.
Try to make our libgnutls28-dev / libgnutls-dev dependency work across
different OS versions.

Change-Id: I673619ae81b15df5bdbe386b4354e5c01f7bba29
Reviewed-on: https://code.wireshark.org/review/28042
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 16:50:26 +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
Anders 394f603c2b Diameter: Type name should be IPAddress
Change-Id: I1e7fed0532823dfe1ad48d8421813df9c43b4d6e
Reviewed-on: https://code.wireshark.org/review/28038
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-05 11:01:00 +00:00
Anders 7745c093cf Diameter: Add some protocol values to AVP Protocol enum.
Change-Id: Ib2543377c5d41bf135cdd2e9a8574a6c71cdb32f
Reviewed-on: https://code.wireshark.org/review/28037
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-05 10:42:34 +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
Anders b891fe969e Diameter: Update with some AVPs from RFC 5777
Change-Id: I70926eef39349c486ae44adc2ee16972424f1838
Reviewed-on: https://code.wireshark.org/review/28031
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-05 08:37:53 +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
Dario Lombardo 14456d0de8 travis: fix gem command line.
Change-Id: I84bc07edad1453b2e41311f21eb37454898a8fd5
Reviewed-on: https://code.wireshark.org/review/28018
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-06-05 06:57:09 +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
Gerald Combs 34df836f0f Debian: Use libgnutls28-dev.
Switch Build-Depends from libgnutls-dev to libgnutls28-dev. I'm
upgrading the Ubuntu builder to 18.04 and this appears to be required in
order to fix the Debian package step.

Change-Id: Ib3ab2a1a5dcfbd9ad0c088b22fcac63d81a2a765
Reviewed-on: https://code.wireshark.org/review/28022
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-05 00:31:41 +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
ruengeler 1f6eb7d7a8 SCTP: Adjust minTSN
Change-Id: If2ccbd983a2a31441d1e882da65971860f5bec94
Reviewed-on: https://code.wireshark.org/review/28013
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2018-06-04 20:49:36 +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
Dario Lombardo 70e49e8e13 travis: don't install asciidoctor's documentation.
Change-Id: I8d70cb7e940dc527c13e60195f4fd049cdff2481
Reviewed-on: https://code.wireshark.org/review/27954
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-06-04 16:48:16 +00:00