Commit Graph

66 Commits

Author SHA1 Message Date
Gerald Combs 6b376c9c0e asn2eth.py:
Catch a TypeError that gets thrown if we don't use any conversion
specifiers during string formatting.

H.248:

Don't dereference a null pointer.  Fixes bug 626.

svn path=/trunk/; revision=16773
2005-12-13 03:48:26 +00:00
Luis Ontanon 976804af94 Add #line directives to the genertated dissector.
Now the compiler knows where a line comes from and errors point to the .cnf or -template.[ch] file instead of the generated code.


svn path=/trunk/; revision=16654
2005-12-02 17:49:47 +00:00
Tomas Kukosa dcae7d303f new field type FT_OID for OBJECT IDENTIFIERs
svn path=/trunk/; revision=16652
2005-12-02 13:16:58 +00:00
Tomas Kukosa 97584210fb improvements in value constraint support
- NO_BOUND is defined instead of usage -1
- negative bound is handled properly for INTEGER

svn path=/trunk/; revision=16505
2005-11-14 13:05:17 +00:00
Anders Broman 314c36da9a From Graeme Lunt:
The ftbp.patch file includes:
a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings.
b) New EXPORTs for the FTAM dissector for use in FTBP.
c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do.

* Better ROS handling and registration
* Simplified RTSE registration
* X411 column information, extension naming and use of new RTSE/ROS registration
* X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch).
* Better highlighting of S4406 protocol.


svn path=/trunk/; revision=16296
2005-10-24 21:42:19 +00:00
Anders Broman 3f7ed7c2a2 Fix problems with bitstring:
- dissect_per_bitstring needs to know if extention exists or not.
- Fixes for bitstring sizes up to 16 ( where max = min ).

svn path=/trunk/; revision=16181
2005-10-10 20:38:28 +00:00
Tomas Kukosa d3492e684a asn2eth
- #.FN_BODY accepts parameters too
 - single line variant of #.FN_PAR is possible
 - new parameter FN_VARIANT for OBJECT IDENTIFIER
packet-per.c
 - dissect_per_object_identifier() returns value as tvb
 - new dissect_per_object_identifier_str() function
PER dissectors adapted and regenerated

svn path=/trunk/; revision=15894
2005-09-20 10:56:08 +00:00
Tomas Kukosa ee8d53adf5 remove unused parameter 'name' from dissect_per_choice()
svn path=/trunk/; revision=15861
2005-09-19 07:35:05 +00:00
Tomas Kukosa 1d6439aa7d - OID names table extended
- NAME and ABBREV attributes can be used in #.FIELD_ATTR
- following constraint format is supported (1..10, ..., 11..MAX)

svn path=/trunk/; revision=15634
2005-08-31 14:32:29 +00:00
Anders Broman bc3830f63d Fix a typo 'BER_UNI_TAG_TeletexString'
svn path=/trunk/; revision=15613
2005-08-29 16:51:58 +00:00
Tomas Kukosa ec979a97fb - dissect_per_restricted_character_string() returns value in tvbbuff_t instead of char
- asn2eth:
  fixed CHOICE tag handling
  #.FN_PARS support for BIT STRING and all string types
  intersection of SIZE and FROM constraints for string is handled
- new asn2eth features used in h225 and h245
- PER dissectors regeneration

svn path=/trunk/; revision=15408
2005-08-18 14:32:49 +00:00
Jörg Mayer c17d44e122 Fix svn properties where needed:
Remove svn:executable
         Add svn:executable
         Add svn:eol-style
         Add svn:keywords


svn path=/trunk/; revision=15182
2005-08-02 05:58:15 +00:00
Tomas Kukosa 49a0d4f697 - fix name handling of imported types
- #.FN_PARS implemented for TypeRef, SET, SEQUENCE, CHOICE

svn path=/trunk/; revision=15161
2005-08-01 08:40:13 +00:00
Ronnie Sahlberg 0ca30abe65 change the symbol dissect_ber_CHOICE back into dissect_ber_choice
svn path=/trunk/; revision=14980
2005-07-21 21:12:09 +00:00
Tomas Kukosa aa6a15ebde PLY package updated to version 1.6
svn path=/trunk/; revision=14951
2005-07-18 20:45:46 +00:00
Tomas Kukosa 1374231148 - PER helper functions for SET/SEQUENCE OF dissection were changed to have prototype similar to BER (per_sequence_t is used as parameter)
- asn2eth was updated to support new PER helper functions for SET/SEQUENCE OF
- #.FN_PARS implemented for SET/SEQUENCE OF and REAL
- PER SET/SEQUENCE OF field can be FT_UINTxx to display number of items
- PER dissectors regenerated

svn path=/trunk/; revision=14921
2005-07-15 15:20:40 +00:00
Guy Harris 2b086353a4 Fix a spelling error.
svn path=/trunk/; revision=14865
2005-07-06 23:55:19 +00:00
Tomas Kukosa 3f36906e3a - #.FN_PARS implemented for BOOLEAN
- user defined body #.FN_BODY can be combined with default body using DEFAULT_BODY parameter (see e.g. H.225)

svn path=/trunk/; revision=14863
2005-07-06 16:15:12 +00:00
Tomas Kukosa ed7d638053 new directives #.PDU_NEW and #.REGISTER_NEW creating and registering PDU dissectors with new_dissector_t prototype
svn path=/trunk/; revision=14860
2005-07-05 21:42:13 +00:00
Tomas Kukosa 648c7863cd - #.FN_PARS support for ENUMERATED type
- cleanup unused parameters for some methods

svn path=/trunk/; revision=14856
2005-07-05 19:47:04 +00:00
Tomas Kukosa 5f2fd433ab - use tvb instead of offset and length in dissect_per_octet_string() for value returning
- asn2eth: #.FN_PARS support for OCTET STRING
- usage of #.FN_PARS in h225 and h245
- h225: ParallelH245Control support
- h245: better support of NonStandardParameter
- usage of MAX_OID_STR_LEN constant
- all PER dissectors regenerated

svn path=/trunk/; revision=14844
2005-07-04 09:35:25 +00:00
Tomas Kukosa f9d6448624 fix for BER string tags
svn path=/trunk/; revision=14800
2005-06-27 13:45:47 +00:00
Ronnie Sahlberg 3a51ba4293 make dissect_ber_choice take a guint* that will return the
index of the branch taken or -1  to make prettifications easier to implement.


change the signature of dissect_ber_choice and rename it to dissect_ber_CHOICE to catch all
occurences of the use of this function

update asn2eth to use the new name/signature

update all occurences of this function to the new name and new signature.



svn path=/trunk/; revision=14758
2005-06-26 05:48:50 +00:00
Tomas Kukosa a9cecadc53 - usage of dissect_per_null() and dissect_ber_null()
- new #.FN_PARS directive (implemented only for OCTET STRING and INTEGER now)
- set true value strings for named bits

svn path=/trunk/; revision=14575
2005-06-07 11:58:22 +00:00
Tomas Kukosa 2d40f0464b - fix handling SET/SEQUENCE OF Type if type name contains hyphen
- raise warning if type is not renamed to name with the first letter uppercase
- raise warning if field is not renamed to name with the first letter lowercase

svn path=/trunk/; revision=14147
2005-04-20 12:39:34 +00:00
Anders Broman 1214d29348 From Jacques, Olivier:
The patch attached fixes it by creating a table of unique files at the
time of file deletion. This way, current asn2eth behaviour is not
modified.
 

svn path=/trunk/; revision=13943
2005-03-27 21:39:38 +00:00
Guy Harris 26722e4761 Fix asn2eth to pass 0, not NULL, for the last argument to
"dissect_per_restricted_character_string()", which is a guint32, not a
pointer.  Re-generate packet-h225.c with the fixed asn2eth.

svn path=/trunk/; revision=13819
2005-03-20 10:57:39 +00:00
Guy Harris e074470278 Handle the new signature for "dissect_per_restricted_character_string()".
svn path=/trunk/; revision=13547
2005-02-28 08:22:02 +00:00
Ronnie Sahlberg fbf762bda5 update asn2eth and all generated dissectors to new dissect_ber_boolean that takes a implicit_tag parameter
svn path=/trunk/; revision=13479
2005-02-23 08:57:47 +00:00
Anders Broman 77a25f2703 From Tomas Kukosa:
Fix  problems with bitfields with dashed ("-") names

svn path=/trunk/; revision=13416
2005-02-16 22:40:56 +00:00
Anders Broman 1fb60a0659 From Alejandro Vaquero :
Find attached a patch for "Voip analysis" to get the LRQ/LCF/LRJ messages included in the H323 calls for Gatekeeper to Gatekeeper configurations

svn path=/trunk/; revision=13338
2005-02-07 08:58:40 +00:00
Tomas Kukosa 1d2249b2c5 Fix bug in SEQUENCE/SET OF handling
svn path=/trunk/; revision=13137
2005-01-20 11:56:33 +00:00
Tomas Kukosa e0d75c08f6 Support of GeneralizedTime in PER
svn path=/trunk/; revision=13086
2005-01-17 11:53:36 +00:00
Tomas Kukosa a79cd5b955 Fixed value string names in field array when NO_PROT_PREFIX option is used
svn path=/trunk/; revision=12949
2005-01-05 07:09:06 +00:00
Tomas Kukosa 0d5093663d Directives #.FN_* can be used for Ethereal types as well as for ASN.1 types
svn path=/trunk/; revision=12942
2005-01-03 14:41:02 +00:00
Tomas Kukosa 5e60281f8d - names for value_string tables are generated with protocol name prefix
- FROM constraint for PER supported

svn path=/trunk/; revision=12941
2005-01-03 12:54:31 +00:00
Tomas Kukosa 316569ef2b - new optional parameter ETH_VAR for #.EXPORTS directive
- few fixes for last changes

Summary of changes during last three revisions
- NULL can be used in #.PDU or #.REGISTER directive
- fix in cyclic dependency handling
- keep <proto>-exp.cnf file regardless of '-k' option
- handling of negative values in SingleValue or ValueRange constraints
- handling of all SEQUONCE/SET (OF) types including SIZE constraint
- rename ber_sequence->ber_sequence_t and ber_choice->ber_choice_t
- rename dissect_ber_integer_new()->dissect_ber_integer()
- fix number of parameters for dissect_per_GeneralString()

svn path=/trunk/; revision=12854
2004-12-29 12:28:16 +00:00
Ronnie Sahlberg 8afae320de update of the asn2eth compiler to use the types ber_[choice|sequence]_t instead of ber_[choice|sequence]
regenerated all dissectors


fixed the choice/sequence struct to use unsigned entities for class and tag
(to reduce some compiler warning and because it should be signed quantities)



svn path=/trunk/; revision=12740
2004-12-13 08:15:34 +00:00
Ronnie Sahlberg 896737c467 update the helper for BER GeneralizedTime to handle implicit tag and update all dissectors using GeneralizedTime
svn path=/trunk/; revision=12732
2004-12-12 22:47:24 +00:00
Ronnie Sahlberg 0e528dc7a1 updates from tomas and anders
create some missing makefiles for autogenerated dissectors

finish the transition to the new ber integer dissetor helper signature
and regenerate all ber dissectors



svn path=/trunk/; revision=12724
2004-12-12 01:14:03 +00:00
Ronnie Sahlberg 3528d63cdf add _U_ to int hf_index to reduce number of compiler warnings
svn path=/trunk/; revision=12547
2004-11-20 07:03:27 +00:00
Ronnie Sahlberg bb0cf08d8c Major update of the ber helpers to fix a lot of bugs and make the handling of implicit_tags more sane.
It worked reasonably well   mainly, I suspect, due to implicit tags are reasonably uncommon in the dissectors we have already implemented and that the bugs were masking eachothers.


my regression tests (limited test samples though) decodes this new one exactly the same as the old one.


As a bonus by not changing anythiong in the decode  is that now it is possible to get dissection of implice items to work properly,  hence CMIP
(and also x509 Extensions work now)


make heaps of dissector helpers implicit_tag  aware.

change asn2eth to generate code to call the implicit_tag aware integer dissector helper.


svn path=/trunk/; revision=12520
2004-11-14 05:10:44 +00:00
Guy Harris 2e8853d825 From Tomas Kukosa:
add support for ANY type;

	add support for DEFAULT { } (empty sequence);

	some minor changes.

svn path=/trunk/; revision=12464
2004-11-01 17:51:07 +00:00
Guy Harris 18cb5c3c07 From Tomas Kukosa:
- avoid assignemnt to None which is deprecated in Python 2.3
	- fix bug when one field is used both with and without implicit
	  tag

svn path=/trunk/; revision=12277
2004-10-12 08:11:46 +00:00
Guy Harris 512285a434 More constification of arrays.
svn path=/trunk/; revision=12261
2004-10-11 08:36:55 +00:00
Guy Harris e409958909 Constify "asn_namedbit" structures.
svn path=/trunk/; revision=12252
2004-10-11 06:31:23 +00:00
Guy Harris 7b287f6696 Make "ber_sequence" tables "const".
svn path=/trunk/; revision=12246
2004-10-08 20:43:43 +00:00
Guy Harris 6aad0b0543 From Tomas Kukosa:
- fix for protocol registration (register_dissector() does not return
  handle)
- new directive REGISTER which can register PDU more than once
- implicit tagging environment is supported 

svn path=/trunk/; revision=12177
2004-10-01 19:54:46 +00:00
Guy Harris 79c706baf9 From Tomas Kukosa:
- make the default protocol name module-name from input file
- don't use the [##]/(##) mark for index of SET/SEQUENCE item with
  original PER/BER API
- allow PDUs to be registered 

svn path=/trunk/; revision=12066
2004-09-22 16:32:20 +00:00
Ronnie Sahlberg 88a4c48f24 from tomas kukosa, fix for generated _PDU() functions to match the dissector_t signature
svn path=/trunk/; revision=11984
2004-09-13 08:00:33 +00:00