Commit Graph

1507 Commits

Author SHA1 Message Date
Evan Huus 4cb6a92d93 Change the exit status of a fuzz failure to 255 so that if you use it with xargs
the failures don't get suppressed.

svn path=/trunk/; revision=54071
2013-12-13 22:15:29 +00:00
Gerald Combs 10d8530102 Switch the cherry-pick merge strategy to "recursive + theirs", which
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-13 01:40:36 +00:00
Gerald Combs a43efdb873 Fix redirection.
svn path=/trunk/; revision=54003
2013-12-13 00:05:32 +00:00
Gerald Combs 07b56cf62f Don't cherry-pick if we have changes.
svn path=/trunk/; revision=54001
2013-12-13 00:03:19 +00:00
Gerald Combs 9b0b75703f Add a "backport-change" script which cherry-picks a proposed backport
and pushes it to Gerrit.

svn path=/trunk/; revision=53999
2013-12-12 23:38:54 +00:00
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
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
Michael Mann a50c42821d expert_add_info_format_text -> expert_add_info_text
svn path=/trunk/; revision=51849
2013-09-08 23:47:06 +00:00
Michael Mann da96b71c95 Add filterable expert info to generated X11 dissector. I didn't regenerate the dissector files, but did manually update the source (tools/process-x11-xcb.pl) so any future regeneration won't lose the changes.
svn path=/trunk/; revision=51834
2013-09-08 13:54:07 +00:00
Michael Mann 306a110ed6 Add filterable expert info to NCP dissector.
svn path=/trunk/; revision=51833
2013-09-08 13:35:57 +00:00
Evan Huus 2fd0b974f7 Ignore licensing in the macosx packaging - it's all copied from Inkscape (GPL)
as far as I can tell, so it doesn't have our headers.

svn path=/trunk/; revision=51829
2013-09-07 22:06:19 +00:00
Gerald Combs ac93afc00b Use "recode" to convert HTML entities to UTF-8 if it's available.
svn path=/trunk/; revision=51806
2013-09-07 00:18:10 +00:00
Evan Huus 47e241f6c4 Make checkAPI notify (warnings only, for now) about deprecated emem functions.
svn path=/trunk/; revision=51782
2013-09-05 12:50:24 +00:00
Jörg Mayer c248e3c5b2 Add modelines to avoid using tabs in the code
svn path=/trunk/; revision=51779
2013-09-05 09:23:50 +00:00
Jörg Mayer a5e2a30fc7 Change the regexp syntax a bit.
svn path=/trunk/; revision=51778
2013-09-05 08:55:09 +00:00
Stig Bjørlykke 06c27f8749 Use intended regex modification for absolute paths.
svn path=/trunk/; revision=51777
2013-09-05 08:32:00 +00:00
Stig Bjørlykke fadd2ae1c8 Removed TAB as indent.
Fixed regex for modifying absolute paths in header.

svn path=/trunk/; revision=51776
2013-09-05 08:22:44 +00:00
Jörg Mayer 8b842aeb02 Adapt generated output to always print paths relative to
the asn1/<proto>/ subdir. This makes cmake generated builds
look identical to autotools generated builds.

svn path=/trunk/; revision=51775
2013-09-05 07:38:32 +00:00
Gerald Combs 0764fcab89 Update for Qt 5.1.1.
svn path=/trunk/; revision=51582
2013-08-29 22:29:48 +00:00
Evan Huus ccbaea51d8 Valgrind requires more resources than running normally. Bump limits to 1.5x
normal when fuzzing with valgrind, as otherwise half the menagerie runs out of
memory.

svn path=/trunk/; revision=51515
2013-08-25 17:23:15 +00:00
Michael Mann df309c6c27 Tool to help convert current expert_add_info_format() calls into filterable expert info API. It's not as helpful as convert_proto_tree_add_text.pl because the expert string is usually too long to take the ei_ variable name or display filter string as is, but it does do the batch "search and replace" nicely and makes finding common expert info easier.
svn path=/trunk/; revision=51506
2013-08-24 01:42:43 +00:00
Michael Mann e123d27ca9 If the proto_tree_add_text string is just "%s", assume it won't be converted (it's usually a header that has the same field filterable in its subtree)
svn path=/trunk/; revision=51505
2013-08-24 01:38:43 +00:00
Evan Huus 1a884bf191 Add a valgrind suppressions file set to suppress the zlib error which otherwise
pops up immediately on the fuzzbot. Hopefully there won't be too many more of
these.

svn path=/trunk/; revision=51434
2013-08-20 03:21:06 +00:00
Jakub Zawadzki 0c0e568cb1 Commit far from being perfect conversation tool from hfindex to hfinfo.
svn path=/trunk/; revision=51407
2013-08-17 19:35:00 +00:00
Evan Huus 0ea379e46d Be sure to forward BIN_DIR to the valgrind script, probably also needed on the
fuzz-but.

svn path=/trunk/; revision=51391
2013-08-16 13:45:00 +00:00
Evan Huus 5d8b79cff5 Try to use smarter path resolution and detection in order to work in
environments that are not the build tree (namely the fuzz-bot, but this might
make normal out-of-tree builds easier too).

svn path=/trunk/; revision=51387
2013-08-16 01:52:51 +00:00
Evan Huus f9834195ed Don't let a valgrind-output-parsing error hide the fact that it was an error of
some sort: if we don't recognize valgrind's output then something somewhere went
wrong and we should be informed.

svn path=/trunk/; revision=51300
2013-08-11 17:48:49 +00:00
Gerald Combs 5364626e07 Fix error handling.
svn path=/trunk/; revision=51240
2013-08-09 22:47:35 +00:00
Michael Mann 5ffa911a6b Allow display base, not field type to have multiple ORed entries (for things like BASE_EXT_STRING)
svn path=/trunk/; revision=51235
2013-08-09 13:55:35 +00:00
Gerald Combs 2dab57f425 Switch to make-services.py. Fix some variable names and version tests.
svn path=/trunk/; revision=51189
2013-08-07 16:33:39 +00:00
Gerald Combs 79713e0ce7 Add a Python version of make-services.pl. Instead of trying to parse the
plain text version of the registry it parses the CSV version (which
should hopefully be more reliable). Tested with Pythons 2.5, 2.6, 2.7,
and 3.3.

Update the services file.

svn path=/trunk/; revision=51178
2013-08-06 23:45:51 +00:00
Michael Mann 635d8d4f2c Add support for determining BASE_EXT_STRING.
svn path=/trunk/; revision=51149
2013-08-05 12:16:50 +00:00
Gerald Combs 97c9a9b9ba Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
2.7, and 3.3. The contents of packet-ncp2222.c are different after the
changes (e.g. some array contents are in a different order) but the
output of running 'tshark -nVxr' on the NCP files in the menagerie are
identical.

svn path=/trunk/; revision=51123
2013-08-02 16:34:31 +00:00
Gerald Combs 9bf533c9db Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
2.6, 2.7, and 3.3.

svn path=/trunk/; revision=51113
2013-08-02 02:09:11 +00:00
Gerald Combs 2336eb9919 Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
2.7, and 3.3.

svn path=/trunk/; revision=51106
2013-08-02 00:22:51 +00:00
Gerald Combs e6202124eb Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
2.7, and 3.3.

svn path=/trunk/; revision=51105
2013-08-02 00:16:14 +00:00
Gerald Combs 4111941a75 Fix compatibility with older versions of Python. Tested with 2.5, 2.6,
and 3.3.

svn path=/trunk/; revision=51079
2013-07-31 23:32:45 +00:00
Gerald Combs ee9c3082a8 Add support for Python 3. Make sure we pass bytes to hashlib.sha1 as
suggested in bug 8995. Call print as a function instead of a builtin as
suggested by 2to3.

svn path=/trunk/; revision=51073
2013-07-31 20:14:35 +00:00
Gerald Combs eb94380646 asciidoc.conf: Have sort-and-group remove commas.
gen-bugnote: Create proper bug links.

svn path=/trunk/; revision=51022
2013-07-29 21:14:13 +00:00
Evan Huus 56bf58dce3 Add license header to script after emailing author to verify that GPL 2+ was the
intended license.

svn path=/trunk/; revision=51018
2013-07-29 20:24:02 +00:00
Michael Mann a87f47c02c Make many items filterable for Vines dissectors.
Add support for FT_VINES type.

svn path=/trunk/; revision=50962
2013-07-28 00:07:49 +00:00
Evan Huus 234cd8dac4 Add the proper license header and attribution to Balint's git-compare-abis script.
svn path=/trunk/; revision=50942
2013-07-27 13:50:52 +00:00
Guy Harris 8d81fe9a0e The descriptive name for a field is the field full name; the name used
in packet-matching expressions and TShark's -e flag and... is the
field's abbreviated name.

svn path=/trunk/; revision=50927
2013-07-26 21:06:38 +00:00
Michael Mann 2675472389 Add support for common FT_ETHER cases.
Bugfix gauging where the "field text" argument when parsing the proto_tree_add_text call.

svn path=/trunk/; revision=50925
2013-07-26 18:30:10 +00:00
Evan Huus 7d73903af6 Multiple improvements and bug-fixes for the fuzz-test script:
- fix a few pieces of bad indentation
- exit cleanly in all cases where we receive a SIGINT or other signal
- check for valgrind bugs and dissector errors with every set of arguments (-nr
  vs -nVxr etc) not just the last
- consider it an error if valgrind reports more than 500KB of leaked memory

For the last point, 500KB is hopefully a safe choice for now since we only leak
about 2KB "by default" and I have no idea what the state of most "non-default"
code is with respect to memory leaks. I would like to eventually work this
down to 0 of course :)

svn path=/trunk/; revision=50895
2013-07-25 23:28:38 +00:00
Michael Mann c5ab45f678 fix "compile" error
svn path=/trunk/; revision=50874
2013-07-24 20:16:44 +00:00
Michael Mann 4795803614 Add "usage" for expert option
svn path=/trunk/; revision=50864
2013-07-24 15:44:49 +00:00
Michael Mann cf4e08bdf2 fix "compiler errors"
Add better support for IP field detection.

svn path=/trunk/; revision=50781
2013-07-22 01:56:35 +00:00
Michael Mann 2e5561d9c5 Add ability to convert proto_tree_add_text to "expert" API. It's a little hacky because the first pass doesn't know that a proto_tree_add_text call will be converted into an expert API call, so there is some "field reappropriation" (but not enough to have a different field layout) in the .proto_tree_input file.
svn path=/trunk/; revision=50762
2013-07-21 19:03:36 +00:00
Gerald Combs a692824160 GeoIP 1.5.1.
svn path=/trunk/; revision=50742
2013-07-20 01:01:55 +00:00
Michael Mann 617925c482 Add better detection of strings and byte arrays.
svn path=/trunk/; revision=50714
2013-07-18 02:49:06 +00:00
Gerald Combs f3a2aba863 gen-bugnote: Produce a list item for AsciiDoc. backport-rev: Add error
checking for newer versions of Subversion.

svn path=/trunk/; revision=50707
2013-07-17 21:01:37 +00:00
Michael Mann f2e1a979fa Add in basic error checking of the .proto_tree_input file to prevent some issues with updated dissector.
svn path=/trunk/; revision=50658
2013-07-16 02:59:16 +00:00
Pascal Quantin 3cd6045421 Get rid of "win-setup.sh: line 24: $'\r': command not found" warning
svn path=/trunk/; revision=50642
2013-07-15 22:02:12 +00:00
Alexis La Goutte 09d68c76e6 Set convert_proto_tree_add_text has executable
svn path=/trunk/; revision=50607
2013-07-15 07:39:26 +00:00
Michael Mann 79aea4b295 Generate better hf_ name
Generate initial filter name
Apply consistent whitespace

svn path=/trunk/; revision=50567
2013-07-14 02:13:07 +00:00
Martin Kaiser fb177c2fe9 set svn properties
svn path=/trunk/; revision=50561
2013-07-13 22:51:55 +00:00
Michael Mann 94f44f7601 Here's a tool to help in the conversion of proto_tree_add_text to proto_tree_add_item. It's still rough around the edges, but it's a lot better than doing it all manually. It targets proto_tree_add_text functions with formatted parameters. It "guesses" the necessary parameters for proto_tree_add_item and the associated hf_ strictly through proto_tree_add_text parameters, so it does better for cases where the tvb_ function (ie tvb_get_guint8) is one of the printf style parameters in the proto_tree_add_text.
If there are cleaner ways (better regex) to represent the logic, please feel free to update.

The key is to improve the "defaults" detected so less manual editting of the proto_tree_input file (and subsequent dissector file) is necessary.

I'll be testing it more (and probably updating) as I try to work through the checkAPIs.pl "naughty list" (now that the list has expanded)

svn path=/trunk/; revision=50559
2013-07-13 21:28:53 +00:00
Jeff Morriss 600e668361 Add a (GPLv2+) license header, copyright Balint.
svn path=/trunk/; revision=50543
2013-07-12 21:53:52 +00:00
Jeff Morriss f3b4e97bcc Add (GPLv2+) license headers to these scripts, assigning the copyright to
the original author of the scripts (Gerald).

svn path=/trunk/; revision=50542
2013-07-12 21:51:34 +00:00
Jeff Morriss 2a62d8e8e6 Include the output (fuzz'd) file name in the output when fuzz (or randpkt)
testing fails.

Useful for when you want to use up a few spare CPU cores running multiple
simultaneous fuzz tests...

svn path=/trunk/; revision=50449
2013-07-08 19:49:17 +00:00
Michael Mann 9822a1f00a Add support for filterable expert info fields. Statistics don't separate out the expert info fields from the hf_ fields because we're really just looking for display filter name errors, regardless of source.
svn path=/trunk/; revision=50398
2013-07-06 02:52:16 +00:00
Michael Mann e2cfb1f173 Make checkAPIs.pl a little more discerning when looking for too many proto_tree_add_text()s. I believe the intent was to ignore "small" dissectors that didn't have enough fields to qualify, but the previous logic ignored dissectors that were (almost) all proto_tree_add_text and no proto_tree_add_xxx.
I'm flexible on the definition of "small" (20 "fields"), but I think checkAPIs should flag the "all proto_tree_add_text" dissectors.

svn path=/trunk/; revision=50385
2013-07-05 14:22:35 +00:00
Chris Maynard fdead4df94 Fix Coverity CID 660 (Negative array index read) by holding off the assignment to yytos until after we check that pParser->yyidx is non-negative.
See also: http://cwe.mitre.org/data/definitions/129.html
#BACKPORT(1.10)

svn path=/trunk/; revision=50336
2013-07-03 02:28:26 +00:00
Chris Maynard 83b4b73dd1 Fix Coverity CID 280323 (Free of array-typed value) by ensuring that tpltname doesn't point to the buf[] stack array before attempting to free it.
#BACKPORT(1.10)

svn path=/trunk/; revision=50335
2013-07-03 01:47:18 +00:00
Guy Harris 5d87a8c461 WS_DLL_PUBLIC is now always WS_DLL_PUBLIC_NOEXTERN with "extern" added;
just define WS_DLL_PUBLIC_NOEXTERN inside the ifdefs, and define
WS_DLL_PUBLIC as WS_DLL_PUBLIC_NOEXTERN followed by "extern".

Then rename WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, to clarify that
it's what should be used for definitions; at least on Windows, you
*have* to use it when declaring arrays without a size, and, whilst you
might be able to use WS_DLL_PUBLIC for definitions of functions and
perhaps data definitions other than no-size arrays, it might be clearer
to rename WS_DLL_PUBLIC to WS_DLL_PUBLIC_DECL and use it only for
declarations.

svn path=/trunk/; revision=50334
2013-07-03 01:43:39 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Graham Bloice e6e7c1181b From Orgad Shaneh via bug 8308 - allow a relative path for the WIRESHARK_LIBS location.
svn path=/trunk/; revision=50065
2013-06-19 23:06:14 +00:00
Martin Mathieson b49fbad27d Add a couple of missing lines from the usage output.
svn path=/trunk/; revision=50043
2013-06-19 18:06:46 +00:00
Gerald Combs 62d87b6cad tools/lemon/lemon.c: Fix an integer shortening issue. (CMake enables
-Werror here but Autotools doesn't. Which is correct?)

epan/dissectors/dcerpc: idl2wrs isn't an installed executable in
Autotools so don't make it one in CMake.

svn path=/trunk/; revision=49871
2013-06-10 18:55:03 +00:00
Jeff Morriss 1cc0587d00 Add a -Y option to match test-captures.sh: it runs tshark with a read filter but without building the tree.
svn path=/trunk/; revision=49797
2013-06-05 21:30:08 +00:00
Jeff Morriss 470bd4455a Add a new environment variable to cause abort()s if we add too many items
to the tree (to separate this case from the generic DISSECTOR_BUG case).

Enable this environment variable when fuzz testing.

Enable the 3rd (without tree but with a read filter) check (added in r49643)
when testing capture files but not when fuzz testing--not sure if we want to
add even more to the fuzzbot's work load now (OTOH I've been running it for
a while and it hasn't buried me in bugs).

svn path=/trunk/; revision=49784
2013-06-05 14:08:40 +00:00
Tomas Kukosa fd5c1ddf5c Allow C directives in #.FN_HDR, #.FN_FTR, #.FN_BODY, they have to start with ##
svn path=/trunk/; revision=49763
2013-06-04 14:07:36 +00:00
Jeff Morriss b49c3e7eca Oh yeah, -R is now -Y in trunk.
svn path=/trunk/; revision=49646
2013-05-31 02:03:03 +00:00
Jeff Morriss c56c403a52 As discussed in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8728#c4 :
Running tshark with a read filter ("-R") and without building the full tree
("-V") causes it to run into some more bugs (usually loops adding more than
100000 items to the tree).  Add some (commented out for now) code to do
this...

svn path=/trunk/; revision=49643
2013-05-31 01:38:55 +00:00
Jeff Morriss b047518b18 Install fop and asciidoc too
svn path=/trunk/; revision=49639
2013-05-30 21:47:24 +00:00
Pascal Quantin bc78191e31 Upgrade user manual
svn path=/trunk/; revision=49634
2013-05-30 20:13:56 +00:00
Jeff Morriss 50bb0650ca test-common.sh doesn't need to be executable (it is sourced, not executed); remove the svn:executable property.
svn path=/trunk/; revision=49626
2013-05-30 00:36:58 +00:00
Jeff Morriss 4509929f2a Exit if we can't load the test-common.sh library.
svn path=/trunk/; revision=49625
2013-05-30 00:35:46 +00:00
Chris Maynard 22f16fc80c If using cygwin, there is no pbcopy or xsel, but we do have putclip.
svn path=/trunk/; revision=49618
2013-05-29 15:59:19 +00:00
Evan Huus eae1f37865 Use the local libtool rather than whatever is in PATH. This works just
the same everywhere I've tested except my mac setup where it works better
(since the libtool in PATH doesn't have --mode=execute for some strange reason).

This is fairly experimental - feel free to revert if it breaks something.

svn path=/trunk/; revision=49604
2013-05-28 22:29:02 +00:00
Pascal Quantin 0ee4d0a00a Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
Michael Mann 5e86cb9bf4 Use new expert info API in idl dissectors. These generated about 50% of the add_expert_info_format() calls.
svn path=/trunk/; revision=49561
2013-05-24 18:09:57 +00:00
Evan Huus 396a1881b7 Add -p option to the valgrind script for profiling with callgrind.
svn path=/trunk/; revision=49543
2013-05-23 02:30:40 +00:00
Alexis La Goutte c97865c179 Enhance backport-rev script
pbcopy is not available in Linux (only in Mac OS)
Add check if pbcopy is available or xsel (a linux variante)

svn path=/trunk/; revision=49483
2013-05-21 16:57:55 +00:00
Evan Huus 0c671d8d4d Remove some of the extra noise added while trying to figure out why
the build-bot's valgrind pass wasn't running with/without tree. It's still
broken, but the debug output wasn't giving us any useful information.

svn path=/trunk/; revision=49464
2013-05-20 22:00:39 +00:00
Gerald Combs c0702583d3 Make the minimum supported GLib version 2.16.
svn path=/trunk/; revision=49444
2013-05-20 17:27:05 +00:00
Alexis La Goutte fc9f9dde91 No always : after URL in svn info
svn path=/trunk/; revision=49440
2013-05-20 16:32:11 +00:00
Alexis La Goutte 5cd90aeec7 Add Modelines Info and remove a tab
svn path=/trunk/; revision=49439
2013-05-20 16:32:03 +00:00
Jeff Morriss fcdc86eb1f test-fuzzed-cap.sh is now test-captures.sh
svn path=/trunk/; revision=49416
2013-05-19 15:00:32 +00:00
Evan Huus 7d63573632 Update test-fuzzed-cap.sh:
- support testing multiple files at once
- use tools/test-common.sh to make sure we have the most up-to-date environment
  variables set (the old version was missing the WMEM_ one for example)
- rename to test-captures.sh since it works just fine on non-fuzzed files

svn path=/trunk/; revision=49412
2013-05-19 12:51:35 +00:00
Gerald Combs 6cc0940305 If 'svn merge' doesn't work show what applying the patch manually would
do.

svn path=/trunk/; revision=49319
2013-05-15 17:51:33 +00:00
Evan Huus 69fae76be1 Support running the massif valgrind tool for memory profiling.
svn path=/trunk/; revision=49251
2013-05-11 19:03:54 +00:00
Evan Huus 108a75a603 Add 'dtds' and 'fix' directories to the checklicense whitelist, they don't
appear to be things we have licensing power over (IANAL).

svn path=/trunk/; revision=49095
2013-04-30 01:34:19 +00:00
Gerald Combs 9120bf883e Move the contents of wsar_html/core to wsar_html. Create tag files for
core, epan, and ui, and link them to each other to varying degrees. This
seems to be the best way to organize our documentation. The alternative
is to switch to a single doxygen.cfg and manually add files to different
groups or sections.

Add a wireshark.dox file which contains markup for the main page. Add
.dox and .txt to svnadd. Clean up our tag files. Force wsar_html to
rebuild each time.

svn path=/trunk/; revision=49091
2013-04-30 00:27:02 +00:00
Evan Huus c17d706c8c Specify to CppCheck that Wireshark code is C89, not the default C11.
svn path=/trunk/; revision=49083
2013-04-28 23:30:29 +00:00
Evan Huus 0a530b2a1f When fuzzing with valgrind and running without -T, run with -v so that the
argument string is non-empty. Perhaps this will fix the fuzz-bot which fails
to run with the empty argument string...

svn path=/trunk/; revision=49075
2013-04-27 14:03:45 +00:00
Gerald Combs b53b4becdd Try to determine the repository URL automatically.
svn path=/trunk/; revision=49056
2013-04-26 19:50:43 +00:00
Gerald Combs 8ea3f82021 Add two tools useful for package maintainers:
backport-rev attempts to merge a revision from the trunk in the current
directory (presumably one of the release branches).

gen-bugnote fetches a bug title from bugs.wireshark.org and formats it
for inclusion in the release notes.

svn path=/trunk/; revision=49004
2013-04-23 19:21:18 +00:00
Guy Harris 6bfd0bb9d5 See whether we can whitelist 'GPL (v3 or later)' for the output of Bison
run on wiretap/ascend.y.

svn path=/trunk/; revision=48908
2013-04-18 02:06:53 +00:00
Evan Huus d385db2133 Remove chromium-specific license exceptions which it makes no sense for
us to carry.

Add an exception of our own for tools/pidl since that is GPL but the headers
are not in a format that licensecheck will pick up, and fixing them all would
just introduce a delta with upstream for no reason.

svn path=/trunk/; revision=48896
2013-04-17 19:35:43 +00:00
Gerald Combs b25fa89125 Reverse the arguments we feed to valgrind-wireshark.sh. Add debugging
output.

svn path=/trunk/; revision=48895
2013-04-17 17:23:41 +00:00
Gerald Combs d75dbf9aff Fix a typo.
svn path=/trunk/; revision=48865
2013-04-15 23:16:20 +00:00
Gerald Combs 3954ab4c69 More indentation fixes.
svn path=/trunk/; revision=48864
2013-04-15 23:04:16 +00:00
Gerald Combs cd7796a6ef Handle the IEEE's new! improved! two-space indentation.
svn path=/trunk/; revision=48856
2013-04-15 19:10:15 +00:00
Evan Huus 5afbf48723 Update some of the old FSF addresses caught by the new licensecheck buildbot
step.

svn path=/trunk/; revision=48848
2013-04-14 18:55:28 +00:00
Evan Huus 374c1dd1e3 From Max Baker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8431
Enhancements to usb scripts to add many more camera models by extracting data
from libgphoto2 (which is LGPL).

svn path=/trunk/; revision=48831
2013-04-12 15:50:55 +00:00
Gerald Combs 267a89b1f4 Make boilerplate consistent with other generated files and recognizable
by licensecheck.

svn path=/trunk/; revision=48826
2013-04-11 20:03:16 +00:00
Gerald Combs 2875b8e3c0 Set properties.
svn path=/trunk/; revision=48821
2013-04-11 18:39:42 +00:00
Gerald Combs a6131151f5 Use consistent "generated automatically" wording which will hopefully be
picked up by licensecheck.

svn path=/trunk/; revision=48812
2013-04-10 21:24:19 +00:00
Gerald Combs 4ea6f01d4d Copy Chromium's checklicenses.py from
http://src.chromium.org/svn/trunk/src/tools/checklicenses/checklicenses.py@190741

The original referred to the project's LICENSE file. Insert its contents from

  http://src.chromium.org/svn/trunk/src/LICENSE@174795

Add an exception for GPLv2 or later.

svn path=/trunk/; revision=48810
2013-04-10 20:36:55 +00:00
Jakub Zawadzki 1c249ca95c NPL stuff:
- stubs for more NPL built-ins
 - try to guess struct size
 - some work on property attribute.

svn path=/trunk/; revision=48774
2013-04-07 17:24:16 +00:00
Anders Broman a9ed804565 From Tomas Kukosa:
Make it possible to sort LocalCode value_strings.

svn path=/trunk/; revision=48720
2013-04-03 16:52:56 +00:00
Jakub Zawadzki cbbf2b01e7 [NPL] Pushing changes to wireshark repo
- parser no longer use abort() after failing
- initial support for attributes
- symbol hashing to avoid strcasecmp()
- misc other fixes

svn path=/trunk/; revision=48672
2013-03-31 15:03:46 +00:00
Jeff Morriss 67172cd3d6 Add a little shell script to install all the RPMs necesary to do Wireshark
development.  Both the development and runtime packages are installed
although the latter aren't strictly necessary.

Ideally this could automatically pull the packages out of
packaging/rpm/SPECS/wireshark.spec.in but given the variance in package names
between distributions, this seems painful...

Tested on Fedora/Redhat and openSUSE.

svn path=/trunk/; revision=48624
2013-03-28 16:59:21 +00:00
Jaap Keuter ae85ba7c58 From Hadriel Kaplan:
The 'make-manuf'perl script gets the IEEE 22-bit OUI and IAB registries, but not OUI-36.
patch to get the OUI-36 listings.

From me:
Update header text in template to list the sources actually used.

svn path=/trunk/; revision=48572
2013-03-26 21:53:09 +00:00
Anders Broman 3dc702e2a8 Align a bit more with upstream.
svn path=/trunk/; revision=48559
2013-03-26 05:36:27 +00:00
Jakub Zawadzki ace8a9cb6a [NPL] another weekend work.
svn path=/trunk/; revision=48527
2013-03-24 16:38:57 +00:00
Tomas Kukosa 109c2326e2 OPERATION and ERROR tables can loop through only items with either local or global CODEs
svn path=/trunk/; revision=48476
2013-03-22 07:30:32 +00:00
Gerald Combs e3156f83be Add .asciidoc support to svnadd. Set properties and add an SVN ID to the
release notes.

svn path=/trunk/; revision=48392
2013-03-18 16:10:35 +00:00
Jakub Zawadzki ccbd2bd44e [NPL] Fresh stuff.
svn path=/trunk/; revision=48353
2013-03-17 15:32:07 +00:00
Martin Kaiser c7dd35dffc flag up a warning if someone includes gcrypt.h instead of wsutil/wsgcrypt.h
svn path=/trunk/; revision=48340
2013-03-16 09:53:19 +00:00
Gerald Combs f076414b6d Sometimes the Python you want isn't /usr/bin/python. Fix the shebang.
svn path=/trunk/; revision=48331
2013-03-15 22:09:25 +00:00
Gerald Combs 1ef83e3e76 Set properties.
svn path=/trunk/; revision=48330
2013-03-15 21:55:21 +00:00
Balint Reczey c2961093be Add asn2deb idl2deb to dist
svn path=/trunk/; revision=48322
2013-03-15 17:37:48 +00:00
Evan Huus 3b4a82d26a Add -W option to valgrind script that just runs the gui without any capture
files.

svn path=/trunk/; revision=48320
2013-03-15 16:42:05 +00:00
Evan Huus 419d10656e Update usage info for valgrind script. We almost need a proper man page for
this now.

svn path=/trunk/; revision=48230
2013-03-10 15:07:42 +00:00
Evan Huus aafe8b18e9 Remove the wmem slab. It was an optimization mimicking the emem slab
(removed in r48218) which did nothing particularly useful. Also lets us remove
another debugging environment variable.

svn path=/trunk/; revision=48219
2013-03-09 20:16:33 +00:00
Evan Huus 122b7cb6df Remove the emem slab feature (sl_* functions) completely, replacing it with
glib memory slices.

- We weren't doing anything with the emem slab that couldn't be done with glib
  slices.
- Removes a fair bit of code as well as one debugging environment variable.
- Glib slices are much cache-friendlier and are multi-threading friendly (if
  we ever go there).
- Allows glib to actually return slices to the OS on occasion. The emem slab
  would hold onto its memory forever which resulted in a great deal of wasted
  memory after closing a large file.

svn path=/trunk/; revision=48218
2013-03-09 20:02:19 +00:00
Jakub Zawadzki 7b9a23a53a [NPL] Misc fixes
svn path=/trunk/; revision=48216
2013-03-09 15:53:30 +00:00
Anders Broman 0685f1d5e1 Update lex and yacc
svn path=/trunk/; revision=48213
2013-03-09 10:10:32 +00:00
Gerald Combs 7613251d1c Switch to WinPcap 4.1.3.
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +00:00
Gerald Combs ac364779f7 Switch to c-ares 1.9.1.
svn path=/trunk/; revision=48191
2013-03-08 16:51:21 +00:00
Jakub Zawadzki e4ebcf4469 [NPL] Simplify parser for EXPRESSION_FIELD (Expression, ".", ID)
svn path=/trunk/; revision=48178
2013-03-07 19:38:35 +00:00
Balint Reczey a8f543b56b Merge asn2deb and idl2deb from official Debian package
svn path=/trunk/; revision=48133
2013-03-06 13:31:08 +00:00
Anders Broman f20eeffb18 Align lempar somewhat with upstream.
svn path=/trunk/; revision=48071
2013-03-04 22:04:58 +00:00
Jakub Zawadzki 3de8c555d9 [NPL] Treat all keywords as seperates token, when really needed accept it as ID.
This seems to be much easier to maintain...

svn path=/trunk/; revision=48066
2013-03-04 21:00:09 +00:00
Evan Huus 1b4cffc527 Add modelines.
Fix issues caught by cppcheck:
- Remove unused variable.
- Make sure to fclose output file.

svn path=/trunk/; revision=48034
2013-03-03 14:03:00 +00:00
Jakub Zawadzki e0d19cb73a Publish initial version of mine npl (Network Parsing Language) generator sources.
Parser pass almost all npl files from Network Monitor Parsers 3.4.2774 package, 
but but not all data is stored in AST.
Work on wireshark code enerator has been started, but it need much more work.

Beware! It's ugly, putting it to wireshark repo, just to not lose sources :)
(feel free to improve/review it).

svn path=/trunk/; revision=48033
2013-03-03 11:59:14 +00:00
Evan Huus 16bda3caf4 Don't pass -v straight to valgrind, it's rarely useful. Just increasing
num-callers is usually enough.

svn path=/trunk/; revision=48017
2013-03-02 21:16:32 +00:00
Anders Broman 41d6d12497 Rearrang the code to align with sqlite lemon and copy over a few more things.
svn path=/trunk/; revision=48014
2013-03-02 19:34:50 +00:00
Anders Broman bd2b6b9964 Wite space changes.
svn path=/trunk/; revision=48005
2013-03-02 12:09:50 +00:00
Anders Broman b9cb9968f2 lemon.c:3176:8: error: attempt to free a non-heap object ‘buf’
svn path=/trunk/; revision=48003
2013-03-02 11:32:25 +00:00
Anders Broman 310b495ff3 Becport more code.
svn path=/trunk/; revision=48002
2013-03-02 10:56:17 +00:00
Anders Broman ad1ec109ed Missed one place.
svn path=/trunk/; revision=48001
2013-03-02 10:03:43 +00:00
Anders Broman da070427d9 lemon.c:78:14: note: expected ‘int (*)(const void *, const void *)’ but argument is of type ‘int (*)(const char *, const char *)’
svn path=/trunk/; revision=48000
2013-03-02 09:54:52 +00:00
Anders Broman 99d88bd54b More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47998
2013-03-02 09:04:52 +00:00
Anders Broman 7c3a122e37 lemon.c:4628:5: error: conflicting types for ‘Configcmp’
lemon.c:366:5: note: previous declaration of ‘Configcmp’ was here

svn path=/trunk/; revision=47997
2013-03-02 08:40:49 +00:00
Anders Broman 18c724b0ad More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47996
2013-03-02 08:19:31 +00:00
Anders Broman a5c53e847e Backports from sqlite lemon.
svn path=/trunk/; revision=47993
2013-03-01 23:54:06 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Jeff Morriss 0b8d70bfb7 Fix a cut-n-pasteo and add a const cast to quiet a warning.
svn path=/trunk/; revision=47991
2013-03-01 22:58:23 +00:00
Anders Broman ea76d02cb2 Backport const casts from sqlite lemon.
svn path=/trunk/; revision=47989
2013-03-01 21:37:48 +00:00
Anders Broman 44993045a2 try to remove C++ incompatibilities from lemon
svn path=/trunk/; revision=47987
2013-03-01 20:32:20 +00:00
Bill Meier a6e56df8b6 it's ==> its & its ==> it's as needed.
svn path=/trunk/; revision=47898
2013-02-26 02:38:52 +00:00
Balint Reczey 6dbd0b68e4 Make compare-abs.sh work on CMake builds
svn path=/trunk/; revision=47884
2013-02-25 21:27:16 +00:00
Gerald Combs 81a5be5813 Enable automatic updates for Win64. Fix a copy/paste error.
svn path=/trunk/; revision=47749
2013-02-19 22:57:40 +00:00
Gerald Combs e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Bill Meier f9ecda41e4 Comment out a number of unused hf[] enrries found by checkhf.
svn path=/trunk/; revision=47670
2013-02-15 02:50:36 +00:00
Evan Huus 5071e8b627 Add an option for bypassing the wmem slab similar to the one for
bypassing the emem slab, to aid in debugging with valgrind.

svn path=/trunk/; revision=47656
2013-02-14 16:07:25 +00:00
Guy Harris eb769ce13e Clean up some warnings (including warnings that ultimately come from
trying to modify string constants, which isn't necessarily guaranteed to
work).

svn path=/trunk/; revision=47618
2013-02-10 22:09:21 +00:00
Bill Meier 19ffe7eb4c Update a comment; tweak a RegEx.
svn path=/trunk/; revision=47612
2013-02-10 18:40:54 +00:00
Bill Meier 233fcd672f Remove blank lines separately after removing comments rather than as
part of the 'remove comments' regex.

Fixes a bug introduced in SVN #47583 which broke '#if 0' handling.


svn path=/trunk/; revision=47598
2013-02-09 22:14:13 +00:00
Bill Meier 404460c14d Cleanup: Ditch CamelCase; use braces around references.
svn path=/trunk/; revision=47585
2013-02-09 16:28:01 +00:00
Bill Meier 7b40629a16 Fix a syntax error which causes a compile error
(altho not in my version Cygwin Perl V5.14 for some reason).

svn path=/trunk/; revision=47584
2013-02-09 14:52:02 +00:00
Bill Meier 4c41fd5df9 Tweaks to RegEx usage for consistency and performance (and
to fix a monor bug or two).

svn path=/trunk/; revision=47583
2013-02-09 14:25:18 +00:00
Bill Meier f5dd71e30e Fix code to delete blank lines to remove all blank lines;
Update some Perl usage.

svn path=/trunk/; revision=47569
2013-02-08 16:25:46 +00:00
Bill Meier 1e64a82f02 Add addition test to reduce false positives for 'ERROR: NO ARRAY: '
Essentially:
 Detect when an hf_... var is effictively initialized
 via the use of proto_registrar_get_id_byname() or
 proto_get_id_by_filter_name() (instead of
 proto_register_field_array()).

svn path=/trunk/; revision=47542
2013-02-07 22:16:39 +00:00
Bill Meier 669e68dfde Add a hack to fix false positive 'unused ...' related to use of ..._add_oui().
svn path=/trunk/; revision=47536
2013-02-07 19:36:29 +00:00
Bill Meier 408e6aa279 Minor tweaks ...
svn path=/trunk/; revision=47533
2013-02-07 17:24:32 +00:00
Bill Meier 64e97d9ec5 Fix a few minor bugs;
Do some small tweaks for readability & consistency.

svn path=/trunk/; revision=47532
2013-02-07 17:17:21 +00:00
Bill Meier 29b72be420 Add checking to verify that global hf_... defs are referenced in hf[] entry in same file.
(Commented out for now since a few false positives are currently generated).

Fix a few minor bugs;
Tweak the calling sequences for various subs.


svn path=/trunk/; revision=47476
2013-02-04 20:06:46 +00:00
Bill Meier 7fa9cf9209 Improvements:
- Handle preprocessed (as well as original) .c source files.
  (Running checkhf on the source after it has been pre-processed
   should give few false positives).
- Remove blank lines, comments & quoted text strings before
   doing the hf_... tests: reduces false positives/negatives.

svn path=/trunk/; revision=47458
2013-02-03 22:12:33 +00:00
Bill Meier eeb90f99b7 Tweaks:
- Remove comments from the input string before checking hf[] entries;
- Remove code under '#if 0' before doing API checks.

svn path=/trunk/; revision=47447
2013-02-02 15:13:45 +00:00
Bill Meier d1ae197ae4 Re-implemention of checkhf.pl:
Main objective: reduce the number of false positives.

  (Committed as a patch to the original
   checkhf.pl written by Joerg Mayer so as to
   keep the history for the original program).


svn path=/trunk/; revision=47331
2013-01-28 22:23:32 +00:00