aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin2-2/+2
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-03Add a few more ad-hoc validations of the hf[] FIELDCONVERT field.Bill Meier1-2/+16
Change-Id: Icd817a950331a2e7416a28c3d4a5a004d297e6f9 Reviewed-on: https://code.wireshark.org/review/1845 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-16Build with GTK+ 2.24.23.Gerald Combs2-2/+2
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460 Reviewed-on: https://code.wireshark.org/review/1665 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-11Increase time permitted when fuzzing with valgrind.Evan Huus1-2/+2
The capture on bug 10098 times out but I don't see any culprits for bad loops or anything - I think the capture is just too big. I'd prefer somebody else take a look at it to verify I'm not missing anything before submitting this. Bug:10098 Change-Id: I2cc43fd6ac9afaa345e7d31184483a9732fd6bf0 Reviewed-on: https://code.wireshark.org/review/1583 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11It is possible to check out a source tree that is not co-located withJoerg Mayer2-2/+3
the .git repository. First attempts to support that setup. Change-Id: Ie1560c372e23e58fb0e310f681388b5e1a65ba5b Reviewed-on: https://code.wireshark.org/review/1596 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-09Add -Q for QtShark and change the dumpcap command to use number ofAndersBroman1-2/+5
packets. Change-Id: Ia4dc03e3722379d41804758feeafb655f26376e9 Reviewed-on: https://code.wireshark.org/review/1573 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-09Be less aggressive about rebuilding sminmpec.c.Gerald Combs2-10/+13
Instead of forcing developers to generate sminmpec.c (which will have different results depending on the presence or absence of a working Internet connection) add sminmpec.c back to the repository. I'll add it to the weekly update-numbers script so that it will be updated at the same time as manuf, services, enterprise-numbers, and usb.c. Change the Autotools, CMake, and Nmake sminmpec.c target name to "update-sminmpec". Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers and sminmpec.c while we're here. Tested with an in-tree Autotools build and an out-of-tree CMake build. Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 Reviewed-on: https://code.wireshark.org/review/1516 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-08Add a command option for dumpcap.AndersBroman1-2/+5
Change-Id: Ic9a4b35f5a6245e0100f93c890622674e44413c6 Reviewed-on: https://code.wireshark.org/review/1564 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-07Error out if someone passes the address of a pointer to a *_string to VALS() ↵Jeff Morriss1-0/+8
or RVALS(). Change-Id: I85021b1cba151c16bf0a2d30169cf3dec77780f5 Reviewed-on: https://code.wireshark.org/review/1540 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-30make-sminmpec.pl fixups.Gerald Combs1-5/+18
Enforce a minimum number of entries and do our work in the epan directory. Change-Id: I69cc6ae3255b23706a2e67db890a9718e10568b2 Reviewed-on: https://code.wireshark.org/review/1398 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-0/+6
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Cleanup "excess" from trying to support sequence of "native types". Last ↵Michael Mann1-40/+38
installment of bug 9532. Cleaned up wireshark_gen.py so that it no longer generates duplicate fields and greatly minimized the number of useless hf_ variables generated. Change-Id: I26b2ddb5b65fcde99787cc2771348aa1b37f919f Reviewed-on: https://code.wireshark.org/review/1329 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-23Continuation of bug 9532.Michael Mann1-0/+14
Ie4d1edfd67a8e6f02834573f29f07baf79058534 created a several duplicate hf_ registrations. That led to the exposure of some other potential problems with generating sequences. Still not quite complete, but want to pacify the buildbots, so there is a small amount of manual editing to comment out a few duplicated hfs in packet-parlay.c. Change-Id: I0ff8a9795e213ab966db8d6333b9477bad06250b Reviewed-on: https://code.wireshark.org/review/1302 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-23Bugfix generating a sequence of "native" types. Bug 9532.Michael Mann1-3/+66
Previously a sequence of "native" types (int, float, etc) generated a proto_tree_add_uint (for the loop over the sequence) and a proto_tree_add_XXX (for the "native" type), but only 1 hf variable was created for the "loop" field, so DISSECTOR_ASSERT_NOT_REACHED would be generated if "native" type != uint. Now a separate hf_ variable is generated for the "loop" and "native" type. Also update existing IDL dissectors with new generator logic. Change-Id: Ie4d1edfd67a8e6f02834573f29f07baf79058534 Reviewed-on: https://code.wireshark.org/review/1274 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-23Fix generator to remove Dead Store (Dead assignement/Dead increment) warning ↵Michael Mann1-2/+13
found by Clang. (not sure why, but regeneration also "moved" some hf_ variables from previous version) Change-Id: I197eacbb3f892dbdca6e6bc354fc88240c1bfb34 Reviewed-on: https://code.wireshark.org/review/1291 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-19Don't se_ allocate strings when mapping addresses to column strings.Guy Harris1-1/+0
This should significantly reduce memory usage, without increasing the CPU time required to process a capture file in TShark or Wireshark. As a result, se_address_to_str() is no longer used; eliminate it. Fixes bug #9949. Change-Id: I65a112a426c82cc73a957b81384c765c3d14f2c3 Reviewed-on: https://code.wireshark.org/review/1213 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-17Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012Pascal Quantin2-2/+2
Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f Reviewed-on: https://code.wireshark.org/review/1176 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Add tvb_get and proto_tree_add for string-encoded timestampsHadriel Kaplan1-1/+1
This commit adds tvb_get_string_time and proto_tree_add_time_item routines for getting nstime fields from the tvb when they are encoded in ASCII string form. The proto_tree_add_time_item routine is also usable for normal big/little-endian encoded time_t, and has the advantage of retrieving the value even if there's no proto tree. It also exposes the routines to Lua, both so that a Lua script can take advantage of this, but also so I can write a testsuite to test the functions. Change-Id: I955da10f68f2680e3da3a5be5ad8fdce7ed6808c Reviewed-on: https://code.wireshark.org/review/1084 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Fix Bug 9951: 'git commit hook isn't calling checkAPIs.pl with arguments for ↵Hadriel Kaplan2-1/+15
the dissectors' I recently made a change to packet-rtp.c and inappropriately included g_error() in it, which the builbots caught during their run of checkAPIs.pl. But checkAPIs.pl is supposed to catch such things for us before we submit, by being invoked in the git pre-commit hook. Apparently though, buildbots call checkAPIs.pl with extra arguments for different cases... and for packet dissectors it calls it with a '-g abort' argument, which is how it caught the g_error. So the "bug" is that the pre-commit hook should invoke checAPIs.pl with that argument too, for epan/dissectors/packet-*.c files. Change-Id: Ie8f9dcc55f2248918208dea85a04f67e6bf9829a Reviewed-on: https://code.wireshark.org/review/953 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-08Add commit-msg hook to tools to spare searching for itMichał Orynicz1-0/+181
commit-msg script adds change id at end of commit messages. As this script is needed for Gerrit review system to work and every wireshark developer will need to download it from somewhere, it will be better if it is downloaded with Wireshark sources and ready to copy to .git/hooks Copied from AOSP Gerrit. Change-Id: Ib3705abfedd2869462eef57690a2f430037f9cc1 Reviewed-on: https://code.wireshark.org/review/1008 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-07Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW ↵Pascal Quantin2-2/+2
gcc 4.3 Fixes bug 9957 Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6 Reviewed-on: https://code.wireshark.org/review/991 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-05Upgrade Windows builds to Lua 5.2.3Pascal Quantin2-2/+2
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0 Reviewed-on: https://code.wireshark.org/review/974 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-05Rework debug_print_hash logic so that it's supported by older versions of perl.Michael Mann1-1/+2
Change-Id: I1720681dc367e01268ffbb1f31035464fa642496 Reviewed-on: https://code.wireshark.org/review/971 Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Michael Mann <mmann78@netscape.net>
2014-04-02Revert Remove check and inverse code to display a error if there is a $Id$Alexis La Goutte1-1/+4
Change-Id: I7061ad312df5079924c927ca95a8fa111c756012 Reviewed-on: https://code.wireshark.org/review/498 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-01Fix checkApis perl script false positive proto_tree_add with ENC_*Hadriel Kaplan1-1/+2
In epan/proto.c in function proto_tree_add_split_bits_crumb, the proto_tree_add_text function is called with one of its arguments using ENC_BIG_ENDIAN, but it's not an argument for proto_tree_add_text itself but instead a function being called inside it. checkAPIs.pl tries to avoid this in check_proto_tree_add_XXX_encoding, by removing parenthesis arguments, but in this acse there are newlines between the arguments, causing the regex to not catch them. This commit fixes the regex. Change-Id: I70ef79d5436ba2ec04ffdc3d9939c7aa2cdf6a1f Reviewed-on: https://code.wireshark.org/review/902 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-1/+0
(Using sed : sed -i '/^\*\* \$Id\$/,+1 d') (2 star and space) Change-Id: I48505ffb8bfa103cd7db0117e18cdb1925a7034d Reviewed-on: https://code.wireshark.org/review/884 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte3-3/+0
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte27-52/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+1
(Using sed : sed -i '/^\* \$Id\$/,+1 d') (no space before star) Change-Id: I318968db2b8512ba1303b5fc5c624c66441658f0 Reviewed-on: https://code.wireshark.org/review/879 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-3/+1
(Using sed : sed -i '/^ \t$Id\$/,+0 d') (tab before $Id$) Also modify generator (NDR.pm) Change-Id: I348a1d129d1d1320bd80b428038ea5ed291d6ca8 Reviewed-on: https://code.wireshark.org/review/878 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-30Fix fuzz-test.sh '-b' option so it works again; Do some other ↵Bill Meier4-36/+44
tools/*test*.sh changes - Add -b option to randpkt-test.sh and test-captures.sh; - Create/ue a common function to do '-x' tests on files/dirs; - Rename exit_error function to ws_exit_error Change-Id: I032c9d784bec1fb6b0717aaad08a061e4d935476 Reviewed-on: https://code.wireshark.org/review/872 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-29Upgrade Windows builds to Lua 5.2.1Pascal Quantin2-2/+2
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-21Fix indexcap toolsAlexis La Goutte1-1/+1
Change-Id: Ib77af11975873106b7db7ac1bcd12f4a0800b59e TypeError: extract_protos_from_file() takes exactly 6 arguments (7 given) Reviewed-on: https://code.wireshark.org/review/779 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Remove duplicate call to fix-encoding-argsEvan Huus1-3/+0
Change-Id: I7067a8856ff1c431d5e5ec7ec2a51228a8613631 Reviewed-on: https://code.wireshark.org/review/743 Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19Add check of whitespace error after Wireshark check (checkhf, checAPIs...)Alexis La Goutte1-3/+4
(Because check whitespace quit after check... and no longer launch other check...) Change-Id: I97ee0191c3d985934e74d23576f88984ec0e9b46 Reviewed-on: https://code.wireshark.org/review/739 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17Enhance pre-commit tools to avoid false positiveAlexis La Goutte1-1/+1
Limit check to file with extension *.c or *.h Patch revert by mistake in 49394d3101ec286b335213a9845b6d4202955021 Change-Id: Ifed4c833c740218e5e24b3176dc20802fa5849bb Reviewed-on: https://code.wireshark.org/review/719 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-13Fix value_string checks in checkAPIs.pl.Gerald Combs1-2/+2
Some strings contain semicolons, which meant g36db2df was terminating our REs too early. Try terminating them with '}' followed by ';'. Change-Id: I97f63351ef35c91e3123d9abd47576d47fea4b2b Reviewed-on: https://code.wireshark.org/review/638 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-13Add a check for newlines in value_strings.Gerald Combs1-81/+118
Update checkAPIs.pl to look for newlines in value_strings and enum_val_t's. We now have to perform the check before we strip quoted strings. Hopefully that won't cause a problem. Rename the check since we do more than check for NULL termination. Add modelines. Fixes bug 9878. Change-Id: I39dd910db60c7028ea4bdb58e8cfdb239c094748 Reviewed-on: https://code.wireshark.org/review/628 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-13Pre-Commit Hook check to check for newer versionRoland Knall1-0/+5
Insert a short check to always check for newer versions in the tool directory of the pre-commit script So far, only a warning is being generated, allowing the developer to decide for him/herself Change-Id: I6fce60e3de1d051757d0ed38eae8fdc94cec7662 Reviewed-on: https://code.wireshark.org/review/633 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-10Replace "see copyright notice in" message with full licenseEvan Huus1-0/+1
Should make the licensecheck buildbot happy. Also add "Public domain MIT/X11 (BSD like)" to the list of permitted licenses, since it is a combination of two permitted licenses. Change-Id: Ibc4ead09af89e9225c4e0589a2b7d06dcee6a44e Reviewed-on: https://code.wireshark.org/review/581 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-07Remove trailing (tab)whitespace...Alexis La Goutte1-7/+7
Change-Id: I26325e40d6100dcd4f3e72080476a82e93edf28d Reviewed-on: https://code.wireshark.org/review/550 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-06Update Wireshark pre-commit tools (Add check for trailing whitespace based ↵Alexis La Goutte1-3/+5
from git pre-commit.sample) Change-Id: If8f5f48dfd96c3657036f7b59b6ca905c9d24043 Reviewed-on: https://code.wireshark.org/review/531 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-05(Trivial) Fix a typo.Bill Meier1-1/+1
Change-Id: Ib084b7e9d463c54fc836745833005b1456a82709 Reviewed-on: https://code.wireshark.org/review/518 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte2-4/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-26More tvbuff API deprecation, comment expansion, and documentation updates.Guy Harris1-0/+1
Do with tvb_get_stringz() what was done with tvb_get_string(). Redo the comments for the string get routines to try to give more detail in a fashion that's a bit less hard to read. Warn, in comments, of the problems with using tvb_get_string()/tvb_get_stringz() (i.e., if your strings are non-ASCII, all bytes with the 8th bit set are going be replaced by the Unicode REPLACEMENT CHARACTER, and displayed as such). Warn, in a comment, of the problems with tvb_get_const_stringz() (i.e., it gives you raw bytes, rather than guaranteed-to-be-valid UTF-8). Update documentation and release notes appropriately. Change-Id: Ibd3efb92a203861f507ce71bc8d04d19d9d38a93 Reviewed-on: https://code.wireshark.org/review/327 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Remove a trailing space from a line of generated code.Bill Meier1-1/+1
Change-Id: Ib95c0db932c54f5664905bde9286aad7a195570f Reviewed-on: https://code.wireshark.org/review/411 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25Install git-review too.Jeff Morriss1-1/+1
Change-Id: I65c98fe8e120ac3b416ca6749eb2b44c47664fb5 Reviewed-on: https://code.wireshark.org/review/386 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25Get rid of a few more Subversion remnants.Jeff Morriss3-8/+1
Change-Id: I35ff651017e355f92b4f9e6388e90d446f245d0a Reviewed-on: https://code.wireshark.org/review/361 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25Delete tools/svnadd: it seems git doesn't need all this fancy properties stuff.Jeff Morriss1-93/+0
Change-Id: Ibb1c713ba9e9b09f062753c232d006b3afd682f0 Reviewed-on: https://code.wireshark.org/review/366 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 04:02:52 +0000