aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-08-04[Automatic update for 2019-08-04]Gerald Combs16-491/+1924
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I8c95eb29066ec1501740545cfd78e5be577a9e7a Reviewed-on: https://code.wireshark.org/review/34177 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-08-04USBLL: Minimal destination address handlingTomasz Moń3-2/+34
Currently only following packets have the address fields populated: * SETUP * OUT * IN * PING * SPLIT Although only some packets have the fields populated, this already makes trace analysis significantly easier. Ping-Bug: 15908 Change-Id: I5a5c0e210cb1ceb8e8a747349c4da33ac84ec4c9 Reviewed-on: https://code.wireshark.org/review/34039 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-04TDS: Fix handling of numeric and decimal types.Craig Jackson1-27/+76
Microsoft and Sybase introduced big-integer types separately and incompatibly. The existing code doesn't completely handle either of them. This should fix both implementations. Bug: 15803 Change-Id: I23dda7790185581716141a5a7556c3858b0ecb93 Reviewed-on: https://code.wireshark.org/review/34114 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-04Use ENC_NA, not ENC_BIG_ENDIAN, for a sequence of bytes.Guy Harris1-1/+1
Change-Id: I90023c940b7a6a89f57c9394b5b21596f560c6e2 Reviewed-on: https://code.wireshark.org/review/34176 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-08-04Set tm_isdst before calling mktime().Guy Harris1-12/+14
You either have to set it to 1 or 0 if you know whether it's shifted time or set it to -1 if you don't. Should address Coverity CID 1452227. Change-Id: I7d435bb6b7dd8897b44bf5103578e3db1a30379e Reviewed-on: https://code.wireshark.org/review/34175 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-08-04Note the Microsoft standard, fix the LZNT1 comment.Guy Harris3-1/+7
Change-Id: I1e809aa09355a7e7235a41a903c6b4adf7df446a Reviewed-on: https://code.wireshark.org/review/34174 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-08-03Qt: Write recent before exporting profilesStig Bjørlykke1-0/+4
The selected profile may have unsaved recent settings when exported, so write the recent file before exporting to ensure that we save the latest changes. A side effect is that it's now possible to export a newly created profile even if it has only default configuration. Bug: 15965 Change-Id: I7bb6428283789894bd2863e9ddbd130ca56b1219 Reviewed-on: https://code.wireshark.org/review/34172 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-03test: skip some tests on big endian machines.Dario Lombardo2-0/+11
Dumpcap doesn't support fifos with streams created on a machine with different endianess. Until dumpcap will support that, we need to skip some tests so the whole test suite can pass. Ping-Bug: 15754 Change-Id: Ia7fdf833715bf975fcee76968a7c1d75d084bd6f Reviewed-on: https://code.wireshark.org/review/34173 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-08-03gitlab-ci: Add job to create debian install-packagesJuergen Kosel1-0/+17
Inspired by the description in https://about.gitlab.com/2016/10/12/automated-debian-package-build-with-gitlab-ci/ the gitlab-ci job build-debian-deb generates *.deb files These files are available as build artifacts for 3 days. Change-Id: Ic0b01c161e659c3ed9dbbd6387fa8960e34d50d3 Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de> Reviewed-on: https://code.wireshark.org/review/34042 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-08-03wiretap: Add support for Busmaster log file formatMaksim Salau9-21/+1298
Only CAN protocol is supported. Extra information available in J1939 entries is ignored since the J1939 wireshark dissector works with raw CAN frames and makes no use of this extra information. The log format may also encapsulate LIN messages which are not supported by wireshark and thus are ignored. The only limitation is that relative timestamp format is not supported. If a file defines relative format of timestamps, packets are extracted, but timestamps are omitted, since random access deems impossible without reparsing the whole file up to the packet of interest. In order to support relative timestamps we need to parse the whole file at once on open and either dump into a temporary PCAP file or keep messages in a private list and provide access to them on read()/seek_read(). The change also creates a separate header for CAN frame structure definitions which are used by several file readers (candump and busmaster for now). Bug: 15939 Change-Id: I87c5555e4e5e1b142b9984b24544b2591d494fbc Reviewed-on: https://code.wireshark.org/review/34083 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-03QUIC: add field for the QUIC packet lengthPeter Wu1-1/+10
Requested by rmarx for qlog which uses tshark -Tjson output. While one can learn the QUIC layer length from the GUI or the -Tpdml output does not include this information. Add a new field as workaround. Change-Id: I145ccce0c5cdd77380918737a7fd954b6d5751d5 Reviewed-on: https://code.wireshark.org/review/34171 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-03CDP: Expand dissection of capabilitesOliver1-0/+24
Adds four extra capability definitions that could exist in a CDP packet. Useful for identifying phones. Change-Id: I2b542a8a079a8483d8c1ee10df60c8df0933af95 Reviewed-on: https://code.wireshark.org/review/34169 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-08-03Correct typo in Extcap-Options-DialogMike782-2/+2
Bug: 15929 Change-Id: Ia68735a4f286e2d13ba2ec1c53b99805533ecff9 Reviewed-on: https://code.wireshark.org/review/34151 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-03Qt: Fix minizip guardsRoland Knall1-0/+4
Change-Id: I4df6bfe132e61fbc65e1f96044ae949eb08b9df6 Reviewed-on: https://code.wireshark.org/review/34170 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-03Qt: Mark with middle buttonRoland Knall1-0/+8
Allow to mark a packet with clicking the middle mouse button Change-Id: I1d291c58ac99f17f94e0b31c6b67e30cc4ad5379 Reviewed-on: https://code.wireshark.org/review/34167 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-03ED137: Fix Climax Time Delay.Roy Chateau1-2/+2
change Climax Time Delay absolute tree to uint8 instead of uint32 like relative. Fix calculation of microseconds to nanoseconds. Change-Id: I984856300204de0a5dab4ae7515a9cb1d73f68ef Reviewed-on: https://code.wireshark.org/review/34017 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-02Qt: Update UI for profiles and handle export/import properlyRoland Knall12-226/+737
This patchset ensures a 1:1 replacement of the old 3.0 version of the profiles dialog. It is a major bugfix for the new version in case of handling creating/ deleting and adding profiles. Delete can be performed on multiple profiles now, by selecting the profiles which need to be deleted. Import/Export functionality has been overhauled to follow these rules: * No imports while changes are pending, due to datamodel sanity * Export for Default Profile and Global Profiles is not possible * Either all personal profiles can be selected or individually choosen ones * Use last directory and store it properly * Imports can be cancelled * Only one import is allowed at a time (but it can contain as many profiles as needed) Change-Id: Ie2fccd397202ec06976d764734437284f464409a Reviewed-on: https://code.wireshark.org/review/34123 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-02wsutil: link with -lm.Dario Lombardo1-0/+1
Required because json_dumper.c uses isfinite, fixes FreeBSD builds. Error: /usr/lib/libpcap.so && : /usr/local/bin/ld: run/libwsutil.so.0.0.0: undefined reference to `__isfinite' collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. Change-Id: I6376250fa2037eab0bb2ad63382b8f3bb3560215 Reviewed-on: https://code.wireshark.org/review/34138 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-02Qt: Rework VOIP Dialog context menuRoland Knall5-50/+42
Rework the context menu to have same functions behave the same way and just create the menu while it is needed. Also, add switch for setting the time of day to the context menu Change-Id: Id813ff39431f6fad15887856f246d03f209e438d Reviewed-on: https://code.wireshark.org/review/34165 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-02rtps: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I88f159f7823026cff82892a59d72a017777fcbab Reviewed-on: https://code.wireshark.org/review/34160 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Ismael Mendez <ismael@rti.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-01caputils: cast g_malloc pointer.Dario Lombardo1-2/+2
Fix compilation on FreeBBSD: ../caputils/capture-pcap-util.c: In function 'if_info_get': ../caputils/capture-pcap-util.c:383:17: error: request for implicit conversion from 'gpointer' {aka 'void *'} to 'char *' not permitted in C++ [-Werror=c++-compat] description = g_malloc(descr_size); ^ Change-Id: I4a3452a8b21c2bee853a50a977c418dd92a5d4b4 Reviewed-on: https://code.wireshark.org/review/34152 Reviewed-by: Guy Harris <guy@alum.mit.edu> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot
2019-08-01debian-setup.sh: Correct order of apt-get update and add_packageJuergen Kosel1-1/+4
apt-get update must be called before calling add_package otherwise available packages appear as unavailable. Change-Id: Ie449ca9037950b82908f72a3951401cc0c6496d1 Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de> Reviewed-on: https://code.wireshark.org/review/34162 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-08-01RTPS: Filter added for detecting starts and end of coherent setsIsmael Mendez Matamoros2-25/+236
Starts and end of coherents ssets can be filtered now. Also those packets show the coherent end start or end sequence number. Change-Id: I7f9579f8d935b1f4a7f924bb3030fe6fc646ae5a Reviewed-on: https://code.wireshark.org/review/33840 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-08-01MAC-NR: SRS Act-Deact CE dissection improvements.Martin Mathieson1-7/+46
For SSB, mask off lower bit that isn't part of the resource ID. Also, show more in the Info column. Change-Id: I3741e7979c0a4c5878ba1f054f86a9457166be03 Reviewed-on: https://code.wireshark.org/review/34157 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-08-01epan: Work around a p11-kit bug on Windows.Gerald Combs1-0/+10
The version of p11-kit that we ship with Windows will crash if we feed gnutls_pkcs11_add_provider an invalid path. Work around this by checking for the file's existence ourselves. Bug: 15957 Change-Id: I81484b8bd8f837a49bc17a6c9cb0b10fd33c3f6e Reviewed-on: https://code.wireshark.org/review/34144 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-08-01MAC-NR: Call RLC dissector for SRB LCIDs using defaults.Martin Mathieson1-2/+18
Change-Id: Id1c27d7af822f8201145eaf7ba5d0b731f8e0ced Reviewed-on: https://code.wireshark.org/review/34150 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-08-01Qt: Fix typo in extcap options dialogStig Bjørlykke1-1/+1
Bug: 15929 Change-Id: Ibdc689691711866ab4ed5bb8239a2219f86555bc Reviewed-on: https://code.wireshark.org/review/34147 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-08-01eth: add dst and src specific local/group fieldsJaap Keuter5-16/+198
The local and group address flags are shared between destination and source addresses. This makes filtering difficult sometimes. Create unique fields for them, while moving the existing fields into hiding. This breaks the output format tests, so the baseline files need to be updated as well. At the same time document how this can be done. Bug: 15955 Change-Id: I849bb306f044c09d4ed0836fe92fef8981912500 Reviewed-on: https://code.wireshark.org/review/34139 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-08-01Qt: Check for invalid filters after coloring rules importStig Bjørlykke1-0/+2
Check for invalid coloring filters after doing an import to give a proper warning to the user, and to avoid the same warning the next time the coloring rules dialog is opened. Change-Id: If6feee8ad00b3a221d157a46cbfb2462e7b7d6ef Reviewed-on: https://code.wireshark.org/review/34143 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-08-01Qt: Add ctx menu to start capturing packetsStig Bjørlykke2-0/+12
Add a context menu in the interface frame to start capturing packets. Bug: 15954 Change-Id: I93379c9abc5d3ba8b64388f57679e6e7bfdd6da7 Reviewed-on: https://code.wireshark.org/review/34133 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-07-31Qt: Remove global recent_ctx_menuStig Bjørlykke2-10/+6
Make recent_ctx_menu local to showRecentContextMenu() to avoid keeping a global pointer which needs to be cleared every time. Change-Id: Ic3baae4501e00ee753529b1edd5888de5d1e2167 Reviewed-on: https://code.wireshark.org/review/34142 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-30Qt: Check for NULL pointer in profile->referenceStig Bjørlykke1-2/+2
Check for NULL pointer before using profile->reference in strcmp() because this will give a crash. Doing a copy profile from a new profile will set the reference to NULL in get_profile_parent(). Use an unambiguously profile reference value NULL as profile->reference when creating a new profile to align with when copy from a new profile. Change-Id: Ib27a1a309776e9c2ec44677f2d22f9a5635dd38a Reviewed-on: https://code.wireshark.org/review/34137 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-30Qt: Change from User/System to Personal/Global profile typesStig Bjørlykke10-106/+106
Change the Profile types from User/System to Personal/Global in UI to match the terminology used in About Wireshark -> Folders. This reverts commit 40af4aa93e469d37bd8e712228ecccb07407c3c6. This reverts commit f0cde7ca34a4975370e1b9ded2fee7df266343f6. This reverts commit c37cabe900b9b11e12c8626ca46adc080e465fdb. Change-Id: I9012db6385707754e26a2dadb57f6003f8112f9b Reviewed-on: https://code.wireshark.org/review/34134 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-07-30docbook: fix infos and commands.Dario Lombardo1-21/+12
- Use apt instead of aptitude. - Update example file name versions. - Remove leading $ from command lines. Change-Id: I888f6612615ac252c0c0b3f867bac36610ae3e51 Reviewed-on: https://code.wireshark.org/review/34110 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-07-30Fix shadow variable warnings, fix type error.Guy Harris1-20/+18
Sadly, index() is still defined to be a function in some UN*Xes, for backwards compatibility with V7, where the function now known as strchr() was called index(); pick another name for variables named "index". wmem_array_get_count() returns a guint; store its value in a guint. That also means its return value is never negative. Change-Id: I357dcda9297f242355ef1ad8d2f1f192a0b5bb5f Reviewed-on: https://code.wireshark.org/review/34132 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-30Qt: Improve numerus translation in status barStig Bjørlykke2-11/+9
Use one translation for the number of bytes in a field reported in the main statusbar. Change-Id: I76f9ca1d718e1493d97caf01c3838c93f20b821a Reviewed-on: https://code.wireshark.org/review/34121 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-07-29Rename variable to eliminate shadow variable warning.Guy Harris2-4/+4
get_profile_dir() already calls the corresponding variable is_system; use that in profile_exists() as well. Change-Id: Icce42b2074d64c46598cc7561b3c5468da8ede90 Reviewed-on: https://code.wireshark.org/review/34131 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-29The next release, introducing those functions, will probably be 3.1.1.Guy Harris1-2/+2
Change-Id: I93557ac0991d4e06269ebec2583607793ce8da70 Reviewed-on: https://code.wireshark.org/review/34130 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-29tools: add missing packages to bsd-setup.Dario Lombardo1-1/+4
Change-Id: I2d9272c5f320891420a7336d648e1ee23d2f20e8 Reviewed-on: https://code.wireshark.org/review/34128 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-07-29proto: fix proto_item_add_bitmask_tree with zero lengthPeter Wu1-4/+9
packet-frame.c calls proto_item_add_bitmask_tree with a zero length, be sure not to trigger undefined behavior (right shift by 64). Observed with the capture from Bug 15247. Change-Id: I5b5b7f920a37365295603be7b915f51b39d99faf Fixes: v2.1.0rc0-1776-gb9fb2ceb88 ("Add heuristic dissectors for the variable part of COTP CR and CC PDUs.") Reviewed-on: https://code.wireshark.org/review/34108 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-29USBLL: Verify Token/Split packets CRC-5Tomasz Moń5-11/+144
Ping-Bug: 15908 Change-Id: I25aaf772d3d0af2f459a1ad78d8253344ed13f05 Reviewed-on: https://code.wireshark.org/review/34025 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-29Bluetooth: SDP: add new AVRCP 1.6 supported feature flagsMatt Porter1-12/+44
Add new AVRCP 1.6 CT/TG supported feature flags to the service recoards as documented in Chapter 8 of https://www.bluetooth.org/docman/handlers/DownloadDoc.ashx?doc_id=292286 Change-Id: I71313379393e85c5a9b4a08e7f16d3244dd3583a Signed-off-by: Matt Porter <mporter@konsulko.com> Reviewed-on: https://code.wireshark.org/review/34094 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-07-29Bluetooth: AVRCP: add new AVRCP 1.6 MediaPlayer Item feature flagsMatt Porter1-2/+14
Add new AVRCP 1.6 MediaPlayer Item feature flags as documented in Section 6.10.2.1 of https://www.bluetooth.org/docman/handlers/DownloadDoc.ashx?doc_id=292286 Change-Id: Id622da89ce1e15b4273f67cd53124cfd60d8a162 Signed-off-by: Matt Porter <mporter@konsulko.com> Reviewed-on: https://code.wireshark.org/review/34095 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-07-29Qt: avoid NULL to terminate a g_build_filename in ExportObjectModelPeter Wu1-8/+7
While documentation for g_build_filename suggests the use of NULL as terminator, the C++ standard permits NULL to be defined as integer 0. This potentially has a different size than a void pointer and can cause crashes if this is the case. Instead of using (void*)0 as terminator, let's just rewrite this piece to avoid the problem in its entirely. Fixes "missing sentinel" warning in GCC with musl due to NULL being 0L. Change-Id: I6a7911887eaeeaa56fdb03d14ee8b70a42c8a05b Reviewed-on: https://code.wireshark.org/review/34107 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-29doc: document WIRESHARK_CONFIG_DIRPeter Wu3-12/+15
WIRESHARK_CONFIG_DIR was introduced with Wireshark 3.0 and is more cross-platform than WIRESHARK_APPDATA. The latter was presumably created for use by PortableApps. Let's consider that an internal, undocumented detail that might be change, and document WIRESHARK_CONFIG_DIR instead. Change-Id: I0042d607b282cc6dee4b017b1e80b44087bd62e9 Reviewed-on: https://code.wireshark.org/review/34113 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2019-07-29log3gpp: Fix purpose of 'init' in proto_reg_handoff_log3gppStig Bjørlykke1-1/+1
The purpose of 'init' in proto_reg_handoff_log3gpp() is to avoid doing multiple dissector_add_uint(), so make this variable static. Change-Id: Ie69c0b20d56102035ef44bd5c71aee87949a5191 Reviewed-on: https://code.wireshark.org/review/34118 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-29Qt: Fix memory leak in zip helperStig Bjørlykke1-0/+2
Memory allocated with malloc must be freed when done. Change-Id: I03fe15232cf589b4af3591018e842cf296e7ee2c Reviewed-on: https://code.wireshark.org/review/34120 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-29Qt: Fix memory leak in Profile modelStig Bjørlykke1-4/+9
The pointer from get_persconffile_path(), get_profiles_dir() and get_system_profiles_dir() is malloc'ed so ensure this is freed when done. Change-Id: Id836643a4209f0f9ec570a18f62a8c58cf2b67a7 Reviewed-on: https://code.wireshark.org/review/34119 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-29Qt: Rename lblInfo to hintLabelStig Bjørlykke2-6/+6
This label is called hintLabel in all other dialogs. Change-Id: Ia17f29907c71a71f25ac20b3c617cc2d1a079814 Reviewed-on: https://code.wireshark.org/review/34117 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-29Qt: Rename profile global to systemStig Bjørlykke10-99/+99
It's called system profiles in UI so update function names and variables to use the same name. This will increase code readability. Change-Id: I048e9ea85bd6ebab4a2c3ed1c685487ac8f7e40e Reviewed-on: https://code.wireshark.org/review/34116 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>