Commit Graph

70219 Commits

Author SHA1 Message Date
Kenneth Soerensen 9149af9948 ZigBee: Add remaining attributes from Smart Energy Prepayment cluster
Change-Id: I7e35dd26d7369cbc39cdb1e078200306d6ada619
Reviewed-on: https://code.wireshark.org/review/25456
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-25 06:47:01 +00:00
Gerald Combs 686aad42e9 Minor wireshark-qt.cpp cleanups.
Remove duplicate and unneeded code. Remove placeholder markers left over
from the initial port from GTK+.

Change-Id: I4b372057c40cce53d0a00a54e490dec2097a7423
Reviewed-on: https://code.wireshark.org/review/25462
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-01-25 05:26:10 +00:00
Jaap Keuter 55fbeec607 bootp: DHCP User Class Data iPXE exception
iPXE seems to violate RFC 3004 by ommitting the UC_Len_i field in the
User Class Data field. Since this seems to be a 'well known' issue,
which is not going to be corrected, detect and circumvent the error
detection for this specific use.

Bug: 14312
Change-Id: I2a15c336d7f67ee5fd83f955de7126eac146bfb1
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25450
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-25 05:18:47 +00:00
Gerald Combs 369f8195e8 Qt+WiX: Skip translations.
We handle translations in QtTranslation.wxs so we need to skip them when
generating QtDependentComponents.wxs.

Change-Id: I05586c7f8fbbaf72fc30564a157ba1175154d1d3
Reviewed-on: https://code.wireshark.org/review/25459
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-24 22:15:50 +00:00
Laszlo Papp ae5e83a25c OpenFlow(v5&v6) : Fix RX_PWR/TX_BIAS
Change-Id: Iae6fe2473d80cb14d5a9676b7efce41dc59a30e2
Reviewed-on: https://code.wireshark.org/review/25454
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 21:31:20 +00:00
Gerald Combs 50b4ff6db8 CMake: Create directories one at a time.
Older versions of CMake don't support passing multiple arguments to `-E
make_directory`.

Change-Id: I62f76753a0ec1a96849de3a1131869f08303dbfc
Reviewed-on: https://code.wireshark.org/review/25458
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-24 21:05:44 +00:00
Gerald Combs 66a9f27dd1 Qt+WiX: Check windeployqt --list output.
Windeployqt 5.9.4 can print translation files that don't exist
(QTBUG-65974).

Fix up whitespace.

Change-Id: If0a4ad6e24023707fa7e9cb1132af8a8dc425627
Reviewed-on: https://code.wireshark.org/review/25457
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-24 20:34:43 +00:00
Laszlo Papp fe00754226 Openflow: Use offset 2 for tx_min/max as they are uint16_t
Change-Id: I2f47e0ede2a31cfdadc69ab125a739b3deaa297e
Reviewed-on: https://code.wireshark.org/review/25453
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-24 18:13:30 +00:00
Laszlo Papp b3cf908ffe Fix the display of Length and Pad2 in the openflow dissector
Change-Id: I12194d1449812c43c062c50d319d44d6d7437c51
Reviewed-on: https://code.wireshark.org/review/25451
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-01-24 16:51:49 +00:00
Alexis La Goutte ccd2b53f40 byte_view_text (qt): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ibfaac5e1d8cc30d6bb8917d0c0e10a79e059a53e
Reviewed-on: https://code.wireshark.org/review/25452
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-24 16:48:18 +00:00
Graham Bloice 0ef0f4ceb5 Windows: Modify position of compress checkbox in Export Packets dialog
The "Compress with gzip" checkbox was over on the right and cut-off.
Move it to a (somewhat) better place.

Change-Id: I241e6216ba69c5fa4e4709e311d45dfecdad2c2d
Reviewed-on: https://code.wireshark.org/review/25448
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-01-24 13:39:13 +00:00
Pascal Quantin 92af82aaa7 CVS pserver: fix infinite loop
Bug: 14364
Change-Id: I49377c5b06a7b3f2e919c8f8ae2c4d95b9b2c7eb
Reviewed-on: https://code.wireshark.org/review/25446
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-24 12:36:18 +00:00
Matej Tkac fa26a00876 [PFCP] Fixed Outer Header Creation IE
3GPP TS 29.244 V14.2.0 (2017-12)

Change-Id: If99b0701541a32e393d3fd19bbd013fd4abcbcc8
Reviewed-on: https://code.wireshark.org/review/25447
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 12:13:50 +00:00
Michael Mann 954fd253e4 Add duplicate value_string in check filter
Change-Id: Ie00d057f5bc36d65b6bba790169543a65b068e47
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/20744
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 11:48:53 +00:00
Jakub Zawadzki 289cbd76d9 wiretap/k12: fix memory leak.
Free state.bb in error path.
Found by clang.

Change-Id: Ic9f2e1383a5219de465a6f22f7b382ac8b1f9cbf
Reviewed-on: https://code.wireshark.org/review/25443
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 11:46:39 +00:00
Jakub Zawadzki 0d584d9fed ui: don't g_assert() in get_args_as_string(), but return empty string for no arguments case.
Rework e861a11210 by returning empty string.
g_assert() seems to be not understand by clang scan.

Change-Id: Iade2d81aa22eecf563a465cb86e694e3e0f853df
Reviewed-on: https://code.wireshark.org/review/25441
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-01-24 11:46:27 +00:00
Gerald Combs 7e37a7db55 CMake: Compile and link flag updates.
Add /guard:cf and /Qspectre to the Visual C++ 2015 compile and link flags.

Don't bother trying to pass -Wl,--as-needed or -pie to Visual C++.

Remove some unneeded quotes.

Change-Id: I4d89d61ce9dd579e7cfbcd49df6116810bfb0178
Reviewed-on: https://code.wireshark.org/review/25356
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-01-24 11:43:56 +00:00
Jakub Zawadzki d672ee9372 wslua: fix nstime memory leak after passing unknown encoding to TvbRange_nstime()
Move checking of encoding before allocating nstime.
Found by clang.

Change-Id: I3c1de5fae6fcf52393cc38302359f21f17808087
Reviewed-on: https://code.wireshark.org/review/25442
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-24 08:34:32 +00:00
Robert Jongbloed cde023c3c5 SDP: Added support for "a=rtcp" and "a=rtcp-mux".
Modern SIP endpoints often use non adjacent, or the same, port for the RTCP
protocol as the RTP protocol. This is indicated via attributes in the SDP,
which should be used to set up the correct dissector for the correct port
on this SIP session.

Change-Id: I37bf30b71541b6f924fbda5ac1cb29f3ba171515
Reviewed-on: https://code.wireshark.org/review/25430
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-01-24 05:09:31 +00:00
Gerald Combs 99b7776d5f CMake: Copy multiple data files at a time.
Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of
individually.

Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff
Reviewed-on: https://code.wireshark.org/review/25439
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-01-24 05:08:27 +00:00
Jaap Keuter 59c958d7cb cvspserver: Add basic cvs pserver protocol dissector
Change-Id: I049c8b9b9a0a1da2243217532186ba5a19cf5671
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25424
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-24 03:18:04 +00:00
Gerald Combs c9a89e29e8 Qt: Add back the "ready to go" startup message.
The stdin capture test and at least one external application depends
on the "Wireshark is up and ready to go" startup message, so we need to
print it even when DEBUG_STARTUP_TIME isn't defined. Print the startup
time in seconds.

Change-Id: Ic1683b751f9cce30b8ca8a6122eddff44fcda015
Reviewed-on: https://code.wireshark.org/review/25440
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-24 03:15:56 +00:00
Jakub Zawadzki 958ef99edf sharkd: try to fix clang uninitialized value stored to field 'protocol'.
Instead of using g_memdup(), make it more C-like.

Change-Id: Ifde75801a261f9e269391fabf323f34a4e3508ac
Reviewed-on: https://code.wireshark.org/review/25395
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-24 02:15:49 +00:00
Gerald Combs 787b93fd07 Docbook: Generate one PDF paper size.
Generate a single PA4-sized PDF. PA4 is the approximate intersection of
A4 and Letter[1]. This gives us one less file to build and distribute.

If you're printing out hard copies of the guides this wastes a few pages
compared to an A4-sized PDF, but if you're printing out hard copies of
the guides you've already made a strong commitment to waste paper.

Page counts:

    Guide    Size      Pages

    WSDG     A4        203
    WSDG     Letter    217
    WSDG     PA4       217

    WSUG     A4        192
    WSUG     Letter    204
    WSUG     PA4       205

[1] https://en.wikipedia.org/wiki/Paper_size#PA4_or_L4

Change-Id: If43d4b19947c77a51b3943a2b329dbab45025d79
Reviewed-on: https://code.wireshark.org/review/25438
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-23 22:15:01 +00:00
Richard Sharpe 6605d844af QUIC: fix build with older Libgcrypt
RHEL7 ships with Libgcrypt 1.5.3 which does not support AEAD, add guards
to fix -Wunused-function errors.

Change-Id: I230a66eff0dca9a882bf87f2f740ee0d36cd1dc6
Reviewed-on: https://code.wireshark.org/review/25434
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-23 19:16:38 +00:00
AndersBroman 7ecf93c833 [MEGACO] Priority value gets displayed as Termitation Id.
Change-Id: If176231d1c71692b1d6a2627934d211e4f2476a7
Reviewed-on: https://code.wireshark.org/review/25433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-23 15:04:52 +00:00
Pascal Quantin 5d5482e2e6 USBMS: fix endianness of GET MAX LUN and RESET
While we are at it, let's add the protocol item to allow filtering on
protocol.

Bug: 14360
Change-Id: I4973a6e657dccd71af4f798584cc118b75bedd20
Reviewed-on: https://code.wireshark.org/review/25425
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 12:16:09 +00:00
Pascal Quantin c2daa6bc73 LTE RRC: register dissectors for UERadioAccessCapabilityInformation(-NB) and UERadioPagingInformation(-NB)
Change-Id: Idb3c3fe2cab4ce7aff2bfe108a6bd4fb07fe44b3
Reviewed-on: https://code.wireshark.org/review/25426
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-01-23 12:15:35 +00:00
Jakub Zawadzki 3a9da2e707 gtk: fix memory leak in profile dialog.
fill_list() don't break the loop when it founds first profile matching
name, and it can memleak if somehow it found more than one.
Don't break the loop to avoid regressions. Just g_free() previously found.
Found by clang.

Change-Id: I082b3f1d16f07580a6d7c814d2a8ee5463a44b0f
Reviewed-on: https://code.wireshark.org/review/25422
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-22 20:53:54 +00:00
Jakub Zawadzki e6eb4815cd gtk: Fix memory error/double free.
pathname is freed by caller of firewall_save_as_ok_cb(). Make pathname const.
Found by clang scan.

Change-Id: I3a0ab85494a9194edb825bae33eca979c7f8faf3
Reviewed-on: https://code.wireshark.org/review/25417
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-22 20:19:57 +00:00
Jakub Zawadzki 862c881318 traffic table: Fix memory leak
Free tpl_line in error path.
Founded by clang scan.

Change-Id: Iaaaaed155d859171ee880d520c11594b2d4d0b59
Reviewed-on: https://code.wireshark.org/review/25420
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-22 19:51:59 +00:00
Jakub Zawadzki 6e31943cd4 gtk: Fix memory leak.
free buffer in error path.
Found by clang scan.

Change-Id: I7c271b74e3e5ac9d4f2a550f3c83988a4594133d
Reviewed-on: https://code.wireshark.org/review/25416
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-22 19:22:41 +00:00
Jakub Zawadzki 257e7d19fd gtk: fix multiple memory leaks in prefs_capture
All leaks follow the same pattern if not gtk_tree_model_get_iter_first(),
than memory allocated was not used/ freed.
Put memory allocation under gtk_tree_model_get_iter_first() block.
Found by clang scan.

Change-Id: I8f9671ae5fb043343ab5dcdc39a57f1d28fec15b
Reviewed-on: https://code.wireshark.org/review/25418
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-22 18:52:49 +00:00
Jakub Zawadzki 98305ba621 packet-ieee80211: fix dead store/ dead increment and assignment.
offset was not used after increment/assignment, just return it to relax clang.
Found by clang scan.

Change-Id: I21dece4e31075ca2da8d3ba942336fb4858636b6
Reviewed-on: https://code.wireshark.org/review/25419
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2018-01-22 18:23:06 +00:00
Alexis La Goutte ebc01bcce5 release-notes: Add note about support of 802.11ax
Change-Id: I361dceb79bed6c2a201db115dba1fad3cad2f659
Reviewed-on: https://code.wireshark.org/review/25414
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-22 12:31:26 +00:00
Martin Boye Petersen a6ae7f7571 ZigBee: Add a preference to choose ZigBee Smart Energy version used for dissecting
Some ZigBee commands within the Smart Energy Profile does not have the same payload
across different specifications. With this preference it is possible to choose what
version of the specification to use when dissecting payloads.
The default version is set to the latest one, which is Smart Energy 1.4, even though
it is still under development.

Change-Id: Iaec5528f2a418aeec4e39cfa087a58e531570d42
Reviewed-on: https://code.wireshark.org/review/25409
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-22 11:45:14 +00:00
Anthony Coddington 3e14d3b440 ERF: Fix broken erf_open ethernet checking
Was copying 8 byte extension header instead of 2 byte ethernet padding subheader.
Introduced recently by I8ede5c733867ccc98ab2d470181d1e4a29ae5b49.

Change-Id: I95a8604ed6204dff33f1794601342e090f6b7eb3
Reviewed-on: https://code.wireshark.org/review/25410
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-22 09:44:09 +00:00
Richard Sharpe 6358aadfd6 ieee80211: 802.11ax support.
This is based on Draft 2 of the standard. Draft 2 did not get approved, but
is close to what the final version will be and support is needed now by the
teams working on this.

Change-Id: I837df05a288b815e1e455883f4f165721104d51f
Reviewed-on: https://code.wireshark.org/review/24861
Petri-Dish: Richard Sharpe <realrichardsharpe@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-01-22 05:18:19 +00:00
Dario Lombardo 4d639b6f0e tap-httpstat: cast memory instead of reallocate it in glib hash table.
Change-Id: I74db1247f15bdd12fb3ef7fa258d0018605caa30
Reviewed-on: https://code.wireshark.org/review/25346
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-22 04:58:40 +00:00
Alexis La Goutte f0e1faac66 QUIC: Add define value for Long Packet Type (Initial, Handshake...)
Bug: 13881
Change-Id: Ia733a9e84e6a7dea58a62bcc1c9d79f51e5b46ff
Reviewed-on: https://code.wireshark.org/review/25401
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-21 21:45:17 +00:00
Alexis La Goutte 34a02eb70b QUIC: Remove draft-05 and draft-06
All tools use draft-07 or draft-08

Bug: 13881
Change-Id: I539e34324f16149fe8c0d05d938bae1298b9eb15
Reviewed-on: https://code.wireshark.org/review/25399
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-21 21:43:50 +00:00
Alexis La Goutte 68b20efb49 QUIC: Update IETF draft URL (draft-08)
and add also IETF QUIC TLS (-08) draft

Bug: 13881
Change-Id: I5662faeb5d1738c896ba66b6857e70baafd3afee
Reviewed-on: https://code.wireshark.org/review/25400
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-21 21:43:15 +00:00
Gerald Combs 00a528f123 Qt: Translate files in subdirectories.
Make sure we pass ui/qt/*/*.{cpp,h} to lupdate. Make update-tx a
bash script and make sure it passes ShellCheck. Add a -n flag, which
disables pushing back to Transifex.

Change-Id: Ia7d6564bbdbf69285f1f9b88cde09e37da4f916c
Reviewed-on: https://code.wireshark.org/review/25382
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-01-21 20:16:58 +00:00
Gerald Combs 145e3a5dc3 Qt: Proto tree fixes
Make sure ProtoTree::toString stops at the right place.

Don't emit fieldSelected when we're processing a context menu event. It
doesn't appear to be needed and it triggers unwanted automatic scrolling
when prefs.gui_auto_scroll_on_expand is enabled.

Change-Id: I351a6974d07aea6fdd3eb0b5c1975a1b8d8eb7da
Reviewed-on: https://code.wireshark.org/review/25396
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-01-21 14:20:32 +00:00
Gerald Combs 73f5afb75f Qt: Implement ProtoTreeModel::flags.
QTreeView checks to see if Qt::ItemNeverHasChildren is set in various
places, particularly when updating its set of expanded items. Implement
ProtoTreeModel::flags and set Qt::ItemNeverHasChildren when needed so
that QTreeView won't mark a leaf node expanded. Otherwise
ProtoTree::isExpanded will return true when it shouldn't and break the
iterator in ProtoTree::toString.

Bug: 14355
Change-Id: Id89be9911aa14dbbb52725f7203ac26a747c42fc
Reviewed-on: https://code.wireshark.org/review/25376
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-01-21 14:20:17 +00:00
Gerald Combs 3efcc9bd53 Qt: Create byte views at the proper zoom level.
Add a zoomed argument to WiresharkApplication::monospaceFont so that we
can easily fetch the font at its current zoom level. Set the zoomed font
when we create new ByteViewTexts.

Change-Id: I1293f206e37bb798247b1ac4b314fdfe88d4c55c
Reviewed-on: https://code.wireshark.org/review/25371
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-01-21 14:19:10 +00:00
Gerald Combs 064bec8797 CMake: File copy updates.
Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing
multiple files on Windows. Add a comment about using copy_if_different
for our data files.

Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple
of other places.

Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a
Reviewed-on: https://code.wireshark.org/review/25402
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-21 13:14:52 +00:00
Jaap Keuter 903c143769 autotools: Rework the plugin Makefiles
The plugin.c generation in an autotools build comes in from an included
Makefile.am file. The various types of plugins need different parameters
for the generation script. Put the plugin.c production rule is a seperate
include file so each plugin type build can include its own variant.

Also amend the README.plugins file with regards to the new directory
structure and the fact that there are multiple types of plugins, not just
dissector plugins.

Change-Id: I3a815d0d767baa555356cf428861b18697401355
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25398
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-21 13:13:17 +00:00
Gerald Combs 47351fb617 Qt: Initialize a struct (found by Coverity)
CID: 1427679
Change-Id: I2ed276f0da413b4853b7dc9ccde3530e655ad760
Reviewed-on: https://code.wireshark.org/review/25403
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-21 13:12:42 +00:00
Gerald Combs 5242dd48b4 [Automatic update for 2018-01-21]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I60c7bef36988fd487d9088880b1d27818723f0b7
Reviewed-on: https://code.wireshark.org/review/25404
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-21 08:18:44 +00:00