aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2015-10-19x11 generator: Don't crash when a switch is in a structPeter Harris1-1/+4
The size calculation for the struct will be wrong (too small) which looks strange in the GUI when the children elements extend past the region marked by their parent. But it doesn't seem to cause any actual problems, there is only one request affected by this, and correct size calculation (by recursing the switch) would take a fair amount of work. Change-Id: I1847f736153daf59b8dbf3299005a772ffe9673a Reviewed-on: https://code.wireshark.org/review/11107 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-19x11 generator: Fix struct size with arrayPeter Harris1-1/+0
my $count here shadows my $count in the outer scope, preventing the size of constant sized arrays from being calculated correctly. Change-Id: I89c989ee2d288d4828871ebab650807fbde747dd Reviewed-on: https://code.wireshark.org/review/11106 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-19x11 generator: Allow perl 5.20 and newerPeter Harris1-1/+0
Despite promises from the Perl maintainers to remove or at least drastically change given/when and smartmatch, that still hasn't happened as of 5.22. We can cross that bridge when we come to it. Until then, assume they're never going to break given/when. Change-Id: If9270bd6fd819d24c58f31f2dfe0d88e831b19fe Reviewed-on: https://code.wireshark.org/review/11104 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-19x11 generator: some blacklisted structs are now used.Jeff Morriss1-9/+9
Also, die more gracefully than: Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 when blacklisted (previously unused) structures start being used in the xcbproto source. (It's still not possible to regenerate the X11 dissector but this is a step...) Change-Id: I1dec16a7a479d5f453c5f54e561aa8238eb21280 Reviewed-on: https://code.wireshark.org/review/10972 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-16CMake: Add /WXGerald Combs1-2/+2
Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16Add OUI-28 to make-manuf.Gerald Combs1-2/+34
Change-Id: I95b9a4422dab6efbc2d94be49aba5f42784ff3e8 Reviewed-on: https://code.wireshark.org/review/11064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-15Add missing CMake files to the tarball.Gerald Combs1-0/+1
Make sure we can build from the tarball using CMake. Tested on Windows. Change-Id: Iffc1ac964279e573aa2a8280b9bb4e799f10a974 Reviewed-on: https://code.wireshark.org/review/11066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-08Add USBPcap 1.1.0.0-g794bf26 to Windows installerPascal Quantin1-2/+4
Change-Id: Idb88cd41436e49b7a29bd4a8e896c92d8489318d Reviewed-on: https://code.wireshark.org/review/10868 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>
2015-09-29NCP2222: change ncp.nds_return_all_classes filter type from FT_STRING to ↵Pascal Quantin1-1/+1
FT_UINT32 Otherwise a call to proto_tree_add_uint_format_value will trigger an assert Bug: 11550 Change-Id: Ic30b07a424cd94b861cee8999b91154ceeb72469 Reviewed-on: https://code.wireshark.org/review/10689 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>
2015-09-28idl2wrs: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangMichael Mann1-14/+33
It looks like "items" could have contributed to fields/data being at an incorrect level off of a tree. Change-Id: I93616ef8b6b364c578f989882045dee42cb6d3c3 Reviewed-on: https://code.wireshark.org/review/8558 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-25ncp2222: Use BASE_CUSTOM for date and time fields.Michael Mann1-18/+15
This simplifies some of the logic required for field formatting. Change-Id: I2f9a612b18e3e4ca01311683d9cf61cbad9950f4 Reviewed-on: https://code.wireshark.org/review/10649 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-25Convert dissect_nds_request and dissect_nds_reply to use proto_tree_add_xxx ↵Michael Mann1-13/+24
directly instead of the homegrown nds_val. Change-Id: Ie67892caec2cddee591631045233f8a3f1cc0bc6 Reviewed-on: https://code.wireshark.org/review/10648 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-25CMake: Add a hardening-check target.Gerald Combs2-3/+88
On Windows, add a hardening-check target which checks for DYNAMICBASE and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. For a Visual Studio solution, run the check by calling: msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj using the config as appropriate for your build. Otherwise if we find the Debian/Fedora hardening-check script add a target which runs it for each of our executables. Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 Reviewed-on: https://code.wireshark.org/review/10641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-25Refactor NCP Python data so that INFO column can be generated on the fly ↵Michael Mann1-462/+498
(TAKE 2) The "old" method of populating the INFO column was to dissect all fields of a function/subfunction, then do a search in the tree to find the hf_ values of interest to then format into something for the INFO column. This is very expensive and requires "low level" APIs (for tree manipulation) which really shouldn't be used in a dissector. The "new" method populates the INFO column at the same time a field is parsed, so nothing has to be revisited (and allows for more fields to be displayed on some malformed packets). There are still expert infos (and possibly column APIs) under if (tree)s, but I'm not sure how FAKE_TREE_IS_VISIBLE factors into that. Removing the FAKE_TREE_IS_VISIBLE seems to negatively affect dissection. Change-Id: Ie487e851c2f6558dd12f0c7010757b4a5f36226b Reviewed-on: https://code.wireshark.org/review/10631 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-22Revert "Refactor NCP Python data so that INFO column can be generated on the ↵Michael Mann1-471/+455
fly." This reverts commit 38b6f306a70905be8b29ffaeb75288d315ff9b04. Change-Id: I6ec83b94811be7699880e9a741c68faaac175bd0 Reviewed-on: https://code.wireshark.org/review/10613 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-21Remove proto_tree_add_text API.Michael Mann1-64/+0
Its time has finally come. Technically I just renamed it to proto_tree_add_text_internal and removed the WS_DLL_PUBLIC (so it shouldn't link outside of epan). It's still (legitimately) used by expert.c otherwise I would have made it static within proto.c (and the rename wouldn't have been necessary). Change-Id: I9bdf888d5e92bc7b70a3f5461b9297a66d994b80 Reviewed-on: https://code.wireshark.org/review/10594 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-09-19Refactor NCP Python data so that INFO column can be generated on the fly.Michael Mann1-455/+471
The "old" method of populating the INFO column was to dissect all fields of a function/subfunction, then do a search in the tree to find the hf_ values of interest to then format into something for the INFO column. This is very expensive and requires "low level" APIs (for tree manipulation) which really shouldn't be used in a dissector. The "new" method populates the INFO column at the same time a field is parsed, so nothing has to be revisited. There are still expert infos (and possibly column APIs) under if (tree)s, but with the FAKE_TREE_IS_VISIBLE "hacks" removed, there should be less fear in removing the tree checks. Change-Id: I847827395fc28704f468df8bc8b47b297dde8479 Reviewed-on: https://code.wireshark.org/review/10572 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-09-19Some more ncp2222 improvementsMichael Mann1-544/+568
Including: 1. Using ENC_BIG_ENDIAN and ENC_LITTLE_ENDIAN instead of self made macros 2. Creating an "expert info hook" so that fields can be parsed "in real time" and added as expert info instead of searching by field name and manually getting values. Most of the expert info is still under if (tree)s, but this is another step closer to removing all of the "manual labor" done that requires "special handling" of all tree functionality. Once the "manual labor" is removed, this dissector can behave like every other dissector and the if (tree)s can be removed with more abandon. Change-Id: If2c6a4c723e12e070e68d6df2d492d4b5ac35123 Reviewed-on: https://code.wireshark.org/review/10555 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-17ncp2222 - Convert process_bitfield -> proto_tree_add_bitmask and other cleanup.Michael Mann1-10/+121
The dissector is doing a lot of unnecessary "manual" operations. Start the process of simplifying that to encourage use of general APIs and put control of the "field name" in the hands of the hf_ entry it belongs with. Change-Id: I5b048c04858ac4a846a276ba12d61c665deb66f8 Reviewed-on: https://code.wireshark.org/review/10547 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-15ncp2222 Updatesgmor1207@gmail.com1-195/+516
Modifications to ncp2222.py Add absolute time values eptime for file/volume info Add support for 64 bit File Transfer NCP's (22/54, 22/55, 22/56, 22/57, 22/58, 87/70, 87/71, 87/72, 87/73, 89/41, 123/35) Fix numerous dissection errors in NWInfo and ExtNWInfo structures Fix some indention (white space) in source Modifications to packet-ncp2222.inc Change seq count rollover value to 16 instead of 255 to make it more robust Add ncp 87,72 reply Add ncp 8x20 request Fix ncp 8x20 reply Change-Id: I80bdcc5854c02edd4ea51c74aa0bbc9c0e062bc1 Reviewed-on: https://code.wireshark.org/review/10017 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-09-13dissector-skinny: Update skinny dissector to fix ServerRes MessageDiederik de Groot2-5/+27
ServerRes message does not follow other message when it comes to provinding the list of ip-addresses. The type of ip-address (IPv4 or IPv6 does not depend on the protocol version but the length of the message. Fix: ipv4 address displayed as ip-address Change-Id: Ie16f81c9482b30a80da37b9327b09e933d7808f8 Reviewed-on: https://code.wireshark.org/review/10513 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-12Eliminate proto_tree_add_text from packet-ncp2222.incMichael Mann1-1/+22
Change-Id: I551204d7546c05ab277bbb299a44b4625475d1a0 Reviewed-on: https://code.wireshark.org/review/10501 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-12dissector-skinny: Update skinny dissector to include new messages and enumsDiederik de Groot1-9/+32
Some new firmware has come out for sccp devices which contains the use of 1 new message and some extended enums Fix: UserToDeviceData was reusing the hf_skinny_data flag which had a side effect of showing the label as 'Statistics' which was incorrect. Change-Id: I84f31f5f170dee075df64b5e7187f8742b6768af Reviewed-on: https://code.wireshark.org/review/10483 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-08tools/pre-commit: compare files instead of mtimePeter Wu1-12/+21
Instead of unconditionally checking for the file mtime, compare file contents instead. Perform this check only for invocations via a hook. While at it, simplify setting defaults for the git directory and the commit identifier. Support executions via relative paths and update the help messages on top of the file. Change-Id: I89c015fe6553ad52e07795683dd88cb219a26ed2 Reviewed-on: https://code.wireshark.org/review/8923 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-31Windows: update GeoIP library to 1.6.6Pascal Quantin1-5/+5
Change-Id: I56f58e52fa39fdddd35bcc7ef6d96cfa4042892d Reviewed-on: https://code.wireshark.org/review/10333 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>
2015-08-30Add Lua 5.2.3 built with MSVC2015Pascal Quantin1-3/+3
Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4 Reviewed-on: https://code.wireshark.org/review/10313 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-27Remove calls of tvb_ensure_length_remaining.Michael Mann1-1/+0
The remaining calls seem to fall into 3 categories: 1. passing it to tvb_find_line_end when -1 (for length) will do. 2. duplicating the checking of tvb_reported_length_remaining, which is already in use near the tvb_ensure_length_remaining call. 3. Those that (probably) need tvb_ensure_capture_length_remaining Change-Id: I1e77695251e055644bcbbb89f3c181c65d1671ca Reviewed-on: https://code.wireshark.org/review/10268 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-08-22Correct logic for finding shadow variables.Michael Mann1-1/+1
Change-Id: Ide03c3b92f70d5dad8d0dceca179ea6f3b9e1fd6 Reviewed-on: https://code.wireshark.org/review/10037 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-21lemonflex: fix warning: no previous prototype for 'df_scanner_*' ↵Alexis La Goutte1-4/+4
[-Wmissing-prototypes] lemonflex-tail.inc:44:1: warning: no previous prototype for 'df_scanner_text' [-Wmissing-prototypes] lemonflex-tail.inc:50:1: warning: no previous prototype for 'df_scanner_file' [-Wmissing-prototypes] lemonflex-tail.inc:59:1: warning: no previous prototype for 'df_scanner_cleanup' [-Wmissing-prototypes] Change-Id: If0476b430592df225234c5c685c8009ab08b5ab6 Reviewed-on: https://code.wireshark.org/review/10162 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-17Install GTK3 too.Jeff Morriss1-3/+3
It was in the list of packages but not in the final command line. Change-Id: I361e660cc4ac91121314a3f8a7388b48fb2c61b7 Reviewed-on: https://code.wireshark.org/review/10081 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-08-13Make building with MSVC2015 workAnders1-1/+1
TODO: - LUA is commented out probably needs to be built with MSVC 2015. - GeoIP is commented out, causes packet-ip* to not build. - Qt not built, needs Qt with MSVC 2015 Change-Id: I1658077931b89b9a22ee32e5ed7de38e07fb6a55 Reviewed-on: https://code.wireshark.org/review/8683 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>
2015-08-13fuzz-test.sh: added missing option in help.Dario Lombardo1-1/+1
Change-Id: I7651e18ec6e8338cddc82be90257c5f183804c7c Reviewed-on: https://code.wireshark.org/review/10011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-12editcap: add change offset.Dario Lombardo1-3/+7
This option skips some bytes when fuzzing, that prevents some headers from being changed. This focuses fuzzer to a smaller part of the packet. Change-Id: I1db83235e93f2774a9991e3af70f633487b816fa Reviewed-on: https://code.wireshark.org/review/9982 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>
2015-08-08NCP2222.py : fix generate indent (use 4 spaces)Alexis La Goutte1-64/+64
Change-Id: Ibe55260e837f0a839649675c08e1bf66d8bcdb52 Reviewed-on: https://code.wireshark.org/review/9924 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-02Skip files larger than 8MB in valgrind fuzzingEvan Huus1-1/+1
Follow-up to g2eabd35 which added a 20MB limit, this lowers it quite a bit since we're still seeing out-of-memory failures with files slightly larger than 8MB. Based on a quick scan of the menagerie this only excludes another dozen or so files so we won't lose much coverage. Ping-Bug: 11395 Change-Id: I8d684bebad553408c68b125330f2878deedc3bff Reviewed-on: https://code.wireshark.org/review/9849 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-25lemon (tools): Fix Dead Store (Dead assignement/Dead increment) warning ↵Alexis La Goutte1-1/+0
found by Clang Change-Id: Ibfa0bfd589e77a58b7b242c7c2fe25ef052a874e Reviewed-on: https://code.wireshark.org/review/9516 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-24Fix CMake 7zip searchGraham Bloice1-2/+6
A further fix for the CMake Windows search for 7-zip. Add the destination\bin path to the search path. When downloading from anonsvn only pass the path within the destination not the whole path. Change-Id: I2beec925730fae21d6a63bee5332e1002f49d6ae Reviewed-on: https://code.wireshark.org/review/9770 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-24Skip large files when fuzzing with valgrindEvan Huus1-0/+5
They run the buildbot out of memory, so just skip them, we don't want to remove them from the menagerie entirely. ("large" here is > 20000 KB, but that could change) Change-Id: I58dd9a981be6e6fc661ea624cc0c5258a5986a9f Ping-Bug: 11395 Reviewed-on: https://code.wireshark.org/review/9768 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-23Fix 7-zip searchGraham Bloice1-1/+2
The path for a Chocolatey 7zip.commandline install is $env:ChocolateyInstall\bin and the version installed by Chocolatey for its own use is in $env:ChocolateyInstall\tools Change-Id: I2f1ee78e93f861075f8c06ed74d81d8173911299 Reviewed-on: https://code.wireshark.org/review/9762 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-23CheckAPI: Add a shadow variable checkAlexis La Goutte1-0/+30
Check if there is index, time or strlen variable Change-Id: I530a35d6e1cf13f0795b35579ce76ee373ed4b1a Reviewed-on: https://code.wireshark.org/review/8724 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-21Be more careful about variable scope and quoting.Gerald Combs1-2/+2
Change-Id: Ica226178cb43b82a87441fe11e8c2093e01db8a5 Reviewed-on: https://code.wireshark.org/review/9738 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-19Fixup make-usb.pyGerald Combs1-3/+9
SourceForge (which is where the Linux USB project is hosted) is currently under maintenance. As a result this morning's update-numbers run clobbered usb.c. Add a minimum vendor and product count check to make-usb.py. Change-Id: Ia18bcd9c0eb365bd97b735795e9ad39cd85093a8 Reviewed-on: https://code.wireshark.org/review/9706 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-02Try to fix OSX build bootAndersBroman1-4/+4
lemon.c:1784: warning: implicit conversion shortens 64-bit value into a 32-bit value lemon.c:1790: warning: implicit conversion shortens 64-bit value into a 32-bit value 1790: warning: implicit conversion shortens 64-bit value into a 32-bit value 1928: warning: implicit conversion shortens 64-bit value into a 32-bit value 2707: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: Ief1b64009891de6885c2c9a6cb0e290752de889f Reviewed-on: https://code.wireshark.org/review/9463 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02Lemon: Update lemon toolsAlexis La Goutte2-647/+793
Update from SQLite trunk (19 April 2015) Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value Add "new" version of lempar.c (3 November 2009). LEMPAR: fix trailing whitespace LEMPAR: fix -Wunused-parameter Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813 Reviewed-on: https://code.wireshark.org/review/6502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-29tools/asn2wrs.py: fix isdn-sup generation with Py3Peter Wu1-16/+10
Python 3 has removed the cmp function for sort functions, relying on a key function instead. Tested with Python 2.7.10 and 3.4.3. Change-Id: Id571b836304528ecc3b23a0f8a2843c4538c3e1b Reviewed-on: https://code.wireshark.org/review/9212 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-29tools/asn2wrs.py: handle windows-1252 encodingPeter Wu1-3/+12
The RRC ASN.1 definitions resulted in a decode error in Python because the file is encoded as windows-1252 instead of UTF-8. This patch makes the tool more forgiving in handling windows-1252 encodings. Tested with Python 2.6.9, 2.7.10, 3.4.3. Change-Id: I9c9269e1065c98b8bcfb57ab4bfd21d5e183a656 Reviewed-on: https://code.wireshark.org/review/9133 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-27checkAPIs.pl: check how ui class files are includedMartin Kaiser1-10/+31
flag up a warning if a ui class file is included from the current directory by using #include "" Visual Studio needs #include <> to make sure that we always pick up these files from the build directory if we're building with CMake combine this check with the other check for gcrypt.h so that included files are checked in one common subroutine Change-Id: If8420ff5886f8eb2a71aa8fbfe6bc5d2bda607ce Reviewed-on: https://code.wireshark.org/review/9189 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-26Update valgrind script for the UIEvan Huus1-2/+2
Plain 'wireshark' is now the Qt version, and 'wireshark-gtk' is the GTK version. Change-Id: I893d6ae9a205998e191cbf6160cf27fcfd09bb4d Reviewed-on: https://code.wireshark.org/review/9181 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-26tools: permit setting BIN_DIR in the environmentEvan Huus5-17/+21
For out-of-tree builds you have to pass the location of your build to our tools like the fuzz script, valgrind script etc. Modify them so that the value can be set in the environment rather than requiring a shell script flag. Set the environment variable in the vagrant provision step, so that the scripts Just Work (TM) in the VM. Change-Id: If8ce6b278176085ba6dd994137b82fc989b80124 Reviewed-on: https://code.wireshark.org/review/9168 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-25Replace Folder.CopyHere with 7-Zip.Gerald Combs1-11/+59
Server Core editions of Windows don't have shell.application. As a result CopyHere and its unzip capabilities aren't guaranteed to be available. Plus, CopyHere is just plain slow. Remove the CopyHere code. Search for 7z and 7za in various places and download the standalone 7za if needed. Bug: 11151 Change-Id: Ie719effbdcee3141764183bf3535ec9bd1c3e97a Reviewed-on: https://code.wireshark.org/review/8226 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 13:42:56 +0000