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
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
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
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
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
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
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
5364626e07
Fix error handling.
...
svn path=/trunk/; revision=51240
2013-08-09 22:47:35 +00:00
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
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
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
635d8d4f2c
Add support for determining BASE_EXT_STRING.
...
svn path=/trunk/; revision=51149
2013-08-05 12:16:50 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
c5ab45f678
fix "compile" error
...
svn path=/trunk/; revision=50874
2013-07-24 20:16:44 +00:00
4795803614
Add "usage" for expert option
...
svn path=/trunk/; revision=50864
2013-07-24 15:44:49 +00:00
cf4e08bdf2
fix "compiler errors"
...
Add better support for IP field detection.
svn path=/trunk/; revision=50781
2013-07-22 01:56:35 +00:00
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
a692824160
GeoIP 1.5.1.
...
svn path=/trunk/; revision=50742
2013-07-20 01:01:55 +00:00
617925c482
Add better detection of strings and byte arrays.
...
svn path=/trunk/; revision=50714
2013-07-18 02:49:06 +00:00
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
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
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
09d68c76e6
Set convert_proto_tree_add_text has executable
...
svn path=/trunk/; revision=50607
2013-07-15 07:39:26 +00:00
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
fb177c2fe9
set svn properties
...
svn path=/trunk/; revision=50561
2013-07-13 22:51:55 +00:00
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
600e668361
Add a (GPLv2+) license header, copyright Balint.
...
svn path=/trunk/; revision=50543
2013-07-12 21:53:52 +00:00
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
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
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
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
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
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
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
ce088c334d
makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
...
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
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
b49fbad27d
Add a couple of missing lines from the usage output.
...
svn path=/trunk/; revision=50043
2013-06-19 18:06:46 +00:00
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
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
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
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
b49c3e7eca
Oh yeah, -R is now -Y in trunk.
...
svn path=/trunk/; revision=49646
2013-05-31 02:03:03 +00:00
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
b047518b18
Install fop and asciidoc too
...
svn path=/trunk/; revision=49639
2013-05-30 21:47:24 +00:00
bc78191e31
Upgrade user manual
...
svn path=/trunk/; revision=49634
2013-05-30 20:13:56 +00:00
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
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
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
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
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
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
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
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
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
c0702583d3
Make the minimum supported GLib version 2.16.
...
svn path=/trunk/; revision=49444
2013-05-20 17:27:05 +00:00
fc9f9dde91
No always : after URL in svn info
...
svn path=/trunk/; revision=49440
2013-05-20 16:32:11 +00:00
5cd90aeec7
Add Modelines Info and remove a tab
...
svn path=/trunk/; revision=49439
2013-05-20 16:32:03 +00:00
fcdc86eb1f
test-fuzzed-cap.sh is now test-captures.sh
...
svn path=/trunk/; revision=49416
2013-05-19 15:00:32 +00:00
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
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
69fae76be1
Support running the massif valgrind tool for memory profiling.
...
svn path=/trunk/; revision=49251
2013-05-11 19:03:54 +00:00
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
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
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
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
b53b4becdd
Try to determine the repository URL automatically.
...
svn path=/trunk/; revision=49056
2013-04-26 19:50:43 +00:00
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
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
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
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
d75dbf9aff
Fix a typo.
...
svn path=/trunk/; revision=48865
2013-04-15 23:16:20 +00:00
3954ab4c69
More indentation fixes.
...
svn path=/trunk/; revision=48864
2013-04-15 23:04:16 +00:00
cd7796a6ef
Handle the IEEE's new! improved! two-space indentation.
...
svn path=/trunk/; revision=48856
2013-04-15 19:10:15 +00:00
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
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
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
2875b8e3c0
Set properties.
...
svn path=/trunk/; revision=48821
2013-04-11 18:39:42 +00:00
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
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
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
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
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
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
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
3dc702e2a8
Align a bit more with upstream.
...
svn path=/trunk/; revision=48559
2013-03-26 05:36:27 +00:00
ace8a9cb6a
[NPL] another weekend work.
...
svn path=/trunk/; revision=48527
2013-03-24 16:38:57 +00:00
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
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
Michael Mann