Commit Graph

145 Commits

Author SHA1 Message Date
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
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
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 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
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
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
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
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
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
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
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
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
Jeff Morriss cf012d27b1 Build the ASN.1 dissectors directly into epan/dissectors (rather than building
them and then copying them over).  The "all" target to builds these dissectors
now (instead of "generate_files" and/or "copy_files").

asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.

Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.

Fix building of conformance files when doing out-of-source-tree builds.


Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.

svn path=/trunk/; revision=39333
2011-10-10 02:31:11 +00:00
Stig Bjørlykke 46ae76bf6c Always generate packet-*-exp.h.
This fixes a bug when only exporting _PDU objects, and we can have
'#include "packet-*-exp.h"' in packet-*-template.h even when having
no #.EXPORTS in the conformation file.

svn path=/trunk/; revision=39320
2011-10-09 10:42:54 +00:00
Tomas Kukosa 733452afd7 Support for Extension Addition Group in PER encoding
Fix for bug 6196 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6199

svn path=/trunk/; revision=38421
2011-08-09 08:00:06 +00:00
Gerald Combs a5b20fbdf6 Add a relative path to the "#line" directives we produce. Regenerate the
SNMP and SPNEGO dissectors to see if it helps Coverity locate the
original source files.

svn path=/trunk/; revision=36522
2011-04-08 19:51:39 +00:00
Anders Broman 0119e04527 Try to enhance output at ValueError to ease debugging.
svn path=/trunk/; revision=35578
2011-01-19 06:33:33 +00:00
Balint Reczey 04386e3ca1 Raise Exceptions containing a string instead of string exceptions
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4846

svn path=/trunk/; revision=35258
2010-12-23 23:36:48 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Bill Meier 1b7474fab6 Sort value_string array by value if used with value_str_ext fcns;
svn path=/trunk/; revision=34874
2010-11-14 23:48:07 +00:00
Tomas Kukosa 5fbdb1c378 Generate proper extension flags for empty constructed types SEQUENCE { ... } and CHOICE { ... }
svn path=/trunk/; revision=34400
2010-10-07 14:24:04 +00:00
Tomas Kukosa 7c60d30dc5 - fix using hex values as constraint
- avoid crash if unknown type is used in type assignment

svn path=/trunk/; revision=33905
2010-08-24 05:53:17 +00:00
Graeme Lunt 5aa05c8559 New "#.SYNTAX" section for the asn2wrs conformance file.
This allows syntaxes to be registered separately from PDUs.
Within the new section, the ASN.1 types to be used as syntaxes should be iterated. 
An optional second parameter on each line may be provided to provide an alternative name for the syntax (that the user will see). This name must be in double quotes.



svn path=/trunk/; revision=33370
2010-06-29 12:16:10 +00:00
Graeme Lunt 0d9ad5016e Remove the -R flag (used to generate syntax registrations) and replace with a
packet-<proto>-syn-reg.c output file. This is more generic and allows the 
syntax registrations to the directed from the template file.


svn path=/trunk/; revision=33342
2010-06-28 09:26:41 +00:00
Graeme Lunt 2e28eb7b5f New option (-r) to allow a prefix to be removed from type names.
Usage: asn2wrs.py -r prefix

This is used by x509sat where a prefix is used in type names to 
avoid conflicts with built-in types.


svn path=/trunk/; revision=33298
2010-06-23 11:00:46 +00:00
Graeme Lunt a3300280f2 New option (-R) to asn2wrs to register the PDUs defined in the conformance file as BER syntaxes (register_ber_syntax_dissector()).
svn path=/trunk/; revision=33175
2010-06-09 09:27:28 +00:00
Tomas Kukosa 2f0c4dde50 Support of value_string_ext in the asn2wrs using new directive #.USE_VALS_EXT
Example usage in NBAP

svn path=/trunk/; revision=32944
2010-05-25 09:07:12 +00:00
Tomas Kukosa 0611ae90a0 Support of AUTOMATIC tagging environment
(necessary for generating e.g. H.248 from original ASN.1 source)

svn path=/trunk/; revision=32782
2010-05-13 13:16:26 +00:00
Tomas Kukosa e32b9b9062 ASN.1 compiler accepts version brackets in SEQUENCE and CHOICE extensions
svn path=/trunk/; revision=32781
2010-05-13 10:00:37 +00:00
Jeff Morriss a0c858efcd Add a little more code to avoid not-very-useful blurbs:
- Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
Jeff Morriss e743c4e101 Try to avoid the user confusion reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3477 by not using blurbs
that look like abbreviations (filter strings).

While we're at it try to avoid giving blurbs that are identical (or nearly so)
to the field name.

Regenerate a couple of dissectors like this to prove out the idea.

svn path=/trunk/; revision=32673
2010-05-05 14:29:55 +00:00
Balint Reczey eef2b5a361 Revert accidentally committed change
svn path=/trunk/; revision=32031
2010-02-27 13:24:42 +00:00
Balint Reczey 339131d835 Prevent potential crash in libsmi.
From: Vincent Bernat <bernat@debian.org>

svn path=/trunk/; revision=32006
2010-02-25 19:28:58 +00:00
Anders Broman 984524db42 Fix from Tomas Kukosa to resolve problem with large negative intiger constraints
"packet-rrlp-fn.c:2391: warning: integer constant is too large for 'long' type."

svn path=/trunk/; revision=31777
2010-02-03 16:58:52 +00:00
Stig Bjørlykke 6a433058f9 Added check for SIZE constraints in bit-string.
svn path=/trunk/; revision=31447
2010-01-05 11:38:33 +00:00
Stig Bjørlykke e73a89d91a Added option (-C) to check for SIZE constraints in octet-string, integer,
enumerated, sequence-of and set-of types.

Added BER functions to check for SIZE constraints and give expert info warnings.

svn path=/trunk/; revision=31309
2009-12-18 15:18:31 +00:00
Anders Broman ba6d7aa766 Handle lenght restriction extension of restricted strings.
Fixes 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4251

svn path=/trunk/; revision=31048
2009-11-22 17:01:56 +00:00
Stig Bjørlykke 13201ce6b7 Default to BASE_NONE for FT_BOOLEAN with zero value for display.
svn path=/trunk/; revision=28803
2009-06-22 06:16:39 +00:00
Stig Bjørlykke 7cd1a1d38b Write NULL for empty blurb.
svn path=/trunk/; revision=28773
2009-06-19 03:37:52 +00:00
Stig Bjørlykke dec6ea57ae Use BASE_NONE for FT_BYTES.
svn path=/trunk/; revision=28769
2009-06-18 21:26:13 +00:00
Stig Bjørlykke cbcd176043 Improved name and abbrev used for sequence of and set of elements.
svn path=/trunk/; revision=28377
2009-05-16 22:01:19 +00:00
Anders Broman e5d6ac8615 Use G_GINT64_CONSTANT in stead of G_GUINT4_CONSTANT
svn path=/trunk/; revision=28048
2009-04-14 18:10:45 +00:00
Tomas Kukosa 3d8d91d80c support UINT64 constants for upper value bounds
svn path=/trunk/; revision=28042
2009-04-14 07:34:56 +00:00
Anders Broman 99bbe55222 Make it possible to check for extension marker in SEQUENCE OF and SET OF.
Fore some reason  the trace in bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3360 does not decode properly
if dissecting the exension marker so leave that code #if 0:ed out for now.

svn path=/trunk/; revision=27848
2009-03-25 22:04:23 +00:00
Tomas Kukosa 33763b7a53 - resolve one reduce/reduce conflict in grammar
- fix obsolete Python constructions

svn path=/trunk/; revision=27367
2009-02-04 13:24:09 +00:00
Tomas Kukosa c5ecbf6d40 fix all warn_explicit() usages incompatible with Python 2.6
svn path=/trunk/; revision=26788
2008-11-15 19:53:05 +00:00