aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-01-03It is also 2015 for Mac OS X :-)Alexis La Goutte1-2/+2
Change-Id: Idbd5e09ac80015feee7ddd30b9569219fde596e1 Reviewed-on: https://code.wireshark.org/review/6269 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03Info.plist : fix indent (use tabs)Alexis La Goutte1-1/+1
Change-Id: I241c124fa341ae5d6126a189374d69dea1a08d96 Reviewed-on: https://code.wireshark.org/review/6268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-03Use g_strdup_printf(), rather than a fixed-length buffer, for the app name.Guy Harris1-6/+8
Change-Id: Ie6034e229f37278fce44b2fddad9250dfb5bc6c8 Reviewed-on: https://code.wireshark.org/review/6286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Use get_ws_vcs_version() to generate the version string.Guy Harris1-11/+9
That's what we do in, for example, dumpcap. Also, use g_strdup_printf() for the strings, rather than using fixed-length arrays. Change-Id: I36ad201e3eda903ef3a089bafb09df0581efe512 Reviewed-on: https://code.wireshark.org/review/6284 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Remove unnecessary includes from wiretap folderMartin Mathieson46-81/+0
Change-Id: I10d3057801673bc1c8ea78f144215869cc4b1851 Reviewed-on: https://code.wireshark.org/review/6217 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-03CMake: Clobber the top-level config.h before we build.Gerald Combs1-0/+10
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>
2015-01-03tshark: dump port number when generating SCTP, TCP or UDP conversationsPascal Quantin1-16/+44
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>
2015-01-03IPv6: do not allocate tap data on stackPascal Quantin1-11/+11
Bug: 10780 Change-Id: I2526fb9a5a2dfd61b19dff5ba1b7902f77927f4a Reviewed-on: https://code.wireshark.org/review/6276 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-03Remove the testing stuff.Guy Harris1-11/+0
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>
2015-01-03tshark: dump port number when generating SCTP endpoints statisticsPascal Quantin1-1/+1
Change-Id: I72b557f0d12ba7a8c13288399a97ef1634121f79 Reviewed-on: https://code.wireshark.org/review/6266 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-03[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bitsAnish Bhatt1-8/+8
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>
2015-01-03Fix Windows x64 CMake buildGraham Bloice1-1/+1
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>
2015-01-03Lua: replace deprecated functionsHadriel Kaplan4-15/+12
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>
2015-01-03Remove the probes from packet-kerberos.c.Guy Harris2-31/+3
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>
2015-01-03Stick some #define probes in on Windows.Guy Harris3-5/+43
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>
2015-01-03Temporarily #if 0 out the call to read_keytab_file().Guy Harris1-1/+2
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>
2015-01-03Support -K iff HAVE_KERBEROS is defined.Guy Harris1-3/+3
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>
2015-01-02Replace proto_tree_add_text in dissector header files where it was used in a ↵Michael Mann19-863/+887
macro that should be expert info. 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>
2015-01-02Don't define a stub read_keytab_file() on Windows if we don't have Kerberos.Guy Harris2-47/+9
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>
2015-01-02Try to clarify the PowerShell requirements.Gerald Combs2-6/+14
Change-Id: Ie4ad0388b920ba4a8483ad8af351ddbdd121a28b Reviewed-on: https://code.wireshark.org/review/6254 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-02USB HID: fix report descriptor main items dissectionPascal Quantin1-9/+9
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>
2015-01-02Add back "version.h" inclusionPascal Quantin2-0/+3
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>
2015-01-02Add sanity check to ensure integer types don't get set to BASE_NONE.Michael Mann1-0/+15
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>
2015-01-02Fix lua tests on WindowsGraham Bloice2-1/+2
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>
2015-01-02mux27010: Add a link to info about the mux27010 packet structure.Bill Meier1-0/+11
Change-Id: I46f8efc8c95bf4501a631ef3adc5291939ab1497 Reviewed-on: https://code.wireshark.org/review/6240 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02test: improve check for out-of-tree testsEvan Huus1-4/+5
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>
2015-01-02test: default WS_QT_BIN_PATH to WS_BIN_PATHEvan Huus1-1/+1
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>
2015-01-02ositp: fix some BASE_ errors from g7935ba9f5beEvan Huus1-3/+3
Change-Id: I71639f95f8efff9619e00dae45763ff863f0ca21 Reviewed-on: https://code.wireshark.org/review/6237 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02Make it easier to run tests out of tree.Joerg Mayer1-3/+8
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>
2015-01-02Eliminate proto_tree_add_text from packet-ositp.cMichael Mann1-178/+178
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>
2015-01-02Lua: regex test suite fails with UTF-8 localeHadriel Kaplan1-1/+7
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>
2015-01-02tvb: implement endianness-paramterized gettersEvan Huus2-4/+125
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>
2015-01-02Always set decrypt_len when setting decrypt.Guy Harris1-3/+8
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>
2015-01-02Revert "Bring pkg.m4 in from pkgconfig version 0.28 so we can use the ↵Stephen Fisher1-214/+0
PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when it isn't installed. Without this (and without pkg-config installed) the configure script is broken. With it, it gives a mes" This reverts commit f94eb278624b5e5ff357ec7f943a16fb7ef2e61b. Change-Id: I1a74fa221bdb3d72e88a46ced64e0d434a8fe552 Reviewed-on: https://code.wireshark.org/review/6231 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2015-01-02When deccoding base-64, the result is the length of the *decoded* result.Guy Harris1-28/+43
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>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier35-35/+39
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02Have hf variables outputted in the order they were found in the file.Michael Mann1-8/+5
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>
2015-01-02Add "Editor modelines"; Adjust whitespace as needed.Bill Meier50-1839/+2489
Change-Id: Ic5a5acb0f36d3aa144edbfb1ae71097b18426db4 Reviewed-on: https://code.wireshark.org/review/6216 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02Restore another include to try to fix solaris buildMartin Mathieson1-0/+2
Change-Id: I5b8dc27943297aae88c652be98d982f75ed9a3ee Reviewed-on: https://code.wireshark.org/review/6215 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-02Restore inclusion of gui_utils.h to pixmap_save.cMartin Mathieson1-0/+1
Change-Id: Ied83d36d8f56f8dc1550ff5ae68bc2b61ea6f1b6 Reviewed-on: https://code.wireshark.org/review/6214 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-02tshark: Add endpoints statisticsMichael Mann26-54/+205
"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>
2015-01-02Remove pkt_comment member from packet_info structure.Michael Mann9-34/+66
Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d Reviewed-on: https://code.wireshark.org/review/5884 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-01Fix tpyo.Guy Harris1-10/+10
Change-Id: I5b190ee35086664ed053d376def4e21ab9ad9236 Reviewed-on: https://code.wireshark.org/review/6213 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01More indentation cleanups.Guy Harris1-34/+34
Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7 Reviewed-on: https://code.wireshark.org/review/6212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Clean up indentation.Guy Harris1-7/+7
Change-Id: I5aa6cafc6249b3a820b1bbf2eddc2ec1fdc88685 Reviewed-on: https://code.wireshark.org/review/6211 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Remove unneeded includes from ui folderMartin Mathieson168-612/+1
Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a Reviewed-on: https://code.wireshark.org/review/6128 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-01Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.Guy Harris9-15/+32
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>
2015-01-01Lua: FieldInfo '==' check isn't really equalityHadriel Kaplan1-12/+10
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>
2015-01-01.gitignore: Add '*.nativecodeanalysis.xml'Bill Meier1-0/+1
Change-Id: I54133af8626125b51e4263d3c77358752bdcf339 Reviewed-on: https://code.wireshark.org/review/6209 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-01wireshark-qt.cpp belongs in, err, umm, the Qt Wireshark - not the GTK+ one.Guy Harris1-2/+2
Change-Id: I101be1967f45bcb56d72784a456e394ca7e51323 Reviewed-on: https://code.wireshark.org/review/6208 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 18:16:23 +0000