Commit Graph

75993 Commits

Author SHA1 Message Date
Roland Knall 5c678288bc Qt: Check filename before import
Before the unzipped files are being copied from the temp directory,
they are checked against the stored list of profile names, to ensure,
that only allowed files are being imported.

Also ensures, that no empty directory exists for the skipped one

Bug: 15969
Change-Id: I6ae8c9fb5f63d089d42fc0ef18dbe84baec515a2
Reviewed-on: https://code.wireshark.org/review/34184
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-05 13:47:11 +00:00
Vasil Velichkov b31d1168f7 GSM RR: Change the TMSI/PTMSI field name
Use hf_gsm_a_tmsi instead of hf_gsm_a_rr_tmsi_ptmsi. This allows easy
filtering of all messages that contains a given TMSI/PTMSI using a
filter with only one field name instead of two.

Change-Id: I356865ebdac9691abd8d14d44aac7ccf4e22e70c
Reviewed-on: https://code.wireshark.org/review/33990
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-05 13:36:08 +00:00
Roland Knall d043439e1c Qt: Sequence Dialog simplify context menu
And minor UI changes

Change-Id: Ieed1e5090c0f5adc6e41b386d9950443b30eb2da
Reviewed-on: https://code.wireshark.org/review/34180
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-08-05 12:33:04 +00:00
Anders Broman 94f9563f5d GTPv2: Update Cause IE.
Change-Id: I52ccd9c680f3dd95ce6d001d61c39146d60c81eb
Reviewed-on: https://code.wireshark.org/review/34186
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-05 12:07:15 +00:00
Anders Broman 1ff576cbeb Diameter: Update 3GPP AVP 513 Specific-Action.
Change-Id: Iec92482d0358c68fd079a5a701bfcb7f015eb5bf
Reviewed-on: https://code.wireshark.org/review/34185
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-05 10:34:54 +00:00
Gerald Combs 545a3986fe Docbook: Document using middle-click to mark packets.
Add an item about marking packets using the middle mouse button to the
release notes.

Update the "Marking Packets" section of the User's Guide accordingly.

Use "menu:...[]" to mark up menu items in a bunch of places. It looks
like we need to a add a "guimenu" class to ws.css.

Change-Id: Ide99112f7643e509d8af8a4aa6ddb4287f3585cf
Reviewed-on: https://code.wireshark.org/review/34182
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-05 08:26:43 +00:00
Stig Bjørlykke 686ef87306 Qt: Always store lastdir on profile import
Always store the last used directory when doing profile import,
even if no profiles where imported. A new directory may have been
used and the user may have selected the wrong .zip file.

Change-Id: I7ed9de8b62fa7a57623ffb3e737186f072a82255
Reviewed-on: https://code.wireshark.org/review/34183
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-08-05 07:33:19 +00:00
Jason Cohen 0f6b655db6 f5ethtrailer: Add dissection for TLS trailers
https://cdn.f5.com/product/bugtracker/ID464934.html

F5 BIGIP v15.0.0 added the ability to provide debug
TLS key information when capturing on BIGIP.  This is
provided as part of the f5ethtrailers.  This dissector
decodes this data and will display it in the protocol
tree.  Some of the data is useful for decryption, while
other data is state data to troubleshoot hadshake failures.

This change set is limited to dissection and display of
data available in the trailer.

Bug: 15948
Change-Id: I21398f9d9e46100a9906d1bcf49f41f9ea9bb1bc
Reviewed-on: https://code.wireshark.org/review/34140
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>
2019-08-05 03:54:53 +00:00
Peter Wu c11fe64834 Qt: do not adjust the time origin for empty graphs
If a graph does not contain any visible data (for example, "TCP Errors"
in a capture without TCP packets), the start offset is bogus. Ignore it
to avoid Time of Day being displayed as 01.01.1970.

Bug: 15247
Change-Id: I0e0a113dac6aebd42a4b48b89bbf563e96a8807a
Reviewed-on: https://code.wireshark.org/review/34129
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-05 03:49:09 +00:00
Roland Knall a2b4586376 Qt: Guard no minizip build
Change-Id: Ib0e4f8343d4acbdde956e35ac37dcf6a2937421f
Reviewed-on: https://code.wireshark.org/review/34181
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-08-04 21:40:55 +00:00
Gerald Combs 072fecbbd4 [Automatic update for 2019-08-04]
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-04 08:19:06 +00:00
Tomasz Moń 4c9a012133 USBLL: Minimal destination address handling
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-04 05:33:39 +00:00
Craig Jackson a4c95bcddf TDS: Fix handling of numeric and decimal types.
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-04 05:32:40 +00:00
Guy Harris e206eb2992 Use ENC_NA, not ENC_BIG_ENDIAN, for a sequence of bytes.
Change-Id: I90023c940b7a6a89f57c9394b5b21596f560c6e2
Reviewed-on: https://code.wireshark.org/review/34176
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-08-04 02:26:37 +00:00
Guy Harris ade3a6b658 Set tm_isdst before calling mktime().
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-04 01:38:41 +00:00
Guy Harris 8ae710dbdc Note the Microsoft standard, fix the LZNT1 comment.
Change-Id: I1e809aa09355a7e7235a41a903c6b4adf7df446a
Reviewed-on: https://code.wireshark.org/review/34174
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-08-04 01:09:47 +00:00
Stig Bjørlykke ca432674b1 Qt: Write recent before exporting profiles
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-03 21:45:37 +00:00
Dario Lombardo 3109f526cd test: skip some tests on big endian machines.
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-03 20:45:51 +00:00
Juergen Kosel b1e74c527b gitlab-ci: Add job to create debian install-packages
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-03 20:23:12 +00:00
Maksim Salau 9011ad1030 wiretap: Add support for Busmaster log file format
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-03 15:46:08 +00:00
Peter Wu 19488f334d QUIC: add field for the QUIC packet length
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-03 15:43:47 +00:00
Oliver fc926c0e97 CDP: Expand dissection of capabilites
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-03 14:45:57 +00:00
Mike78 048af39e47 Correct typo in Extcap-Options-Dialog
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-03 10:50:36 +00:00
Roland Knall 6c32251bd6 Qt: Fix minizip guards
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-03 09:54:29 +00:00
Roland Knall a76044f47c Qt: Mark with middle button
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-03 07:29:39 +00:00
Roy Chateau cdee7494d5 ED137: Fix Climax Time Delay.
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-03 05:19:26 +00:00
Roland Knall f259187803 Qt: Update UI for profiles and handle export/import properly
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-02 21:38:02 +00:00
Dario Lombardo 66747a982b wsutil: link with -lm.
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-02 20:42:23 +00:00
Roland Knall c5b158bec1 Qt: Rework VOIP Dialog context menu
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-02 19:14:55 +00:00
Alexis La Goutte 6376a69675 rtps: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
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-02 16:59:17 +00:00
Dario Lombardo ad5db22a14 caputils: cast g_malloc pointer.
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-01 19:58:06 +00:00
Juergen Kosel e7852aa3ba debian-setup.sh: Correct order of apt-get update and add_package
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-01 19:52:08 +00:00
Ismael Mendez Matamoros d286b819b7 RTPS: Filter added for detecting starts and end of coherent sets
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-01 17:28:02 +00:00
Martin Mathieson 225068d89d MAC-NR: SRS Act-Deact CE dissection improvements.
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-01 16:44:42 +00:00
Gerald Combs 1b1de214c4 epan: Work around a p11-kit bug on Windows.
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-01 16:24:14 +00:00
Martin Mathieson 6b4264cb26 MAC-NR: Call RLC dissector for SRB LCIDs using defaults.
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-01 15:15:12 +00:00
Stig Bjørlykke 61004d728c Qt: Fix typo in extcap options dialog
Bug: 15929
Change-Id: Ibdc689691711866ab4ed5bb8239a2219f86555bc
Reviewed-on: https://code.wireshark.org/review/34147
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-08-01 10:28:44 +00:00
Jaap Keuter 67dfb53dcf eth: add dst and src specific local/group fields
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-01 07:33:17 +00:00
Stig Bjørlykke af59b00f2d Qt: Check for invalid filters after coloring rules import
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-01 06:33:30 +00:00
Stig Bjørlykke 0c4264f6cf Qt: Add ctx menu to start capturing packets
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-08-01 06:33:17 +00:00
Stig Bjørlykke cae3bec14e Qt: Remove global recent_ctx_menu
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-31 07:49:43 +00:00
Stig Bjørlykke 927afac570 Qt: Check for NULL pointer in profile->reference
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-30 11:34:35 +00:00
Stig Bjørlykke 5d0a2ccbb7 Qt: Change from User/System to Personal/Global profile types
Change the Profile types from User/System to Personal/Global in UI
to match the terminology used in About Wireshark -> Folders.

This reverts commit 40af4aa93e.
This reverts commit f0cde7ca34.
This reverts commit c37cabe900.

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-30 10:11:10 +00:00
Dario Lombardo d614865c8c docbook: fix infos and commands.
- 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-30 07:56:13 +00:00
Guy Harris a0cdb06aba Fix shadow variable warnings, fix type error.
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-30 07:47:18 +00:00
Stig Bjørlykke 679ae4c1e3 Qt: Improve numerus translation in status bar
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-30 07:14:11 +00:00
Guy Harris 40af4aa93e Rename variable to eliminate shadow variable warning.
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-29 22:23:36 +00:00
Guy Harris f0cde7ca34 The next release, introducing those functions, will probably be 3.1.1.
Change-Id: I93557ac0991d4e06269ebec2583607793ce8da70
Reviewed-on: https://code.wireshark.org/review/34130
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-29 21:36:05 +00:00
Dario Lombardo ecd731ca92 tools: add missing packages to bsd-setup.
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-29 21:28:55 +00:00
Peter Wu 77b6160696 proto: fix proto_item_add_bitmask_tree with zero length
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-29 20:50:45 +00:00