Commit Graph

82279 Commits

Author SHA1 Message Date
Alexis La Goutte f0da2cf58f core: Fix Wmissing-prototypes
packet-cose.c:1221:6: warning: no previous prototype for function 'proto_reg_handoff_cose' [-Wmissing-prototypes]
packet-cose.c:1185:6: warning: no previous prototype for function 'proto_register_cose' [-Wmissing-prototypes]
2021-10-03 19:22:06 +00:00
Alexis La Goutte 3cce9e3a74 core: Fix Clang Analyzer Warning
Value stored to 'sublen' is never read
2021-10-03 19:22:06 +00:00
Gerald Combs 4bda9dfd3d [Automatic update for 2021-10-03]
Update manuf, services enterprise numbers, translations, and other items.
2021-10-03 10:51:10 +00:00
Adrian Granados da11ef5770 ieee80211: Add 6E support when converting freq. to channel number.
Converting from freq to channel only needed the 6 GHz freq. range
to be added, however, converting from channel to freq. will require
the function ieee80211_chan_to_mhz to take a starting frequency as
there's overlap in the channel numbering between 2.4/5 GHz and 6 GHz
bands. This may not be possible in some cases, so for now the
function will continue to do the conversion based on the order
on which the freq. ranges are defined. Specifically, it will favor
2.4/5 GHz over 6 GHz.
2021-10-03 10:03:45 +00:00
Stig Bjørlykke 41f4855443 Lua: Make FileHandler seek_read() optional
When FileHandler seek_read() is not implemented use a default
implementation which does the same as the provided example to
file_seek() and then call the FileHandler read().
2021-10-03 11:04:29 +02:00
Stig Bjørlykke c6b046abd7 rdp: Fix compile errors
Remove double typedef zgfx_context_t.
Change from size_t to guint32 for a `residue` variable.
2021-10-03 10:31:07 +02:00
David Fort 09f762ba5e rdp: add dissector for the egfx channel
This patch adds basic dissection for the egfx channel. It also fixes fragmentation
in the dynamic channel, and also introduces some of the decompressors involved in RDP
traffic.
2021-10-02 11:15:32 +02:00
David Fort 7b5661dfe0 rdp: dissect close requests PDU in drdynvc channel
This patch adds the display of the corresponding channel name.
2021-10-02 11:04:03 +02:00
David Fort 3841bcd82c rdp: set the server address in the right place
In some cases the server address was set too late, this patch fixes that.
2021-10-02 11:04:03 +02:00
Ed 4e61cf4b73 UBDP: Update the UBDP header dissection and add username TLV
Update

Update
2021-10-02 08:15:27 +00:00
John Thacker ced4f00447 UI: Fix "Follow Stream" spin box for protocols without substreams
If the substream spin box is not visible, then we don't need to
go looking for a new substream value. Fix #17624
2021-10-01 22:32:24 -04:00
Gerald Combs cfc3212ae2 Docs: Miscellaneous man page updates.
Add the program version to more commonly-used commands. We were labeling
output with "Output" and "Example output". Use "Example output"
everywhere. Other miscellaneous updates.
2021-10-01 23:57:21 +00:00
Gerald Combs ce22d958a8 Test: Add external tests.
Add test/suite_external.py, which can dynamically generate tests from a
configuration file. This is intended to make happy-shark useful, but it
should make it easy to add simple TShark tests elsewhere.

The configuration file format must currently be JSON as described in the
Developer's Guide.
2021-10-01 23:40:17 +00:00
Gerald Combs 436dd46720 GitLab CI: Switch all Linux builds to our container registry.
Switch all of the remaining Linux builds to
registry.gitlab.com/wireshark/wireshark-containers/
2021-10-01 15:52:38 -07:00
Gerald Combs f9279ddaea GitLab CI: Switch the openSUSE 15.2 image.
Switch to the image in the wireshark/wireshark-containers registry.
2021-10-01 22:23:53 +00:00
Martin Mathieson 58a9b77fb8 F1AP: Don't export PDUs as L7
This is because exporting as L3 (should be L4) over SCTP works
well enough.
2021-10-01 21:09:09 +00:00
Gerald Combs fee7f31e63 GitLab CI: Switch the CentOS 8 image.
Switch to the image in the wireshark/wireshark-containers registry.
2021-10-01 20:13:31 +00:00
Gerald Combs 8705dfbe74 Docs: Update some man page markup and remove pod2adoc.py.
Remove pod2adoc.py since it's no longer needed. Add versions to the
Wireshark, TShark, and Dumpcap man pages. Use definition lists in the
TShark glossary descriptions. Other minor fixes.
2021-10-01 19:24:59 +00:00
Gerald Combs 7f47511653 Try to fix RPM packaging.
Asciidoctor is now required for packaging. Try to make sure it's
installed on CentOS 8 and openSUSE 15.2. Note that CentOS 8 doesn't have
an Asciidoctor package, which complicates our SPEC.
2021-10-01 18:26:24 +00:00
Stig Bjørlykke ec2746c910 capture: Check for valid wtap when capture.show_info
Changing profile during capture may change the capture_opts->show_info
setting. Always init cap_session->wtap and check if valid before doing
capture_info_new_packets(). Always close dialog and cap_session->wtap
in capture_input_closed().

This will not bring up the Capture Information dialog when switching
to a profile having this enabled.

Fixes #17622
2021-10-01 17:16:13 +00:00
João Valverde c7dc907d0e dfilter: Rename some identifiers in grammar
Prefer grammar names for readibility over C names.

Prefer rel_binop to rel_op2. Clean formatting.
2021-10-01 16:58:42 +00:00
Gerald Combs 84ab55cf75 Docs+Packaging: Convert our man pages to Asciidoctor.
Convert doc/*.pod to Asciidoctor. This:

* Means we use the same markup for our man pages, the guides, and
  release notes.
* Lets us add versions to our man pages.
* Gives us more formatting options, e.g. AsciiDoc supports `commands`,
  nested lists and makes it easy to include version information. The
  manpage backend doesn't seem to support tables very well,
  unfortunately.

Convert our CMake configuration to produce *roff and html man pages
using Asciidoctor. Add a "manarg" block macro which makes our synopses
wrap correctly.

Similar to the release notes, guides, and FAQ, if Asciidoctor isn't
found the man pages won't be generated or installed.

Move Asciidoctor to the list of package build dependencies in various
places.

This commit includes the conversion script (pod2adoc.py), which will be
removed later.

Line count sanity check:

Man page         .pod .adoc
androiddump       260  280
asn2deb            93  105
capinfos          401  471
captype            54   55
ciscodump         241  269
dftest             42   42
dpauxmon          153  169
dumpcap           464  534
editcap           528  583
etwdump           136  156
extcap            157  181
idl2deb            91  103
idl2wrs           120  100
mergecap          206  207
mmdbresolve        75   75
randpkt           107  111
randpktdump       158  184
rawshark          558  610
reordercap         76   78
sdjournal         145  157
sshdump           272  302
text2pcap         274  312
tshark           2135 2360
udpdump           133  151
wireshark-filter  486  479
wireshark        2967 3420
2021-10-01 16:42:34 +00:00
Gerald Combs 9f1607ab47 Docs: Prep for POD to Asciidoctor conversion.
[skip ci]

Rename each of our .pod files to .adoc. Add pod2adoc.py, which converts
POD markup to Asciidoctor, along with customizations specific to us.
2021-10-01 16:42:34 +00:00
João Valverde 04b0e2b80b dfilter: Extend function 'tostr' method
Print function arguments instead of just a count.
2021-10-01 16:04:37 +00:00
João Valverde 90dc58a942 dfilter: Add range 'tostr' method 2021-10-01 16:04:37 +00:00
João Valverde dcf41b93a8 dfilter: Add set 'tostr' method 2021-10-01 16:04:37 +00:00
João Valverde 2c55bffb41 dfilter: Improve syntax error message
Pass simple token value and use it for the error message. This string
is freed in the parser destructor.
2021-10-01 16:04:37 +00:00
João Valverde db18865e55 dfilter: Save token value to syntax tree
When parsing we save the token value to the syntax tree. This is
useful for better error reporting. Use it to report an invalid
entity for the slice operation. Before only the memory location
was reported, which is not a good error message.

Before:
  % dftest '"01:02:03:04"[0:3] == foo'
  Filter: ""01:02:03:04"[0:3] == foo"
  dftest: Range is not supported for entity <0x7f6c84017740> of type STRING

After:
  % dftest '"01:02:03:04"[0:3] == foo'
  Filter: ""01:02:03:04"[0:3] == foo"
  dftest: Range is not supported for entity 01:02:03:04 of type STRING

When creating a new node from an old one we need to copy the token
value. Simple tokens such as RBRACKET, COMMA and COLON are
not part of the AST and don't have an associated semantic value.
2021-10-01 16:04:37 +00:00
João Valverde 487e2b6bc3 dfilter: Remove unnecessary log activation check
Use log_write_always_full() instead of ws_log() to avoid a useless
activation check.

Rename stnode_log() to log_stnode() for consistency.
2021-10-01 16:04:37 +00:00
Pascal Quantin 728061fa17 NR RRC: upgrade dissector to v16.6.0 2021-10-01 14:36:49 +00:00
Pascal Quantin 35826bbb95 LTE RRC: upgrade dissector to v16.6.0 2021-10-01 15:05:02 +02:00
João Valverde de6f5b9d82 dfilter: Fixup syntax tree node display 2021-09-30 19:11:17 +01:00
João Valverde b4af7c52a5 dfilter: Add a flags member to the syntax tree node
Use it to record "inside parenthesis".
2021-09-30 17:03:55 +00:00
John Thacker eef110de80 documentation: Add absolute time to user guide
Add a description of absolute time fields to the Display Filter
Field Types section and explain some of its quirks (always in
local time zone, no time zone suffix, etc.) Related to #13268.
2021-09-30 16:44:22 +00:00
João Valverde 0e7ba54d98 dfilter: Clean up handling of "deprecated" tokens
Pass the deprecated data struture to the scanner and insert the deprecated
tokens there. This avoids having to keep a dedicated syntax node field
for this.

Pass the deprecated argument in dfwork_t instead of in a separate
argument. This is less cumbersome than adding an extra argument
to every level of the semantic checker.
2021-09-30 17:26:19 +01:00
João Valverde d6836d103d dfilter: Add test for "deprecated" tokens
Tokens that are (so-called) deprecated produce a warning/hint to
the user in the UI.
2021-09-30 17:26:19 +01:00
João Valverde 3ea2a61f2a dfilter: Display syntax tree for debugging
Use wslog to output debug information. Being able to control
it at runtime is a big advantage.

We extend the syntax tree nodes with a method to return a
canonical string representation.

Add a routine to walk the tree and return an textual representation
for debugging purposes.
2021-09-30 16:29:11 +01:00
João Valverde 1883487241 ws_getopt: Add a test for optional parameter 2021-09-30 14:24:52 +00:00
João Valverde 5362d0c31b ws_getopt: Rename struct and macros
This is part of the API and should also be renamed to avoid conflicts.
2021-09-30 13:59:28 +00:00
Martin Mathieson 0173ea0ec1 COSE: make some functions static 2021-09-30 13:42:24 +00:00
João Valverde e6a1225611 wslog: Alias --log-domain to --log-domains
I keep mistyping this if there is only one domain and it's annoying.
2021-09-30 13:08:32 +00:00
Stig Bjørlykke 19d27eff98 Lua: Free FileHandler on deregister
Free FileHandler and all allocated strings on deregister to avoid
memory leak when reloading Lua plugins.
2021-09-30 11:07:08 +00:00
Stig Bjørlykke 96cfaf67a3 Qt: Reload Lua FileHandler when having a capture file
Support reloading a Lua FileHandler when this is in use for a
loaded capture file. Prompt to save the file if having unsaved
changes because the file must be reloaded.

Fixes #17615
2021-09-30 11:07:08 +00:00
Joakim Andersson a3c2ad04ee nordic_ble: Re-use OK Error true false flag
Re-use the OK Error true false flag instead of defining a custom one
with OK Incorrect.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-09-30 07:42:28 +00:00
Joakim Andersson e4842cea3f nordic_ble: Add address resolved flag to Advertising PDUs
Add address resolved flag to Advertising PDUs. This indicates if the
sniffer was able to resolve the advertising address using an IRK.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-09-30 07:42:28 +00:00
John Thacker 2ee57a0e46 ftype-time: Absolute times for DFILTER are always local time
absolute_val_from_string() doesn't allow a time zone and always
assumes that time strings are in local time zone, so
absolute_val_to_repr() needs to produce that output for FTREPR_DFILTER
so that construct_match_selected_string() produces the correct filter
string for FT_ABSOLUTE_TIME fields that are not ABSOLUTE_TIME_LOCAL.

Fix #17617
2021-09-30 06:23:05 +00:00
Adrian Granados 4975dbc867 ieee80211: Add dissector for Ruckus vendor specific IE
Dissector supports only type 3: AP Name.
2021-09-30 05:38:13 +00:00
Thomas Dreibholz 220b5af9d4 Removed unnecessary second lookup with val_to_str_const(). 2021-09-30 04:08:36 +00:00
Thomas Dreibholz c2a0a5ebca Add message type with col_add_fstr(). 2021-09-30 04:08:36 +00:00
Jaap Keuter e1543bda0c IS-IS LSP: extended IP reachability prefix SID dissection change
The flags were used to identify the SID format, without regard for the
available size. Also in case of error in the flags the SID would not be
shown. Convert, like elsewhere, SID format identification based on size
and add flag validity checks, based on RFC 8667 section 2.1.1.

Closes #17610
2021-09-30 03:51:45 +00:00