Commit Graph

81055 Commits

Author SHA1 Message Date
Martin Mathieson 8775e2c694 check_static.py: remove unused option 2021-06-08 10:47:59 +01:00
Stig Bjørlykke 76a93df87c smb: Fix 32bit build
The maximum size stored in calculated_size is already checked if
bigger than G_MAXUINT32, so add a cast to size_t.
2021-06-08 10:18:10 +02:00
Stig Bjørlykke 1bb3d761b8 epan: Change export_object_entry_t.payload_len to size_t
The *real* maximum object size is size_t, so change payload_len
to match this.
2021-06-08 07:16:22 +00:00
Simon Barber 97e5b64f6f ieee80211_radio: Clarify Aggregate duration field description.
Change-Id: Ieaff474e4be59b5b41a8262431dbfbc6995579c9
2021-06-08 05:32:16 +00:00
John Thacker 73eca0905d DVB-S2-BB: Two coverity flagged issues from !3239
Address two issues found by coverity.
2021-06-07 20:10:41 -04:00
Alexis La Goutte 307b669aa5 ieee80211: rename TBTT Information to Neighbor AP Information 2021-06-07 20:00:47 +00:00
Alexis La Goutte 17893e35c6 rtps-processed: remove unused else block
From review of Luis
2021-06-07 19:27:27 +00:00
Alexis La Goutte aa36919b4b rtps-virtual-transport: Add comment about type of variable
following code review from Luis
2021-06-07 19:27:27 +00:00
Alexis La Goutte a65b879b04 rtps-virtual-transport: Fix unused variable 2021-06-07 19:27:27 +00:00
Alexis La Goutte b65488b4be rtps-processed: Fix Dead Store found by Clang Analyzer
packet-rtps-processed.c:321:13: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
packet-rtps-processed.c:349:13: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
packet-rtps-processed.c:356:9: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
2021-06-07 19:27:27 +00:00
Alexis La Goutte e520217ea5 rtps-virtual-transport: Fix Dead Store
packet-rtps-virtual-transport.c:946:17: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
packet-rtps-virtual-transport.c:995:5: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
2021-06-07 19:27:27 +00:00
João Valverde 586535bdb8 Add documentation for display filter raw string syntax 2021-06-07 18:58:49 +00:00
Gerald Combs 35f5c116ca GitLab CI: Don't clobber the Code Lines before_script. 2021-06-07 11:40:19 -07:00
Gerald Combs e80e118f7a GitLab CI: Add more code line counters.
Count lines using cloc, scc, and tokei in addition to SLOCCount.
2021-06-07 18:20:10 +00:00
João Valverde 2c477efabd WSUG: Add section about regexes and the display filter
Add section about common regex pitfalls and correct some examples.

Also add a more information about the string field type, including
an explanation of byte escape sequences.

Ping #15716.
2021-06-07 18:04:35 +00:00
João Valverde e931336a2d doc: Replace link to pcrepattern(3) 2021-06-07 18:04:35 +00:00
Stig Bjørlykke 44a615e854 Qt: Give a directory to wsApp->setLastOpenDir()
Use wsApp->setLastOpenDirFromFilename() to convert a filename
to a directory name before calling wsApp->setLastOpenDir().

This will ensure to always store a directory instead of a filename
in the recent gui.fileopen_remembered_dir.
2021-06-07 13:52:59 +00:00
Chuck Craft 8c79fa5e1b Qt: add display filter - invalid new filter syntax 2021-06-07 13:36:20 +00:00
Anders Broman 7e9ac7a4fc GTPv2: Additional RRM Policy Index, add Index to IE tree. 2021-06-07 12:15:35 +02:00
Stig Bjørlykke 68e360bf04 ui: Return length from ssl_export_sessions()
All users of ssl_export_sessions() calculates the length of the
returned string, so let's return the length instead.
2021-06-07 08:59:02 +02:00
Stig Bjørlykke 5dbaa8d3b2 wsutil: Add filesystem write_file_binary_mode()
Add a generic function to write content to file. Use this on write
TLS session keys from UI and tshark, and for export objects.

Remove the now unused export_object_ui.[ch].
2021-06-07 06:24:28 +00:00
João Valverde 6895f71574 WSUG: Fix reference to macro syntax
Fixes #17408.
2021-06-07 04:04:30 +01:00
João Valverde 9e1be36071 version info: Clean clang version
__VERSION__ is copied from GCC, clang has __clang_version__.

Apparently clang's __VERSION__ already includes the name:

  Compiled (64-bit) using clang Clang 11.1.0
2021-06-07 00:20:14 +00:00
João Valverde e5cb4ddd87 Qt: Fix clang -Wmisleading-indentation 2021-06-07 00:20:14 +00:00
Michael Tuexen 4ddae68508 pcapng: add support for custom blocks 2021-06-06 21:15:35 +00:00
João Valverde 4aff36d501 Replace g_assert() with ws_assert() in places 2021-06-06 20:05:26 +00:00
João Valverde ef0f022f86 wslog: Add a comment 2021-06-06 19:48:54 +00:00
João Valverde 4e4bef09f9 wiretap: Remove some redundant debug information
It is not necessary to include the function name and/or locations,
ws_debug() includes that information,
2021-06-06 19:48:54 +00:00
João Valverde c015257c9f wslog: Include function name in ws_debug() output format
The GLib documentation says G_STRLOC includes the function name
but that is a lie[1]. Change ws_debug() to not use G_STRLOC and receive
__FILE__, __LINE__ and G_STRFUNC separately instead.

[1]https://bugzilla.gnome.org/show_bug.cgi?id=69097
2021-06-06 19:48:53 +00:00
Martin Mathieson abf3c0f2f9 Add some spelling words.
Fix one iee80211 typo.wq
2021-06-06 18:47:38 +01:00
Gerald Combs 154b0aaad8 [Automatic update for 2021-06-06]
Update manuf, services enterprise numbers, translations, and other items.
2021-06-06 17:06:37 +00:00
Stig Bjørlykke 2b29269f5d tshark: Add option to export TLS session keys
Add a new option --export-tls-session-keys <keyfile> to tshark
to export TLS session keys.
2021-06-06 13:32:40 +02:00
Nicolás Alvarez 577282f679 Fix null dereference in ipsec esp_sa_record_add_from_dissector
The esp_sa_record_add_from_dissector function is passing a null pointer to
the err argument of uat_esp_sa_record_update_cb, which then dereferences
it. Apparently esp_sa_record_add_from_dissector is not called anywhere in
Wireshark, but it's exported and available for external code to call it.

Fix by passing a pointer to a local char* instead.

Bug found by clang static analyzer.
2021-06-05 20:22:07 -03:00
Richard Sharpe 1718151a65 ieee80211: Prevent incorrect Ranging Trigger frames from causing problems.
Handle invalid Ranging Trigger subtypes and insert an expert info for
them.
2021-06-05 14:59:43 +00:00
David Fort b1eb5bc16f rdp: fixes and improvements in negotiation packets
The selectedProtocol field in RDP_NEG_RSP packets was not handled correctly,
it's a single value not some flags.
RDSTLS has also been added in the protocols list.
clientRequestedProtocols in TS_UD_SC_CORE has also been adjusted as it's supposed
to be the list of supported protocols sent by the client in the RDP_NEG_REQ packet.
So it's union of flags, not a single value.
2021-06-05 09:11:49 +00:00
John Thacker 174b994031 VLAN: Increase permitted number of tags in a packet
VLAN_MAX_NESTED_TAGS is a misnomer, it sets a maximum on the total
number of tags in a packet, nested or not. It's possible to surpass the
current value of 10 with legal packets, e.g. jumbo frames that carry
entire DVB Base Band Frames with GSE (or TS/MPE) that have fifteen
PDUs each with a IP/VLAN/ARP. Raise it to a somewhat higher but still
small finite limit.
2021-06-05 08:57:17 +00:00
Christian Reusch 7179e1d1fb tcp: Fix dissection of DSACK
DSACK blocks (the first SACK block in a TCP SACK option, with right edge
being lower or equal to the ACK filed) are now identified correctly.

Closes #17315
2021-06-05 08:42:09 +00:00
John Thacker c5c25a9268 DVB-S2-BB: Add support for TS over BBFrame
Add support for Transport Streams carried over DVB Base Band Frames,
passing them to the MP2T dissector. Add an endpoint type for the ISI.
Update comments. Use standard true false strings in a couple cases.
Create a header file for MP2T, since the BBFrame dissector needs to
know about the MPEG2 TS packet size and sync byte.
2021-06-05 08:12:47 +00:00
João Valverde 783fa48ea6 Cosmetic change to compiler information
Move compiler information from last sentence to "compiled with"
paragraph.

Before:
    Compiled (64-bit) with ...

    Running on Linux ...

    Built using gcc 11.1.0.

After:
    Compiled (64-bit) using GCC 11.1.0, with ...

    Running on Linux ...
2021-06-05 07:57:10 +00:00
João Valverde 0fe551e5e7 dfilter: Disallow embedded NUL bytes in regular strings
When byte escape sequences, that is hex \xhh or octal \0ddd,
are interpreted at the lexical level it is not possible to
use strings with embedded NUL bytes. The NUL byte is interpreted
as a C string terminator. As a consequence, for example, the
strings "AB" and "AB\x00CDE" compare as the same. This leads to
unexpected false matches and a poor user experience.

Disallow embedded NULs for regular strings (strings literals that
do not begin with 'r' or 'R') for this reason.

It is possible to use a raw string instead (eg: r"AB\x00C")
to match embedded NUL bytes, although that only works with regular
expressions. Normal escape rules would also work with regular
expressions (eg: "AB\\x00C"). This is the same string as the previous
one, written in an alternate form.  What won't work is "AB\x00C", this
string is synctatically invalid.

So the expression: data matches r"AB\x00C"
will match the bytes {'A', 'B', '\0', '\C'}.

However the expression: data contains r"AB\x00C"
won't match the fvalue above. Because the "contains" operator
doesn't compile a regular expression it literally tries to
contains-match the bytes {'A', 'B', '\\', 'x', '0', '0', 'C'}.

Therefore raw strings are very convenient but it is still necessary
to be aware that the matches operator has an extra level of indirection
than other string operators (same as in Python).

Fixes #16156.
2021-06-05 02:47:39 +01:00
João Valverde 85c257431f dfilter: Add support for raw strings
Add support for a literal string specification copied from Python
raw strings[1].

Raw string literals are enclosed with r"..." or R"...". Double quotes
can be include in the string but they must be escaped with backslash.
In escape sequences backslashes are preserved in the final result.

So for example the string "a\\\"b" is the same as r"a\"b".

r"\\\a" is the same as "\\\\\\a".

Raw strings should be used for convenience wherever a regular expression
is used in a display filter expression.

[1]https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals
2021-06-05 02:46:40 +01:00
Guy Harris eaa4a7022b file-pcapng: redo the way we dissect the data in blocks.
Create a tvbuff that covers the data portion of a block, and use that to
dissect all data in the block, including but not limited to the options.

Catch ReportedBoundsError exceptions and treat them as an indication
that the block length was too short - add an expert info to the block
length item indicating that.

Have separate routines for each block type that dissects the data in
that block type.

While we're at it, check whether the trailing block length is equal to
the  header block length and, if not, report an error in the trailing
block length.

Fix the tests to match.
2021-06-04 16:46:40 -07:00
Guy Harris deb6786ed4 file-pcapng: fix name of expert info.
The entry was copied and pasted, and the variable name and descriptive
text were changed, but the field name wasn't.
2021-06-04 14:48:24 -07:00
Anders Broman 42cb9643aa GTPv2: Update with new IEs from 3GPP TS 29.274 V17.1.1 (2021-03).
Update dissection of IE names and define the metodes to do dissection.
Only Additional RRM Policy Index is fully dissected.
2021-06-04 12:38:29 +00:00
Gerald Combs 6bfab69d14 Windows: Switch from HTML Help to plain HTML.
Switch from HTML Help to plain HTML files. In the NSIS and WiX installers,
place the help assets in a directory with a friendly name.
2021-06-04 08:57:32 +00:00
Piotr Winiarczyk 6846271b76 btmesh: Enhanced messages reassembly
This commit adds enhanced messages reassembly for access and control
message. Closes #17417.
2021-06-04 08:40:31 +00:00
Thomas Dreibholz 6e5081474e SCTP: Display basic TSN information with packets 2021-06-04 08:04:31 +00:00
Chris Brandson 256af1d2f0 added latest Zigbee manufacturer codes 2021-06-03 14:37:00 +00:00
Anders Broman e64bad71be Diameter: Update AVPs from 3GPP TS 29.272 V16.4.0
Amend the xml checking script to exlude one more AVP from the check and
make it easy to add more to the list.
 Courtesy of Christopher Maynard.
2021-06-03 15:49:38 +02:00
Simon Barber 5202119239 ieee80211_radio: Use calculated bitrate if not supplied
For 802.11n if the bitrate is not supplied then the calculated bitrate is used. This change does the same for 11ac and 11ax.

Sniffer traces taken on recent versions of Macos no longer supply the bitrate for 11ac frames in the RADIOTAP header, this change allows the wireless timeline to work with these traces.

Fixes #17419.
2021-06-02 21:47:03 +00:00