Commit Graph

84470 Commits

Author SHA1 Message Date
Chuck Craft d008708552 editcap/mergecap: swap 'v'|'V' options to match other CLI utilities
Closes #18134
2022-06-16 02:13:50 +00:00
Gerald Combs 572e6b0c10 Docs: Add some protocols to the release notes. 2022-06-15 11:49:40 -07:00
Gerald Combs 022ebb106a GitLab CI: Fix our documentation globs
The correct glob pattern for a directory and its subdirectories is
"**/*". Use that in the change rules for the Documentation job.
2022-06-15 10:26:36 -07:00
João Valverde a1f36f06f6 Fix a sentence in AUTHORS file 2022-06-15 07:28:41 +00:00
Adrian Granados a664d29978 ieee80211: Update reason codes as in IEEE Std 802.11-2020 and 802.11ax-2021 2022-06-15 07:06:35 +00:00
João Valverde 05074f3e96 Add two more acknowledgements for external projects we use
Move an acknowledgement to authors section where it belongs.

Add two missing acknowledgements.

Refresh the AUTHORS file.
2022-06-15 07:26:21 +01:00
João Valverde c5b47cb839 Qt: Remove some bogus entries from Authors list
Some lines in Acknowledgements are mistakenly matching the regular
expression to capture authors and email addresses, resulting in
bogus authors entries.

Stop matching authors after we reach the Acknowledgements section.
This matches the structure of the AUTHORS-SHORT file and fixes the
bogus entries.
2022-06-15 06:46:50 +01:00
Roland Knall 1272b62106 Docs: Update documentation for redesigned Traffic Tabs
Update the documentation to document the change of features
that happen during the redesign of the UI as well as fix some
wordings in the data model.
2022-06-14 21:33:26 +00:00
Chuck Craft 208cf56b75 ip: ip.flags field are 3 high bits not full byte
See https://ask.wireshark.org/question/27546/0x01-flag-on-last-of-fragmented-packets/
2022-06-14 20:28:17 +00:00
Roland Knall 4f283e9ef8 Qt: Fix Qt6 compile warnings for traffic tabs
Some conversions are warning, that qsizetype is implicitly
converted, this fixes that
2022-06-14 22:10:31 +02:00
Roland Knall a4f25e5115 Qt: Redesign TrafficTree Dialogs UI
The new UI should better group functionality and as well as better
showing which taps are available and can be used.
2022-06-14 09:36:30 +00:00
John Thacker f1cbc6b662 epan: Remove fragment_get_reassembled()
Because completed reassemblies are hashed in the reassembled_table for
all the frame numbers that contributed fragments,
fragment_get_reassembled_id() works wherever fragment_get_reassembled()
does, and also works where the fragment id is not the frame number.

However, since the reassembled_table hash key only depends on the
fragment id and the frame number, it only allows a frame to have
one reassembly with a given fragment id. Some protocols can have
more than one reassembly with a given fragment id (that differ on
addresses or other keys), such as GSM SMS, and the wrong reassembly
is retrieved on the second pass in those cases.

For this reason, we might want to add additional key elements to
reassembled_table, such as layer number. fragment_get_reassembled_id
already takes packet_info as a parameter and can accommodate that
without further changes, but fragment_get_reassembled cannot, so
remove the latter in favor of the former.
2022-06-14 00:59:34 +00:00
John Thacker 47c418d419 tftp: Handle TFTP servers that don't switch ports
If we get into the dissect_tftp call, we must have either matched
a WRQ/RRQ at some point and created a wildcarded UDP conversation,
or we matched the TFTP port. While it is contrary to the spirit
of RFC 1350 for the server not to switch ports, it basically works
and the port is IANA assigned, so it doesn't do harm to process these.
In the heuristic dissector, of course, we don't do this.

The conversation code doesn't automatically fill in wildcarded
ports for UDP (since it's connectionless), and the wildcarded
find_conversation call in the TFTP dissector was twisted around
so it didn't actually fill in the second port before anyway.
Filling in the server port would make sense, but then the necessary
logic to find the right conversations would be more complicated.
(The default find_conversation logic prefers any conversation with
both ports to a wildcarded conversation, but the TFTP dissector would
then want the most recent conversation, whether wildcarded or with
both ports.)

These packets were handled prior to the 3.6 changes. Fix #18122
2022-06-14 00:36:27 +00:00
Andoni Diaz de Cerio 1ec1422318 MCPTT: Fix dissection of Track Info field
Unlike most of the FC fields, Track info participant type string file
padding is not considered in the dissector. This causes that all the FC
message dissection fails the string contains padding.

According to ETSI TS 24.380 Section 8.2.3.13:
If the length of the <Participant Type> value is not a multiple
of 4 bytes, the <Participant Type> value is padded to a
multiple of 4 bytes. The value of the padding bytes is set to zero.
The padding bytes are ignored by the receiver.
2022-06-13 19:08:07 +00:00
Uli Heilmeier 9d17919f2a WSUG: Typo
Add a missing comma
2022-06-13 16:47:26 +00:00
Roland Knall 1dc37de740 Qt: Fix sorting for ports
Ports where sorted as string and not numerical
2022-06-13 17:33:38 +02:00
Roland Knall be112bd44e Qt: Fix maxmind open map
Fix an issue, where the map button is not correctly activated
and therefore the map cannot be shown or opened
2022-06-13 14:39:14 +00:00
John Thacker 16af26dcc2 gsm_sms: Display reassembled unpacked 7-bit GSM SM with that encoding
Use the proper encoding instead of ENC_ASCII when displaying the
individual parts of a reassembled unpacked 7-bit GSM alphabet
SM, just as when displaying each fragment.
2022-06-13 12:50:41 +00:00
John Thacker 1301c033b4 SMPP: Handle decoding packed 7-bit GSM with UDH correctly
SMPP only has the number of octets of the message payload, but
with packed 7-bit GSM with a UDH, there are fill bits after the
UDH before the message (to align the message start with a septet
boundary), and we need to calculate the number of septets.
2022-06-13 12:27:36 +00:00
Roland Knall 0cfe7a0d56 Qt: Better sorting for traffic dialogs
Allow the traffic columns to automatically sort on secondary columns if
applicable. e.g. the address and port column for TCP and UDP, or the
secondary address for conversations
2022-06-13 13:50:50 +02:00
Gerald Combs b3a102eb46 [Automatic update for 2022-06-12]
Update manuf, services enterprise numbers, translations, and other items.
2022-06-12 17:03:28 +00:00
Chuck Craft f82ddef8d2 tshark/docs: add -X read_format: example to view file internals 2022-06-12 16:30:35 +00:00
Roland Knall 212abb7efe Qt: Autoset limit to display filter for expert dialog
Autoset the "Limit to display filter" if a display filter
was present, when the dialog was opened
2022-06-12 15:30:12 +00:00
John Thacker 01f9dcbb7b tftp: Fix spelling 2022-06-12 14:37:40 +00:00
John Thacker 4277d24fa1 smpp: Handle TLV and UDH parameters for text and subdissection
Handle UDH-like information (ports and fragmentation info) that is sent
in TLVs instead of in a UDH, passing to to the gsm_sms_ud dissector.
Allow message_payload TLV to substitute for short_message when allowed.
Warn with expert info when both fields are present.
Skip over a UDH, if present, when converting the short message to text
using the encoding.
Fix #2161.

Use protocol data to reduce the amount of parameters passed back and
forth.

replace_sm can have a TLV (message_payload) (at least in 5.0), so
check for that.
2022-06-12 14:19:19 +00:00
Roland Knall a807047b95 Qt: Adapt sorting for traffic tables
Improve sorting for the traffic tables
2022-06-12 14:53:23 +02:00
DarienSpencer65 58ee7bf6ee AT: Implement CMGL command (binary mode) 2022-06-12 09:29:33 +00:00
Triton Circonflexe 1e8beaa245 Add support for UUID type in Thrift
Closes #18125
2022-06-12 08:56:25 +00:00
John Thacker 1d09a9a4fb gsm_sms: Don't let header be included twice 2022-06-11 09:31:50 -04:00
John Thacker 6df11bde44 gsm_sms_ud: Use the UDH function from the GSM SMS dissector
The UDH parsing in the gsm_sms dissector is much more complete
than the one in gsm_sms_ud, so use that one and get rid of the
redundant fields. Add in the option to pass in the UDH field
data to the dissector instead, since there is an option to transmit
the ports and fragment information as TLVs in SMPP.
2022-06-10 23:01:38 -04:00
Dylan Ulis c758e9d9c0 LLDP: Add CIP TLVs 2022-06-11 00:18:11 +00:00
Roland Knall bcb8558be2 Docs: Update release notes
Add note about the change for tap_packet_cb

[skip ci]
2022-06-10 21:05:47 +02:00
Gerald Combs d047a18e83 Docs: Update the release notes.
Rearrange and update a few items.

[skip ci]
2022-06-10 10:53:04 -07:00
Roland Knall cbed7f8013 docbook: Add Releasenotes for traffic column 2022-06-10 16:31:52 +02:00
John Thacker fa1d908f9e gsm_sms: Use character_set enum when decoding DCS and TP-UD
Rather than using three mutually exclusive booleans for the
encoding, use the existing enum, adding entries to distinguish
UCS2 from 8 bit binary and to support GSM 7-bit unpacked in a
more natural way.
2022-06-10 12:58:31 +00:00
Roland Knall 51d5cb42b2 Qt: Implement total columns for traffic tables
Implement a column type, which will show total values
for traffic columns.

Implements #15071
2022-06-10 12:38:56 +02:00
Roland Knall 0640b711ea tap: Mark filtered packets instead of dropping them
Allows packets to be filtered but marked and not removed from the
tap listing. Additionally a total is calculated for all rx/tx frames
and bytes
2022-06-10 09:17:52 +02:00
Roland Knall 2cf938cfa8 tap: Adding flags for tap_packet
This allows flags to be passed by the registering listener
to the collection of information
2022-06-10 05:46:15 +00:00
John Thacker 8b1d140c49 smpp: Decode message_payload field as text
Decode the message_payload field using the data_coding value sent
when it is present instead of the short_message field. Fix #15900.
2022-06-10 00:44:04 +00:00
Stig Bjørlykke 4fa4cad396 irda: Use correct conversation_new() options
Fix conversation_new() options after they was changed/improved
in commit 709593ee.
2022-06-09 20:59:17 +00:00
João Valverde ef581f230f fix-encoding-args: Remove a string check
ENC_NA should not be used because it is unnecessary and
adds no information but since it is just a matter of style and
a lot of code is using it be more lax and ignore that case.
2022-06-09 20:27:26 +00:00
João Valverde eafcd7f97c fix-encoding-args: Revert a change
ENC_ASCII should be invalid for this case so add back the fix.
2022-06-09 20:27:26 +00:00
João Valverde 3e543bb0af Docs: Update README.dissector for string encodings 2022-06-09 20:52:24 +01:00
Gerald Combs 662957926a PortableApps: Fix a couple of variables.
It would be really nice if the PortableApps package builder exited
with an error to stdio instead of opening an dialog in a CI builder's
inaccessible UI session.
[skip ci]
2022-06-09 10:05:50 -07:00
John Thacker 5a2bd62cd3 gsm_sms: Add Language IEIs
Update the list of possible UDH IEs. Include some rudimentary decoding
of the Language Shift IEs, though actually implementing the different
encodings is an entirely different beast.
2022-06-09 12:17:48 +00:00
John Thacker a530d45c20 SMPP: Fix DCS decoding
The DCS in SMPP has many reserved values, and only can take a few
possiblities from the GSM DCS (and cannot be interpreted as Cell
Broadcast DCS.) Remove unused DCS fields and add others that are
missing.

Determine the proper text encoding for the values from 3GPP TS 23.038
DCS with the high two bits set.

Add support for EUC-KR. Add a preference for GSM 7-bit alphabet packed
versus unpacked for the DCS values that unambiguously indicate the
7 bit alphabet (unlike DCS 0).
2022-06-09 02:53:49 +00:00
John Thacker 7394527038 roon_discovery: Include stdlib.h
Looks like the Windows build needs to include stdlib.h in order to
get bsearch()
2022-06-08 22:25:11 -04:00
Aaron Turner b89a195b4c Add Roon Discovery dissector
Add support for Roon/roonlabs.com discovery running
on UDP/9003.
2022-06-08 20:02:00 +00:00
Dr. Lars Völker 0b48a284b6 SOME/IP-SD: Make option parsing a bit more robust
If the SOME/IP-SD message is broken, it could have happend that the
parsing stopped on the option and did not go back to the entry parsing.
This patch makes this code more robust.
2022-06-08 19:18:02 +00:00
Gerald Combs bbe6ab6316 CMake: Update WiX and PortableApps target names.
Rename the wix_package target to wireshark_wix and the
portableapps_package target to wireshark_portableapps.
2022-06-08 18:12:46 +00:00