Commit Graph

76609 Commits

Author SHA1 Message Date
Stig Bjørlykke 499d912f4b funnel: Free callback data
Free allocated callback data in FunnelStringDialog, TextWindow and
registered menu items. Also free strings used in FunnelStringDialog.

Bug: 16177
Change-Id: I9a129b8975a55d1dc89fe851116feebe82763bca
Reviewed-on: https://code.wireshark.org/review/34945
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-11-05 15:21:30 +00:00
Pascal Quantin b01f0febe2 Fix find_conversation_pinfo() description in documentation
Change-Id: I3956dd841ee29d1676dbe2d1927a31bae5249414
Reviewed-on: https://code.wireshark.org/review/34986
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-05 15:03:19 +00:00
Anders Broman b921cd32dd Some IP: Fix Warn heuristic_protos' line 3
has extra stuff after the protocol name.

Change-Id: Ic384d4870632aef1abe70c85d57489d1cf997dec
Reviewed-on: https://code.wireshark.org/review/34978
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 13:43:08 +00:00
Peter Wu 3ccb01666b TLS: report encrypted TLS alerts as such
Encrypted alerts could be misreported as plain encrypt messages. Be sure
to check the length before interpreting it as unencrypted alert message.
Rename SSL to TLS while at it, and support unknown alerts.

Bug: 16180
Change-Id: I223568f8502cd629fed4642a786c9f5fcb488e8e
Reviewed-on: https://code.wireshark.org/review/34982
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 13:28:14 +00:00
Başak Kalfa 2ce3ec5055 PROFINET: Padding in SRLData block is corrected.
According to specification, padding in SRLData block
will be adapted to make the block unsigned32 aligned.
2 bytes padding is changed to unsigned32 aligned.

Change-Id: I78729a491cd5245acaff07fe595664187c2bf39e
Reviewed-on: https://code.wireshark.org/review/34979
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 13:26:28 +00:00
Stig Bjørlykke 6500d8071e Qt: Use g_new0 to allocate fmt_data
The column fmt_data will be g_free()'d later so ensure this is
allocated using g_new0().

Change-Id: I31abe4ea16004e7972a59b4fff965460fa930800
Reviewed-on: https://code.wireshark.org/review/34981
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 13:21:24 +00:00
Jirka Novak c0cec58564 RTP: rtp_audio_stream.cpp: fixed excess silence in visualisation on waveform
When silence is inserted to waveform (VaD, no RTP, ...), waveform is shifted to correct time in visualisation. Code was inserting silence to audio waveform too therefore following audio was shifted twice.
This patch fixes it.

Change-Id: I4f3e02328662f92b1dabec80ce9da31d0a839046
Reviewed-on: https://code.wireshark.org/review/34917
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 11:50:09 +00:00
Dario Lombardo 6fd51d5b25 print: some indentation fixes.
Change-Id: Iba03bae6dedd296477be1e7d522b4936efefef10
Reviewed-on: https://code.wireshark.org/review/34977
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 11:08:49 +00:00
Anders Broman 2ae8451121 OER: Handle negatived constraints in dissect_oer_constrained_integer.
Bug: 16176
Change-Id: I944ad530fd53222857a22d361432aaaca7f7e571
Reviewed-on: https://code.wireshark.org/review/34962
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2019-11-05 11:01:59 +00:00
Alexis La Goutte ce0b559534 BMP: Enhance dissection of Stats type
Add hf for each type
And also fix dissection of per AFI type (9 and 10), it is not only a uint32 or uint64, start with AFI/SAFI

Change-Id: Icb15db89365ee352a37f30650712a97bca99b4b3
Reviewed-on: https://code.wireshark.org/review/34971
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 10:20:55 +00:00
Başak Kalfa d793c8d70e PROFINET: Manufacturer Data ranges are modified.
According to specification, ranges for manufacturer data
are modified for both DCP and MRP. Small fixes are done.

Change-Id: I08fa8a8b04e8b82ade7f6a275774cfcbdb490495
Reviewed-on: https://code.wireshark.org/review/34755
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 10:13:36 +00:00
Alexis La Goutte f70c14af07 QUIC: Add draft-24
No packet change

Change-Id: I5d6510599905a6306343d96514ea6aa9334c147a
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/34972
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 10:08:16 +00:00
Alexis La Goutte ee61df4bbf TLS: Add facebook TLS 1.3 draft number
Bug: 16175
Change-Id: I150a0deeeb8223d926d96bdde2b951794f5f79dd
Reviewed-on: https://code.wireshark.org/review/34973
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 09:58:20 +00:00
Roland Knall e1dc9f82a6 Qt: Load filenames properly
Use a more stable approach for checking the file and avoid having
QFile reset with the filename. It is ok due to the fact, that it
is not opened, but is frowned upon in the documentation.

This only sets the filename once.

Change-Id: Ibe13eaf5938e060d7c39655591af34ac44340f49
Reviewed-on: https://code.wireshark.org/review/34965
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-05 09:29:47 +00:00
Stig Bjørlykke c39bb02fbc Qt: Fix memory leaks in FilterListModel::reload()
This fixes up to 6 string leaks in FilterListModel::reload().

1. The char pointer returned from get_persconffile_path() and
   get_datafile_path() is allocated and must be free'd by the caller.

2. QFile.setFileName() takes a QString() so don't strdup() the name
   given because that will leak as well.

Change-Id: I580020a5ff37a9b2b8ae16179ac6d7ba4a0f16da
Reviewed-on: https://code.wireshark.org/review/34964
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-05 09:29:42 +00:00
Nitzan Carmi 22ab2b970a nvme: Dissect NVMe Identify Ctrl (CNS 0x1) data response
On NVMe specification, calling NVMe "Identify Controller" command
(Identify with CNS 0x1) is responded with 4K data structure which
holds all controller's capabilities/attributes.

This commits dissects the main fields in this data structure.

Change-Id: I36eced7619ba70f0323a8f3d3914394343ec4dd0
Signed-off-by: Nitzan Carmi <nitzanc@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/34931
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-05 00:03:11 +00:00
Mikael Kanstrup 2ecb2828a8 dot11decrypt: Let dissector feed engine with EAPOL key message type
EAPOL key message type is known by dissector so no need for dot11decrypt
to parse frames to determine this. Instead feed engine with message
type from dissector. With this some code duplication can be avoided.

Change-Id: Icfd119186ebab5b0db29968df3eb94275d921e76
Reviewed-on: https://code.wireshark.org/review/34929
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-04 17:54:16 +00:00
Mikael Kanstrup 0ec8bd50c7 dot11decrypt: Separate key extraction step from decryption step
As a step towards removing the parsing of frames inside dot11decrypt
engine separate the key extraction step from the decryption step.

Two new functions for extracting keys are now provided by the
do11decrypt engine. One to be called for EAPOL key frames that
will extract and feed the engine with keys present in 4-way handshake
and group handshake messages. And one to be called for TDLS action
frames to extract keys and feed the engine with keys during TDLS
session establishement.

The old Dot11DecryptPacketProcess function called for all 802.11
frames is simplified and now only has one purpose. To decrypt
encrypted packets. Hence renamed to Dot11DecryptDecryptPacket.

Change-Id: Idb38d538f435ec352c6bbb200a09bc2a2347c42e
Reviewed-on: https://code.wireshark.org/review/34928
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-04 17:54:10 +00:00
Pascal Quantin 23850a3342 CMS: reset object_identifier_id after dissecting ContentInfo
Bug: 15961
Change-Id: I3d6b3e96103b69f88fcb512da81fa20ff6a1c40e
Reviewed-on: https://code.wireshark.org/review/34960
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-04 17:53:56 +00:00
Gerald Combs 5c10ad1e29 Qt: Remove some extraneous qDebug()s.
Change-Id: Id9c7786304c24048422a0855cca3a8bca5b9918b
Reviewed-on: https://code.wireshark.org/review/34963
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-04 17:46:48 +00:00
Dario Lombardo 2dc1b77827 elastic: print times the right way.
According to https://www.elastic.co/guide/en/elasticsearch/reference/6.7/date.html
a timestamp can be string or integer. Print the absolute times as string and the
relative times as integers.

The format for the time will be "date_nanos" as described here
https://www.elastic.co/guide/en/elasticsearch/reference/current/date_nanos.html

Ping-Bug: 15784
Change-Id: I430939961767fa65d11f2d3c939b203c8c84e88e
Reviewed-on: https://code.wireshark.org/review/34166
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-11-04 17:40:34 +00:00
Jaap Keuter 2336547a5f Show correct format of --display command line parameter
The --display command line parameter must not have an equal sign
between it and the value in order to work. Otherwise it is interpreted
as a abbreviation of the display-filter long option.

Bug: 16167
Change-Id: Ifcdd4cb8c41b24faccf01936a019a318fb1c3e0c
Reviewed-on: https://code.wireshark.org/review/34961
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-04 17:26:43 +00:00
Roland Knall e0ddc7ad9c Qt: Move CaptureEdit to FilterListModel
Move CaptureFilterEdit to FilterListModel and do cleanup

Change-Id: I9fdd37fda5698a3389f9bc4e550f2e56077675ec
Reviewed-on: https://code.wireshark.org/review/34959
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-04 15:45:23 +00:00
Roland Knall 04bb48bf2c Qt: Fix various issues with the bookmark menu
Odering differed from the manage filter expression. Also, managing
filter expressions is called "Filter Button Preferences.." throughout
other functions. And finally it did not properly update the information
about the selected filter, if a new filter was saved or an existing
filter removed.

Change-Id: I005028cd0b741587f4c5f2f39612e36d5d7d6c25
Reviewed-on: https://code.wireshark.org/review/34958
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-04 15:04:01 +00:00
Pascal Quantin 1628bff78d Get rid of proto_tree_add_debug_text() calls
This function should not be used for anything else than debug, as stated
in its name.

Bug: 15989
Change-Id: Ie2a99f3487169fcf2d00c06e7fc5d61086f32969
Reviewed-on: https://code.wireshark.org/review/34954
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-04 14:22:05 +00:00
Joakim Karlsson 3c3e88986f json: add application/merge-patch+json to the media types handled.
Change-Id: I09db950c4da59aa24da50715194be59f385b7032
Reviewed-on: https://code.wireshark.org/review/34952
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-04 14:05:16 +00:00
Gerald Combs 5acf14d5c0 macOS: Remove an exit code check.
Change-Id: I2b9d576bf6d5c49dcfa716abb00f80ea067328db
Reviewed-on: https://code.wireshark.org/review/34953
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-04 13:48:07 +00:00
Dario Lombardo 8cfe3f5aeb gitlab-ci: bump opensuse image version to 15.1.
According to https://en.wikipedia.org/wiki/OpenSUSE_version_history#Leap_15_series_[22][23]
15.0 is EOL in November 2019.

Change-Id: I201fc2683078f7ae16b9317e3b34c312f442aeb1
Reviewed-on: https://code.wireshark.org/review/34944
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-11-04 13:41:29 +00:00
Gerald Combs 89890097bd macOS: Properly sign our extra packages.
Use productsign to sign product archives.

Change-Id: I40fd329e6f2b0abc49f1b4b0247eae380de8101b
Reviewed-on: https://code.wireshark.org/review/34951
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-04 13:33:53 +00:00
Stig Bjørlykke b9c7bab05d bthci_evt: Use specific expert infos
Add specific expert infos for HCI revision changed and
LMP subversion changed.

Change-Id: Ic5837a03cf069254aada07f5fd769a7e859b8c87
Reviewed-on: https://code.wireshark.org/review/34949
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-04 13:31:02 +00:00
Roland Knall d21078309d Qt: Hide Searchbar if the icon is activated again
Change-Id: Ic478cc29ac1e0685737580da7110ec9f5d06d313
Reviewed-on: https://code.wireshark.org/review/34950
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-04 13:11:10 +00:00
Roland Knall a8052b9f38 Qt: Coloringrules Mime is encoded as JSON
Encode coloring rules as json objects to avoid encoding issues

Change-Id: I4b5369fef3c0f9e73cbb08edf14de6535ff35026
Reviewed-on: https://code.wireshark.org/review/34947
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-04 13:09:52 +00:00
Pascal Quantin 6fbb1d5c66 BTATT: avoid crashing when called directly through user DLT
Check the bluetooth_data pointer validity before using it for the
red-black tree key. It should be non nul when called from another
dissector, but it's not the case when you call btatt dissector
directly through a user DLT.

Bug: 16104
Change-Id: Ic572d639a8695b93102529a45b99ff6c3c7def03
Reviewed-on: https://code.wireshark.org/review/34948
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-04 12:49:11 +00:00
Roland Knall 013e87a8fd Qt: Remove DisplayFilterMimeData
Make the mimetype for the display filter more generic, so that external
programs can attach to Wireshark and users can drag and drop display
filters to the program

Change-Id: Id78b4dff7883e3dab879a31aad07f577d8cc4ee3
Reviewed-on: https://code.wireshark.org/review/34936
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-11-04 11:39:48 +00:00
Alexis La Goutte 05e37a386e Lustre: Fix conflict
'lustre.mdt_rec_reint.size' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'lustre.ldlm_res_id.name' exists multiple times with NOT compatible types: FT_STRING and FT_UINT64

Change-Id: I2706ac7c9866e4b435e6bd3c235fb67f1833af70
Reviewed-on: https://code.wireshark.org/review/34909
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-04 11:27:12 +00:00
Pascal Quantin b6c31d5db7 RTCP: fix an infinite loop (CID 1455251)
Change-Id: Ic8b058f6e12090355ba74e4210326d71f2674e66
Reviewed-on: https://code.wireshark.org/review/34946
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-04 11:25:59 +00:00
Stig Bjørlykke a673a50ad8 epan: Rename dissector_filters.c to conversation_filter.c
For the same reason as in g89c9d909.

Change-Id: I5e344ebdf8ba05d169484aa32b409d84edc6124f
Reviewed-on: https://code.wireshark.org/review/34943
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-04 10:17:16 +00:00
Peter Wu a596d269e8 TLS: workaround broken TLS reassembly with multiple TLS records
Break nested TLS in TLS in favor of keeping TLS reassembly working.

Bug: 16109
Change-Id: I10da5392635ea5224c1c7b31f24cebc45d8926ee
Reviewed-on: https://code.wireshark.org/review/34942
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-03 23:00:07 +00:00
Alexis La Goutte c02b39baa0 gsm_a_bssmap: Fix Dead Store
Fix dead store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I1b8121402316b3fb8698e3522b6666080428f246
Reviewed-on: https://code.wireshark.org/review/34906
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-03 22:58:23 +00:00
Alexis La Goutte de7760d490 BMP: Update to RFC (7854)
Change-Id: I9d1d689ad69bad525779b2bb0f659ba88e07abbb
Reviewed-on: https://code.wireshark.org/review/34912
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-03 22:57:30 +00:00
Pascal Quantin c537828d60 Wi-Fi NAN: fix infinite loop when parsing NDP extension attribute
Bug: 16170
Change-Id: I21bd45a092a1f9e99758b0eae8431b0314c6bce3
Reviewed-on: https://code.wireshark.org/review/34941
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-03 21:19:14 +00:00
Pascal Quantin ddb86b9237 IEEE 802.11: avoid a "Null pointer passed to bytes_to_str()" error
Change-Id: I221d0bf489ef3eef32d931e4832ce0d8b155ae22
Reviewed-on: https://code.wireshark.org/review/34940
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-03 21:18:53 +00:00
Alexis La Goutte c4bd5222f5 lustre: fix typo (wrong hf)
Unused href entry: epan/dissectors/packet-lustre.c: hf_lustre_hsm_state_set

Change-Id: I1bb0c63f049e824ddb99aa81e220ec6342af3af2
Reviewed-on: https://code.wireshark.org/review/34910
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-03 18:49:31 +00:00
Peter Wu 89c9d90980 snort: rename snort-config to packet-snort-config
I sometimes type too fast and 'epan/dissectors/s<TAB>' ends up into
'epan/dissectors/snort-config.' which is never intentional.

Change-Id: I5bae7b303bbcc7057f15d5acfa9fa01610cd90ce
Reviewed-on: https://code.wireshark.org/review/34926
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-11-03 18:47:44 +00:00
Jaap Keuter 8087bcbf6d HTTP2: fix build without nghttp2
http2_get_data_reassembly_mode is not used when nghttp2 is not found.
Put compile guards around it to stop the compiler from complaining about
an unused function.

Change-Id: I5f1fa094d0968d3a877127058adc1024c5013fea
Reviewed-on: https://code.wireshark.org/review/34939
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-11-03 18:46:42 +00:00
Pascal Quantin 8541d686e9 Wi-Fi NAN: initialize ieee80211_tagged_field_data_t structure
Bug: 16174
Change-Id: I0d1eac5fd11ab768e8665d3fbdf51e5103792600
Reviewed-on: https://code.wireshark.org/review/34938
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-03 18:21:02 +00:00
Gerald Combs f2036f0fbd Qt: Print qDebug messages by default.
We handle Qt and GLib logging in the same handler, which means that if
we map qDebug messages to G_LOG_LEVEL_DEBUG they won't be printed by
default. This can make debugging the UI more confusing, since sprinkling
in qDebug()s is a common Qt debugging method. If you're focused on
fixing a bug it's easy to forget that you need to use qWarning() or
change the logging level preference instead.

Set the log level for qDebug messages to G_LOG_LEVEL_WARNING so that
they show up.

Change-Id: I4336b001cb667a31bf8b25306cd34e758cc8967e
Reviewed-on: https://code.wireshark.org/review/34937
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-03 17:45:36 +00:00
Peter Wu 26504a0024 snort: fix alert rule parsing
Clang warned about casting 'char *' to 'char **' and indeed, the end
pointer should not be stored in the value string that is being parsed.
While at it, the 'rev' parameter was not properly set.

Change-Id: I63c121e54e15bf432a878e289e9ed6547aca375f
Reviewed-on: https://code.wireshark.org/review/34924
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-11-03 17:22:10 +00:00
Mikael Kanstrup e60b8d1eb1 dot11decrypt: Shorten the debug macros
The debug log macros are really long and require function name as
one parameter. This makes debug log lines either too wide or span
several lines of source code. Shorten the macro defines and make
use of G_STRFUNC to avoid manual function name entries in code.

NOTE: A bonus of removing all the manual function name entries is
that browsing/searching the code for function names is much easier.

Change-Id: Ia643f56df76e4a1b01ee6e6818cd61ec01047d33
Reviewed-on: https://code.wireshark.org/review/34927
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-11-03 17:20:46 +00:00
Peter Wu eeb179edee snort: fix non-static 'g_file_separator' variable
Clang warned (-Wmissing-variable-declarations) about a non-static
'g_file_separator' variable. Remove it since the G_DIR_SEPARATOR_S macro
fulfills the same purpose, and use g_build_path since it is more
appropriate and does not have length limits.

Change-Id: I696c82a6ce3f58e6a28b87f096f1f7bf7ae73cf7
Reviewed-on: https://code.wireshark.org/review/34925
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-11-03 17:20:24 +00:00