aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-07-19Carry drop count/packet ID/queue ID as options on packet blockDavid Perry8-122/+40
2021-07-19Remove unused variables in sharkd_session.cEvan Huus1-14/+1
The compiler pointed them out. I'm not sure what purpose they were meant to serve originally but they're dead now.
2021-07-19CMake: Don't define NEED_STRPTIME.Gerald Combs1-2/+0
We haven't needed it since 5bfc21cf9e.
2021-07-18BLF: Fix Win32 compilation issues.Gerald Combs1-18/+18
Fix ``` wiretap\blf.c(368,73): error C2220: the following warning is treated as an error [build\wiretap\wiretap.vcxproj] wiretap\blf.c(368,73): error C2220: unsigned char *compressed_data = g_try_malloc0(tmp.infile_length); [build\wiretap\wiretap.vcxproj] wiretap\blf.c(368,73): error C2220: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(368,73): warning C4244: 'function': conversion from 'guint64' to 'gsize', possible loss of data [build\wiretap\wiretap.vcxproj] wiretap\blf.c(368,73): warning C4244: unsigned char *compressed_data = g_try_malloc0(tmp.infile_length); [build\wiretap\wiretap.vcxproj] wiretap\blf.c(368,73): warning C4244: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(375,59): warning C4244: 'function': conversion from 'guint64' to 'gsize', possible loss of data [build\wiretap\wiretap.vcxproj] wiretap\blf.c(375,59): warning C4244: unsigned char *buf = g_try_malloc0(tmp.real_length); [build\wiretap\wiretap.vcxproj] wiretap\blf.c(375,59): warning C4244: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(654,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(654,23): warning C4018: if (object_length < (data_start - block_start) + sizeof(blf_ethernetframeheader_t)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(654,23): warning C4018: ^ [build\wiretap\wiretap.vcxproj] busmaster.c wiretap\blf.c(733,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(733,23): warning C4018: if (object_length < (data_start - block_start) + sizeof(blf_ethernetframeheader_ex_t)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(733,23): warning C4018: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(818,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(818,23): warning C4018: if (object_length < (data_start - block_start) + sizeof(canheader)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(818,23): warning C4018: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(859,27): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(859,27): warning C4018: if (object_length < (data_start - block_start) + sizeof(canheader) + payload_length_valid + sizeof(can2trailer)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(859,27): warning C4018: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(894,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(894,23): warning C4018: if (object_length < (data_start - block_start) + sizeof(canheader)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(894,23): warning C4018: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(966,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(966,23): warning C4018: if (object_length < (data_start - block_start) + sizeof(canheader)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(966,23): warning C4018: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(1045,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(1045,23): warning C4018: if (object_length < (data_start - block_start) + sizeof(frheader)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(1045,23): warning C4018: ^ [build\wiretap\wiretap.vcxproj] wiretap\blf.c(1126,23): warning C4018: '<': signed/unsigned mismatch [build\wiretap\wiretap.vcxproj] wiretap\blf.c(1126,23): warning C4018: if (object_length < (data_start - block_start) + sizeof(frheader)) { [build\wiretap\wiretap.vcxproj] wiretap\blf.c(1126,23): warning C4018: ^ [build\wiretap\wiretap.vcxproj] ```
2021-07-18json: fix buffer overflow in string_unescape()Developer Alexander1-151/+287
Fixes a potential buffer overflow issue in string_unescape() with a redesign to be more robust against invalid input. It makes use of wmem_strbuf API now. Closes #17475
2021-07-18[Automatic update for 2021-07-18]Gerald Combs19-117/+174
Update manuf, services enterprise numbers, translations, and other items.
2021-07-17Delete various unused fieldsEvan Huus10-109/+0
Discovered during the build failure of https://gitlab.com/wireshark/wireshark/-/merge_requests/3695
2021-07-17XML: don't try to hide the UTF-8 Byte Order MarkJaap Keuter1-11/+5
Closes #17489
2021-07-17can: Optimized column info for better readabilityDeveloper Alexander1-23/+13
Column info is tuned for better readability. It containes CAN ID and Length. The same applies to protocol item within protocol tree. Entire packet data (payload) should not be printed to column info by default. So this behaviour is removed.
2021-07-16erf: make a copy of the first SHB comment.Guy Harris1-2/+5
We free it, but what wtap_block_get_nth_string_option_value() returns is what's stored in the block, and it might get freed up out from under us. Save a copy of it, so that when we free it, we're not double-freeing.
2021-07-16LIN: Fix ID parsing (bugfix)Dr. Lars Völker1-3/+3
2021-07-16BLF: fix clang warningsDr. Lars Völker1-2/+2
2021-07-16ISO15765: Add support for the new CAN APIDr. Lars Völker1-5/+29
This patch allows to register single IDs for CAN.
2021-07-16oampdu: Add Network port declaration and it's parsing to GetRequest packetsArkady Gilinsky1-2/+8
* Declarations were added according to CableLab specification Signed-off-by: Arkady Gilinsky <8351139-ark-g@users.noreply.gitlab.com>
2021-07-16TECMP: Adding a filter for Channel ID namesDr. Lars Völker1-2/+10
This patch allows adding a channel name column or use a filter for it.
2021-07-16Signal-PDU: Add support for the new CAN APIDr. Lars Völker1-0/+29
This patch directly registers configured CAN IDs.
2021-07-16NSIS: Add DPI awarenessGerald Combs1-0/+9
Set `ManifestDPIAware true` in the NSIS installer and uninstaller. Note that this trades a better appearance on HiDPI displays for some oddly-sized controls.
2021-07-16CAN: Adding support for more specific tables (2)Dr. Lars Völker3-54/+8
This patch changes TECMP, 1722, and caneth to use the new socketcan_call_subdissectors method.
2021-07-16JUNIPER: Set proper item length for protocol layerJaap Keuter1-24/+24
2021-07-16BLF: Support for BLF file formatDr. Lars Völker8-3/+2604
This patch adds first support for the BLF file format.
2021-07-16docbook: Fix our admon image widths.Gerald Combs1-36/+40
Set a minimum width for our admonition graphics. Otherwise some browsers make them tiny. Fixes #17473. Fix was done via https://github.com/geraldcombs/asciidoctor-stylesheet-factory/commit/420a8a3d7c431c232f1e8dc18a9f7b947fd270df which also pulls in upstream CSS fixes.
2021-07-15CMake: Remove no-longer-used checks.Gerald Combs2-25/+2
The following commits removed code that required the following defines, so remove them: c0711693ab HAVE_GETOPT_H (Partial; still required by CMake) 2925fb0850 HAVE_MKSTEMPS 0c889d6f5c HAVE_SYS_IOCTL_H 0c889d6f5c HAVE_SYS_SOCKIO_H 0c889d6f5c HAVE_STRUCT_SOCKADDR_SA_LEN 9c5049a80b HAVE_STRUCT_STAT_ST_FLAGS
2021-07-15tcp: switch packet_scope to pinfo->poolEvan Huus1-15/+15
Per mailing list discussion: https://www.wireshark.org/lists/wireshark-dev/202107/msg00030.html Long-term we want to get rid of the wmem_*_scope globals in favour of passing wmem pools around. Step one is to replace all reasonable uses of wmem_packet_scope() with pinfo->pool which has effectively the same lifespan. This converts the TCP dissector as a proof of concept. TCP is a common enough protocol this should stress-test the idea fairly well.
2021-07-15wireshark(HEAD): oampdu: Fix: do not stop GetReq packet parsing for Object 0Arkady Gilinsky1-1/+1
* The next_byte variable is taken before the pointer moved forward, this lead to stop parsing get request packets when object is 0. This commit fixes it. Signed-off-by: Arkady Gilinsky <8351139-ark-g@users.noreply.gitlab.com>
2021-07-15ORAN FH CUS: Fix C-Section dissection.Martin Mathieson1-64/+92
Some fields are present or not depending upon the section type - fix reserved/beamId error.
2021-07-15tshark: fix the checks for --capture-comment.Guy Harris1-27/+37
Move those checks out of #ifdef HAVE_LIBPCAP/#endif, as that option is supported even if we don't build with pcap - it's also used when reading one file and writing another. Don't check for pcapng when deciding whether, when reading from an existing capture file, we can write it with added file comments; check whether the specified file type supports file comments and, if it doesn't, report all file formats that do as part of the error.
2021-07-15can: more specific dissector tables for CAN IDs and extended IDsDeveloper Alexander4-44/+58
Introduces two new dissector tables can.id and can.extended_id to enable a more precise control of subdissectors dependent on the can id which is often used to identify the the payload. Since standard CAN IDs and extended IDs can be used in the same network and their ranges overlap it is necessary to have two different dissector tables. Existing Decode as dissector table can.subdissector stays as is to prevent a breaking change. But new dissector tables can.id and can.extended_id get priority over can.subdissector since they are more specific. Id they get a match can.subdissector won't be called. New dissector tables can.id and can.extended_id are accessible in lua scripts via DissectorTable:add() while can.subdissector unfortunately is not. For related Discussion see MR !3405
2021-07-15CMake: Don't bother checking for fcntl.h or floorl.Gerald Combs5-28/+0
fcntl.h appears to be available on all of our supported platforms, including Windows. We've also been including it without HAVE_FCNTL_H guards in a few places (e.g. sshdump.c) without any issues for some time. floorl is part of C99.
2021-07-15DoIP: Add TLS handover for encrypted communicationJ M1-2/+5
2021-07-15Clean up handling of --capture-comment.Guy Harris19-86/+142
Don't store the comments in a capture_options structure, because that's available only if we're being built with capture support, and --capture-comment can be used in TShark when reading a capture file and writing another capture file, with no live capture taking place. This means we don't handle that option in capture_opts_add_opt(); handle it in the programs that support it. Support writing multiple comments in dumpcap when capturing. These changes also fix builds without pcap, and makes --capture-comment work in Wireshark when a capture is started from the command line with -k. Update the help messages to indicate that --capture-comment adds a capture comment, it doesn't change any comment (much less "the" comment, as there isn't necessarily a single comment). Update the man pages: - not to presume that only pcapng files support file comments (even if that's true now, it might not be true in the future); - to note that multiple instances of --capture-comment are supported, and that multiple comments will be written, whether capturing or reading one file and writing another; - clarify that Wireshark doesn't *discard* SHB comments other than the first one, even though it only displays the first one;
2021-07-15packet-kerberos: implement PAC Ticket checksum verificationStefan Metzmacher4-6/+518
We use some private functions from MIT kerberos: - krb5_free_enc_tkt_part() - decode_krb5_enc_tkt_part() - encode_krb5_enc_tkt_part() but we already do that for krb5int_c_mandatory_cksumtype(), which is newer than the above functions. We use all of them only under HAVE_KRB5_PAC_VERIFY, so we don't seem to need additional configure tests. Signed-off-by: Stefan Metzmacher <metze@samba.org>
2021-07-15packet-kerberos: always get the true length from decrypt_krb5_data_asn1()Stefan Metzmacher2-32/+32
Otherwise the child_tvb blobs may contain to much data. Signed-off-by: Stefan Metzmacher <metze@samba.org>
2021-07-14CMake: Fixup qtui's includes.Gerald Combs2-17/+6
Add ${MINIZIP_INCLUDE_DIRS} to qtui's includes instead of every target's. Make more includes SYSTEM PRIVATE.
2021-07-14GitLab CI: Produce less test output.Gerald Combs1-4/+4
Pass `--output-on-failure` instead of `--verbose` to ctest so that we produce more relevant output.
2021-07-14sv: fix typo ConfRef => ConfRevAlexis La Goutte2-5/+5
Reported by Robert Sandholzer (#17486)
2021-07-14CMake: Fixup SpanDSP's TIFF includes.Gerald Combs4-11/+8
Add TIFF_INCLUDE_DIR to SPANDSP_INCLUDE_DIRS, but only if TIFF has been found. Ping #17477.
2021-07-14ISO15765: Make a function static.Martin Mathieson1-1/+1
2021-07-14ISIS-LSP: Fix spelling of "algorithm"Martin Mathieson1-6/+6
2021-07-14Rename LONGOPT_NUM_CAP_COMMENT to LONGOPT_CAPTURE_COMMENT.Guy Harris4-5/+5
The latter is what editcap calls --capture-comment, and the _NUM serves no purpose whatsoever. One #define name for it suffices.
2021-07-14LIN: Adding support for LIN dissectionDr. Lars Völker9-35/+629
This patch adds support for LIN (Local Interconnect Network) as well as support for: - Signal PDUs on LIN - ISO 15765 (ISO TP) on LIN - TECMP transported LIN is handle like LIN LIN is a simple automotive fieldbus to connect for example simple sensors and actuators to an electronic control unit.
2021-07-14pcapng: shuffle functions that process various option types.Guy Harris1-48/+48
Define them in the order in which wiretap/wtap_opttypes.h defines the corresponding enum values for wtap_opttype_e.
2021-07-14wiretap: clean up option definitions a bit.Guy Harris8-29/+28
Spell out "DESCRIPTION" for the IDB description option, as it's spelled out in the pcapng spec. Put the #defines for various options in the same order as the block types for them are in the pcapng spec.
2021-07-14WSUG: rpcapd not included with npcapChuck Craft1-2/+0
Open issues at npcap to support rpcap client and server: https://github.com/nmap/npcap/issues/312 https://github.com/nmap/npcap/issues/74
2021-07-14Rework how comments show in edit menuDavid Perry2-10/+20
Addresses [this issue][1] reported with the revised comment editing UI, wherein comments with embedded newlines may not appear properly in the menu. [1]: https://gitlab.com/wireshark/wireshark/-/merge_requests/2859#note_621024711
2021-07-14tshark: allow --capture-comment when reading a fileDavid Perry5-23/+62
Allows adding one or more capture comments to a new pcapng file when tshark is reading from a file. Currently, tshark only allows setting one capture comment, and that only when doing a live capture. The use case for this feature is given in bug #15005. I decided to allow multiple capture comments to match the same ability in `editcap`. To allow this change, I changed the function signature of `process_cap_file()` so it takes a `capture_options` struct instead of individual parameters that affect the capture.
2021-07-14CMake: Adjust wsutil includes and linking.Gerald Combs7-26/+46
Mark wsutil's includes SYSTEM PRIVATE. This exposed a lot of targets that were indirectly picking up include paths via the wsutil target, so add direct includes where needed. The G.722 and G.726 codecs were implicilty including tiffio.h; find it explicitly instead. Mark some of wsutil's libraries PRIVATE, but leave commonly-used ones PUBLIC. Ping #17477.
2021-07-14GitLab CI: Don't print a performance summary on Windows.Gerald Combs1-1/+1
In the Windows merge request build job, don't pass /consoleloggerparameters:PerformanceSummary;NoSummary to msbuild. It makes the output more verbose and in turn makes errors more difficult to find.
2021-07-14wiretap: iptrace/Sniffer/Peek classic always have packet flags.Guy Harris3-28/+18
For iptrace files, there's always a direction indication (which also means that the flags field will never be zero - "outbound" and "inbound" both have non-zero values - so the test for non-zero always succeeds, so it's not even a useful test). For Sniffer Ethernet/FDDI/synchronous serial line files, and for Peek classic files, there are always flags; they might be zero if there were no errors, but that doesn't mean that the lack of errors shouldn't be noted with a flags field. While we're at it, shuffle creating of the block next to the setting of the record type - the block and record type should match, so the two operations are doing related things.
2021-07-13CMake: Fix nullability warnings for the version_info target.Gerald Combs1-1/+1
Add "SYSTEM" to "target_include_directories(version_info ...", which keeps ``` /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_stdio.h:93:16: warning: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Wnullability-completeness] unsigned char *_base; ^ ``` from being printed here.
2021-07-13prefs_register_protocol_obsolete protocols with only obsolete prefsChuck Craft12-11/+12
Related to #17465 and !3526
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 23:36:09 +0000