Change-Id: I49ef553c29742ba18d477a61183ce8b6f5e23233
Reviewed-on: https://code.wireshark.org/review/23006
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: I1bb25125d9bd7b62b5784bd43d933dc5ff13987c
Reviewed-on: https://code.wireshark.org/review/23005
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Catches mistakes where the same variable is populated by multiple preferences:
prefs_register_bool_preference(epl_module, "show_soc_flags", "text1", "desc1",
&show_soc_flags);
prefs_register_bool_preference(epl_module, "show_soa_flags", "text2", "desc2",
&show_soc_flags);
Change-Id: I77a9432d9b518e951166c93a890a948d3f228162
Reviewed-on: https://code.wireshark.org/review/22974
Reviewed-by: Michael Mann <mmann78@netscape.net>
to avoid mistaking it for a range function that operates on pairs.
Change-Id: If9117c195ba21d55a476c3b9deb2a2ca7a1056ed
Reviewed-on: https://code.wireshark.org/review/22994
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
The machine-readable format is recommended by the Debian Policy Manual:
https://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightformat
It also allows uscan to omit files from repacked upstream tarballs.
In wireshark package's case it allows removing the debian/ directory
from the tarball.
Change-Id: I0d56efaff26bb61048de795e109c9f5d26cbffc4
Signed-off-by: Balint Reczey <balint.reczey@canonical.com>
Reviewed-on: https://code.wireshark.org/review/22969
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
We have to remove the lz4 build tree as root.
We can't do "make uninstall" for libssh, so manually remove the stuff it
installs. Also, remove the -done file, and remove the downloaded
tarball and build tree if we're supposed to do so.
Change-Id: If594ab241a9955229dfbc12e4f5e0c517add6daa
Reviewed-on: https://code.wireshark.org/review/22996
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Mismatch between parameter name in comment and prototype
Change-Id: Ia458362a3cc8cd073dbb0a184f28b28f12b19b9f
Reviewed-on: https://code.wireshark.org/review/22993
Reviewed-by: João Valverde <j@v6e.pt>
Convert from using TreeWidgetItems to UAT model/delegate. More of the GUI
is "just handled" within the table.
Required to add support for "colors" and "protocol fields" to UAT types.
Also needed to add some hacks for "custom" UAT field handlers for
backwards compatibility with the existing UAT structure used.
Because UAT functionality was switched completely to the model, some
information in the table was "lost in translation" because the UATs
themselves aren't translated to other languages.
TODO:
2. Better "order of operations"? A bunch of NULL/size checks needed to be added to prevent crashing.
Now with model/"view" should events/functions be reordered?
Bug: 13585
Change-Id: I2bbba78182317c4fada07b927c05d0c6f4cdc0fe
Reviewed-on: https://code.wireshark.org/review/22766
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>
Older versions of Xcode don't support -Wunused-but-set-variable, so
remove it from the list of options with which to compile SpanDSP.
Change-Id: Idd298e19eaf770980da179412480e17a00514d36
Reviewed-on: https://code.wireshark.org/review/22991
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Have "avp_is_extended" fully control extended attribute properties.
including "long-extended".
Change-Id: I73b3636b08fe088b7dc4113b1b4144a97bc59efa
Reviewed-on: https://code.wireshark.org/review/22989
Reviewed-by: João Valverde <j@v6e.pt>
Change-Id: Id65e57766d8f31615f210cfe8ac3e03a16f180c8
Reviewed-on: https://code.wireshark.org/review/22987
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Directory and File "UAT types" have been using a separately launched
dialog, instead of an "editor", so it breaks "tab rules". Create and
treat (File) dialog as an editor.
Change-Id: I983728abefb0cdd79899468a800328f1b56e2910
Reviewed-on: https://code.wireshark.org/review/22886
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>
Maybe there's some way to say "yes, I know that the pointer being cast
is appropriately aligned", or maybe some platforms say "yes, I know,
this is a struct sockaddr *, but those are aligned well enough for any
other socket address types", in which case we might be able to turn that
on by default in some cases.
Change-Id: I6b8cff7ebfe27785b20adbbc2f855e859b090236
Reviewed-on: https://code.wireshark.org/review/22983
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Move -Wduplicated-branches, which is C-and-C++, above
-Wbad-function-cast, which is C-only.
This matches CMakeLists.txt.
Change-Id: I7c60695252645524f80461575ce3e92572e0efa7
Reviewed-on: https://code.wireshark.org/review/22981
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Move -Wunused-const-variable after -Wc++-compat.
Move -Wduplicated-branches after -Wdocumentation.
Add some comments for the warning flags for which the configure script
does a test to make sure the compiler doesn't mishandle them.
Add some other comments.
Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49
Reviewed-on: https://code.wireshark.org/review/22980
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If we want to add -Wframe-larger-than=16384, *append* it, don't
*overwrite* it.
Indent that code properly while we're at it.
Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba
Reviewed-on: https://code.wireshark.org/review/22977
Reviewed-by: Guy Harris <guy@alum.mit.edu>
check_box_ member was missing a #if (QT_VERSION > QT_VERSION_CHECK(5, 2, 0)) wrapper
Change-Id: Ibdddbe523b8e15c0af31fddfd3f251c24114d11a
Reviewed-on: https://code.wireshark.org/review/22959
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
If a variable is initialized in a loop body or an if clause or a switch
clause, declare it inside the loop body/clause, and de-initialize it
before leaving the loop body/clause.
De-initialize the gnutls_pkcs12_t before leaving rsa_load_pkcs12(), so
as not to leak it.
Always leave the per-bag loop by "goto done", even if we're not within
an inner loop, to make it clearer what we're doing.
We initialize the bag structure at the beginning of that loop body;
de-initialize it at the end.
If we leave the loop without a private key, and we don't have an error
message, the error is "we didn't find a PKCS8 key"; report that.
Change-Id: I87cf296876c8f1879f69d01ce67ca2829b4f8d16
Reviewed-on: https://code.wireshark.org/review/22958
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pacify checkAPIs.pl
Change-Id: I637a6cd678b99d05cd1b26fd3cba6ad4dd19e8d2
Reviewed-on: https://code.wireshark.org/review/22957
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Add shortcut Ctrl+Alt+Shift+
T for "Follow TCP Stream"
U for "Follow UDP Stream"
H for "Follow HTTP Stream"
S for "Follow SSL Stream"
Bug: 13047
Change-Id: I0fdd5b4d20b976b56694821a9c11424eab40b2b3
Reviewed-on: https://code.wireshark.org/review/22930
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Commit ffea2f8a24 ("ZigBee: fix endian for File Version field in OTA")
fixed the endianness of the file version field but did not update the
masks for the sub-elements of this field now that they are compared
against the value decoded as little-endian.
Change-Id: Icdb9d56cc29da19b9fc26da84979f15936c930d4
Reviewed-on: https://code.wireshark.org/review/22955
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Improve dispaly of Error Cap Flags
Add new Flag for Cap Flag
Misc coding aligmement
Change-Id: I9ad593dbe8bcc116057af9a6324f25451bac2a88
Reviewed-on: https://code.wireshark.org/review/22938
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>
Pass the remaining line length to process_pwd_success(), and don't treat
the string passed to it as a null-terminated string, check the length
value.
Also, make sure the line is long enough before even calling
process_pwd_success().
Bug: 13946
Change-Id: I67d015854046bbaaa6f55d4221f314e1446e7398
Reviewed-on: https://code.wireshark.org/review/22943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Update the Windows section for Visual Studio 2015. Copy the content from
README.cmake to its own WSDG section and remove README.cmake.
Remove the PowerShell sections. Our required version (2.0) ships with
every supported version of Windows. Remove the sed section.
Change-Id: Id37c6e71bacc247a3ed1992adb1408ec13f6a187
Reviewed-on: https://code.wireshark.org/review/22940
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Ensure that rsa_load_pem_key() and rsa_load_pkcs12() always return an
error message string if they fail, so that
1) they don't return NULL without supplying an error string;
2) they don't supply an error string if they succeed.
If either of them fails, report the error; if there's no error string,
report an unknown error (that shouldn't happen, but the wsutil/rsa.c
code needs more cleanup before I'll believe it can't happen).
While we're at it, clean up some of those error strings, return NULL
rather than 0 as the failure case from rsa_load_pkcs12() as we do in
rsa_load_pem_key() (they mean the same thing, but NULL makes it a bit
clearer), and de-initialize the private key structure in
rsa_load_pem_key() if we fail (so that we don't leak memory).
Change-Id: Id9dd331800d87b017a500a6f579df446057f555b
Reviewed-on: https://code.wireshark.org/review/22941
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Nothing ensures that will be the case, and if we assume it is the case,
we can crash.
Bug: 13945
Change-Id: I7f6cb47da81efe219e87b06f8def65a332273480
Reviewed-on: https://code.wireshark.org/review/22939
Reviewed-by: Guy Harris <guy@alum.mit.edu>
CMake should check both the 32-bit and 64-bit views automatically.
Change-Id: I856814efcd660260c734c7956ad00ee43a8f666f
Reviewed-on: https://code.wireshark.org/review/22936
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pass in a QString argument only when we have a placeholder. Fixes a
QString::arg: Argument missing: MainWelcome { ...
warning on Windows.
Change-Id: I42dd155252bd9fd4f21f0112b62044c7397c9810
Reviewed-on: https://code.wireshark.org/review/22934
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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>
When using a length of -1, use the tvb remaining length instead of 0.
Change-Id: I569e9c9f57531914a3b613c3a6a9bff076fba362
Reviewed-on: https://code.wireshark.org/review/22931
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>
Remove assignee and other miscellaneous information that changes more
frequently than service name and can be consulted directly in the IANA
registry.
Allow merging identical transports into a single line for convenience
and size/speed optimization (a backward-compatible change).
Remove obsolete make-services.pl.
Change-Id: I3ecbd1a6a68d87c084d77498a0eeb44b7afdab67
Reviewed-on: https://code.wireshark.org/review/22872
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>