Commit Graph

1275 Commits

Author SHA1 Message Date
Jörg Mayer f7f47af562 Reapply the removal or the use of private_data that got removed by
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-06 22:50:28 +00:00
Jörg Mayer 02fe7ff23a Copy over the current WIP from samba.org::ftp/unpacked/samba_4_0_test/pidl
- 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-06 22:48:50 +00:00
Evan Huus 99d8439ce0 Add a license-ignore for tools/html2text.py
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-06 17:43:49 +00:00
Michael Mann 79cd3563fc Remove pinfo->private_data from DCERPC dissectors. Bug 9387 (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-06 12:36:09 +00:00
Jörg Mayer 117a59d7a2 Pass the name of the sed executable as an explicit argurment to
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

svn path=/trunk/; revision=53059
2013-11-03 12:22:39 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Jeff Morriss 2d20a6c864 Fix up some more svn properties.
svn path=/trunk/; revision=52882
2013-10-27 00:51:54 +00:00
Jeff Morriss 04c9e08b19 Don't set svn:keywords on .pod files. Remove it from those that have it.
Reorganize svnadd a little bit.

svn path=/trunk/; revision=52881
2013-10-27 00:50:26 +00:00
Evan Huus 01c2eecc35 Updates to radiotap-iter licensing terms. The upstream version has a COPYING
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-26 20:57:38 +00:00
Evan Huus ce22ab5ef6 Add an exception to the license-checker for Samba's special IDL license which
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-25 18:14:36 +00:00
Jeff Morriss ed7af16d9f Handle *.rtf and *.qm files.
svn path=/trunk/; revision=52833
2013-10-25 01:25:00 +00:00
Gerald Combs 5303e144a3 Confirm the license as well.
svn path=/trunk/; revision=52819
2013-10-24 17:24:07 +00:00
Gerald Combs f5492ad94a Enable QtMultimedia. We'll need it for VoIP playback at some point.
(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
2013-10-24 17:23:13 +00:00
Evan Huus 918df38a05 Add an X11/MIT license to asn2wrs.py as it's compatible with our license, that's
what the original base code was, and Tomas (who made most of the
wireshark-specific changes) has no particular preference.

svn path=/trunk/; revision=52801
2013-10-23 17:22:54 +00:00
Evan Huus 2322bd3122 Fix lemon FSF address and add license exception for the generated mate grammar
files. One of them has no license (it is just defines) and the other gets picked
up as LGPL for no reason I can discern.

svn path=/trunk/; revision=52675
2013-10-18 18:10:46 +00:00
Graham Bloice 9c4ee86784 Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
Pascal Quantin 6390f33772 Update the User Guide for the upcoming 1.11.0 release
svn path=/trunk/; revision=52576
2013-10-12 23:48:43 +00:00
Gerald Combs 6a5afa8e95 Update to the latest Windows library tags. Add an "install_qt" target.
svn path=/trunk/; revision=52558
2013-10-12 01:02:34 +00:00
Jeff Morriss 64cc800644 Don't assume people have subversion--I just copied my home directory to a new
machine and it would have been nice if this script and installed subversion
for me.

Install perl-podlators too (for pod2man).  Need to check if that's the package
name to use on SuSE too...

svn path=/trunk/; revision=52526
2013-10-11 00:31:01 +00:00
Evan Huus 2693e1243e Add some license headers after emailing the respective authors to confirm.
svn path=/trunk/; revision=52471
2013-10-09 17:30:50 +00:00
Gerald Combs de8242ef36 Fix a comment.
svn path=/trunk/; revision=52460
2013-10-09 00:03:14 +00:00
Evan Huus 00c8690599 Ignore g711.c it's under some weird Sun license but appears to be fully
GPL-compatible as far as I can tell (not a lawyer).

svn path=/trunk/; revision=52415
2013-10-06 19:07:30 +00:00
Gilbert Ramirez 5dfd0adb1f Add license text to dftestlib files, and point to the
capture files that someone renamed from *.cap to *.pcap.

svn path=/trunk/; revision=52414
2013-10-06 19:05:31 +00:00
Michael Mann ee208c8dcc Add support for RELATIVE-OID ASN.1 type. Bug 9192 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9192)
From Ed Beroset.

svn path=/trunk/; revision=52393
2013-10-06 02:31:10 +00:00
Michael Mann 625fbd5f9a Allow a "more complex" algorithm to finding proto_tree_add_text overuse. Disabled by default, but used when I want to go on an add filterability spree. convert_proto_tree_add_text.pl makes these easier to fix, so why not be pickier about the percentages that dissectors use.
svn path=/trunk/; revision=52392
2013-10-06 02:07:47 +00:00
Michael Mann 0334c5b425 Remove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804).
I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here.

I will be sending the "PIDL source" (non dissector files) to the samba team.

svn path=/trunk/; revision=52313
2013-10-01 14:45:03 +00:00
Jeff Morriss b80c83618c Rename PCAP files to .pcap; set mime-type appropriately. Should these files be in the test/captures directory?
svn path=/trunk/; revision=52138
2013-09-18 14:23:14 +00:00
Gilbert Ramirez 9983ada8f5 Missed one file from dfilter-test.py
Updated license in ancient tool.

svn path=/trunk/; revision=52137
2013-09-18 05:12:04 +00:00
Gilbert Ramirez 4797eafddb Update dfilter-test.py to use a much more modern test harness,
the "unittest" module that comes with Python. Specifically, this
takes advantage of a couple of features in the "unittest" in
Python 2.7. The tests are all the same as before, but much
better managed.

This is in preparation for some work on the display filter code.

svn path=/trunk/; revision=52136
2013-09-18 05:07:46 +00:00
Jörg Mayer 4e74f3a3c3 Don't print a warning about missing svn id when the argument is not
a file. Warn about the "wrong" filetype and continue

svn path=/trunk/; revision=52105
2013-09-16 20:30:34 +00:00
Evan Huus 464bbb1275 Tweak mq macro and checkAPI to avoid false positives - "garbage"
(like a #define) at the beginning of a line before a value_string no longer
matches so a #define that includes the beginning of a value_string doesn't
confuse the script.

svn path=/trunk/; revision=52089
2013-09-15 22:34:36 +00:00
Jörg Mayer 98baf8ba18 Add help option
List options one by one

svn path=/trunk/; revision=52068
2013-09-15 17:50:18 +00:00
Jörg Mayer 05ba7d3afc http://url is NOT a c++ style comment
svn path=/trunk/; revision=52061
2013-09-15 14:49:16 +00:00
Evan Huus 868a331c10 Add GPL license as per Anders' email.
svn path=/trunk/; revision=52033
2013-09-14 12:23:19 +00:00
Evan Huus f2f2d0e888 Add license header to colorfilters2js.pl as per email from Dirk.
svn path=/trunk/; revision=52028
2013-09-13 23:02:39 +00:00
Guy Harris 170a70aafd Copyright notice (GPL, why not).
svn path=/trunk/; revision=52025
2013-09-13 21:40:19 +00:00
Jeff Morriss d179a1b788 Move debian-setup.sh into tools/
svn path=/trunk/; revision=52023
2013-09-13 21:06:08 +00:00
Evan Huus 863e056a9c cmake/TestFileOffsetBits also copied from an upstream with the appropriate
license

svn path=/trunk/; revision=52020
2013-09-13 18:40:15 +00:00
Evan Huus b33c061cc5 Permit a bunch of 'combo' licenses (meaning GPL + something else we accept in
the same file).

svn path=/trunk/; revision=52019
2013-09-13 18:36:11 +00:00
Evan Huus d0d4118263 Add license header (attributing to Jakub) for a few of the npl files.
svn path=/trunk/; revision=52018
2013-09-13 18:29:08 +00:00
Evan Huus b5c48b4a41 Ignore svnversion.h, it's auto-generated. Ignore lemon and except.[ch], they're
imported from upstreams with correct licensing but without a useful header (and
there's no particular reason to carry that delta).

svn path=/trunk/; revision=52017
2013-09-13 18:24:22 +00:00
Chris Maynard 50bcbef658 OK, all the Makefiles use -build since r41943, so add that option back for now.
svn path=/trunk/; revision=52016
2013-09-13 18:11:29 +00:00
Chris Maynard 051c082a8c Update the comments to match the current usage.
svn path=/trunk/; revision=52015
2013-09-13 18:00:32 +00:00
Chris Maynard 9c7e47fb2e Rename --build to --check-addtext/--nocheck-addtext for clarity.
Add --check-addtext/--nocheck-addtext, --check-hf/--nocheck-hf and --debug to the usage output and format the usage output a little better.

svn path=/trunk/; revision=52006
2013-09-13 16:52:08 +00:00
Evan Huus a10254082b When profiling we are more interested in real-world performance than memory
errors, so we want to use the "fast" allocators rather than the ones that are
friendly to memcheck.

svn path=/trunk/; revision=51969
2013-09-12 13:45:04 +00:00
Gerald Combs 8a5db6b66c Add newlines to the AsciiDoc output.
svn path=/trunk/; revision=51930
2013-09-10 15:39:05 +00:00
Balint Reczey ed31edea01 Make compare-abis.sh work with versions having multiple digits in version number
svn path=/trunk/; revision=51927
2013-09-10 11:10:00 +00:00
Jeff Morriss fb6d18fe0d Set *.ts files' mime type to be XML; set svn properties on tools/pre-commit.
svn path=/trunk/; revision=51900
2013-09-09 21:24:54 +00:00
Alexis La Goutte 45b9f5964b Add my pre-commit git script (with checkAPI/hf/encoding args...) Need to copy in .git/hooks folder and will be launch all check when make local commit (if there is some false-positive add --no-verify to disable check)
Should be enhance to be better (check trailing/whitespace...)

svn path=/trunk/; revision=51884
2013-09-09 19:30:39 +00:00
Michael Mann 25bb947bdb Have conversion tools use the "new" expert_add_info_format.
svn path=/trunk/; revision=51857
2013-09-09 02:19:27 +00:00