aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2013-12-19proto_tree_add_text -> proto_tree_add_xxx conversion.Michael Mann1-0/+3
svn path=/trunk/; revision=54274
2013-12-19Some patches from Peter Harris:Jeff Morriss1-19/+105
[PATCH 1/5] X11 dissector: Sort declarations This prevents pointless changes showing up in the diff when evaluating unrelated changes to the generator. See http://search.cpan.org/dist/perl-5.18.0/pod/perldelta.pod#Hash_randomization [PATCH 2/5] X11 dissector: Silence warnings on perl 5.18, prevent 5.20 Perl 5.18 retroactively marked "given/when" experimental, with a promise to remove or dramatically change it in 5.20. Since there is no perl 5.20 yet, there is no way to make this script compatible with it. [PATCH 3/5] X11 dissector: Support variable_param (at least for glCallLists) (This patch makes the change in r54232 unnecessary by using the previously- unused variable.) [PATCH 4/5] X11 dissector: Remove obsolete TODO item This item was done in r53531 PATCH 09/11 svn path=/trunk/; revision=54242
2013-12-18Some proto_tree_add_xxx functions have a '_' in the function name so make ↵Michael Mann1-1/+1
sure they get counted in the proto_tree_add_text percentage. Makes a few dissectors look a little better. svn path=/trunk/; revision=54236
2013-12-18Instead of assigning a variable to itself, avoid unused warnings similarGerald Combs1-1/+1
to the Q_UNUSED macro. svn path=/trunk/; revision=54232
2013-12-18Fix [-Wmissing-prototypes]Anders Broman1-0/+1
svn path=/trunk/; revision=54209
2013-12-13Change the exit status of a fuzz failure to 255 so that if you use it with xargsEvan Huus1-1/+1
the failures don't get suppressed. svn path=/trunk/; revision=54071
2013-12-13Switch the cherry-pick merge strategy to "recursive + theirs", whichGerald Combs1-1/+4
seems to pull in fewer changes and be less prone to conflitcs. This was the case for r53086, at least. Add "-x" which adds a "cherry picked from..." line to the commit message. Show a diff before pushing. svn path=/trunk/; revision=54007
2013-12-13Fix redirection.Gerald Combs1-1/+1
svn path=/trunk/; revision=54003
2013-12-13Don't cherry-pick if we have changes.Gerald Combs1-0/+6
svn path=/trunk/; revision=54001
2013-12-12Add a "backport-change" script which cherry-picks a proposed backportGerald Combs2-1/+142
and pushes it to Gerrit. svn path=/trunk/; revision=53999
2013-12-04Ply parser updated to 3.5 (from GitHub github.com/dabeaz/ply)Tomas Kukosa2-119/+179
svn path=/trunk/; revision=53782
2013-12-04From Anders request Add prototype for corba/idl dissectorAlexis La Goutte1-0/+17
svn path=/trunk/; revision=53778
2013-12-03Dissectors should not use dfilter.h, don't include it.Jakub Zawadzki1-0/+1
XXX ncp2222 dissector is using dfilter_compile(), why? svn path=/trunk/; revision=53766
2013-12-03Add modelines info to idl generate fileAlexis La Goutte1-2/+36
svn path=/trunk/; revision=53754
2013-12-03Fix indent for generated file (Use 4 space)Alexis La Goutte1-39/+39
svn path=/trunk/; revision=53753
2013-12-03Fix generator don't generate trailing whitespaceAlexis La Goutte1-4/+6
svn path=/trunk/; revision=53752
2013-12-03Remove trailing whitespace and add modelines infoAlexis La Goutte1-44/+46
svn path=/trunk/; revision=53751
2013-12-03Remove whitespace and add modelines infoAlexis La Goutte1-2/+12
svn path=/trunk/; revision=53750
2013-12-03Add #pragma to idl generator...Alexis La Goutte1-1/+5
svn path=/trunk/; revision=53746
2013-12-01Use 4-space (PEP 8) indentation. Add modelines.Gerald Combs5-443/+501
svn path=/trunk/; revision=53685
2013-12-01Use indentation recommended by PEP 8.Gerald Combs1-126/+125
svn path=/trunk/; revision=53684
2013-12-01Fix compatibility with Python 2.5. Tested with 2.5, 2.6, 2.7, and 3.3.Gerald Combs1-3/+4
svn path=/trunk/; revision=53683
2013-11-29Graham BloiceJörg Mayer1-5/+14
I've now got tshark to build from a VS solution file, had to do some hacks to get there though, patch files attached for others to peruse, as I'm not sure if they are the optimal solutions: 3. As mentioned in my previous message, the VS solution chops out every 8192nd byte from the command line passed to make-dissector-reg.py. My patch (make-reg.patch) gets CMake to write out the required source file list to a file and modifies the python script to read in the file. The python changes *should* be backwards compatible. Me: Small fix to UseMakeDissectorReg.cmake (elseif() -> else()) svn path=/trunk/; revision=53654
2013-11-28Fix potential signed int overflow in LemonBalint Reczey1-2/+2
This chrashed Solaris buildbot when -ftrapv was enabled. Triaged by Guy Harris, see detail at: http://www.wireshark.org/lists/wireshark-dev/201311/msg00185.html svn path=/trunk/; revision=53624
2013-11-25Delete the svn:executable property on added files (we might add it back later).Jeff Morriss1-0/+3
svn path=/trunk/; revision=53587
2013-11-24Move dceprc_procedure_name from packet_info to dcerpc_info. Doesn't appear ↵Michael Mann1-2/+2
to be "used" by dissectors, just stored (for help in debugging?). svn path=/trunk/; revision=53552
2013-11-24Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.Jeff Morriss1-3/+4
Also, as per Peter Harris' request, update copyright date. svn path=/trunk/; revision=53545
2013-11-24Some patches from Peter Harris to make it possible to build the X11 dissectorJeff Morriss1-132/+371
again (and some various other improvements): Rebuild the dissector with the latest xcbproto and mesa. Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types These types are used by the new Present extension. Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures The xinput structs are used by the latest xcb/proto, and the xkb struct has been removed. Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty xinput:ChangeProperty should use switch/case, but only switch/bitcase is supported at the moment. Add (hopefully temporary) hack. Subject: [PATCH 04/11] X11 dissector: Use namespace for types In particular, the name of the xsync struct 'INT64' collides with a basic type of the same name. Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events All new extensions are using the new "Generic" events instead of traditional events, because there aren't enough traditional event numbers. Denoted by <event xge="true"> in xcb/proto. Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase XKB is weird. Subject: [PATCH 08/11] X11 dissector: Support sumof Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables (This patch also reverts r53298/r53299.) svn path=/trunk/; revision=53531
2013-11-23Implement address_to_str which is like ep_address_to_str and se_address_to_strEvan Huus1-1/+3
except it takes a wmem scope instead. Add the two emem equivalents to checkAPI as (weakly) deprecated. svn path=/trunk/; revision=53528
2013-11-22Add exception for cmake/TestWindowsFSeek.c it is copied from upstream under aEvan Huus1-0/+3
valid license, but has no recognizable header and there's no reason to carry the delta. svn path=/trunk/; revision=53518
2013-11-17Add a way to retrieve a PER variable bit string lengthPascal Quantin1-1/+2
svn path=/trunk/; revision=53382
2013-11-13Wrap GCC pragma in an #ifdef to make it compile when we're not using GCC.Jeff Morriss1-1/+3
Again, change manually applied to the .h file. svn path=/trunk/; revision=53299
2013-11-13Use a gcc pragma to stop the (pages of) warnings coming out ofJeff Morriss1-2/+3
x11-extensions-implementation.h . This change was manually applied to the .h file as I can't currently rebuild the X11 dissector. svn path=/trunk/; revision=53298
2013-11-11Add -P option to allow specifying the 'callgrind-out-file' nameBill Meier1-2/+4
svn path=/trunk/; revision=53250
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53230
2013-11-10Move struct _ftype_t + callback typedefs + free macro to ftypes-int.hJakub Zawadzki1-0/+1
svn path=/trunk/; revision=53223
2013-11-09Include <epan/to_str.h> only when needed.Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53189
2013-11-06Reapply the removal or the use of private_data that got removed byJörg Mayer1-58/+52
syncing from samba.org. If any other patches were applied, then I missed them and they are lost unless reapplied. svn path=/trunk/; revision=53121
2013-11-06Copy over the current WIP from samba.org::ftp/unpacked/samba_4_0_test/pidlJörg Mayer18-191/+360
- As the pidl in Wireshark doesn't work anyway we can just mirror the WIP so that patches to our code base are against the current code. svn path=/trunk/; revision=53120
2013-11-06Add a license-ignore for tools/html2text.pyEvan Huus1-3/+8
Update the preamble to COPYING to clarify that pidl isn't the only tool we carry which isn't GPLv2-compatible. svn path=/trunk/; revision=53108
2013-11-06Remove pinfo->private_data from DCERPC dissectors. Bug 9387 ↵Michael Mann1-58/+52
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) This is the PIDL input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters. I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes. svn path=/trunk/; revision=53098
2013-11-03Pass the name of the sed executable as an explicit argurment toJörg Mayer1-3/+13
runlex.sh (like it is done with LEX already). May fix a problem on Windows with cmake. svn path=/trunk/; revision=53059
2013-10-27More SVN properties cleanup.Jeff Morriss2-2/+2
svn path=/trunk/; revision=52884
2013-10-27Fix up some more svn properties.Jeff Morriss18-18/+18
svn path=/trunk/; revision=52882
2013-10-27Don't set svn:keywords on .pod files. Remove it from those that have it.Jeff Morriss1-7/+3
Reorganize svnadd a little bit. svn path=/trunk/; revision=52881
2013-10-26Updates to radiotap-iter licensing terms. The upstream version has a COPYINGEvan Huus1-0/+1
file containing what is actually the ISC license (BSD-like), so add that to the header for licensecheck's sake (and remove the confusing reference to the BSD license). This makes the code actually your choice of ISC and GPL2 (since it is used in the Linux kernel which is GPL2-only). ISC is already acceptable for us, so ISC \union * must be also, so add ISC+GPL2 to checlicenses' list. Upstream COPYING file, for reference: http://git.sipsolutions.net/?p=radiotap.git;a=blob;f=COPYING;hb=97478c8467ce7ab56b7c9e8fd7cdc0f4e2cb22ed svn path=/trunk/; revision=52879
2013-10-25Add an exception to the license-checker for Samba's special IDL license whichEvan Huus1-0/+6
appears to be compatible as far as I can tell (not a lawyer). See: https://www.wireshark.org/lists/wireshark-dev/201310/msg00234.html svn path=/trunk/; revision=52849
2013-10-25Handle *.rtf and *.qm files.Jeff Morriss1-1/+7
svn path=/trunk/; revision=52833
2013-10-24Confirm the license as well.Gerald Combs1-1/+1
svn path=/trunk/; revision=52819
2013-10-24Enable QtMultimedia. We'll need it for VoIP playback at some point.Gerald Combs1-1/+0
(The current Qt packages in wireshark-win{32,64}-libs still have QtMultimedia disabled. This will hopefully make sure it's enabled next time around.) svn path=/trunk/; revision=52818