diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-12-13 08:15:34 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-12-13 08:15:34 +0000 |
| commit | 8afae320de76b02165028db72b7c8266e54f9566 (patch) | |
| tree | 99088dd584f524a92e5cd1f30c341c4c395653eb /tools | |
| parent | 084055c89517e2ef2fd80f4ba68dbbcb428ce64b (diff) | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/asn2eth.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/asn2eth.py b/tools/asn2eth.py index 51b1259a47..4be0cb0c53 100644 --- a/tools/asn2eth.py +++ b/tools/asn2eth.py @@ -1956,7 +1956,7 @@ class SequenceOfType (SqType): ef = ectx.field[f]['ethname'] out = '' if (ectx.Ber()): - out = "static const ber_sequence %s_sequence_of[1] = {\n" % (tname) + out = "static const ber_sequence_t %s_sequence_of[1] = {\n" % (tname) out += self.out_item(f, self.val, False, '', ectx) out += "};\n" out += ectx.eth_type_fn_hdr(tname) @@ -2025,7 +2025,7 @@ class SetOfType (SqType): ef = ectx.field[f]['ethname'] out = '' if (ectx.Ber()): - out = "static const ber_sequence %s_set_of[1] = {\n" % (tname) + out = "static const ber_sequence_t %s_set_of[1] = {\n" % (tname) out += self.out_item(f, self.val, False, '', ectx) out += "};\n" out += ectx.eth_type_fn_hdr(tname) @@ -2146,10 +2146,7 @@ class SequenceType (SqType): def eth_type_fn(self, proto, tname, ectx): fname = ectx.eth_type[tname]['ref'][0] - if (ectx.OBer()): - out = "static const %s_sequence %s_sequence[] = {\n" % (ectx.encp(), tname) - else: - out = "static const %s_sequence_t %s_sequence[] = {\n" % (ectx.encp(), tname) + out = "static const %s_sequence_t %s_sequence[] = {\n" % (ectx.encp(), tname) if hasattr(self, 'ext_list'): ext = 'ASN1_EXTENSION_ROOT' else: @@ -2385,10 +2382,7 @@ class ChoiceType (Type): for e in (lst): if (e.GetTag(ectx)[0] != t): tagval = False - if (ectx.OBer()): - out += "static const %s_choice %s_choice[] = {\n" % (ectx.encp(), tname) - else: - out += "static const %s_choice_t %s_choice[] = {\n" % (ectx.encp(), tname) + out += "static const %s_choice_t %s_choice[] = {\n" % (ectx.encp(), tname) cnt = 0 if hasattr(self, 'ext_list'): ext = 'ASN1_EXTENSION_ROOT' |