Commit Graph

1302 Commits

Author SHA1 Message Date
Tomas Kukosa 0a626c33c8 Ply parser updated to 3.5 (from GitHub github.com/dabeaz/ply)
svn path=/trunk/; revision=53782
2013-12-04 14:45:32 +00:00
Alexis La Goutte 6b10f16ca8 From Anders request Add prototype for corba/idl dissector
svn path=/trunk/; revision=53778
2013-12-04 09:53:21 +00:00
Jakub Zawadzki cedb73c7f7 Dissectors should not use dfilter.h, don't include it.
XXX ncp2222 dissector is using dfilter_compile(), why?

svn path=/trunk/; revision=53766
2013-12-03 21:31:04 +00:00
Alexis La Goutte 3fc5a3e845 Add modelines info to idl generate file
svn path=/trunk/; revision=53754
2013-12-03 13:38:38 +00:00
Alexis La Goutte de65892796 Fix indent for generated file (Use 4 space)
svn path=/trunk/; revision=53753
2013-12-03 13:38:30 +00:00
Alexis La Goutte a637d81706 Fix generator don't generate trailing whitespace
svn path=/trunk/; revision=53752
2013-12-03 13:38:23 +00:00
Alexis La Goutte 225161b1be Remove trailing whitespace and add modelines info
svn path=/trunk/; revision=53751
2013-12-03 13:38:15 +00:00
Alexis La Goutte ede151cbba Remove whitespace and add modelines info
svn path=/trunk/; revision=53750
2013-12-03 13:38:07 +00:00
Alexis La Goutte 76db825c84 Add #pragma to idl generator...
svn path=/trunk/; revision=53746
2013-12-03 13:37:31 +00:00
Gerald Combs 4e2b6b13f6 Use 4-space (PEP 8) indentation. Add modelines.
svn path=/trunk/; revision=53685
2013-12-01 01:53:26 +00:00
Gerald Combs c02bbf9883 Use indentation recommended by PEP 8.
svn path=/trunk/; revision=53684
2013-12-01 01:46:45 +00:00
Gerald Combs 80b4bc004a Fix compatibility with Python 2.5. Tested with 2.5, 2.6, 2.7, and 3.3.
svn path=/trunk/; revision=53683
2013-12-01 01:35:13 +00:00
Jörg Mayer fb22ecce8d Graham Bloice
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-29 19:57:00 +00:00
Balint Reczey 2ec033d15e Fix potential signed int overflow in Lemon
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-28 16:04:33 +00:00
Jeff Morriss 8993524953 Delete the svn:executable property on added files (we might add it back later).
svn path=/trunk/; revision=53587
2013-11-25 22:57:24 +00:00
Michael Mann e2df7c83cb Move dceprc_procedure_name from packet_info to dcerpc_info. Doesn't appear to be "used" by dissectors, just stored (for help in debugging?).
svn path=/trunk/; revision=53552
2013-11-24 20:55:55 +00:00
Jeff Morriss a98072967e Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.
Also, as per Peter Harris' request, update copyright date.

svn path=/trunk/; revision=53545
2013-11-24 14:27:52 +00:00
Jeff Morriss a434d9647e Some patches from Peter Harris to make it possible to build the X11 dissector
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-24 01:32:20 +00:00
Evan Huus d97c9e2ff4 Implement address_to_str which is like ep_address_to_str and se_address_to_str
except it takes a wmem scope instead. Add the two emem equivalents to checkAPI
as (weakly) deprecated.

svn path=/trunk/; revision=53528
2013-11-23 22:17:27 +00:00
Evan Huus 11d8147ab5 Add exception for cmake/TestWindowsFSeek.c it is copied from upstream under a
valid license, but has no recognizable header and there's no reason to carry the
delta.

svn path=/trunk/; revision=53518
2013-11-22 23:46:00 +00:00
Pascal Quantin ea45be32c5 Add a way to retrieve a PER variable bit string length
svn path=/trunk/; revision=53382
2013-11-17 13:31:32 +00:00
Jeff Morriss 38eac2f54f Wrap GCC pragma in an #ifdef to make it compile when we're not using GCC.
Again, change manually applied to the .h file.

svn path=/trunk/; revision=53299
2013-11-13 14:00:45 +00:00
Jeff Morriss 8893d3d960 Use a gcc pragma to stop the (pages of) warnings coming out of
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-13 03:20:37 +00:00
Bill Meier 8f888557af Add -P option to allow specifying the 'callgrind-out-file' name
svn path=/trunk/; revision=53250
2013-11-11 18:44:50 +00:00
Jakub Zawadzki ae59b09443 Add missing includes in order to remove exceptions.h from proto.h (next commit).
svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
Jakub Zawadzki 12d1509aa1 Move struct _ftype_t + callback typedefs + free macro to ftypes-int.h
svn path=/trunk/; revision=53223
2013-11-10 13:14:09 +00:00
Jakub Zawadzki 1899903f69 Include <epan/to_str.h> only when needed.
svn path=/trunk/; revision=53189
2013-11-09 13:41:10 +00:00
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