aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-10-15cli: stats_tree: Make syntax consistent with other -z optionsJohn Thacker1-2/+8
The statistics that use the stats_tree API parse the -z option without expecting a comma separator between the statistics name and the filter. This is contrary to both the man pages and how all the other options work. Fix that so it's consistent. Fix #17656
2021-10-14socketcan: support the CANFD_FDF flag for identifying CAN FD frames.Guy Harris2-85/+105
The Linux SocketCAN header now uses the formerly-reserved byte in the SocketCAN header after the "payload length" field as an "FD flags" field, with a flag bit reserved to indicate whether the frame is a classic CAN frame or a CAN FD frame, with two other bits giving frame information for FD frames. For LINKTYPE_CAN_SOCKETCAN, use that flag bit to determine whether the frame is classic CAN or CAN FD. As some older LINKTYPE_CAN_SOCKETCAN captures have SocketCAN headers in which the fields after the "payload length" field were uninitialized, so trust that thge "FD flags" was filled in, rather than possibly randomly uninitialized, only if the only bits set in that field are the bits defined to be in that field and the two reserved bytes after it are zero. This will be needed when the current main-branch libpcap is released, as it uses LINKTYPE_CAN_SOCKETCAN rather than LINKTYPE_LINUX_SLL for ARPHRD_CAN devices; we add it now to future-proof the Wireshark releases to which this is being committed. It also handles what existing CAN FD captures using LINKTYPE_CAN_SOCKETCAN exist. For LINKTYPE_LINUX_SLL frames, we have the protocol field to distinguish between classic CAN and CAN FD, so we use that to determine the frame type, rather than looking at the CANFD_FDF flag. dissect_socketcan_common() now handles both classic CAN and CAN FD frames.
2021-10-14dfilter: Fix crash with duplicated syntax nodeJoão Valverde1-20/+17
The uninitialized memory causes access violations printing duplicated nodes. Fixes 5dd90e3b30a98956a9c1db9dfd068964b36d8757.
2021-10-14dfilter: Display token value for debuggingJoão Valverde2-2/+9
2021-10-14CMake: Partially revert recent docs changes.Gerald Combs1-15/+9
Revert recent "docs" target changes. It made that target build faster, but broke other dependencies. Keep the AsciidoctorJ changes. Revert "doc: fix the macOS build." This reverts commit 119667d886c111b6feab703953624d56c756fdd6. Revert "CMake: Try to make our man page builds faster." This reverts commit 74747c4d2ffef25c20d950525aa316bb5e2a0700.
2021-10-14dfilter: Fixup deprecated tokens initializationJoão Valverde4-41/+23
Always use the internal API to access "deprecated" and initialize the data structure on demand. This fixes a null pointer dereference introduced previously. Use reference counting to share the array cleanly and avoid memory leaks. Keep the pointer in dfwork_t.
2021-10-14dfilter: Resolve field names in the parserJoão Valverde4-32/+37
The lexical rules for fields and unparsed strings are ambiguous, e.g. "fc" can be the protocol fibre channel or the byte 0xfc. In general a name is determined to be a protocol field or not by checking the registry. Resolving the name in the parser gives more flexibility, for example to use different semantic rules according to the relation between LHS and RHS, and allows function names and protocol names to co-exist without ambiguity. Before: Filter: tcp == 1 Constants: 00000 PUT_FVALUE 01 <FT_PROTOCOL> -> reg#1 Instructions: 00000 READ_TREE tcp -> reg#0 00001 IF-FALSE-GOTO 3 00002 ANY_EQ reg#0 == reg#1 00003 RETURN Filter: tcp() == 1 dftest: Syntax error near "(". After: Filter: tcp == 1 Constants: 00000 PUT_FVALUE 01 <FT_PROTOCOL> -> reg#1 Instructions: (same) Filter: tcp() == 1 dftest: Function 'tcp' does not exist It's also a goal to make it easier to modify the lexer rules. Ping #12810.
2021-10-14dfilter: Remove unused function definitionJoão Valverde1-3/+0
2021-10-14dfilter: Replace node in convert_to_bytes()João Valverde1-24/+11
2021-10-14doc: fix the macOS build.Guy Harris1-2/+6
BUNDLE_RESOURCE_SHARE_MAN[14]_FILES shouold *not* have the generate_ prefixes; names with those prefixes are fake targets, not names of files that we generate, so attempting to copy files with those names fails. It should, however, have "doc/" before the names of the man pages, as they're generated into the doc directory of the top-level build directory.
2021-10-13dumpcap: do all packet counting in capture_loop_wrote_one_packet().Guy Harris1-6/+7
We need to update global_ld.inpkts_to_sync_pipe as soon as we've written a packet to the current capture file. If we're writing to multiple files, then, if we delay counting until after we switch to another file, the packet-count message we send to the parent before switching won't include the packet, and the first packet-count message we send to the parent *after* switching *will* include the packet, which could mean the parent will try to read more packets than there are in the new file, in which case it'll get an EOF and, at least in the case of TShark, treat that as an error and stop capturing. This should fix issue #17654. While we're at it, don't send a "we have no packets" packet-count message even for the packet-count message we send just before switching files.
2021-10-13CMake: Try to make our man page builds faster.Gerald Combs2-13/+21
Depend on our generator targets instead of the generated files, which allows parallel builds outside of Ninja. Don't reserve JRE memory when building HTML and man page targets. This reduces the "docs" target build time on my Windows VM here from over two minutes to under one.
2021-10-13captype: add options to Usage: and man pageChuck Craft2-1/+21
2021-10-13GSM A-bis/RSL: dissect some more Osmocom specific IEsVadim Yanitskiy1-0/+124
2021-10-13GSM A-bis/RSL: add a checkbox for Osmocom specific definitionsVadim Yanitskiy1-9/+25
2021-10-13GSM A-bis/RSL: fix wrong tree/length in dissect_rsl_ie_message_id()Vadim Yanitskiy1-2/+2
2021-10-13Packaging: Add captype to the Windows installers.Gerald Combs4-0/+30
Add captype and its documentation to the NSIS and WiX packages.
2021-10-13BT HCI_ISO: Don't overrun our reassembly buffer.Gerald Combs1-1/+7
Fixes #17649.
2021-10-13couchbase: Add Subdoc replace body with xattr opcodeBen Huddleston1-0/+2
Change-Id: Icce8f7a30caf0d52c01b20b8535a1f157a1e4f56
2021-10-13couchbase: Add ReviveDocument subdoc flagBen Huddleston1-0/+3
Change-Id: I914f4aae11b4c459a6db0d7b18ab81b73747fd58
2021-10-13couchbase: Add new subdoc error codesBen Huddleston1-0/+9
Change-Id: I7d5350d1a590e8c5a2b87f4cc0d815d5da63a2f1
2021-10-13eNode-B: Fix check for eri_enb_log_magicStig Bjørlykke1-1/+1
Files not having the eri_enb_log_magic should not be opened as a eNode-B raw log file format.
2021-10-13gprscdr: Update to 3GPP TS 32.298 V17.0.0Joakim Karlsson3-30/+253
2021-10-13SIP: 200 ok put resp to method in info colAnders Broman1-12/+19
2021-10-13pfcp: Update to 3GPP TS 29.244 V17.2.0Joakim Karlsson1-37/+859
2021-10-13extcap: reword error message referencing captypeChuck Craft8-8/+8
There exists a program called "captype" but it's not used here.
2021-10-13BT-uTP: Track conversationsJohn Thacker3-19/+232
Add endpoint type for uTP connection IDs. Manage uTP conversations, creating generated stream ID to filter on both sides of a conversation. Display more information in INFO column, similar to TCP. This is some progress towards #8792.
2021-10-13BPV7: Address check_static.py issuesMartin Mathieson1-7/+1
epan/dissectors/packet-bpv7.c (00000000000010d0 T bp_block_canonical_free) is not referred to so could be static? epan/dissectors/packet-bpv7.c (0000000000000e50 T bp_creation_ts_new) is not referred to so could be static? One function was not called at all - the other only in this dissector so could be static.
2021-10-12BP: Fix crashes on invalid fuzzed inputsBrian Sipos3-2/+4
2021-10-12docs: -z stats - bootp now dhcp; not all in man pageChuck Craft2-0/+2
2021-10-12docs: -z stats - bootp now dhcp; not all in man pageChuck Craft2-6/+4
2021-10-12capinfos: man page typos; add longopts to Usage:Chuck Craft2-17/+20
The verbiage for first/last packets and start/end times seem to not be consistent. Changing will also require a change to Capture File Statistics in the Wireshark Gui. Future MR.
2021-10-12Proposed rewording of filter tooltipsDavid Perry1-2/+2
For #16186. Proposed changes to the tooltips which appear when a filter expression is potentially problematic. Rename references to "User's Guide" to "Help" since the link to the User's Guide in the Help menu is just called *Contents*. Name specific sections within the help which pertain to the warning tooltip being shown. Gives first-time users some help in finding the right part of the sizeable User's Guide.
2021-10-12dumpcap: double received count when using threadsChuck Craft1-1/+3
Closes #17089
2021-10-12TCP: Follow: Don't treat placeholder value 0 as a real ACK numberJohn Thacker1-4/+4
Since the wraparound aware GT_SEQ is used, passing in 0 for the ACK number can result in thinking that bytes are missing and dropping frames from the follow stream tap.
2021-10-12TCP: Port reuse ends with false RetransmissionsEugene Adell1-18/+37
In rare circumstances when a connection could not established on the first try, succeeding in establishing it later would generate many Retransmissions. Closes 17616.
2021-10-12BT-DHT: Exit a loop.Gerald Combs1-6/+7
Always make sure our offset advances in dissect_bencoded_list. Fixes #17651.
2021-10-12Docs: Use Asciidoctor to copy ws.css.Gerald Combs3-2/+5
Use the `copycss` attribute in the release notes and FAQ to copy ws.css to the right location.
2021-10-11dfilter: Split tostr() into debug and pretty printJoão Valverde9-36/+72
2021-10-11dfilter: Cache stnode_tostr()João Valverde6-35/+24
This avoids having to save/free the pointer for each tostr() invocation (or leak memory).
2021-10-11autosar_nm: get rid of unused protocol IDs.Guy Harris1-9/+0
We fetch the protocol IDs for several protocols, but use none of them. Get rid of them.
2021-10-11wsutil: Provide static inline g_memdup2 in glib-compat.h to not export itBalint Reczey4-46/+14
Shared libraries should not export symbols exported by other libraries to avoid collisions. Fixes #17645.
2021-10-11packet-btmesh: fix build without GCRYPTLin Sun1-1/+2
2021-10-11proto: Check for reserved keywords in filter namesJoão Valverde1-0/+25
2021-10-11Qt: More new-style signals+slot conversions.Gerald Combs10-39/+40
2021-10-11Qt: Use new-style signals+slots in more places.Gerald Combs24-38/+33
2021-10-11BPSEC, BPv7, COSE: Bugfix MacOS buildDr. Lars Völker3-19/+19
The usage of PRIi64 and PRIu64 may lead to failed builds on MacOS - at least it did for me. This patch fixes this.
2021-10-11Rawshark: is not a CamelCase wordChuck Craft15-28/+28
2021-10-11Fix some spelling errorsMartin Mathieson12-18/+67
2021-10-10[Automatic update for 2021-10-10]Gerald Combs27-369/+538
Update manuf, services enterprise numbers, translations, and other items.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 04:39:51 +0000