If you use the same source directory for in-tree Autotools or Nmake
builds and out-of-tree CMake builds you can end up with a conflicting
config.h a the top of your source tree. Try to remove it in CMake before
building our config.h
Ping-Bug: 10301
Change-Id: I7ebeb31c92022fd28cbfca05fdb6931ffa2d9cae
Reviewed-on: https://code.wireshark.org/review/6282
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Change-Id: Ie3cda43a4cfca06482f2cee09f33230d1535b77d
Reviewed-on: https://code.wireshark.org/review/6265
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
The problem was probably that we had two competing config.h files, with
some source files including one of them and othe source files including
the other, with the nmake config.h defining HAVE_KERBEROS and
HAVE_MIT_KERBEROS and the CMake config.h defining neither, and with
wireshark-qt.cpp including the nmake config.h, so that it expected there
to be a read_keytab_file() routine, and
epan/dissectors/packet-kerberos.c including the CMake config.h, so that
it didn't define a read_keytab_file() routine.
(If the CMake build is done out-of-tree, with its config.h file outside
the source tree, and the nmake build done in-tree, with its config.h in
the top-level source directory, wireshark-qt.cpp, in the top-level
source directory, might pick up the config.h in the same directory, but
epan/dissectors/packet-kerberos.c doesn't have a config.h in its source
directory and might pick up the config.h from the CMake build
directory.)
Change-Id: I040126026c4101aca1264affc04e585fee89b87b
Reviewed-on: https://code.wireshark.org/review/6272
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: I72b557f0d12ba7a8c13288399a97ef1634121f79
Reviewed-on: https://code.wireshark.org/review/6266
Reviewed-by: Michael Mann <mmann78@netscape.net>
Bug: 10753
Change-Id: Ib5522eba5c1d9107219ee2d70c96899ba6f22ca1
Reviewed-on: https://code.wireshark.org/review/6258
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Unfortunately Kerberos for Windows (kfw) has a different lib
name for x86 & x64. Fix FindKERBEROS.cmake to check for both
lib names.
Change-Id: I525df6de099d4e50322226317bda8d93d7a8dd23
Reviewed-on: https://code.wireshark.org/review/6246
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Remove deprecated functions from Lua API code: tvb_length and
tvb_length_remaining. The calls to proto_tree_add_text() are
left in, as I have no idea what to replace them with. The calls
to ep_* are being left in, as they're removed by change-id
I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55.
Bug: 10822
Change-Id: Ib0686f90be1edc892d3ecf401b91eb7484540b3e
Reviewed-on: https://code.wireshark.org/review/6247
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or
HAVE_LIBNETTLE defined when it's compiled. So how is HAVE_KERBEROS
getting defined when wireshark-qt.cpp is compiled?
Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d
Reviewed-on: https://code.wireshark.org/review/6262
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Let's try to figure out why, on the 64-bit Windows build,
wireshark-qt.cpp is being compiled to call read_keytab_file() but
packet-kerberos.c is not being compiled to define it.
Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d
Reviewed-on: https://code.wireshark.org/review/6261
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If this fixes the Win64 build, somehow HAVE_KERBEROS is getting defined
when this is built but we're not actually building read_keytab_file in
packet-kerberos.c.
If that *doesn't* fix the Win64 build's failure to find
read_keytab_file(), something Really Weird is going on, because nobody
should be looking for it.
Change-Id: If607e0eeeff854693cf9ce2ea1009d34a20a9992
Reviewed-on: https://code.wireshark.org/review/6259
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This *shouldn't* make a difference, but it's a bit clearer, and, if it
*does* make a difference with some build, there's a bug in the
configuration process for that build.
Clean up indentation while we're at it.
Change-Id: I94aa6d565c3d5545620a7aeeaabce03153ec5e1c
Reviewed-on: https://code.wireshark.org/review/6257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af
Reviewed-on: https://code.wireshark.org/review/6244
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
We don't declare it, so all the DLL export stuff won't work, and we
shouldn't need it, as we shouldn't be calling it if we don't have
Kerberos (we shouldn't support the -K option if we don't have Kerberos,
for example).
Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef
Reviewed-on: https://code.wireshark.org/review/6255
Reviewed-by: Guy Harris <guy@alum.mit.edu>
true_false_string definitions were inverted
While we are at it, use the exact same wording as in the spec
Bug: 10825
Change-Id: Ia391b310e92eb88a9a144a2fb0974701a460afc8
Reviewed-on: https://code.wireshark.org/review/6251
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
It got removed by the automatic include cleaning scripts
Also add it to text2pcap.c as it is used to get the version when writing a pcapng file
Change-Id: I3d56985fa1d04bcb066fe015a588c24cf3cb7267
Reviewed-on: https://code.wireshark.org/review/6248
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This is checked by Wireshark, but the script should catch it earlier in case Wireshark/TShark isn't run after the script is executed (a mistake I've made several times).
Change-Id: I1d113871b10fcae5a6d3e9036cc80d7b1ec1ae57
Reviewed-on: https://code.wireshark.org/review/6245
Reviewed-by: Michael Mann <mmann78@netscape.net>
Convert TEST_DIR path to a Windows path, this is used in all the lua tests.
Fix a typo
Change-Id: I38808822c998ed1df007732b3701b6b13d6c886b
Reviewed-on: https://code.wireshark.org/review/6235
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Rather than running `cd` and letting it potentially fail, just use the `-d` flag
to test that `run` exists and is a directory. Avoids useless stderr output.
Change-Id: Iab8b63681db6256aa1a6fc389d2536acbd491aba
Reviewed-on: https://code.wireshark.org/review/6239
Reviewed-by: Evan Huus <eapache@gmail.com>
it used to be SOURCE_DIR, which is still the fallback for WS_BIN_PATH, but this
way if you specify a custom WS_BIN_PATH it gets picked up for both
Change-Id: If9198565fc7b7b3911550fd200adb0f918622540
Reviewed-on: https://code.wireshark.org/review/6238
Reviewed-by: Evan Huus <eapache@gmail.com>
Change-Id: I4ed10339d3c543d9d199e5262b6e7bb8247544ac
Reviewed-on: https://code.wireshark.org/review/5148
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: If97f1b17bf8dbd6bac708b7dfbef6df73fad0f30
Reviewed-on: https://code.wireshark.org/review/6218
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: Evan Huus <eapache@gmail.com>
Due to the change in change-id Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b, the setlocale() call has been moved earlier in tshark's processing, such that Lua plugins load with the environment locale instead of C-locale. Since that matches Wireshark's behavior, it's good, but it causes the Lua regex test suite to fail. So the test suite needs to be fixed.
Bug: 10824
Change-Id: I3dcad15a9e247a1e42d2f708ccfb7272de2fe960
Reviewed-on: https://code.wireshark.org/review/6226
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
e.g. tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN)
Change-Id: Iea02fd59b13678aca741d028fb1f66f334447498
Reviewed-on: https://code.wireshark.org/review/6191
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: Evan Huus <eapache@gmail.com>
This may not always be necessary, but....
Change-Id: Ib409839dbee0574c516568a1f43793f8b407f611
Reviewed-on: https://code.wireshark.org/review/6232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That way, for example, format_text() calls on the decoded result don't
go past the end of the decoded result.
Fix some more indentation while we're at it.
Bug: 10823
Change-Id: Ia7b7b1d9fb06af5df945f19a375bf5bef3277018
Reviewed-on: https://code.wireshark.org/review/6221
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Previously they were "randomly sorted" in the hash table. The hf "array" is outputted in the order found, so have the hf variable declaration match.
Change-Id: I4b078a6328ba7c2781f07bb41d701412fc74ba22
Reviewed-on: https://code.wireshark.org/review/6219
Reviewed-by: Michael Mann <mmann78@netscape.net>
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector.
Change-Id: If34bcb5165b493948e784ba038ab202803a59843
Reviewed-on: https://code.wireshark.org/review/6154
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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>
Don't throw its declaration in file.h, as it's not defined in file.c.
Instead, include it in epan/dissectors/packet-kerberos.h and include
that wherever read_keytab_file() is called.
Yes, that means you also have to include <epan/asn1.h> and, therefore,
you have to include <epan/packet.h>. Yes, that should be cleaned up,
perhaps by splitting the Kerberos support code into "stuff that handles
encryption keys without any reference to dissection" and "stuff that
does dissection-related work".
Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef
Reviewed-on: https://code.wireshark.org/review/6210
Reviewed-by: Guy Harris <guy@alum.mit.edu>
The FieldInfo metamethod for equality (letting you use the '==' operator)
doesn't check for equality, but rather if the left-hand side is within
the right-hand side. It should be equality instead. Also, all of the
FieldInfo operate overloads should push a boolean even if they're false
result.
Bug: 10820
Change-Id: Ibddaab29713f26d22ddb4d5804b9edb15e93fd79
Reviewed-on: https://code.wireshark.org/review/6186
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Do not use delete on g_allocated memory
Change-Id: I84e0adc65c45520916adb9b2f6d46ca3f144486e
Reviewed-on: https://code.wireshark.org/review/6207
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
It's not a GTK+ Wireshark source file, so don't include it in
wireshark-gtk.
Change-Id: I0affa1fab1a29e10e1cf446e49182c9c4f218b87
Reviewed-on: https://code.wireshark.org/review/6203
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Wrap its declarations in the usual "extern "C"" stuff.
Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a
Reviewed-on: https://code.wireshark.org/review/6201
Reviewed-by: Guy Harris <guy@alum.mit.edu>