Handle cases where we might shorten a name (e.g. "ZAO") down to
nothing.
Change-Id: I5ecb9592d2ecd8225d0ed459ef16885214af5da4
Reviewed-on: https://code.wireshark.org/review/35584
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Move our business types and general terms to a list and add more. Only
convert all upper case names to title case. Remove double quotes when
shortening names.
Change-Id: I31e9799986542270350b8c2436929f293de4e36c
Reviewed-on: https://code.wireshark.org/review/35577
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Changes consist of:
- Addition of new enum values
- Header file references now point to kernel sources
- Dissection of few more fields
- Fixes to some dissections
Change-Id: I4cda045153ab0971b0b09ce59a7363238fe627ee
Reviewed-on: https://code.wireshark.org/review/35571
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Taking the Linux kernel v5.4 uapi/linux/nl80211.h file:
- Sort the enums in the generation script according to the header file
to make incremental maintenance easier.
- Add listing of all additional enums found in the header file.
- Update the generated netlink dissector code for 802.11.
Change-Id: I9d2dc09d58d8f252d4746e662e4133d47a7525c5
Reviewed-on: https://code.wireshark.org/review/35570
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Ifcf041eb70bd68564d326b94868a45efab86a71f
Reviewed-on: https://code.wireshark.org/review/35568
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
tvb_find_line_end(), unlike a tvb_find_guint8() looking for an LF,
returns a length that *doesn't* include the line ending, *regardless* of
whether the line ends with CR-LF or just LF, so the query string we
extract is just the query, without any of the line ending.
Update some comments while we're at it to note that the "next_offset"
pointer argument to tvb_find_line_end() and tvb_find_line_end_unquoted()
can be NULL, in which case the offset *past* the line ending isn't
returned. (We pass tvb_find_line_end() NULL in the aforementioned call,
because, in that particular case, we don't care about the next line.)
Change-Id: I1c9746e32c61a79f8cb636d577a2e14a07ecab17
Reviewed-on: https://code.wireshark.org/review/35566
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Use tvb_get_string_enc(), because it guarantees null termination, unlike
tvb_memdup(), and use ENC_ASCII|ENC_NA as the encoding, to convert
non-ASCII characters to Unicode REPLACEMENT CHARACTER (there is *no*
standard for the encoding of WHOIS texts other than "ASCII"; we use
ENC_ASCII|ENC_NA elsewhere).
Bug: 16298
Change-Id: I6b7ff2a1af3997e8426ca07bea1ce68fe9cbc9c6
Reviewed-on: https://code.wireshark.org/review/35564
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Changed display of SMB2 oplock/lease break packets:
using proper Notification/Acknowledgment/Response naming notation and
explicitly indicate Oplock/Lease type of packets.
According to [MS-SMB2] 2.2.23, 2.2.24 and 2.2.25
Bug: 16296
Change-Id: I04c8b34116aec850b917fd47f6333fb56a1ec934
Reviewed-on: https://code.wireshark.org/review/35560
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Bug: 16143
Change-Id: Ibdd888157919315775637eb639158ea2e6cb26f0
Reviewed-on: https://code.wireshark.org/review/35561
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
AS Timestamp and Sequence Id are not decoded in AVP RTCP (IEEE17333) packets.
This adds a unsigned 32 bit field for AS Timestamp and a unsigned 64 bit
field for Sequence Id to the rtcp dissector.
Change-Id: I9f47001d60985b90d0f4a67ca1b1188ceba45923
Reviewed-on: https://code.wireshark.org/review/35537
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Keep track of it in the conversation to reuse the string in the
answer as well.
Bug: 16291
Change-Id: I1be6efe4456867b9e33ba15ca06d039a6fb9fed0
Reviewed-on: https://code.wireshark.org/review/35551
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
CDC Data interfaces are linked with Communications and CDC Control
interfaces via Union Functional Descriptors. Store subordinate to master
interface connection during descriptor dissection and use that
information to determine if CDC Data is Ethernet or not.
Bug: 14587
Change-Id: I442262186319969303af9ac3a7c17aad19cecab8
Reviewed-on: https://code.wireshark.org/review/35496
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This patch adds the styles Cross, Plus and Circle to IO Graph.
Change-Id: I72ff0134cd34a7e9b88a3e9c6a685526a0bca1db
Reviewed-on: https://code.wireshark.org/review/35555
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Fixup the formatting for the "Dropped packets" portion of the Capture
File Properties dialog. Fix a couple of other issues flagged by clang.
Change-Id: Ia1fad4bee37525a1a0cc25849abe34a0495f1ac8
Reviewed-on: https://code.wireshark.org/review/35552
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This reverts commit aa2145982f.
Each of the three delete calls added to the deconstructor
SequenceDialog::~SequenceDialog() results in Wireshark
crashing when the Flow dialog is closed.
Bug: 16260
Change-Id: Iecbd5dcc16be6eb451b8920b22ca2b9ccef7c7b0
Reviewed-on: https://code.wireshark.org/review/35521
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Long responses are *really* hard to read if you make them one single
string item. Show it a line at a time, as we do with many other
text-oriented protocols.
Change-Id: Ie2e81dabeba728ed34772d7015c52b0b047904e8
Reviewed-on: https://code.wireshark.org/review/35544
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
n is used to address the buffers, but the check condition
follows its use. Fix the code by inverting the two of them
Bug: 16283
Change-Id: I7cba868979982946f99cfe787a7b5f86d2db1b70
Reviewed-on: https://code.wireshark.org/review/35538
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It's the responsibility of code that processes radio metadata (file
readers in libwiretap or dissectors in libwireshark) to set the PHY
correctly, even if it has to infer it from the frequency. The 802.11
dissector should just check the PHY.
Change-Id: Ie6aa73a062c7538cbe2e994fb6a6a2a1e9ac978d
Reviewed-on: https://code.wireshark.org/review/35533
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
dpauxmon relies on libnl that is linux specific. Skip the test
for other platforms.
Fix skip message while here.
Change-Id: I744d83d0a56e41e1c32e45ade8ca0d9dd29876e1
Reviewed-on: https://code.wireshark.org/review/35525
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Apparently, at least in some regulatory domains, the DMG PHY now goes
above 66 GHz or may do so in the future; the new/future top appears to
be 71 GHz.
Change-Id: I1ee3f9cff177eed269ccc8318b5c952dbeb526ff
Reviewed-on: https://code.wireshark.org/review/35529
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The range doesn't start at 60 GHz, it starts at 57 GHz; this fixes that,
and leaves it open to future fixes.
Change-Id: I51d7188f50479bf542babe0f6677638e8a683314
Reviewed-on: https://code.wireshark.org/review/35524
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Much better to use a known library than create it ourselves.
Also remove get_tempfile_path as it's not used.
Bug: 15992
Change-Id: I17b9bd879e8bdb540f79db83c6c138f8ee724764
Reviewed-on: https://code.wireshark.org/review/34420
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
According to 'CCC-TS-010_ Virtual Networking Computing (VNC).pdf'
Table 31: VA H.264 Encoding within a Framebuffer Update Message
The h264 encoding format should be:
h264 nbytes (4B)
h264 slice type (4B)
h264 width (4B)
h264 height (4B)
...
Change-Id: Ic3bc7ac6723fed68243ec0359791a0d329662ca4
Reviewed-on: https://code.wireshark.org/review/35518
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Create user-guide.xml-stamp and developer-guide.xml-stamp when building
under Visual Studio. Fixes
C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\VC\v160\Microsoft.CppCommon.targets(231,5): warning MSB8064: Custom build for item "C:\buildbot\builders\wireshark-master-32\windows-2019-x86\build\cmbuild\CMakeFiles\8721ce5c0a51a8e0d8e35fd55fbe2e6e\user-guide.hhp.rule" succeeded, but specified dependency "c:\buildbot\builders\wireshark-master-32\windows-2019-x86\build\cmbuild\docbook\user-guide.xml-stamp" does not exist. This may cause incremental build to work incorrectly. [C:\buildbot\builders\wireshark-master-32\windows-2019-x86\build\cmbuild\docbook\user_guide_chm.vcxproj]
when building the user_guide_chm target.
Change-Id: Ia224823841b4d3def3436f9f3a48b759694ffb37
Reviewed-on: https://code.wireshark.org/review/35509
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This prevents the use of too high values when using the
shift operator.
Bug: 15632
Change-Id: Iba4156c3038ca3c6645e41650b716c2ab07d3e43
Reviewed-on: https://code.wireshark.org/review/35344
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
In dissect_oml_attrs(), all pairs of:
- val16 = tvb_get_ntohs(...);
- proto_tree_add_uint(..., val16);
can be replaced by generic proto_tree_add_item(..., ENC_BIG_ENDIAN).
Change-Id: Id5a77b056d8e6bfafb1074d5e5ded853f64f168d
Reviewed-on: https://code.wireshark.org/review/35514
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
We never use a value returned by tvb_get_ipv4() for anything else
than calling proto_tree_add_ipv4(). Thus we can simply call
proto_tree_add_item(), and get rid of a temporary variable.
Change-Id: Ifbabef0cf835df288bc6fad8d89ca739ad86f81c
Reviewed-on: https://code.wireshark.org/review/35502
Reviewed-by: Anders Broman <a.broman58@gmail.com>
As per doc/README.dissector, the IPv4 addresses shall not be converted
to host byte order before being passed to proto_tree_add_ipv4(). Due
to this bug, the IPA Destination IP Address was displayed wrong.
Change-Id: I2dd96590bbd736a8bfe05502d6803813838c6c59
Bug: 16282
Reviewed-on: https://code.wireshark.org/review/35501
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The pkgbuild man page doesn't really discuss file permissions[1], but it
appears that it simply preserves them. Make sure the ChmodBPF and
path_helper roots have the correct permssions before building their
respective installers.
[1] The --ownership flag description mentions chmod but that appears to
be a typo.
Bug: 16284
Change-Id: I5ef277539a5b2015394ae3e722ef4c176f9c243f
Reviewed-on: https://code.wireshark.org/review/35507
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Regression introduced in g1cd1e36.
Change-Id: I85775ef86d9325d4f5bf811a5f52925a2cf0d387
Reviewed-on: https://code.wireshark.org/review/35503
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Fixes:
- sdjournal is available on linux only.
- The systemd library has been put in the right group in debian-setup.
Change-Id: Ie022f29da4313d17d55201b6e7ea1ab2ae740e18
Reviewed-on: https://code.wireshark.org/review/35478
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Two enhancements and one fixed bug:
1. Add dissecting protobuf fields as wireshark (header) fields preferences. User
can input the full names of protobuf fields or messages in Filter toolbar for
searching.
2. Add 'protobuf_field' dissector table. Dissector based on protobuf can register
itself to 'protobuf_field' keyed with the full names of fields of BYETS or STRING
types.
3. A bug about search MESSAGE or ENUM type in context is fixed.
4. Another small enhancement is adding prefs_set_preference_effect_fields() which
can mark a preference that affects fields change (triggering FieldsChanged event).
See the linked bug for sample capture file and .proto files.
Ping-Bug: 16209
Change-Id: Ibc3c45a6d596a8bb983b0d847dd6a22801af7e04
Reviewed-on: https://code.wireshark.org/review/35111
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Run osx-extras.sh before building the ChmodBPF installer package.
Change-Id: Iec3f88da86e48b5aac385369c7e68f23babc4c34
Reviewed-on: https://code.wireshark.org/review/35491
Reviewed-by: Gerald Combs <gerald@wireshark.org>