Commit Graph

988 Commits

Author SHA1 Message Date
Jakub Zawadzki 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Bill Meier 5e4bff84d3 Use non-capturing grouping when grouping just for alternatives;
Also: improve error message slightly in the case of a missing NULL termination.

svn path=/trunk/; revision=44826
2012-09-10 01:53:23 +00:00
Jeff Morriss b1a5af9eed string_strings and range_strings must also be {0, NULL} terminated.
Also, remove some tabs.

svn path=/trunk/; revision=44824
2012-09-10 00:48:50 +00:00
Gerald Combs 345529250f Run 'git log' if we have a .git directory. Fixes a copy+paste error.
svn path=/trunk/; revision=44784
2012-09-05 20:58:15 +00:00
Pascal Quantin e6538311a6 Replace process_RequestOperation macro by a real function to speedup compilation time
svn path=/trunk/; revision=44779
2012-09-05 12:45:54 +00:00
Michael Mann 64d81e7477 Check for PFNAME #define as it is a common substitute for a literal string for the proto filter name and consider it the proto filter name.
Ignore "duplicates" that are generated because a display filter is prefixed by a #define (which checkfiltername.pl is not smart enough to handle), causing an empty string

svn path=/trunk/; revision=44654
2012-08-24 03:05:05 +00:00
Michael Mann 8242949ebc Allow proto filter names to have a period in them and allow display filter names to use any period separated value as a prefix. For example "gmr1.foo.bar" would allow "gmr1", "gmr1.foo" and "gmr1.foo.bar" as valid prefixes. Otherwise it will be flagged as a possible error.
Also added a "FILE TYPE" for proto filter names with a period so that they can be verified.  Presumably only "large", possibly "meta" protocols (probably spanning multiple dissector files) will be allowed to use a period in the proto filter name.

svn path=/trunk/; revision=44648
2012-08-23 21:31:20 +00:00
Evan Huus 450d24d835 Don't go into a tight loop when there's no specific number of passes.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7651

Also, use consistent indentation.

svn path=/trunk/; revision=44581
2012-08-19 13:50:22 +00:00
Evan Huus f385acc461 From Toralf Förster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7652
Use a fast bash built-in rather than a slow call out to `expr` to increment
the loop count.

svn path=/trunk/; revision=44580
2012-08-19 13:38:53 +00:00
Gerald Combs faf3cdf75d Move error reporting to a common function. Lot information about the
most recent revision / commit.

svn path=/trunk/; revision=44552
2012-08-17 16:28:28 +00:00
Michael Mann c3f223d356 Bug 3725 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3725)
Have giop dissector use more ephemeral memory.
Update idl2wrs dissector generator accordingly.

svn path=/trunk/; revision=44498
2012-08-14 18:33:58 +00:00
Evan Huus 69cd284787 Catch more types of valgrind errors in the fuzz-tester.
These happen when, eg, a program runs out of memory under valgrind
or other more fatal errors (that may sometimes be valgrind bugs instead).

svn path=/trunk/; revision=44451
2012-08-12 14:14:08 +00:00
Jeff Morriss ff748a68c3 From Michael Mann on -dev:
The idl2wrs generated dissectors don't follow the convention of using the
filter name registered with the protocol as the start of any display filter
name.  This patch fixes that.

svn path=/trunk/; revision=44325
2012-08-08 03:37:05 +00:00
Jeff Morriss 98a893986d Use expert infos instead of g_warning when something unexpected is found.
svn path=/trunk/; revision=44324
2012-08-08 03:29:51 +00:00
Michael Mann 65379209d6 Add support for (ignoring) idl2wrs generated dissectors.
Add commandline options to show file line numbers of dissectors.  The default is to have no line numbers shown as its easier to compare results without a minor file change causing the line number of the filter to change resulting in an unnecessary difference.
Add commandline option to check filter names of automated files (default disabled).
Check for underscores prefacing or following a period in filter names as this is probably a typo.
Cleaned up output when checking a single file.

svn path=/trunk/; revision=44182
2012-08-01 03:10:34 +00:00
Jeff Morriss b667cc5a99 Add comments to point out that these 2 scripts do the same thing.
svn path=/trunk/; revision=44175
2012-07-31 23:16:26 +00:00
Evan Huus 2d1575a2d1 Update the usage stanza for fuzz-test to reflect the changes in r44024.
svn path=/trunk/; revision=44083
2012-07-27 22:31:08 +00:00
Jakub Zawadzki d1a7b804d3 Use HEAD for git-compare-abis.sh
svn path=/trunk/; revision=44072
2012-07-27 14:57:30 +00:00
Evan Huus 69a95ad3a2 valgrind-wireshark.sh:
- add support for 2-pass dissection and config profiles
 - make whitespace a consistent 4-spaces
fuzz-test.sh:
 - update 2-pass support to use -2 and not the old -P
 - add support for fuzz-testing under valgrind with the new -g option

svn path=/trunk/; revision=44024
2012-07-26 02:38:34 +00:00
Jeff Morriss a74307f29a Add cppcheck tools to the source distribution.
svn path=/trunk/; revision=43944
2012-07-23 19:08:45 +00:00
Jeff Morriss 1959d4d6bf r43756 said that _snwprintf is banned. Make it so.
svn path=/trunk/; revision=43939
2012-07-23 16:57:16 +00:00
Evan Huus e70e0e6bfc Enhancements to the cppcheck script:
- Take command-line arguments of files to check. In this case make output
  GCC-like, as it's much more human-readable than the HTML.
- If there are no arguments, provide HTML output for the entire current
  directory like before, for use with build-bot integration.
- Don't hack with the CWD to try and get include-paths to work. Cppcheck
  will warn already if it can't find them, and since a lot of the checks
  still work in any case, a warning is more appropriate than an error or
  a hack.

svn path=/trunk/; revision=43882
2012-07-21 02:43:10 +00:00
Guy Harris 41be8e4344 Add a local errorCount variable to functions that use it, have them
return it, and use the return value.

svn path=/trunk/; revision=43818
2012-07-19 07:02:00 +00:00
Guy Harris 66ed910844 Yup, that did it. Make use of ENC_ values in non-item proto_tree_add
calls an error.

Fix one case where we weren't counting an error (unregistered ett
variables).

svn path=/trunk/; revision=43817
2012-07-19 04:16:15 +00:00
Evan Huus 6e8258be9a Add basic CppCheck configuration and runner.
Probably subject to change as it gets integrated into the build-bot.

svn path=/trunk/; revision=43778
2012-07-18 02:30:35 +00:00
Pascal Quantin babe622987 Use G_MININT32 instead of -2^31 so as to get rid of 'this decimal constant is unsigned only in ISO C90' warning
svn path=/trunk/; revision=43764
2012-07-17 13:12:50 +00:00
Chris Maynard 5f6a3400dc Fix Coverity CID 709600: Resource leak.
svn path=/trunk/; revision=43694
2012-07-13 20:04:28 +00:00
Anders Broman 80aba5ebf7 From Martin Kaiser:
CID 280531: "Argument cannot be negative" in lemon
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7453

svn path=/trunk/; revision=43619
2012-07-09 02:24:07 +00:00
Jeff Morriss 0cb874b9ec Add a function to packet-giop.c that does what the code that
template_get_CDR_string (in wireshark_gen.py) did.  This eliminates another
whole pile of function-local variables in packet-parlay.c.

Unfortunately it doesn't seem to speed up compilation (or eliminate the
variable tracking size limit problem).  But it does eliminate a lot of
lines of code...

svn path=/trunk/; revision=43610
2012-07-08 03:57:35 +00:00
Jeff Morriss a2c4716670 Eliminate a lot of function-local variables by not storing the result of
(several of the) get_CDR_*() functions: instead call the function directly
in the proto_tree_add_text() calls.

Eliminate a lot of global variables that are only later used in (a single)
strcmp().

All the GIOP dissectors are built-in now; don't include the (#if'd out) plugin
registration code in the generated dissector.

Try to clean up the formatting of the generated code a bit.

Regenerate the IDL dissectors; as noted in r39932, this seems to involve a
lot of function re-ordering in packet-parlay.c (making the delta bigger).


These changes decrease the time to compile packet-parlay.c by, on my system,
about half.  But it still complains:

variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without

and it still takes "too long."

svn path=/trunk/; revision=43609
2012-07-08 03:29:49 +00:00
Jeff Morriss 3d1b5e3474 As suggested by Jakub in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7429#c4 :
Add checks for calls to proto_tree_add_XXX (where XXX != item and a few other
functions) with an encoding (ENC_*) argument.


Also add a comment to checkAddTextCalls() about why 3 loops are used.

svn path=/trunk/; revision=43563
2012-07-03 21:55:55 +00:00
Jeff Morriss 6dd3a8b1fd From Todd Eigenschink via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7411 :
Have runlex.sh exit with the exit status of lex (if it failed).

svn path=/trunk/; revision=43555
2012-07-02 21:15:51 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Gerald Combs 75c8dbff83 Use the first matched color instead of the last one, which is what
Wireshark does.

svn path=/trunk/; revision=43391
2012-06-19 23:01:21 +00:00
Gerald Combs 0541cc3897 Switch to a working tag (r43278).
svn path=/trunk/; revision=43344
2012-06-18 23:42:09 +00:00
Jeff Morriss 41242190b0 Prohibit strtod() (as per r 43212).
Replace tabs with spaces (for consistency).

svn path=/trunk/; revision=43213
2012-06-11 19:42:05 +00:00
Gerald Combs 1a7470c6be Forward-port r43165 and r43168 from trunk-1.6.
------------------------------------------------------------------------
  r43165 | gerald | 2012-06-08 14:23:25 -0700 (Fri, 08 Jun 2012) | 4 lines
  Changed paths:
     M /trunk-1.6/epan/Makefile.am
     M /trunk-1.6/wiretap/Makefile.am
     M /trunk-1.6/wsutil/Makefile.am
  
  Use separate commands in the dumpabi recipes instead a big huge long
  chain. If abi-compliance-checker fails print the contents of its
  log file.
  ------------------------------------------------------------------------
  r43168 | gerald | 2012-06-08 15:43:50 -0700 (Fri, 08 Jun 2012) | 2 lines
  Changed paths:
     M /trunk-1.6/epan/Makefile.am
     M /trunk-1.6/wiretap/Makefile.am
     M /trunk-1.6/wsutil/Makefile.am
  
  Make sure ln happens in the right directory.
  ------------------------------------------------------------------------

We don't currently have a usable tag for "git describe --tags
--abbrev=0" to latch onto so just use the first 1.9 commit.

svn path=/trunk/; revision=43170
2012-06-08 23:54:22 +00:00
Jeff Morriss 4e72731543 The application/xml* MIME types are considered binary types by svn, use text/xml for .xml and don't set a MIME type for .dtd files.
svn path=/trunk/; revision=43159
2012-06-08 19:09:23 +00:00
Jeff Morriss 3fd9f8e76d Handle adding .xml and .dtd files.
svn path=/trunk/; revision=43158
2012-06-08 19:04:13 +00:00
Gerald Combs c592ceded1 Update the Lua configuration on Win64 to reflect the recent change to
Visual Studio 2010.

svn path=/trunk/; revision=43142
2012-06-06 20:42:47 +00:00
Anders Broman 3ae9cc81c4 Add more depricated functions
svn path=/trunk/; revision=43040
2012-06-03 18:03:51 +00:00
Jeff Morriss ea9e7c2359 Look only for calls to strlen() within an snprintf() call (not for any file
that has the string "strlen" somewhere after a call to snprintf()).

svn path=/trunk/; revision=42950
2012-05-31 21:19:39 +00:00
Gerald Combs 35c22ed068 If we're feeding the output of strlen to an snprintf-style function
there's a good chance we're doing something wrong.

svn path=/trunk/; revision=42947
2012-05-31 20:12:27 +00:00
Anders Broman d57656a43f Add fix-encoding-args.pl to the distribution.
svn path=/trunk/; revision=42943
2012-05-31 13:09:27 +00:00
Anders Broman 7720ac9929 Remove redundant code from the template.
svn path=/trunk/; revision=42941
2012-05-31 12:46:09 +00:00
Gerald Combs ddcd6c5ce7 Use the updated GeoIP package (1.4.8-2).
svn path=/trunk/; revision=42933
2012-05-30 22:55:02 +00:00
Anders Broman 2a7ecea45c Modify IDL generated plugin interface (untested)
svn path=/trunk/; revision=42925
2012-05-30 19:02:53 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
2012-05-29 23:31:00 +00:00
Jeff Morriss 7f1ccd46ec Followup to r42823: check for RVALS used without BASE_RANGE_STRING.
Also: identify problematic fields by hf_variable_name instead of name or
abbreviation (the variable name is sure to be unique).

svn path=/trunk/; revision=42826
2012-05-24 14:52:06 +00:00