The test script was running lua/nstime.lua rather than lua/pinfo.lua for
the Pinfo test, and the Pinfo test was testing the ipproto property for
a Pinfo, but that was removed.
Change-Id: Iccdccd265dd550e41640af3acd607362f1f2f02e
Reviewed-on: https://code.wireshark.org/review/6747
Reviewed-by: Guy Harris <guy@alum.mit.edu>
It's 2 byte only so we need to use tvb_get_letohs().
Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6710
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This will be able to hold also SMB2 file ids and maybe other stuff in future.
Change-Id: Ib55895a346b7dc6562291730693453728c99fe91
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/6708
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
There's nothing special about LUA_VERSION when it comes to the user
overriding it - they'd do that by changing it, the same as with any
other _VERSION variable. Remove the comment about it, which is now out
of date in any case.
Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc
Reviewed-on: https://code.wireshark.org/review/6739
Reviewed-by: Guy Harris <guy@alum.mit.edu>
offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value.
Bug:10877
Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/6738
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Categories 063 and 065 were decoded only partially. Now the dissector
dissects all the items in these two categories.
Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
Reviewed-on: https://code.wireshark.org/review/6714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
If, for a package, the version specified by the _VERSION variable
doesn't match the version installed (as indicated by a -done file),
un-install it, and remove the downloaded version, before doing any
installs, so that the specified version replaces the installed version.
Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4
Reviewed-on: https://code.wireshark.org/review/6736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Uninstall automake if autoconf is going to be changed; remove libtool if
autoconf or automake is going to be changed.
Change-Id: I4aced967cb7bed197d3f1a4be851a0bc78c8f12d
Reviewed-on: https://code.wireshark.org/review/6735
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If there's an unversioned -done file, make it a versioned file under the
assumption that the requested version is what's installed.
Create a versioned file when installing. Use the installed version when
uninstalling, and remove the versioned file.
Change-Id: Ic21e0f139bb35df8f159a5ba7732706357a099fb
Reviewed-on: https://code.wireshark.org/review/6731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
subdir-objects will be enabled unconditionally in automake-2.0 and
automake-1.14 gives us warnings about the upcoming change.
Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and
I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of
the source files rather than the full path to each.
In echld don't use sources in the top-level directory in libechld: it breaks
distclean with subdir-objects turned on.
Bug: 10648
Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76
Reviewed-on: https://code.wireshark.org/review/6697
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Move the "do I want this and, if so, is it already installed?" checks
into the install_ functions.
Move the "is this already installed?" checks into the uninstall_
functions, and have them clear the appropriate installed version
variable when finished.
Also, fetch the installed versions early in the main line.
Change-Id: I9e5d8ca48285c6d424a4a2a5f53f4aa449a891d3
Reviewed-on: https://code.wireshark.org/review/6730
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Call it install_all to avoid collision with the OS's install command, if
any; rename the uninstall function to uninstall_all to match.
Change-Id: I9383424ff3910f04244493569fed3e5bc5d3d99d
Reviewed-on: https://code.wireshark.org/review/6729
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That lets us put the install and uninstall sequences for a particular
tool or library together, and separates them from the overall
installation and uninstallation flow.
Change-Id: I5e7def9983b587ba7c3276a9d5762db340a04802
Reviewed-on: https://code.wireshark.org/review/6728
Reviewed-by: Guy Harris <guy@alum.mit.edu>
- Remove dead initializers (and localize some vars);
- proto_item_set_len() takes a 'proto_item *';
- Use gboolean for a TRUE/FALSE var;
- Remove a set of unneeded brackets.
Change-Id: Ic7b27e2cd321c9d307c01cc4afdb0fc4c6d3cd55
Reviewed-on: https://code.wireshark.org/review/6722
Reviewed-by: Bill Meier <wmeier@newsguy.com>
One bug was introduced in g4d58904
Change-Id: I16a5e83f11f48038945e957c7e6ce9d50b4aec46
Reviewed-on: https://code.wireshark.org/review/6721
Reviewed-by: Bill Meier <wmeier@newsguy.com>
- col_...() shouldn't be under 'if (tree)';
- remove dead initializers;
- use proto_tree_add_subtree() in place of ..._add_text()/...add_subtree()
in one more instance;
- tvb_length() --> tvb_reported_length();
- use 'proto tree *' variable instead of incorrect 'proto_item *' var in
one instance;
- use SYNP_... for a few macro names to prevent any possible
namespace collisions;
- fix some long-lines, indentation and whitespace.
Change-Id: I4e0a2e5d0b5e13b72a14ec6dd3779a7104534445
Reviewed-on: https://code.wireshark.org/review/6720
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Replace a pile-o-ifdefs with generated include files. This should make
it easier to add an NSIS target to CMake.
Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while.
Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873
Reviewed-on: https://code.wireshark.org/review/6717
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(yet) use libcodec.
Also, there's no need to explicitly call pkg-config to get SBC's
CFLAGS and LIBS: PKG_CHECK_MODULES does that for you.
Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b
Reviewed-on: https://code.wireshark.org/review/6700
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
If we aren't adding -Werror, just set it to a null string, so when we
fetch it to add the SSE 4.2 flag to it for ws_mempbrk_sse42.c, it
doesn't fail.
Change-Id: I53858130c025e094ed8d0d975451961506fb1a39
Reviewed-on: https://code.wireshark.org/review/6704
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If we think the compiler supports SSE 4.2, check whether we can use
nmmintrin.h if we tell the compiler to compile with SSE 4.2 support; if
not, disable SSE 4.2 support.
This matches what we do in autotools.
Change-Id: I474d53d2fe7e2628faca7309efd7155b63bd7eab
Reviewed-on: https://code.wireshark.org/review/6702
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The initial suggestions came from Michal Labedzki on
https://code.wireshark.org/review/#/c/4178
Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518
Reviewed-on: https://code.wireshark.org/review/6511
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Niels de Vos <devos@fedoraproject.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt.
Don't put ws_mempbrk_sse42.c in WSUTIL_FILES by default; add it if we
think the compiler supports compiling for SSE 4.2.
Add -msse4.2 to its COMPILE_FLAGS, but don't add it to any other
compiler flags - we don't want to build anything else with -msse4.2 by
default, as the only code that uses SSE 4.2 instructions but *only* does
so if the processor supports it is our mempbrk implementation. (And
*add* it, don't *replace* the existing flags with -msse4.2; that way,
-Werror is left in there as well.)
Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a
Reviewed-on: https://code.wireshark.org/review/6698
Reviewed-by: Guy Harris <guy@alum.mit.edu>
When checking whether nmmintrin.h works, add -msse4.2 at the *beginning*
of CFLAGS, so that user (or Gentoo build process) settings with
-mno-sse4.2 override it.
Bug: 10792
Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812
Reviewed-on: https://code.wireshark.org/review/6696
Reviewed-by: Guy Harris <guy@alum.mit.edu>
While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory.
Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49
Reviewed-on: https://code.wireshark.org/review/6682
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
Do not make any assumption on the endianness: not all hosts running Wireshark are little endian
Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4
Reviewed-on: https://code.wireshark.org/review/6693
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Remove in NEWS by gca174999
Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5
Reviewed-on: https://code.wireshark.org/review/6650
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Guy Harris