Commit Graph

80949 Commits

Author SHA1 Message Date
John Thacker 17f2fc32f7 tshark: Correct documentation about name resolution.
The tshark help and documentation has been incorrect for at least
eight years, claiming that by default all name resolutions are
performed. Fixes #11762
2021-05-26 23:09:53 +00:00
Chuck Craft 4bd80d551b WSDG: update link to artwork in master on gitlab 2021-05-26 21:58:54 +00:00
Michael Tuexen bb327af305 macossetup.sh: fix syntax 2021-05-26 23:21:39 +02:00
Michael Tuexen c1518877fa macossetup.sh: whitespace fix 2021-05-26 23:20:44 +02:00
John Thacker 99618b5b93 DVB-S2-BB: Verify EIP CRC
Verify the optional DVB-RCS2 Explicit Integrity Protection CRC32.
2021-05-26 20:31:28 +00:00
Kirill Smorodinnikov 33c414a2c8 PCEP: Fixing SR-PCE-CAPABILITY flags offset
Fix offset of flags in SR-PCE-CAPABILITY TLV. Flags are placed after reserved 2 bytes: https://datatracker.ietf.org/doc/html/rfc8664#section-4.1.2
2021-05-26 19:27:41 +00:00
Gtker 837fd40081 WOW: Move unused variable into function 2021-05-26 19:09:30 +00:00
Gtker 7b73af34ce WOW: Remove unused variables
As discussed on issue
https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_581073618
2021-05-26 19:09:30 +00:00
Gtker 2e8027c645 WOW: Remove declarations and move functions above dissect_wow_pdu
As discussed in issue
https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580961205
2021-05-26 19:09:30 +00:00
Gtker 09b0e09cb8 WOW: Fix whitespace change that was accidentally applied 2021-05-26 19:09:30 +00:00
Gtker bc1fd8e5c4 WOW: Rearrange header field variables and add comments
From discussion with maintainers on issue tracker
https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker 60c68534a5 Revert "WOW: Refactor logon challenge server to client packet into struct"
This reverts commit 94333a170b0e7b55db035ccb7224bd2a0fd2395c.

See discussion in issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker 881a8f300f Revert "WOW: Refactor logon challenge server to client packet into struct"
This reverts commit 07f796f3573dc05e561e6034acabf28514715561.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker 1fb8a922e7 Revert "WOW: Refactor logon proof client to server packet into struct"
This reverts commit 92fe72f612f789693eba8f2ee02143db2193b5b3.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker b8c5f8ab00 Revert "WOW: Refactor logon proof server to client packet into struct"
This reverts commit 12b28e29f98ce1ee64e4e3759ae1adbde1530a5c.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker d457983c74 Revert "WOW: Refactor logon proof server to client packet into struct"
This reverts commit 3bc3ce07ffdb96fb6aa20aaefa8cbfa3ccef80aa.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker 30ed82bb94 Revert "WOW: Refactor reconnect challenge server to client packet into struct"
This reverts commit 8e36f124f66fde0d8d23f095601cbd9be1df1e6e.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker b6ee285fd6 Revert "WOW: Refactor reconnect proof client to server packet into struct"
This reverts commit e0164783e497142906dbfb1267e68979e1e9e896.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker 4688922527 Revert "WOW: Refactor realm list server to client packet into struct"
This reverts commit b35b1692a35181557c2d514f9ff2a0bc33a40f09.

See discussion on issue tracker https://gitlab.com/wireshark/wireshark/-/merge_requests/3039#note_580145729
2021-05-26 19:09:30 +00:00
Gtker fc16a536d6 WOW: Refactor realm list server to client packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker c920d63574 WOW: Refactor reconnect proof client to server packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker 4c11ba87e2 WOW: Refactor reconnect challenge server to client packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker 18213b94ca WOW: Refactor logon proof server to client packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker 3088ba6c9d WOW: Refactor logon proof server to client packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker da306b47f9 WOW: Refactor logon proof client to server packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker 1f83adac27 WOW: Refactor logon challenge server to client packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker 612bab8295 WOW: Refactor logon challenge server to client packet into struct
None of the fields in the struct are present in any other packet.
2021-05-26 19:09:30 +00:00
Gtker 7f7948c65a WOW: Move packet parsing logic into separate functions
The switch-case is already unnecessarily big, and additions to some
packets with slightly more complicated logic will make them even bigger.
2021-05-26 19:09:30 +00:00
Martin Mathieson 7e2bc903cd Make some functions and vars static 2021-05-26 17:30:52 +00:00
Richard Sharpe cd865bb683 ieee80211: Fix the handling of Start of Padding in a User Info List.
I broke this in a previous commit.

Change-Id: Iaeac46b59804862a471b63dae0c5c8d902415c8b
2021-05-26 05:51:25 -07:00
Martin Mathieson 5b0afb1722 GTP: set RoHC once when calling PDCP-NR 2021-05-26 10:06:03 +01:00
Gerald Combs 54546f228a Follow stream: Print YAML time more portably.
The secs member of nstime_t is a time_t, which is difficult to print in
a way that's compatible across platforms. Convert our time to floating
point and print that value instead. Fixes

../ui/cli/tap-follow.c:304:63: error: format specifies type 'unsigned long long' but the argument has type 'time_t' (aka 'long') [-Werror,-Wformat]
      printf("    timestamp: %" G_GINT64_MODIFIER "u.%09d\n", follow_record->abs_ts.secs, follow_record->abs_ts.nsecs);
                             ~~~~~~~~~~~~~~~~~~~~~~~          ^~~~~~~~~~~~~~~~~~~~~~~~~~
                             %ld

on macOS.
2021-05-26 05:23:19 +00:00
Lin Sun ecd1ab5b23 opus: improve dissection of opus
*packet-opus.c: more details fields for OPUS packet dissector, include the opus
TOC details and opus frame information.
2021-05-26 04:28:45 +00:00
John Thacker 1b32a71f2b DVB-S2-BB: Fix GSE reassembly
Fix several issues with GSE reassembly:

Use the Input Stream Identifier (ISI) to distinguish packets on
different input streams, when present.

Take into account the label, if present, when reassembling. Also
don't send partially reassembled packets to subdissectors, but show
the bytes as undecoded PDU data in the fragment if reassembly did
not complete. (All this fixes #17403.)

Also include the Total Length field when reassembling, since it is
included in the CRC32 calculation. Check the CRC32 in completed
reassemblies.

Deal with reassembly issues arising from pinfo->src, dst, etc. changing
from subdissectors (since GSE oft carries IP.)

Require that reassemblies begin with Start packets, and don't add
Start packets to in progress reassemblies but rather start a new one.
2021-05-26 04:13:19 +00:00
John Thacker 9bd450f507 macos: Update Python
Update Python from 3.9.3 to 3.9.5, since 3.9.3 was recalled due
to unintentional ABI compatiblity breakage:
(https://bugs.python.org/issue43710)
2021-05-26 03:50:03 +00:00
John Thacker 4371474cc3 ip: Reassemble across VLANs for publicly routable IPv4 addresses
Default to taking the VLAN ID into account when reassembling only
for private IPv4 addresses as defined by RFC 1918 and for link-local
addresses. Otherwise, do not take the VLAN ID into account unless
the "Enable stricter conversation tracking heuristics" preference
is enabled. Fixes #14356.
2021-05-25 20:09:25 -04:00
Richard Sharpe 11cd298ae8 ieee80211: Fix the handling of padding in Trigger frames and the FCS.
Change-Id: I6af9d04bcaafabf57c485c76da5d4e87fe5eb0e9
2021-05-25 14:53:05 -07:00
Richard Sharpe 8cc61aa8cd ieee80211: The TRIGGER User Info List terminates with 0x0FFF not 0x?FFF.
Change-Id: I5085308449fc41829517d246dd631437814f7bb3
2021-05-25 21:33:09 +00:00
Richard Sharpe 3f1754d929 ieee80211: Make Trigger Frames conform to IEEE80211ax D7.0 and beyond.
The most recent drafts of IEEE80211ax D7.0 change the format of trigger
frames in the User Info field quite a bit over the earlier drafts. This
also feeds into the fields in IEEE80211az draft 3.0 and beyond.

Change-Id: I5b80d3a3ccc9d0c16d0885bf284253b095ee0116
2021-05-25 21:33:09 +00:00
João Valverde 9b13c4352d epan: Add SMI version 2021-05-25 20:10:37 +01:00
João Valverde ea424f881f epan: Add c-ares version 2021-05-25 18:54:21 +01:00
João Valverde d0717c151a epan: Add nghttp2 version 2021-05-25 18:54:14 +01:00
João Valverde 9ae2820ff3 epan: Remove some superfluous calls 2021-05-25 18:54:04 +01:00
John Thacker 0137c24d60 DVB-S2-BB: Prevent infinite loop
Commit 4bf4ee88f0 removed an else
statement that broke out of the BBFrame processing loop. Without
it, infinite loops might be possible if the GSE frames have bit errors
in the length field.
2021-05-25 13:32:34 +00:00
João Valverde ab4a2aa0f2 epan: Add some minimum version checks 2021-05-25 13:15:47 +00:00
Martin Mathieson 3248e2a759 Add E2AP ORAN 1.00 dissector 2021-05-25 13:29:47 +01:00
John Thacker 21a204643e prefs: Allow empty strings specified from the command line
prefs_set_pref should allow the value of a preference argument set with
'-o pref:value' to be an empty string. Some of the types, like string
and range preferences, can and should be set to empty strings in some
cases. For types that wish to reject empty strings as a syntax error,
that can happen later in set_pref based on type, as already done for
PREF_UINT. Fixes #17199
2021-05-25 11:41:54 +00:00
Toff 2df04e5bb0 Follow stream: Modify YAML format, add timestamps and peers
Modify YAML output format so it includes information about peers and
absolute timestamps for each packet.
This also adds yaml output to tshark: -z follow,tcp,yaml,X
2021-05-25 08:09:31 +00:00
Guy Harris 48ba793ef6 erf: clean up handling the return value when getting and option value.
Make the variable into which we put the return value of
wtap_block_get_nth_string_option_value() a wtap_opttype_return_val, as
that's the type of the return value - it's not a boolean, it's a status
code with multiple values.

Explicitly check that value against WTAP_OPTTYPE_SUCCESS.  Yes,
WTAP_OPTTYPE_SUCCESS is 0, so

	if (xxx)

is equivalent to

	if (xxx != WTAP_OPTTYPE_SUCCESS)

but it's better to make it explict, so it's clear that it's checking for
failure.
2021-05-24 23:39:26 -07:00
John Thacker c00b062cb0 RANAP: Don't attempt to re-register heuristic dissectors
Move the RANAP heuristic dissector registration under the initialization
guard that they're only registered once. Prevents console warnings about
the dissectors already being registered to the sccp and sua tables if
a RANAP preference is changed.
2021-05-25 04:19:28 +00:00