Commit graph

1203 commits

Author SHA1 Message Date
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