Strength the heuristic cheking PDU-Type and Criticality field values too
Change-Id: Id95603634a93033664bdbd169880e6b411cfbc11
Bug: 13791
Reviewed-on: https://code.wireshark.org/review/22076
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
There's no guarantee that there's a color filter that matches, so the
color filter pointer might be null.
Change-Id: Ia11845824a4ca9c0cc153a89aa2fba876084a796
Reviewed-on: https://code.wireshark.org/review/22079
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Some hf_ variables were "cached" in print.c to break dependency on (frame)
dissectors. They are no longer used (and check*.pl scripts found them)
Change-Id: Ib46e5f5e58da54b6d7a3f85586581507f653c55a
Reviewed-on: https://code.wireshark.org/review/22078
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Bug: 13786
Change-Id: Iaa3890610768605b5c579aaddc73124b9f85bdd9
Reviewed-on: https://code.wireshark.org/review/22074
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
With this commit, tshark will mimic the packet coloring present in the
Wireshark GUI whenever "--color" is passed. This initial commit only
adds such support for the standard text output format. A future commit
could potentially broaden this support to other output modes (such as
"-V" mode).
Bug: 5158
Change-Id: I59329e32475b0c67e28802e79610544d4868ea2d
Reviewed-on: https://code.wireshark.org/review/21325
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This new interface allows printing a line with specified foreground and
background colors. The implementation avoids printing escape sequences
if the output stream is not a TTY and note that escape sequences are
ignored on Windows.
This initial implementation relies on relatively modern 24-bit color
support which is present in many terminal emulators but may not always
display properly on older or simpler emulators. Windows coloring is
handled with SetConsoleTextAttribute, which offers a "1-bit" color
experience (but it's better than nothing)
This commit is a precursor to adding additional coloring to tshark.
Bug: 5158
Change-Id: Ib2b9d800095a065a4bb60abe0550862cda5539ec
Reviewed-on: https://code.wireshark.org/review/21324
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Id471772488d3a0568f16f604585b3155a57e47b2
Reviewed-on: https://code.wireshark.org/review/22072
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
g9f0d22b introduced the use of GREATER_EQUAL operator. Let's update the
minimum CMake version accordingly.
Change-Id: Ibf619a24f5ee296b547fbc6ba46e13b8a1f3302c
Reviewed-on: https://code.wireshark.org/review/22066
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Those algorithms are e.g. used to sign X.509 certificates, or in CMP (RFC4210)
messages.
It is not fully deterministic to which dissector those OIDs should be added,
PKCS1 is chosen as there are already the OIDs for the ECC curves and the OIDs
in question are also listed in PKIXAlgs-2009.asn.
Change-Id: I4fc41d27220400c37695ecce5d7f05726ad39af2
Reviewed-on: https://code.wireshark.org/review/22049
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
NBAP and RANAP regenerated don't match current branch
Change-Id: I033997f4db15255b1439626cf973d218c1ad8416
Reviewed-on: https://code.wireshark.org/review/22065
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Places that only need color_t, such as certain preferences, don't need
the color filter stuff.
Change-Id: I88fc2858454d04e659b323a8bc28b21d362ca3fb
Reviewed-on: https://code.wireshark.org/review/22060
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It gives all the necessary details; no need to mention the name of a
routine the existence of which the user is probably unaware.
Change-Id: I66d372bc6650c84fbbc6be438be695eff1048413
Reviewed-on: https://code.wireshark.org/review/22055
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If the user's color filter file exists but can't be opened, fail and
return a failure indication.
If it doesn't exist, just try reading the global color filter file.
If *that* exists but can't be opened, fail and return a failure
indication; if it doesn't exist, don't treat that as an error.
Change-Id: I5ebdc0eb1ada3cc190990be9228639304f32147e
Reviewed-on: https://code.wireshark.org/review/22054
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Also fixes a bug where vcredist was found in
C:\Program Files\Wireshark
Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9
Reviewed-on: https://code.wireshark.org/review/22044
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Bug: 12296
Change-Id: Ib49396e2822f6ee0082aedd39ed8636379bbd75a
Reviewed-on: https://code.wireshark.org/review/21726
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Implemented extraction of 802.15.4 page number information.
Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955
Reviewed-on: https://code.wireshark.org/review/22040
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
With captures where TSF indicates the end of the frame the
preamble was being counted twice in the calculation of the start.
Change-Id: I3d042d8ea3bc46a833438cb3d2f75e3499a7711d
Reviewed-on: https://code.wireshark.org/review/22020
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
According to PEP 514, Python.org's Windows installer stores its
installation path in
HKEY_LOCAL_MACHINE\Software\Python\<Company>\<Tag>\InstallPath
where <Tag> is the value of sys.winver. Newer versions of python add "-32"
and "-64" to the version in order to allow side by side installations.
Adjust LocatePythonExecutable accordingly.
Change-Id: I8c7f8b4c31b37e7f687ce9909f97d62a779cfa91
Reviewed-on: https://code.wireshark.org/review/22048
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Remove the heuristic dissector that checks for arbitrary UDP ports in favor
of adding a preference for the range of UDP ports that can be used for LAPD.
Change-Id: Ib85fbee4a433727af24279fffb0cbf2c25f7d292
Reviewed-on: https://code.wireshark.org/review/21985
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
As defined in 3GPP TS 29.274 V14.3.0
Change-Id: I79140dfb2f64b7e444f80dcab09e94bc868df097
Reviewed-on: https://code.wireshark.org/review/22036
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The length field in an X11 request has two bytes. The BIG-REQUESTS
extension allows larger events. Its use (after properly being enabled
via an extension request) is indicated by setting the two-byte length
field to zero. In this case, the next four bytes indicate the real
length of the request. See e.g.:
https://www.x.org/releases/X11R7.7/doc/bigreqsproto/bigreq.html
Bug: 13763
Change-Id: I34ef8b47380fedcb16ab62cb8195fb136a45fe21
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-on: https://code.wireshark.org/review/21964
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Ensure that filter as a different abbreviation depending on the
technology used.
Bug: 13481
Change-Id: I14782dffcf70bdb015fd705d2184ae8c42f232c5
Reviewed-on: https://code.wireshark.org/review/22039
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Changed some channels' dissection methods to not override the U-RNTI set
for RLC reassembly with 'communication context'
Change-Id: Ibddb35e810e433ca4f40665c196c9ea2e35bff51
Reviewed-on: https://code.wireshark.org/review/22011
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Add a local copy of FindHTMLHelp.cmake to search for hhc.exe that
includes the 32 bit program files locations "Program Files (x86)"
as this is where hhc.exe normally lives.
Change-Id: Ic5917a0765786ac483a7d4ef457043319d0e8501
Reviewed-on: https://code.wireshark.org/review/22037
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Updated to be in line with 3GPP TS 29.274 V14.3.0
Change-Id: Iaa6fdc6999c470d9a826f50b5d55fa1058f58cd1
Reviewed-on: https://code.wireshark.org/review/22032
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
smb2_eo_tap is not called when smb2 packets are dissected as
named pipe then exit. Basically, for the following code snippet,
if (length) {
int old_offset = offset;
...
offset = dissect_file_data_smb2_pipe(...);
if (offset != oldoffset) {
/* managed to dissect pipe data */
return offset;
...
dissect_file_data_smb2_pipe() always returns a different offset,
thus it will never hit the smb2_eo_tap related code below that
are needed for exporting smb2 objects.
As a quick fix, call the tap related code before returning.
Bug: 13214
Change-Id: I7a99177947c384f53424b209f7e5c1f9963b5da8
Reviewed-on: https://code.wireshark.org/review/22031
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
We add the message length to the tree as big endian but we interpret it
as little endian for our further calculations. This causes parsing
errors. Use big endian for both cases.
Bug: 13766
Change-Id: I4e6cdb7d4267be96ea78eb664e88c532a9a90b52
Reviewed-on: https://code.wireshark.org/review/22024
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Id7f6d5d2b108d98a7c40fd01e3f35ad20076f54b
Reviewed-on: https://code.wireshark.org/review/22025
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
The Windows builders now use Visual Studio 2015.
Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1
Reviewed-on: https://code.wireshark.org/review/22018
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1)
Reviewed-on: https://code.wireshark.org/review/22019
Change-Id: Id5dde66c6473cd7ba3c7cc981d7b86f564f7ca9f
Reviewed-on: https://code.wireshark.org/review/22004
Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Minor comments changes
Change-Id: I71fb37ee20cf10b03beb5c805c5e63aed016d8ab
Reviewed-on: https://code.wireshark.org/review/22010
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Id8e5c3622f5186fcab530b9d329a0ff1d42bd6f3
Reviewed-on: https://code.wireshark.org/review/22002
Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I0ab6056a5241c53dba8b569905e29a9ab9d9f265
Reviewed-on: https://code.wireshark.org/review/22001
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Piotr Tulpan <piotr.tulpan@netscan.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
- Change keyboard shortcuts to Ctrl+Shift+[IOU]
- Use UTF8_MICRO_SIGN in tooltip text
- Change 0xffffffffffffffff with G_MAXUINT64
- Check for valid wlan_radio *ri before use
- Small whitespace cleanups
Change-Id: I9fa85c0d675ef3837510afaf5f1b723d89ac134c
Ping-Bug: 13769
Reviewed-on: https://code.wireshark.org/review/21993
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Simon Barber <simon.barber@meraki.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Change-Id: Ia657e7ad5c8d507aeec74ce815568e6e44137d70
Reviewed-on: https://code.wireshark.org/review/21975
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte