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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12724 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/MAP_Dialogue/Makefile b/asn1/MAP_Dialogue/Makefile
new file mode 100755 (executable)
index 0000000..d1bf03a
--- /dev/null
+++ b/asn1/MAP_Dialogue/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-MAP_DialoguePDU.c : ../../tools/asn2eth.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf
+       python ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn
+       cp packet-MAP_DialoguePDU.* ../../epan/dissectors
+

diff --git a/asn1/cmip/Makefile b/asn1/cmip/Makefile
new file mode 100755 (executable)
index 0000000..3eb2877
--- /dev/null
+++ b/asn1/cmip/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-cmip.c : ../../tools/asn2eth.py CMIP.asn packet-cmip-template.c packet-cmip-template.h cmip.cnf 
+       python ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn
+       cp packet-cmip.* ../../epan/dissectors
+

diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index 90c489310908fb30ad9ac78de879bdb6c14a278e..3541b21f1aa2b4f678b4f6051b5af8d0fc4e38cd 100644 (file)
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -35,14 +35,14 @@ ROS
 
 #.FN_BODY CMIPAbortSource
   guint32 value;
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value);
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_append_fstr(pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, CMIPAbortSource_vals, " Unknown AbortSource:%d"));
   }
 #.END
 
 #.FN_BODY Opcode
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode);
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, Opcode_vals, " Unknown Opcode:%d"));
   }
@@ -83,7 +83,7 @@ ROS
 
 #.FN_BODY AttributeId/localForm
   attributeform = ATTRIBUTE_LOCAL_FORM;
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL);
 
 #.FN_BODY Attribute/value
   /*XXX handle local form here */
@@ -172,7 +172,7 @@ ROS
 
 #.FN_BODY ObjectClass/oclocalForm
   objectclassform = OBJECTCLASS_LOCAL_FORM;
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_oclocalForm, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_oclocalForm, NULL);
 
 #.FN_BODY ActionInfo/actionType
   offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,

diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf
index 9fbeb1ab7c3cec7235ad9d06903b9473b21ad0df..aa570b6a91687b348ef96144465e3b016793fb6d 100644 (file)
--- a/asn1/cms/cms-exp.cnf
+++ b/asn1/cms/cms-exp.cnf
@@ -17,13 +17,13 @@ IssuerAndSerialNumber    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 ContentInfo              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ContentType              TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SignedData               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-DigestAlgorithmIdentifiers TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-SignerInfos              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+DigestAlgorithmIdentifiers TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+SignerInfos              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 EncapsulatedContentInfo  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SignerInfo               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SignerIdentifier         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(SignerIdentifier_vals)  BITMASK = 0
-SignedAttributes         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-UnsignedAttributes       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+SignedAttributes         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+UnsignedAttributes       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SignatureValue           TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 IssuerAndSerialNumber    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 #.END

diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index bf04c386f50d8e84095d217cce138c52ee68a34f..1e894beeb15d98bcf08f322984c64e1a262a7a2e 100644 (file)
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -170,7 +170,7 @@ static guint32 opcode=0;
 
 static int
 dissect_gsm_map_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
+  offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
 
   if (check_col(pinfo->cinfo, COL_INFO)){
     col_set_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, gsm_map_opr_code_strings, "Unknown GSM-MAP (%u)"));
@@ -543,7 +543,7 @@ dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse
 }
 
 static int dissect_invokeid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL);
+  return dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL);
 }
 
 

diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 1910a02407cfee79509026a65a2fa0d323889a6d..45eeb15561e6c372ed3098ecdb7c2c6cd55915ca 100644 (file)
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -272,7 +272,7 @@ dissect_h248_annex_C_PDU(gboolean implicit_tag, tvbuff_t *tvb, packet_info *pinf
                        dissect_nsap(new_tvb, 0,tvb_length_remaining(new_tvb, 0), tree);
                        break;
                case 0x9001: /* TMR */
-                       offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_h248_package_annex_C_TMR, NULL);
+                       offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_package_annex_C_TMR, NULL);
                        break;
                case 0x9023: /* User Service Information */
                        offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_h248_package_annex_C_USI, &new_tvb);
@@ -304,7 +304,7 @@ guint offset=0;
                        proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "H.248: Dissector for Package/ID:0x%04x not implemented (yet).", name_major);
                        break;
                case 0x001e: /* Bearer Characteristics Q.1950 Annex A */
-                       offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_h248_package_bcp_BNCChar_PDU, NULL);
+                       offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_package_bcp_BNCChar_PDU, NULL);
                        break;
                case 0x0021: /* Generic Bearer Connection Q.1950 Annex A */
                        proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "H.248: Dissector for Package/ID:0x%04x not implemented (yet).", name_major);

diff --git a/asn1/pkcs1/Makefile b/asn1/pkcs1/Makefile
new file mode 100755 (executable)
index 0000000..17a493c
--- /dev/null
+++ b/asn1/pkcs1/Makefile
@@ -0,0 +1,4 @@
+../../epan/dissectors/packet-pkcs1.c : ../../tools/asn2eth.py PKCS1.asn packet-pkcs1-template.c packet-pkcs1-template.h pkcs1.cnf
+       python ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn
+       cp packet-pkcs1.* ../../epan/dissectors
+

diff --git a/asn1/pkinit/Makefile b/asn1/pkinit/Makefile
new file mode 100755 (executable)
index 0000000..50c54b2
--- /dev/null
+++ b/asn1/pkinit/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-pkinit.c : ../../tools/asn2eth.py PKINIT.asn packet-pkinit-template.c packet-pkinit-template.h pkinit.cnf
+       python ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn
+       cp packet-pkinit.* ../../epan/dissectors
+

diff --git a/asn1/pkix1explicit/Makefile b/asn1/pkix1explicit/Makefile
new file mode 100755 (executable)
index 0000000..670de30
--- /dev/null
+++ b/asn1/pkix1explicit/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-pkix1explicit.c : ../../tools/asn2eth.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf
+       python ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn 
+       cp packet-pkix1explicit.* ../../epan/dissectors
+

diff --git a/asn1/pkix1implicit/Makefile b/asn1/pkix1implicit/Makefile
new file mode 100755 (executable)
index 0000000..e830685
--- /dev/null
+++ b/asn1/pkix1implicit/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-pkix1implicit.c : ../../tools/asn2eth.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf
+       python ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn 
+       cp packet-pkix1implicit.* ../../epan/dissectors
+

diff --git a/asn1/pkixqualified/Makefile b/asn1/pkixqualified/Makefile
new file mode 100755 (executable)
index 0000000..ed81400
--- /dev/null
+++ b/asn1/pkixqualified/Makefile
@@ -0,0 +1,5 @@
+
+../../epan/dissectors/packet-pkixqualified.c : ../../tools/asn2eth.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf
+       python ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn
+       cp packet-pkixqualified.* ../../epan/dissectors
+

diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf
index 20f16dd83b4b78fd22b6cc8cea65942ff7e86fc6..5b898fa6de374e20877ca18768b63a039d1f697c 100644 (file)
--- a/asn1/x509af/x509af-exp.cnf
+++ b/asn1/x509af/x509af-exp.cnf
@@ -31,11 +31,11 @@ AlgorithmIdentifier      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 Validity                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Time                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Time_vals)  BITMASK = 0
-Extensions               TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+Extensions               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Extension                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Certificates             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ForwardCertificationPath TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CrossCertificates        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+ForwardCertificationPath TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CrossCertificates        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificationPath        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificatePair          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificateList          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf
index 0def4ccb3f8f6125014f5eb4cff2216dff168bd8..aa51e8c79221b6aea693f511ae4d36608c05d3fd 100644 (file)
--- a/asn1/x509ce/x509ce-exp.cnf
+++ b/asn1/x509ce/x509ce-exp.cnf
@@ -58,20 +58,20 @@ AuthorityKeyIdentifier   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 KeyIdentifier            TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 SubjectKeyIdentifier     TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 KeyUsage                 TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-KeyPurposeIDs            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+KeyPurposeIDs            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 KeyPurposeId             TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PrivateKeyUsagePeriod    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CertificatePoliciesSyntax TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CertificatePoliciesSyntax TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PolicyInformation        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PolicyQualifierInfo      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PolicyMappingsSyntax     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-GeneralNames             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+PolicyMappingsSyntax     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+GeneralNames             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 GeneralName              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(GeneralName_vals)  BITMASK = 0
 EDIPartyName             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributesSyntax         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+AttributesSyntax         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BasicConstraintsSyntax   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 NameConstraintsSyntax    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-GeneralSubtrees          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+GeneralSubtrees          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 GeneralSubtree           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BaseDistance             TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 PolicyConstraintsSyntax  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
@@ -79,19 +79,19 @@ SkipCerts                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL
 CRLNumber                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 CRLReason                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(CRLReason_vals)  BITMASK = 0
 HoldInstruction          TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CRLScopeSyntax           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CRLScopeSyntax           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PerAuthorityScope        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 OnlyCertificateTypes     TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 NumberRange              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BaseRevocationInfo       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-StatusReferrals          TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+StatusReferrals          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 StatusReferral           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(StatusReferral_vals)  BITMASK = 0
 CRLReferral              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DeltaRefInfo             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CRLStreamIdentifier      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 OrderedListSyntax        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(OrderedListSyntax_vals)  BITMASK = 0
 DeltaInformation         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-CRLDistPointsSyntax      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CRLDistPointsSyntax      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DistributionPoint        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DistributionPointName    TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(DistributionPointName_vals)  BITMASK = 0
 ReasonFlags              TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
@@ -100,7 +100,7 @@ BaseCRLNumber            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL
 CertificateExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificateAssertion     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AltNameType              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(AltNameType_vals)  BITMASK = 0
-CertPolicySet            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+CertPolicySet            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificatePairExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificatePairAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificateListExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf
index 32b5ffd1c68a78d9ed2ec51aad2ffac1e21d53c5..448036073a94a297121f7bab1e47c47de5bb5433 100644 (file)
--- a/asn1/x509if/x509if-exp.cnf
+++ b/asn1/x509if/x509if-exp.cnf
@@ -48,12 +48,12 @@ AttributeValueAssertion  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 ContextAssertion         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AttributeTypeAssertion   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Name                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Name_vals)  BITMASK = 0
-RDNSequence              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-DistinguishedName        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-RelativeDistinguishedName TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+RDNSequence              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+DistinguishedName        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+RelativeDistinguishedName TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AttributeTypeAndDistinguishedValue TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SubtreeSpecification     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-LocalName                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+LocalName                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ChopSpecification        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BaseDistance             TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 Refinement               TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Refinement_vals)  BITMASK = 0

diff --git a/asn1/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf
index 2cf5a0532234f255e3ef391086e7fc8ecb31fef1..05e01b04b9dbd4fcbcd82da1195cbf219194223e 100644 (file)
--- a/asn1/x509sat/x509sat-exp.cnf
+++ b/asn1/x509sat/x509sat-exp.cnf
@@ -37,20 +37,20 @@ UniqueIdentifier         TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL
 CountryName              TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Criteria                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Criteria_vals)  BITMASK = 0
 EnhancedGuide            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PostalAddress            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+PostalAddress            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 FacsimileTelephoneNumber TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 X121Address              TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 InternationalISDNNumber  TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DestinationIndicator     TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PreferredDeliveryMethod  TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+PreferredDeliveryMethod  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PresentationAddress      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ProtocolInformation      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 NameAndOptionalUID       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 MultipleMatchingLocalities TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SubstringAssertion       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CaseIgnoreListMatch      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-OctetSubstringAssertion  TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-ZonalSelect              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
+SubstringAssertion       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+CaseIgnoreListMatch      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+OctetSubstringAssertion  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+ZonalSelect              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ZonalResult              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(ZonalResult_vals)  BITMASK = 0
 LanguageContextSyntax    TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 TimeSpecification        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0

diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c
index 319c54642db39e0dc8b8bc3ae9b667d81238eb3a..5ecaf0c83c6b0c2e8ecd02ad0d261d5f0822fbac 100644 (file)
--- a/epan/dissectors/packet-MAP_DialoguePDU.c
+++ b/epan/dissectors/packet-MAP_DialoguePDU.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
 /* ./packet-MAP_DialoguePDU.c                                                 */
-/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
 
 /* Input file: packet-MAP-DialoguePDU-template.c */
 
@@ -100,7 +100,7 @@ static gint ett_MAP_DialoguePDU_MAP_ProviderAbortInfo = -1;
 
 
 static int
-dissect_MAP_DialoguePDU_DestinationReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_DestinationReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                     NULL);
 
@@ -112,7 +112,7 @@ static int dissect_destinationReference_impl(packet_info *pinfo, proto_tree *tre
 
 
 static int
-dissect_MAP_DialoguePDU_OriginationReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_OriginationReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
                                     NULL);
 
@@ -129,7 +129,7 @@ static const ber_sequence T_map_open_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_T_map_open(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_T_map_open(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 T_map_open_sequence, hf_index, ett_MAP_DialoguePDU_T_map_open);
 
@@ -144,7 +144,7 @@ static const ber_sequence T_map_accept_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_T_map_accept(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_T_map_accept(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 T_map_accept_sequence, hf_index, ett_MAP_DialoguePDU_T_map_accept);
 
@@ -159,7 +159,7 @@ static const ber_sequence T_map_close_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_T_map_close(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_T_map_close(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 T_map_close_sequence, hf_index, ett_MAP_DialoguePDU_T_map_close);
 
@@ -179,8 +179,8 @@ static const value_string Reason_vals[] = {
 
 
 static int
-dissect_MAP_DialoguePDU_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+dissect_MAP_DialoguePDU_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -194,7 +194,7 @@ static const ber_sequence T_map_refuse_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_T_map_refuse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_T_map_refuse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 T_map_refuse_sequence, hf_index, ett_MAP_DialoguePDU_T_map_refuse);
 
@@ -206,7 +206,7 @@ static int dissect_map_refuse_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
 
 
 static int
-dissect_MAP_DialoguePDU_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   { proto_item *ti_tmp;
   ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE);
   proto_item_append_text(ti_tmp, ": NULL");
@@ -230,8 +230,8 @@ static const value_string ResourceUnavailable_vals[] = {
 
 
 static int
-dissect_MAP_DialoguePDU_ResourceUnavailable(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+dissect_MAP_DialoguePDU_ResourceUnavailable(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -253,8 +253,8 @@ static const value_string ApplicationProcedureCancellation_vals[] = {
 
 
 static int
-dissect_MAP_DialoguePDU_ApplicationProcedureCancellation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+dissect_MAP_DialoguePDU_ApplicationProcedureCancellation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -280,7 +280,7 @@ static const ber_choice MAP_UserAbortChoice_choice[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_UserAbortChoice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_UserAbortChoice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_choice(pinfo, tree, tvb, offset,
                               MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice);
 
@@ -296,7 +296,7 @@ static const ber_sequence T_map_userAbort_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_T_map_userAbort(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_T_map_userAbort(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 T_map_userAbort_sequence, hf_index, ett_MAP_DialoguePDU_T_map_userAbort);
 
@@ -315,8 +315,8 @@ static const value_string MAP_ProviderAbortReason_vals[] = {
 
 
 static int
-dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -330,7 +330,7 @@ static const ber_sequence T_map_providerAbort_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_T_map_providerAbort(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_T_map_providerAbort(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 T_map_providerAbort_sequence, hf_index, ett_MAP_DialoguePDU_T_map_providerAbort);
 
@@ -362,7 +362,7 @@ static const ber_choice MAP_DialoguePDU_choice[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_choice(pinfo, tree, tvb, offset,
                               MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU);
 
@@ -376,7 +376,7 @@ static const ber_sequence MAP_OpenInfo_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_OpenInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_OpenInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo);
 
@@ -388,7 +388,7 @@ static const ber_sequence MAP_AcceptInfo_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_AcceptInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_AcceptInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo);
 
@@ -400,7 +400,7 @@ static const ber_sequence MAP_CloseInfo_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_CloseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_CloseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo);
 
@@ -413,7 +413,7 @@ static const ber_sequence MAP_RefuseInfo_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_RefuseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_RefuseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo);
 
@@ -426,7 +426,7 @@ static const ber_sequence MAP_UserAbortInfo_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_UserAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_UserAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo);
 
@@ -442,8 +442,8 @@ static const value_string ResourceUnavailableReason_vals[] = {
 
 
 static int
-dissect_MAP_DialoguePDU_ResourceUnavailableReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+dissect_MAP_DialoguePDU_ResourceUnavailableReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -462,8 +462,8 @@ static const value_string ProcedureCancellationReason_vals[] = {
 
 
 static int
-dissect_MAP_DialoguePDU_ProcedureCancellationReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+dissect_MAP_DialoguePDU_ProcedureCancellationReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -474,7 +474,7 @@ static const ber_sequence MAP_ProviderAbortInfo_sequence[] = {
 };
 
 static int
-dissect_MAP_DialoguePDU_MAP_ProviderAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
+dissect_MAP_DialoguePDU_MAP_ProviderAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
                                 MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo);
 

diff --git a/epan/dissectors/packet-MAP_DialoguePDU.h b/epan/dissectors/packet-MAP_DialoguePDU.h
index d78b55fdd45f5f4425bca6816ae687e47c6d73e5..8c0b4ff6a05a938f960e9d1310233e5ec482d696 100644 (file)
--- a/epan/dissectors/packet-MAP_DialoguePDU.h
+++ b/epan/dissectors/packet-MAP_DialoguePDU.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
 /* ./packet-MAP_DialoguePDU.h                                                 */
-/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
 
 /* Input file: packet-MAP-DialoguePDU-template.h */
 

diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 7936866f5e0b86de1f1353b0a9134b8a1ca6ea72..99f6bc747baa1fc2b94643b350a1953ee3ca6032 100644 (file)
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -193,7 +193,7 @@ dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *t
        case BER_CLASS_UNI:
                switch(tag){
                case BER_UNI_TAG_INTEGER:
-                       offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_INTEGER, NULL);
+                       offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_INTEGER, NULL);
                        break;
                case BER_UNI_TAG_OCTETSTRING:
                        offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, start_offset, hf_ber_unknown_OCTETSTRING, NULL);
@@ -489,7 +489,7 @@ int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinfo, prot
 
 
 int
-dissect_ber_integer_new(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value)
+dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value)
 {
        guint8 class;
        gboolean pc;
@@ -510,9 +510,9 @@ name=hfinfo->name;
 name="unnamed";
 }
 if(tvb_length_remaining(tvb,offset)>3){
-printf("INTEGERnew dissect_ber_integer_new(%s) entered implicit_tag:%d offset:%d len:%d %02x:%02x:%02x\n",name,implicit_tag,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2));
+printf("INTEGERnew dissect_ber_integer(%s) entered implicit_tag:%d offset:%d len:%d %02x:%02x:%02x\n",name,implicit_tag,offset,tvb_length_remaining(tvb,offset),tvb_get_guint8(tvb,offset),tvb_get_guint8(tvb,offset+1),tvb_get_guint8(tvb,offset+2));
 }else{
-printf("INTEGERnew dissect_ber_integer_new(%s) entered implicit_tag:%d len:%d\n",name,implicit_tag,len);
+printf("INTEGERnew dissect_ber_integer(%s) entered implicit_tag:%d len:%d\n",name,implicit_tag,len);
 }
 }
 #endif

diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h
index 44d71483de1bec2dab81128621a020da93bb9b2c..4e79d3dcfaf34c693ddb348b54b086b74f466822 100644 (file)
--- a/epan/dissectors/packet-ber.h
+++ b/epan/dissectors/packet-ber.h
@@ -86,7 +86,7 @@ extern int dissect_ber_length(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 extern int dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
 extern int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func);
 
-extern int dissect_ber_integer_new(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
+extern int dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
 
 
 extern int dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);

diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 9813842a26863838ce0599e94b50ae022898dde7..a3f21e796d2718d9f11babc9302784d2fac43fed 100644 (file)
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
 /* ./packet-cmip.c                                                            */
-/* ../../tools/asn2eth.py -e -X -b -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
 
 /* Input file: packet-cmip-template.c */
 
@@ -332,7 +332,7 @@ static const value_string ModifyOperator_vals[] = {
 
 static int
 dissect_cmip_ModifyOperator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -404,7 +404,7 @@ static int dissect_ocglobalForm_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 static int
 dissect_cmip_T_oclocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   objectclassform = OBJECTCLASS_LOCAL_FORM;
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_oclocalForm, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_oclocalForm, NULL);
 
 
   return offset;
@@ -511,7 +511,7 @@ static const value_string T_errorStatus_vals[] = {
 
 static int
 dissect_cmip_T_errorStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -538,7 +538,7 @@ static int dissect_globalForm_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
 static int
 dissect_cmip_T_localForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   attributeform = ATTRIBUTE_LOCAL_FORM;
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_cmip_localForm, NULL);
 
 
   return offset;
@@ -731,7 +731,7 @@ static const value_string T_errorStatus2_vals[] = {
 
 static int
 dissect_cmip_T_errorStatus2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -855,7 +855,7 @@ static const value_string T_errorStatus1_vals[] = {
 
 static int
 dissect_cmip_T_errorStatus1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1206,7 +1206,7 @@ static const value_string T_deleteErrorInfo_vals[] = {
 
 static int
 dissect_cmip_T_deleteErrorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1289,7 +1289,7 @@ static const value_string CMISSync_vals[] = {
 
 static int
 dissect_cmip_CMISSync(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1308,7 +1308,7 @@ static const value_string T_namedNumbers_vals[] = {
 
 static int
 dissect_cmip_T_namedNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1320,7 +1320,7 @@ static int dissect_namedNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 
 static int
 dissect_cmip_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1993,7 +1993,7 @@ static const value_string Opcode_vals[] = {
 
 static int
 dissect_cmip_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode);
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, Opcode_vals, " Unknown Opcode:%d"));
   }
@@ -2025,7 +2025,7 @@ static int dissect_rRBody(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_cmip_InvokeID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2184,7 +2184,7 @@ static const value_string GeneralProblem_vals[] = {
 
 static int
 dissect_cmip_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2208,7 +2208,7 @@ static const value_string InvokeProblem_vals[] = {
 
 static int
 dissect_cmip_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2227,7 +2227,7 @@ static const value_string ReturnResultProblem_vals[] = {
 
 static int
 dissect_cmip_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2248,7 +2248,7 @@ static const value_string ReturnErrorProblem_vals[] = {
 
 static int
 dissect_cmip_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2283,7 +2283,7 @@ static const value_string RejectProblem_vals[] = {
 
 static int
 dissect_cmip_RejectProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2373,7 +2373,7 @@ static const value_string CMIPAbortSource_vals[] = {
 static int
 dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   guint32 value;
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value);
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_append_fstr(pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, CMIPAbortSource_vals, " Unknown AbortSource:%d"));
   }
@@ -2565,7 +2565,7 @@ void proto_register_cmip(void) {
         "", HFILL }},
     { &hf_cmip_getInfoList,
       { "getInfoList", "cmip.getInfoList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "GetListError/getInfoList", HFILL }},
     { &hf_cmip_getInfoList_item,
       { "Item", "cmip.getInfoList_item",
@@ -2589,7 +2589,7 @@ void proto_register_cmip(void) {
         "AttributeIdError/attributeId", HFILL }},
     { &hf_cmip_setInfoList,
       { "setInfoList", "cmip.setInfoList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SetListError/setInfoList", HFILL }},
     { &hf_cmip_setInfoList_item,
       { "Item", "cmip.setInfoList_item",
@@ -2685,7 +2685,7 @@ void proto_register_cmip(void) {
         "AttributeError/attributeValue", HFILL }},
     { &hf_cmip_attributeList,
       { "attributeList", "cmip.attributeList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_cmip_attributeList_item,
       { "Item", "cmip.attributeList_item",
@@ -2717,7 +2717,7 @@ void proto_register_cmip(void) {
         "", HFILL }},
     { &hf_cmip_modificationList,
       { "modificationList", "cmip.modificationList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SetArgument/modificationList", HFILL }},
     { &hf_cmip_modificationList_item,
       { "Item", "cmip.modificationList_item",
@@ -2861,7 +2861,7 @@ void proto_register_cmip(void) {
         "FilterItem/equality", HFILL }},
     { &hf_cmip_substrings,
       { "substrings", "cmip.substrings",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "FilterItem/substrings", HFILL }},
     { &hf_cmip_substrings_item,
       { "Item", "cmip.substrings_item",
@@ -2909,7 +2909,7 @@ void proto_register_cmip(void) {
         "CMISFilter/item", HFILL }},
     { &hf_cmip_and,
       { "and", "cmip.and",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CMISFilter/and", HFILL }},
     { &hf_cmip_and_item,
       { "Item", "cmip.and_item",
@@ -2917,7 +2917,7 @@ void proto_register_cmip(void) {
         "CMISFilter/and/_item", HFILL }},
     { &hf_cmip_or,
       { "or", "cmip.or",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CMISFilter/or", HFILL }},
     { &hf_cmip_or_item,
       { "Item", "cmip.or_item",
@@ -2941,7 +2941,7 @@ void proto_register_cmip(void) {
         "Scope/baseToNthLevel", HFILL }},
     { &hf_cmip_attributeIdList,
       { "attributeIdList", "cmip.attributeIdList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "GetArgument/attributeIdList", HFILL }},
     { &hf_cmip_attributeIdList_item,
       { "Item", "cmip.attributeIdList_item",

diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h
index facc8a86a4e439161499b88ac5bb51c16a2277b8..6b39f8388354ce81fca5257398cb8e1165734aac 100644 (file)
--- a/epan/dissectors/packet-cmip.h
+++ b/epan/dissectors/packet-cmip.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
 /* ./packet-cmip.h                                                            */
-/* ../../tools/asn2eth.py -e -X -b -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
+/* ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
 
 /* Input file: packet-cmip-template.h */
 

diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 1ee134a80693e958bd2859d1593424309d15aa24..3ae046e18873831591f7e7e34af7e4fd239c3530 100644 (file)
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -9,7 +9,7 @@
  * Routines for RFC2630 Cryptographic Message Syntax packet dissection
  *   Ronnie Sahlberg 2004
  *
- * $Id: packet-cms-template.c 12434 2004-10-29 12:11:42Z sahlberg $
+ * $Id: packet-cms-template.c 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -274,7 +274,7 @@ static const value_string CMSVersion_vals[] = {
 
 static int
 dissect_cms_CMSVersion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1337,7 +1337,7 @@ void proto_register_cms(void) {
         "", HFILL }},
     { &hf_cms_digestAlgorithms,
       { "digestAlgorithms", "cms.digestAlgorithms",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SignedData/digestAlgorithms", HFILL }},
     { &hf_cms_encapContentInfo,
       { "encapContentInfo", "cms.encapContentInfo",
@@ -1345,15 +1345,15 @@ void proto_register_cms(void) {
         "", HFILL }},
     { &hf_cms_certificates,
       { "certificates", "cms.certificates",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SignedData/certificates", HFILL }},
     { &hf_cms_crls,
       { "crls", "cms.crls",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_cms_signerInfos,
       { "signerInfos", "cms.signerInfos",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SignedData/signerInfos", HFILL }},
     { &hf_cms_DigestAlgorithmIdentifiers_item,
       { "Item", "cms.DigestAlgorithmIdentifiers_item",
@@ -1381,7 +1381,7 @@ void proto_register_cms(void) {
         "", HFILL }},
     { &hf_cms_signedAttrs,
       { "signedAttrs", "cms.signedAttrs",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SignerInfo/signedAttrs", HFILL }},
     { &hf_cms_signatureAlgorithm,
       { "signatureAlgorithm", "cms.signatureAlgorithm",
@@ -1393,7 +1393,7 @@ void proto_register_cms(void) {
         "SignerInfo/signature", HFILL }},
     { &hf_cms_unsignedAttrs,
       { "unsignedAttrs", "cms.unsignedAttrs",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SignerInfo/unsignedAttrs", HFILL }},
     { &hf_cms_issuerAndSerialNumber,
       { "issuerAndSerialNumber", "cms.issuerAndSerialNumber",
@@ -1421,7 +1421,7 @@ void proto_register_cms(void) {
         "", HFILL }},
     { &hf_cms_recipientInfos,
       { "recipientInfos", "cms.recipientInfos",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_cms_encryptedContentInfo,
       { "encryptedContentInfo", "cms.encryptedContentInfo",
@@ -1429,11 +1429,11 @@ void proto_register_cms(void) {
         "", HFILL }},
     { &hf_cms_unprotectedAttrs,
       { "unprotectedAttrs", "cms.unprotectedAttrs",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_cms_certs,
       { "certs", "cms.certs",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "OriginatorInfo/certs", HFILL }},
     { &hf_cms_RecipientInfos_item,
       { "Item", "cms.RecipientInfos_item",
@@ -1489,7 +1489,7 @@ void proto_register_cms(void) {
         "KeyAgreeRecipientInfo/ukm", HFILL }},
     { &hf_cms_recipientEncryptedKeys,
       { "recipientEncryptedKeys", "cms.recipientEncryptedKeys",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "KeyAgreeRecipientInfo/recipientEncryptedKeys", HFILL }},
     { &hf_cms_originatorKey,
       { "originatorKey", "cms.originatorKey",
@@ -1541,7 +1541,7 @@ void proto_register_cms(void) {
         "AuthenticatedData/macAlgorithm", HFILL }},
     { &hf_cms_authenticatedAttributes,
       { "authenticatedAttributes", "cms.authenticatedAttributes",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuthenticatedData/authenticatedAttributes", HFILL }},
     { &hf_cms_mac,
       { "mac", "cms.mac",
@@ -1549,7 +1549,7 @@ void proto_register_cms(void) {
         "AuthenticatedData/mac", HFILL }},
     { &hf_cms_unauthenticatedAttributes,
       { "unauthenticatedAttributes", "cms.unauthenticatedAttributes",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuthenticatedData/unauthenticatedAttributes", HFILL }},
     { &hf_cms_AuthAttributes_item,
       { "Item", "cms.AuthAttributes_item",
@@ -1605,7 +1605,7 @@ void proto_register_cms(void) {
         "ExtendedCertificate/signature", HFILL }},
     { &hf_cms_attributes,
       { "attributes", "cms.attributes",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ExtendedCertificateInfo/attributes", HFILL }},
 
 /*--- End of included file: packet-cms-hfarr.c ---*/

diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h
index 36272b827b496ae53bad525b21ea2820f31d701f..d407310dc66e744b7e22bf6373685ccc24fff236 100644 (file)
--- a/epan/dissectors/packet-cms.h
+++ b/epan/dissectors/packet-cms.h
@@ -9,7 +9,7 @@
  * Routines for RFC2630 Cryptographic Message Syntax packet dissection
  *   Ronnie Sahlberg 2004
  *
- * $Id: packet-cms-template.h 12434 2004-10-29 12:11:42Z sahlberg $
+ * $Id: packet-cms-template.h 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>

diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 25cc981860eb0f0089684eea106e3d2f1126cd7b..d55966f1f5c9bab23b61769552b220220af2b5e2 100644 (file)
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -189,7 +189,7 @@ static const value_string AllOrFirstTier_vals[] = {
 
 static int
 dissect_ess_AllOrFirstTier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -269,7 +269,7 @@ static const value_string ESSVersion_vals[] = {
 
 static int
 dissect_ess_ESSVersion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -382,7 +382,7 @@ static const value_string SecurityClassification_vals[] = {
 
 static int
 dissect_ess_SecurityClassification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -740,7 +740,7 @@ void proto_register_ess(void) {
         "ContentReference", HFILL }},
     { &hf_ess_MLExpansionHistory_PDU,
       { "MLExpansionHistory", "ess.MLExpansionHistory",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MLExpansionHistory", HFILL }},
     { &hf_ess_SigningCertificate_PDU,
       { "SigningCertificate", "ess.SigningCertificate",
@@ -756,7 +756,7 @@ void proto_register_ess(void) {
         "ReceiptRequest/receiptsFrom", HFILL }},
     { &hf_ess_receiptsTo,
       { "receiptsTo", "ess.receiptsTo",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ReceiptRequest/receiptsTo", HFILL }},
     { &hf_ess_receiptsTo_item,
       { "Item", "ess.receiptsTo_item",
@@ -768,7 +768,7 @@ void proto_register_ess(void) {
         "ReceiptsFrom/allOrFirstTier", HFILL }},
     { &hf_ess_receiptList,
       { "receiptList", "ess.receiptList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ReceiptsFrom/receiptList", HFILL }},
     { &hf_ess_receiptList_item,
       { "Item", "ess.receiptList_item",
@@ -840,7 +840,7 @@ void proto_register_ess(void) {
         "MLReceiptPolicy/none", HFILL }},
     { &hf_ess_insteadOf,
       { "insteadOf", "ess.insteadOf",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MLReceiptPolicy/insteadOf", HFILL }},
     { &hf_ess_insteadOf_item,
       { "Item", "ess.insteadOf_item",
@@ -848,7 +848,7 @@ void proto_register_ess(void) {
         "MLReceiptPolicy/insteadOf/_item", HFILL }},
     { &hf_ess_inAdditionTo,
       { "inAdditionTo", "ess.inAdditionTo",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MLReceiptPolicy/inAdditionTo", HFILL }},
     { &hf_ess_inAdditionTo_item,
       { "Item", "ess.inAdditionTo_item",
@@ -856,7 +856,7 @@ void proto_register_ess(void) {
         "MLReceiptPolicy/inAdditionTo/_item", HFILL }},
     { &hf_ess_certs,
       { "certs", "ess.certs",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SigningCertificate/certs", HFILL }},
     { &hf_ess_certs_item,
       { "Item", "ess.certs_item",
@@ -864,7 +864,7 @@ void proto_register_ess(void) {
         "SigningCertificate/certs/_item", HFILL }},
     { &hf_ess_policies,
       { "policies", "ess.policies",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SigningCertificate/policies", HFILL }},
     { &hf_ess_policies_item,
       { "Item", "ess.policies_item",

diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 871ef07b1767628577f6886db0f867f7d8afdd9a..c1aa55f53118266ac4fcfa1a07a3bc43c08f478e 100644 (file)
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -113,9 +113,9 @@ static int hf_gsm_map_camelCapabilityHandling = -1;  /* INTEGER_1_16 */
 static int hf_gsm_map_msisdn = -1;                /* Msisdn */
 static int hf_gsm_map_category = -1;              /* OCTET_STRING_SIZE_1 */
 static int hf_gsm_map_subscriberStatus = -1;      /* SubscriberStatus */
-static int hf_gsm_map_bearerServiceList = -1;     /* SEQUNCE_OF_OCTET_STRING_SIZE_1_5 */
+static int hf_gsm_map_bearerServiceList = -1;     /* SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5 */
 static int hf_gsm_map_bearerServiceList_item = -1;  /* OCTET_STRING_SIZE_1_5 */
-static int hf_gsm_map_teleserviceList = -1;       /* SEQUNCE_OF_Teleservice */
+static int hf_gsm_map_teleserviceList = -1;       /* SEQUNCE_SIZE_1_20_OF_Teleservice */
 static int hf_gsm_map_teleserviceList_item = -1;  /* Teleservice */
 static int hf_gsm_map_provisionedSS = -1;         /* T_provisionedSS */
 static int hf_gsm_map_provisionedSS_item = -1;    /* T_provisionedSS_item */
@@ -144,7 +144,7 @@ static int hf_gsm_map_odb_Data = -1;              /* T_odb_Data */
 static int hf_gsm_map_odb_GeneralData = -1;       /* Odb_GeneralData */
 static int hf_gsm_map_odb_HPLMN_Data = -1;        /* Odb_HPLMN_Data */
 static int hf_gsm_map_roamingRestrictionDueToUnsupportedFeature = -1;  /* NULL */
-static int hf_gsm_map_regionalSubscriptionData = -1;  /* SEQUNCE_OF_OCTET_STRING_SIZE_2 */
+static int hf_gsm_map_regionalSubscriptionData = -1;  /* SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2 */
 static int hf_gsm_map_regionalSubscriptionData_item = -1;  /* OCTET_STRING_SIZE_2 */
 static int hf_gsm_map_vbsSubscriptionData = -1;   /* T_vbsSubscriptionData */
 static int hf_gsm_map_vbsSubscriptionData_item = -1;  /* T_vbsSubscriptionData_item */
@@ -157,7 +157,7 @@ static int hf_gsm_map_vlrCamelSubscriptionInfo = -1;  /* T_vlrCamelSubscriptionI
 static int hf_gsm_map_o_CSI = -1;                 /* O_CSI */
 static int hf_gsm_map_ss_CSI = -1;                /* T_ss_CSI */
 static int hf_gsm_map_ss_CamelData = -1;          /* T_ss_CamelData */
-static int hf_gsm_map_ss_EventList = -1;          /* SEQUNCE_OF_OCTET_STRING_SIZE_1 */
+static int hf_gsm_map_ss_EventList = -1;          /* SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1 */
 static int hf_gsm_map_ss_EventList_item = -1;     /* OCTET_STRING_SIZE_1 */
 static int hf_gsm_map_gsmSCF_Address = -1;        /* GsmSCF_Address */
 static int hf_gsm_map_o_BcsmCamelTDP_CriteriaList = -1;  /* O_BcsmCamelTDP_CriteriaList */
@@ -198,7 +198,7 @@ static int hf_gsm_map_plmnClientList = -1;        /* T_plmnClientList */
 static int hf_gsm_map_plmnClientList_item = -1;   /* T_plmnClientList_item */
 static int hf_gsm_map_molr_List = -1;             /* T_molr_List */
 static int hf_gsm_map_molr_List_item = -1;        /* T_molr_List_item */
-static int hf_gsm_map_ss_List = -1;               /* SEQUNCE_OF_OCTET_STRING_SIZE_1 */
+static int hf_gsm_map_ss_List = -1;               /* SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1 */
 static int hf_gsm_map_ss_List_item = -1;          /* OCTET_STRING_SIZE_1 */
 static int hf_gsm_map_regionalSubscriptionResponse = -1;  /* RegionalSubscriptionResponse */
 static int hf_gsm_map_callBarringFeatureList = -1;  /* T_callBarringFeatureList */
@@ -210,9 +210,9 @@ static int hf_gsm_map_noReplyConditionTime = -1;  /* INTEGER */
 static int hf_gsm_map_matchType = -1;             /* MatchType */
 static int hf_gsm_map_destinationNumberList = -1;  /* T_destinationNumberList */
 static int hf_gsm_map_destinationNumberList_item = -1;  /* T_destinationNumberList_item */
-static int hf_gsm_map_destinationNumberLengthList = -1;  /* SEQUNCE_OF_INTEGER_1_15 */
+static int hf_gsm_map_destinationNumberLengthList = -1;  /* SEQUNCE_SIZE_1_3_OF_INTEGER_1_15 */
 static int hf_gsm_map_destinationNumberLengthList_item = -1;  /* INTEGER_1_15 */
-static int hf_gsm_map_forwardingFeatureList = -1;  /* SEQUNCE_OF_ForwardingFeatureList */
+static int hf_gsm_map_forwardingFeatureList = -1;  /* SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList */
 static int hf_gsm_map_forwardingFeatureList_item = -1;  /* ForwardingFeatureList */
 static int hf_gsm_map_naea_PreferredCIC = -1;     /* OCTET_STRING_SIZE_3 */
 static int hf_gsm_map_O_BcsmCamelTDP_CriteriaList_item = -1;  /* O_BcsmCamelTDP_CriteriaList_item */
@@ -229,15 +229,15 @@ static int hf_gsm_map_vgcsGroupIndication = -1;   /* NULL */
 static int hf_gsm_map_camelSubscriptionInfoWithdraw = -1;  /* NULL */
 static int hf_gsm_map_gprsSubscriptionDataWithdraw = -1;  /* T_gprsSubscriptionDataWithdraw */
 static int hf_gsm_map_allGPRSData = -1;           /* NULL */
-static int hf_gsm_map_contextIdList = -1;         /* SEQUNCE_OF_INTEGER_1_50 */
+static int hf_gsm_map_contextIdList = -1;         /* SEQUNCE_SIZE_1_50_OF_INTEGER_1_50 */
 static int hf_gsm_map_contextIdList_item = -1;    /* INTEGER_1_50 */
 static int hf_gsm_map_roamingRestrictedInSgsnDueToUnsuppportedFeature = -1;  /* NULL */
 static int hf_gsm_map_lsaInformationWithdraw = -1;  /* T_lsaInformationWithdraw */
 static int hf_gsm_map_allLSAData = -1;            /* NULL */
-static int hf_gsm_map_lsaIdentityList = -1;       /* SEQUNCE_OF_OCTET_STRING_SIZE_3 */
+static int hf_gsm_map_lsaIdentityList = -1;       /* SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3 */
 static int hf_gsm_map_lsaIdentityList_item = -1;  /* OCTET_STRING_SIZE_3 */
 static int hf_gsm_map_gmlc_ListWithdraw = -1;     /* NULL */
-static int hf_gsm_map_hlr_List = -1;              /* SEQUNCE_OF_OCTET_STRING_SIZE_3_8 */
+static int hf_gsm_map_hlr_List = -1;              /* SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8 */
 static int hf_gsm_map_hlr_List_item = -1;         /* OCTET_STRING_SIZE_3_8 */
 static int hf_gsm_map_msNotReachable = -1;        /* NULL */
 static int hf_gsm_map_traceReference = -1;        /* OCTET_STRING_SIZE_1_2 */
@@ -321,6 +321,7 @@ static int hf_gsm_map_ss_Data = -1;               /* Ss_Data */
 static int hf_gsm_map_ccbs_Index = -1;            /* INTEGER_1_5 */
 static int hf_gsm_map_b_subscriberNumber = -1;    /* B_subscriberNumber */
 static int hf_gsm_map_b_subscriberSubaddress = -1;  /* OCTET_STRING_SIZE_1_21 */
+static int hf_gsm_map_forwardingFeatureList1 = -1;  /* SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList */
 static int hf_gsm_map_genericServiceInfo = -1;    /* T_genericServiceInfo */
 static int hf_gsm_map_maximumEntitledPriority = -1;  /* INTEGER_0_15 */
 static int hf_gsm_map_ccbs_FeatureList = -1;      /* T_ccbs_FeatureList */
@@ -360,7 +361,7 @@ static int hf_gsm_map_locationInformationFlag = -1;  /* NULL */
 static int hf_gsm_map_subscriberStateFlag = -1;   /* NULL */
 static int hf_gsm_map_subscriberIdentity = -1;    /* T_subscriberIdentity */
 static int hf_gsm_map_ss_Event = -1;              /* OCTET_STRING_SIZE_1 */
-static int hf_gsm_map_ss_EventSpecification = -1;  /* SEQUNCE_OF_OCTET_STRING_SIZE_1_20 */
+static int hf_gsm_map_ss_EventSpecification = -1;  /* SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20 */
 static int hf_gsm_map_ss_EventSpecification_item = -1;  /* OCTET_STRING_SIZE_1_20 */
 static int hf_gsm_map_asciCallReference = -1;     /* OCTET_STRING_SIZE_1_8 */
 static int hf_gsm_map_codec_Info = -1;            /* OCTET_STRING_SIZE_5_10 */
@@ -502,8 +503,8 @@ static gint ett_gsm_map_BcsmCamelTDPData = -1;
 static gint ett_gsm_map_BcsmCamelTDPDataList = -1;
 static gint ett_gsm_map_O_CSI = -1;
 static gint ett_gsm_map_InsertSubscriberDataArg = -1;
-static gint ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_5 = -1;
-static gint ett_gsm_map_SEQUNCE_OF_Teleservice = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_20_OF_Teleservice = -1;
 static gint ett_gsm_map_T_provisionedSS = -1;
 static gint ett_gsm_map_T_provisionedSS_item = -1;
 static gint ett_gsm_map_T_cug_Info = -1;
@@ -514,7 +515,7 @@ static gint ett_gsm_map_T_cug_FeatureList_item = -1;
 static gint ett_gsm_map_T_ss_Data2 = -1;
 static gint ett_gsm_map_T_emlpp_Info = -1;
 static gint ett_gsm_map_T_odb_Data = -1;
-static gint ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_2 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2 = -1;
 static gint ett_gsm_map_T_vbsSubscriptionData = -1;
 static gint ett_gsm_map_T_vbsSubscriptionData_item = -1;
 static gint ett_gsm_map_T_vgcsSubscriptionData = -1;
@@ -522,7 +523,7 @@ static gint ett_gsm_map_T_vgcsSubscriptionData_item = -1;
 static gint ett_gsm_map_T_vlrCamelSubscriptionInfo = -1;
 static gint ett_gsm_map_T_ss_CSI = -1;
 static gint ett_gsm_map_T_ss_CamelData = -1;
-static gint ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1 = -1;
 static gint ett_gsm_map_T_gprsSubscriptionData = -1;
 static gint ett_gsm_map_T_gprsDataList = -1;
 static gint ett_gsm_map_T_gprsDataList_item = -1;
@@ -540,27 +541,28 @@ static gint ett_gsm_map_T_plmnClientList = -1;
 static gint ett_gsm_map_T_molr_List = -1;
 static gint ett_gsm_map_T_molr_List_item = -1;
 static gint ett_gsm_map_InsertSubscriberDataRes = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1 = -1;
 static gint ett_gsm_map_CallBarringInfo = -1;
 static gint ett_gsm_map_T_callBarringFeatureList = -1;
 static gint ett_gsm_map_T_callBarringFeatureList_item = -1;
 static gint ett_gsm_map_ForwardingFeatureList = -1;
 static gint ett_gsm_map_DestinationNumberCriteria = -1;
 static gint ett_gsm_map_T_destinationNumberList = -1;
-static gint ett_gsm_map_SEQUNCE_OF_INTEGER_1_15 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_3_OF_INTEGER_1_15 = -1;
 static gint ett_gsm_map_ForwardingInfo = -1;
-static gint ett_gsm_map_SEQUNCE_OF_ForwardingFeatureList = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList = -1;
 static gint ett_gsm_map_Naea_PreferredCI = -1;
 static gint ett_gsm_map_O_BcsmCamelTDP_CriteriaList = -1;
 static gint ett_gsm_map_O_BcsmCamelTDP_CriteriaList_item = -1;
 static gint ett_gsm_map_Ss_SubscriptionOption = -1;
 static gint ett_gsm_map_DeleteSubscriberDataArg = -1;
 static gint ett_gsm_map_T_gprsSubscriptionDataWithdraw = -1;
-static gint ett_gsm_map_SEQUNCE_OF_INTEGER_1_50 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_50_OF_INTEGER_1_50 = -1;
 static gint ett_gsm_map_T_lsaInformationWithdraw = -1;
-static gint ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3 = -1;
 static gint ett_gsm_map_DeleteSubscriberDataRes = -1;
 static gint ett_gsm_map_ResetArg = -1;
-static gint ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3_8 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8 = -1;
 static gint ett_gsm_map_RestoreDataArg = -1;
 static gint ett_gsm_map_RestoreDataRes = -1;
 static gint ett_gsm_map_ActivateTraceModeArg = -1;
@@ -606,6 +608,7 @@ static gint ett_gsm_map_Ss_Info = -1;
 static gint ett_gsm_map_Ccbs_Feature = -1;
 static gint ett_gsm_map_Ss_ForBS = -1;
 static gint ett_gsm_map_InterrogateSS_Res = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList = -1;
 static gint ett_gsm_map_T_genericServiceInfo = -1;
 static gint ett_gsm_map_T_ccbs_FeatureList = -1;
 static gint ett_gsm_map_T_ccbs_FeatureList_item = -1;
@@ -641,7 +644,7 @@ static gint ett_gsm_map_AnyTimeInterrogationArg = -1;
 static gint ett_gsm_map_T_subscriberIdentity = -1;
 static gint ett_gsm_map_AnyTimeInterrogationRes = -1;
 static gint ett_gsm_map_Ss_InvocationNotificationArg = -1;
-static gint ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_20 = -1;
+static gint ett_gsm_map_SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20 = -1;
 static gint ett_gsm_map_Ss_InvocationNotificationRes = -1;
 static gint ett_gsm_map_PrepareGroupCallArg = -1;
 static gint ett_gsm_map_PrepareGroupCallRes = -1;
@@ -738,7 +741,7 @@ static const value_string ProtocolId_vals[] = {
 
 static int
 dissect_gsm_map_ProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1242,7 +1245,7 @@ static const value_string CancellationType_vals[] = {
 
 static int
 dissect_gsm_map_CancellationType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1550,7 +1553,7 @@ dissect_gsm_map_PrepareSubsequentHO_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_gsm_map_INTEGER_1_5(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1603,7 +1606,7 @@ static const value_string T_requestingNodeType_vals[] = {
 
 static int
 dissect_gsm_map_T_requestingNodeType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1722,7 +1725,7 @@ static const value_string EquipmentStatus_vals[] = {
 
 static int
 dissect_gsm_map_EquipmentStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1737,7 +1740,7 @@ static const value_string OverrideCategory_vals[] = {
 
 static int
 dissect_gsm_map_OverrideCategory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1831,7 +1834,7 @@ static const value_string IntraCUG_Options_vals[] = {
 
 static int
 dissect_gsm_map_IntraCUG_Options(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1903,7 +1906,7 @@ static const value_string SubscriberStatus_vals[] = {
 
 static int
 dissect_gsm_map_SubscriberStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1921,7 +1924,7 @@ static const value_string BcsmTriggerDetectionPoint_vals[] = {
 
 static int
 dissect_gsm_map_BcsmTriggerDetectionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1936,7 +1939,7 @@ static int dissect_o_BcsmTriggerDetectionPoint(packet_info *pinfo, proto_tree *t
 
 static int
 dissect_gsm_map_ServiceKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1972,7 +1975,7 @@ static const value_string DefaultCallHandling_vals[] = {
 
 static int
 dissect_gsm_map_DefaultCallHandling(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2022,7 +2025,7 @@ static int dissect_t_BcsmCamelTDPDataList(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_gsm_map_INTEGER_1_16(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2129,34 +2132,34 @@ static int dissect_bearerServiceList_item(packet_info *pinfo, proto_tree *tree,
   return dissect_gsm_map_OCTET_STRING_SIZE_1_5(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_bearerServiceList_item);
 }
 
-static const ber_sequence SEQUNCE_OF_OCTET_STRING_SIZE_1_5_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_bearerServiceList_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_5(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_OCTET_STRING_SIZE_1_5_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_5);
+                                   SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5);
 
   return offset;
 }
 static int dissect_bearerServiceList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_5(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_bearerServiceList);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_bearerServiceList);
 }
 
-static const ber_sequence SEQUNCE_OF_Teleservice_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_20_OF_Teleservice_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_teleserviceList_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_Teleservice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_20_OF_Teleservice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_Teleservice_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_Teleservice);
+                                   SEQUNCE_SIZE_1_20_OF_Teleservice_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_20_OF_Teleservice);
 
   return offset;
 }
 static int dissect_teleserviceList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_Teleservice(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_teleserviceList);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_20_OF_Teleservice(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_teleserviceList);
 }
 
 
@@ -2229,7 +2232,7 @@ static int dissect_forwardingOptions_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_gsm_map_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2259,22 +2262,19 @@ static int dissect_forwardingFeatureList_item(packet_info *pinfo, proto_tree *tr
   return dissect_gsm_map_ForwardingFeatureList(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_forwardingFeatureList_item);
 }
 
-static const ber_sequence SEQUNCE_OF_ForwardingFeatureList_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingFeatureList_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_ForwardingFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_ForwardingFeatureList_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_ForwardingFeatureList);
+                                   SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList);
 
   return offset;
 }
 static int dissect_forwardingFeatureList(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_ForwardingFeatureList(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_forwardingFeatureList);
-}
-static int dissect_forwardingFeatureList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_ForwardingFeatureList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_forwardingFeatureList);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_forwardingFeatureList);
 }
 
 static const ber_sequence ForwardingInfo_sequence[] = {
@@ -2350,7 +2350,7 @@ static int dissect_callBarringInfo_impl(packet_info *pinfo, proto_tree *tree, tv
 
 static int
 dissect_gsm_map_INTEGER_0_32767(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2465,7 +2465,7 @@ static const value_string CliRestrictionOption_vals[] = {
 
 static int
 dissect_gsm_map_CliRestrictionOption(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2521,7 +2521,7 @@ static int dissect_ss_Data2_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_gsm_map_INTEGER_0_15(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2643,19 +2643,19 @@ static int dissect_regionalSubscriptionIdentifier_impl(packet_info *pinfo, proto
   return dissect_gsm_map_OCTET_STRING_SIZE_2(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_regionalSubscriptionIdentifier);
 }
 
-static const ber_sequence SEQUNCE_OF_OCTET_STRING_SIZE_2_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_regionalSubscriptionData_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_OCTET_STRING_SIZE_2_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_2);
+                                   SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2);
 
   return offset;
 }
 static int dissect_regionalSubscriptionData_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_2(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_regionalSubscriptionData);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_regionalSubscriptionData);
 }
 
 static const ber_sequence T_vbsSubscriptionData_item_sequence[] = {
@@ -2723,22 +2723,19 @@ static int dissect_vgcsSubscriptionData_impl(packet_info *pinfo, proto_tree *tre
   return dissect_gsm_map_T_vgcsSubscriptionData(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_vgcsSubscriptionData);
 }
 
-static const ber_sequence SEQUNCE_OF_OCTET_STRING_SIZE_1_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_EventList_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_OCTET_STRING_SIZE_1_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1);
+                                   SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1);
 
   return offset;
 }
 static int dissect_ss_EventList(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_ss_EventList);
-}
-static int dissect_ss_List_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ss_List);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_ss_EventList);
 }
 
 static const ber_sequence T_ss_CamelData_sequence[] = {
@@ -2786,7 +2783,7 @@ static const value_string MatchType_vals[] = {
 
 static int
 dissect_gsm_map_MatchType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2825,7 +2822,7 @@ static int dissect_destinationNumberList_impl(packet_info *pinfo, proto_tree *tr
 
 static int
 dissect_gsm_map_INTEGER_1_15(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2833,19 +2830,19 @@ static int dissect_destinationNumberLengthList_item(packet_info *pinfo, proto_tr
   return dissect_gsm_map_INTEGER_1_15(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_destinationNumberLengthList_item);
 }
 
-static const ber_sequence SEQUNCE_OF_INTEGER_1_15_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_3_OF_INTEGER_1_15_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_destinationNumberLengthList_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_INTEGER_1_15(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_3_OF_INTEGER_1_15(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_INTEGER_1_15_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_INTEGER_1_15);
+                                   SEQUNCE_SIZE_1_3_OF_INTEGER_1_15_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_3_OF_INTEGER_1_15);
 
   return offset;
 }
 static int dissect_destinationNumberLengthList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_INTEGER_1_15(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_destinationNumberLengthList);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_3_OF_INTEGER_1_15(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_destinationNumberLengthList);
 }
 
 static const ber_sequence DestinationNumberCriteria_sequence[] = {
@@ -2876,7 +2873,7 @@ static const value_string CallTypeCriteria_vals[] = {
 
 static int
 dissect_gsm_map_CallTypeCriteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2959,7 +2956,7 @@ static int dissect_naea_PreferredCI_impl(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_gsm_map_INTEGER_1_50(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3060,7 +3057,7 @@ static const value_string T_networkAccessMode_vals[] = {
 
 static int
 dissect_gsm_map_T_networkAccessMode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3078,7 +3075,7 @@ static const value_string T_lsaOnlyAccessIndicator_vals[] = {
 
 static int
 dissect_gsm_map_T_lsaOnlyAccessIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3177,7 +3174,7 @@ static const value_string NotificationToMSUser_vals[] = {
 
 static int
 dissect_gsm_map_NotificationToMSUser(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3248,7 +3245,7 @@ static const value_string T_gmlc_Restriction_vals[] = {
 
 static int
 dissect_gsm_map_T_gmlc_Restriction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3303,7 +3300,7 @@ static const value_string T_plmnClientList_item_vals[] = {
 
 static int
 dissect_gsm_map_T_plmnClientList_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3446,6 +3443,21 @@ dissect_gsm_map_InsertSubscriberDataArg(gboolean implicit_tag _U_, tvbuff_t *tvb
   return offset;
 }
 
+static const ber_sequence SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_List_item },
+};
+
+static int
+dissect_gsm_map_SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1);
+
+  return offset;
+}
+static int dissect_ss_List_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_gsm_map_SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ss_List);
+}
+
 
 static const value_string RegionalSubscriptionResponse_vals[] = {
   {   0, "networkNodeAreaRestricted" },
@@ -3458,7 +3470,7 @@ static const value_string RegionalSubscriptionResponse_vals[] = {
 
 static int
 dissect_gsm_map_RegionalSubscriptionResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3485,19 +3497,19 @@ dissect_gsm_map_InsertSubscriberDataRes(gboolean implicit_tag _U_, tvbuff_t *tvb
   return offset;
 }
 
-static const ber_sequence SEQUNCE_OF_INTEGER_1_50_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_50_OF_INTEGER_1_50_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_contextIdList_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_INTEGER_1_50(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_50_OF_INTEGER_1_50(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_INTEGER_1_50_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_INTEGER_1_50);
+                                   SEQUNCE_SIZE_1_50_OF_INTEGER_1_50_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_50_OF_INTEGER_1_50);
 
   return offset;
 }
 static int dissect_contextIdList(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_INTEGER_1_50(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_contextIdList);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_50_OF_INTEGER_1_50(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_contextIdList);
 }
 
 
@@ -3524,19 +3536,19 @@ static int dissect_gprsSubscriptionDataWithdraw(packet_info *pinfo, proto_tree *
   return dissect_gsm_map_T_gprsSubscriptionDataWithdraw(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_gprsSubscriptionDataWithdraw);
 }
 
-static const ber_sequence SEQUNCE_OF_OCTET_STRING_SIZE_3_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_lsaIdentityList_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_OCTET_STRING_SIZE_3_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3);
+                                   SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3);
 
   return offset;
 }
 static int dissect_lsaIdentityList(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_lsaIdentityList);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_lsaIdentityList);
 }
 
 
@@ -3614,19 +3626,19 @@ static int dissect_hlr_List_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_gsm_map_OCTET_STRING_SIZE_3_8(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_hlr_List_item);
 }
 
-static const ber_sequence SEQUNCE_OF_OCTET_STRING_SIZE_3_8_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_List_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3_8(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_OCTET_STRING_SIZE_3_8_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3_8);
+                                   SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8);
 
   return offset;
 }
 static int dissect_hlr_List(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3_8(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_hlr_List);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_hlr_List);
 }
 
 static const ber_sequence ResetArg_sequence[] = {
@@ -3690,7 +3702,7 @@ static int dissect_traceReference_impl(packet_info *pinfo, proto_tree *tree, tvb
 
 static int
 dissect_gsm_map_INTEGER_0_255(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3796,7 +3808,7 @@ static const value_string T_interrogationType_vals[] = {
 
 static int
 dissect_gsm_map_T_interrogationType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3808,7 +3820,7 @@ static int dissect_interrogationType_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_gsm_map_INTEGER_1_127(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3857,7 +3869,7 @@ static const value_string T_forwardingReason_vals[] = {
 
 static int
 dissect_gsm_map_T_forwardingReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3892,7 +3904,7 @@ static const value_string T_ext_ProtocolId_vals[] = {
 
 static int
 dissect_gsm_map_T_ext_ProtocolId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4254,7 +4266,7 @@ static const value_string T_numberPortabilityStatus_vals[] = {
 
 static int
 dissect_gsm_map_T_numberPortabilityStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4300,7 +4312,7 @@ static const value_string NetDetNotReachable_vals[] = {
 
 static int
 dissect_gsm_map_NetDetNotReachable(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4511,7 +4523,7 @@ static const value_string Ccbs_Monitoring_vals[] = {
 
 static int
 dissect_gsm_map_Ccbs_Monitoring(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4546,7 +4558,7 @@ static const value_string Ccbs_SubscriberStatus_vals[] = {
 
 static int
 dissect_gsm_map_Ccbs_SubscriberStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4578,7 +4590,7 @@ static const value_string MonitoringMode_vals[] = {
 
 static int
 dissect_gsm_map_MonitoringMode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4597,7 +4609,7 @@ static const value_string CallOutcome_vals[] = {
 
 static int
 dissect_gsm_map_CallOutcome(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4683,7 +4695,7 @@ static const value_string Ruf_Outcome_vals[] = {
 
 static int
 dissect_gsm_map_Ruf_Outcome(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4854,6 +4866,21 @@ dissect_gsm_map_Ss_ForBS(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
   return offset;
 }
 
+static const ber_sequence SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList_sequence_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingFeatureList_item },
+};
+
+static int
+dissect_gsm_map_SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
+                                   SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList);
+
+  return offset;
+}
+static int dissect_forwardingFeatureList1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_gsm_map_SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_forwardingFeatureList1);
+}
+
 static const ber_sequence T_ccbs_FeatureList_item_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Index_impl },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberNumber_impl },
@@ -4920,7 +4947,7 @@ static const value_string InterrogateSS_Res_vals[] = {
 static const ber_choice InterrogateSS_Res_choice[] = {
   {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Status_impl },
   {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_basicServiceGroupList_impl },
-  {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_forwardingFeatureList_impl },
+  {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_forwardingFeatureList1_impl },
   {   4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_genericServiceInfo_impl },
   { 0, 0, 0, 0, NULL }
 };
@@ -4996,7 +5023,7 @@ static const value_string GetPasswordArg_vals[] = {
 
 static int
 dissect_gsm_map_GetPasswordArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -5119,7 +5146,7 @@ static int dissect_sm_RP_PRI_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_gsm_map_INTEGER_0_10(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -5367,7 +5394,7 @@ static const value_string Sm_DeliveryOutcome_vals[] = {
 
 static int
 dissect_gsm_map_Sm_DeliveryOutcome(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -5472,7 +5499,7 @@ static const value_string T_alertReason_vals[] = {
 
 static int
 dissect_gsm_map_T_alertReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -5611,19 +5638,19 @@ dissect_gsm_map_AnyTimeInterrogationRes(gboolean implicit_tag _U_, tvbuff_t *tvb
   return offset;
 }
 
-static const ber_sequence SEQUNCE_OF_OCTET_STRING_SIZE_1_20_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_EventSpecification_item },
 };
 
 static int
-dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_20(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_gsm_map_SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_OCTET_STRING_SIZE_1_20_sequence_of, hf_index, ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_20);
+                                   SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20_sequence_of, hf_index, ett_gsm_map_SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20);
 
   return offset;
 }
 static int dissect_ss_EventSpecification_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_20(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ss_EventSpecification);
+  return dissect_gsm_map_SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ss_EventSpecification);
 }
 
 static const ber_sequence Ss_InvocationNotificationArg_sequence[] = {
@@ -5967,7 +5994,7 @@ static const value_string LcsClientType_vals[] = {
 
 static int
 dissect_gsm_map_LcsClientType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6005,7 +6032,7 @@ static const value_string LcsClientInternalID_vals[] = {
 
 static int
 dissect_gsm_map_LcsClientInternalID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6064,7 +6091,7 @@ static const value_string Lcs_Event_vals[] = {
 
 static int
 dissect_gsm_map_Lcs_Event(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6104,7 +6131,7 @@ static const value_string T_locationEstimateType_vals[] = {
 
 static int
 dissect_gsm_map_T_locationEstimateType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6150,7 +6177,7 @@ static const value_string T_responseTimeCategory_vals[] = {
 
 static int
 dissect_gsm_map_T_responseTimeCategory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6374,7 +6401,7 @@ static const value_string NetworkResource_vals[] = {
 
 static int
 dissect_gsm_map_NetworkResource(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6495,7 +6522,7 @@ static const value_string T_unknownSubscriberDiagnostic_vals[] = {
 
 static int
 dissect_gsm_map_T_unknownSubscriberDiagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6553,7 +6580,7 @@ static const value_string T_roamingNotAllowedCause_vals[] = {
 
 static int
 dissect_gsm_map_T_roamingNotAllowedCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6664,7 +6691,7 @@ static const value_string T_absentSubscriberReason_vals[] = {
 
 static int
 dissect_gsm_map_T_absentSubscriberReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6724,7 +6751,7 @@ static const value_string CallBarringCause_vals[] = {
 
 static int
 dissect_gsm_map_CallBarringCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6822,7 +6849,7 @@ static const value_string T_cug_RejectCause_vals[] = {
 
 static int
 dissect_gsm_map_T_cug_RejectCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6896,7 +6923,7 @@ static const value_string Pw_RegistrationFailureCause_vals[] = {
 
 static int
 dissect_gsm_map_Pw_RegistrationFailureCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -6954,7 +6981,7 @@ static const value_string T_sm_EnumeratedDeliveryFailureCause_vals[] = {
 
 static int
 dissect_gsm_map_T_sm_EnumeratedDeliveryFailureCause(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -7031,7 +7058,7 @@ static const value_string T_unauthorizedLCSClient_Diagnostic_vals[] = {
 
 static int
 dissect_gsm_map_T_unauthorizedLCSClient_Diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -7070,7 +7097,7 @@ static const value_string T_positionMethodFailure_Diagnostic_vals[] = {
 
 static int
 dissect_gsm_map_T_positionMethodFailure_Diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -7207,7 +7234,7 @@ static guint32 opcode=0;
 
 static int
 dissect_gsm_map_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
+  offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
 
   if (check_col(pinfo->cinfo, COL_INFO)){
     col_set_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, gsm_map_opr_code_strings, "Unknown GSM-MAP (%u)"));
@@ -7580,7 +7607,7 @@ dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse
 }
 
 static int dissect_invokeid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL);
+  return dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL);
 }
 
 
@@ -7968,7 +7995,7 @@ void proto_register_gsm_map(void) {
         "PurgeMS-Res/freezeP-TMSI", HFILL }},
     { &hf_gsm_map_authenticationSetList,
       { "authenticationSetList", "gsm_map.authenticationSetList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SendIdentificationRes/authenticationSetList", HFILL }},
     { &hf_gsm_map_authenticationSetList_item,
       { "Item", "gsm_map.authenticationSetList_item",
@@ -8072,7 +8099,7 @@ void proto_register_gsm_map(void) {
         "BcsmCamelTDPDataList/_item", HFILL }},
     { &hf_gsm_map_o_BcsmCamelTDPDataList,
       { "o-BcsmCamelTDPDataList", "gsm_map.o_BcsmCamelTDPDataList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "O-CSI/o-BcsmCamelTDPDataList", HFILL }},
     { &hf_gsm_map_camelCapabilityHandling,
       { "camelCapabilityHandling", "gsm_map.camelCapabilityHandling",
@@ -8092,7 +8119,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/subscriberStatus", HFILL }},
     { &hf_gsm_map_bearerServiceList,
       { "bearerServiceList", "gsm_map.bearerServiceList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_gsm_map_bearerServiceList_item,
       { "Item", "gsm_map.bearerServiceList_item",
@@ -8100,7 +8127,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_teleserviceList,
       { "teleserviceList", "gsm_map.teleserviceList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_gsm_map_teleserviceList_item,
       { "Item", "gsm_map.teleserviceList_item",
@@ -8108,7 +8135,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_provisionedSS,
       { "provisionedSS", "gsm_map.provisionedSS",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/provisionedSS", HFILL }},
     { &hf_gsm_map_provisionedSS_item,
       { "Item", "gsm_map.provisionedSS_item",
@@ -8128,7 +8155,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/provisionedSS/_item/cug-Info", HFILL }},
     { &hf_gsm_map_cug_SubscriptionList,
       { "cug-SubscriptionList", "gsm_map.cug_SubscriptionList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/provisionedSS/_item/cug-Info/cug-SubscriptionList", HFILL }},
     { &hf_gsm_map_cug_SubscriptionList_item,
       { "Item", "gsm_map.cug_SubscriptionList_item",
@@ -8148,11 +8175,11 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/provisionedSS/_item/cug-Info/cug-SubscriptionList/_item/intraCUG-Options", HFILL }},
     { &hf_gsm_map_basicServiceGroupList,
       { "basicServiceGroupList", "gsm_map.basicServiceGroupList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_gsm_map_cug_FeatureList,
       { "cug-FeatureList", "gsm_map.cug_FeatureList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/provisionedSS/_item/cug-Info/cug-FeatureList", HFILL }},
     { &hf_gsm_map_cug_FeatureList_item,
       { "Item", "gsm_map.cug_FeatureList_item",
@@ -8216,7 +8243,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_regionalSubscriptionData,
       { "regionalSubscriptionData", "gsm_map.regionalSubscriptionData",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/regionalSubscriptionData", HFILL }},
     { &hf_gsm_map_regionalSubscriptionData_item,
       { "Item", "gsm_map.regionalSubscriptionData_item",
@@ -8224,7 +8251,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/regionalSubscriptionData/_item", HFILL }},
     { &hf_gsm_map_vbsSubscriptionData,
       { "vbsSubscriptionData", "gsm_map.vbsSubscriptionData",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/vbsSubscriptionData", HFILL }},
     { &hf_gsm_map_vbsSubscriptionData_item,
       { "Item", "gsm_map.vbsSubscriptionData_item",
@@ -8240,7 +8267,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/vbsSubscriptionData/_item/broadcastInitEntitlement", HFILL }},
     { &hf_gsm_map_vgcsSubscriptionData,
       { "vgcsSubscriptionData", "gsm_map.vgcsSubscriptionData",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/vgcsSubscriptionData", HFILL }},
     { &hf_gsm_map_vgcsSubscriptionData_item,
       { "Item", "gsm_map.vgcsSubscriptionData_item",
@@ -8268,7 +8295,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/vlrCamelSubscriptionInfo/ss-CSI/ss-CamelData", HFILL }},
     { &hf_gsm_map_ss_EventList,
       { "ss-EventList", "gsm_map.ss_EventList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/vlrCamelSubscriptionInfo/ss-CSI/ss-CamelData/ss-EventList", HFILL }},
     { &hf_gsm_map_ss_EventList_item,
       { "Item", "gsm_map.ss_EventList_item",
@@ -8280,7 +8307,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_o_BcsmCamelTDP_CriteriaList,
       { "o-BcsmCamelTDP-CriteriaList", "gsm_map.o_BcsmCamelTDP_CriteriaList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_gsm_map_tif_CSI,
       { "tif-CSI", "gsm_map.tif_CSI",
@@ -8300,7 +8327,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_gprsDataList,
       { "gprsDataList", "gsm_map.gprsDataList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/gprsSubscriptionData/gprsDataList", HFILL }},
     { &hf_gsm_map_gprsDataList_item,
       { "Item", "gsm_map.gprsDataList_item",
@@ -8348,7 +8375,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/lsaInformation/lsaOnlyAccessIndicator", HFILL }},
     { &hf_gsm_map_lsaDataList,
       { "lsaDataList", "gsm_map.lsaDataList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/lsaInformation/lsaDataList", HFILL }},
     { &hf_gsm_map_lsaDataList_item,
       { "Item", "gsm_map.lsaDataList_item",
@@ -8376,7 +8403,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/lcsInformation", HFILL }},
     { &hf_gsm_map_gmlc_List,
       { "gmlc-List", "gsm_map.gmlc_List",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/lcsInformation/gmlc-List", HFILL }},
     { &hf_gsm_map_gmlc_List_item,
       { "Item", "gsm_map.gmlc_List_item",
@@ -8384,7 +8411,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/lcsInformation/gmlc-List/_item", HFILL }},
     { &hf_gsm_map_lcs_PrivacyExceptionList,
       { "lcs-PrivacyExceptionList", "gsm_map.lcs_PrivacyExceptionList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/lcsInformation/lcs-PrivacyExceptionList", HFILL }},
     { &hf_gsm_map_lcs_PrivacyExceptionList_item,
       { "Item", "gsm_map.lcs_PrivacyExceptionList_item",
@@ -8396,7 +8423,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_externalClientList,
       { "externalClientList", "gsm_map.externalClientList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/lcsInformation/lcs-PrivacyExceptionList/_item/externalClientList", HFILL }},
     { &hf_gsm_map_externalClientList_item,
       { "Item", "gsm_map.externalClientList_item",
@@ -8416,7 +8443,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/lcsInformation/lcs-PrivacyExceptionList/_item/externalClientList/_item/gmlc-Restriction", HFILL }},
     { &hf_gsm_map_plmnClientList,
       { "plmnClientList", "gsm_map.plmnClientList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/lcsInformation/lcs-PrivacyExceptionList/_item/plmnClientList", HFILL }},
     { &hf_gsm_map_plmnClientList_item,
       { "Item", "gsm_map.plmnClientList_item",
@@ -8424,7 +8451,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/lcsInformation/lcs-PrivacyExceptionList/_item/plmnClientList/_item", HFILL }},
     { &hf_gsm_map_molr_List,
       { "molr-List", "gsm_map.molr_List",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InsertSubscriberDataArg/lcsInformation/molr-List", HFILL }},
     { &hf_gsm_map_molr_List_item,
       { "Item", "gsm_map.molr_List_item",
@@ -8432,7 +8459,7 @@ void proto_register_gsm_map(void) {
         "InsertSubscriberDataArg/lcsInformation/molr-List/_item", HFILL }},
     { &hf_gsm_map_ss_List,
       { "ss-List", "gsm_map.ss_List",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_gsm_map_ss_List_item,
       { "Item", "gsm_map.ss_List_item",
@@ -8444,7 +8471,7 @@ void proto_register_gsm_map(void) {
         "", HFILL }},
     { &hf_gsm_map_callBarringFeatureList,
       { "callBarringFeatureList", "gsm_map.callBarringFeatureList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CallBarringInfo/callBarringFeatureList", HFILL }},
     { &hf_gsm_map_callBarringFeatureList_item,
       { "Item", "gsm_map.callBarringFeatureList_item",
@@ -8472,7 +8499,7 @@ void proto_register_gsm_map(void) {
         "DestinationNumberCriteria/matchType", HFILL }},
     { &hf_gsm_map_destinationNumberList,
       { "destinationNumberList", "gsm_map.destinationNumberList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DestinationNumberCriteria/destinationNumberList", HFILL }},
     { &hf_gsm_map_destinationNumberList_item,
       { "Item", "gsm_map.destinationNumberList_item",
@@ -8480,7 +8507,7 @@ void proto_register_gsm_map(void) {
         "DestinationNumberCriteria/destinationNumberList/_item", HFILL }},
     { &hf_gsm_map_destinationNumberLengthList,
       { "destinationNumberLengthList", "gsm_map.destinationNumberLengthList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DestinationNumberCriteria/destinationNumberLengthList", HFILL }},
     { &hf_gsm_map_destinationNumberLengthList_item,
       { "Item", "gsm_map.destinationNumberLengthList_item",
@@ -8488,8 +8515,8 @@ void proto_register_gsm_map(void) {
         "DestinationNumberCriteria/destinationNumberLengthList/_item", HFILL }},
     { &hf_gsm_map_forwardingFeatureList,
       { "forwardingFeatureList", "gsm_map.forwardingFeatureList",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ForwardingInfo/forwardingFeatureList", HFILL }},
     { &hf_gsm_map_forwardingFeatureList_item,
       { "Item", "gsm_map.forwardingFeatureList_item",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -8512,7 +8539,7 @@ void proto_register_gsm_map(void) {
         "O-BcsmCamelTDP-CriteriaList/_item/destinationNumberCriteria", HFILL }},
     { &hf_gsm_map_basicServiceCriteria,
       { "basicServiceCriteria", "gsm_map.basicServiceCriteria",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "O-BcsmCamelTDP-CriteriaList/_item/basicServiceCriteria", HFILL }},
     { &hf_gsm_map_callTypeCriteria,
       { "callTypeCriteria", "gsm_map.callTypeCriteria",
@@ -8528,7 +8555,7 @@ void proto_register_gsm_map(void) {
         "Ss-SubscriptionOption/overrideCategory", HFILL }},
     { &hf_gsm_map_basicServiceList,
       { "basicServiceList", "gsm_map.basicServiceList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DeleteSubscriberDataArg/basicServiceList", HFILL }},
     { &hf_gsm_map_regionalSubscriptionIdentifier,
       { "regionalSubscriptionIdentifier", "gsm_map.regionalSubscriptionIdentifier",
@@ -8556,7 +8583,7 @@ void proto_register_gsm_map(void) {
         "DeleteSubscriberDataArg/gprsSubscriptionDataWithdraw/allGPRSData", HFILL }},
     { &hf_gsm_map_contextIdList,
       { "contextIdList", "gsm_map.contextIdList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DeleteSubscriberDataArg/gprsSubscriptionDataWithdraw/contextIdList", HFILL }},
     { &hf_gsm_map_contextIdList_item,
       { "Item", "gsm_map.contextIdList_item",
@@ -8576,7 +8603,7 @@ void proto_register_gsm_map(void) {
         "DeleteSubscriberDataArg/lsaInformationWithdraw/allLSAData", HFILL }},
     { &hf_gsm_map_lsaIdentityList,
       { "lsaIdentityList", "gsm_map.lsaIdentityList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DeleteSubscriberDataArg/lsaInformationWithdraw/lsaIdentityList", HFILL }},
     { &hf_gsm_map_lsaIdentityList_item,
       { "Item", "gsm_map.lsaIdentityList_item",
@@ -8588,7 +8615,7 @@ void proto_register_gsm_map(void) {
         "DeleteSubscriberDataArg/gmlc-ListWithdraw", HFILL }},
     { &hf_gsm_map_hlr_List,
       { "hlr-List", "gsm_map.hlr_List",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ResetArg/hlr-List", HFILL }},
     { &hf_gsm_map_hlr_List_item,
       { "Item", "gsm_map.hlr_List_item",
@@ -8708,7 +8735,7 @@ void proto_register_gsm_map(void) {
         "SendRoutingInfoRes/extendedRoutingInfo/camelRoutingInfo/gmscCamelSubscriptionInfo/t-CSI", HFILL }},
     { &hf_gsm_map_t_BcsmCamelTDPDataList,
       { "t-BcsmCamelTDPDataList", "gsm_map.t_BcsmCamelTDPDataList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SendRoutingInfoRes/extendedRoutingInfo/camelRoutingInfo/gmscCamelSubscriptionInfo/t-CSI/t-BcsmCamelTDPDataList", HFILL }},
     { &hf_gsm_map_cugSubscriptionFlag,
       { "cugSubscriptionFlag", "gsm_map.cugSubscriptionFlag",
@@ -8922,6 +8949,10 @@ void proto_register_gsm_map(void) {
       { "b-subscriberSubaddress", "gsm_map.b_subscriberSubaddress",
         FT_BYTES, BASE_HEX, NULL, 0,
         "", HFILL }},
+    { &hf_gsm_map_forwardingFeatureList1,
+      { "forwardingFeatureList", "gsm_map.forwardingFeatureList",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "InterrogateSS-Res/forwardingFeatureList", HFILL }},
     { &hf_gsm_map_genericServiceInfo,
       { "genericServiceInfo", "gsm_map.genericServiceInfo",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -8932,7 +8963,7 @@ void proto_register_gsm_map(void) {
         "InterrogateSS-Res/genericServiceInfo/maximumEntitledPriority", HFILL }},
     { &hf_gsm_map_ccbs_FeatureList,
       { "ccbs-FeatureList", "gsm_map.ccbs_FeatureList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "InterrogateSS-Res/genericServiceInfo/ccbs-FeatureList", HFILL }},
     { &hf_gsm_map_ccbs_FeatureList_item,
       { "Item", "gsm_map.ccbs_FeatureList_item",
@@ -9080,7 +9111,7 @@ void proto_register_gsm_map(void) {
         "Ss-InvocationNotificationArg/ss-Event", HFILL }},
     { &hf_gsm_map_ss_EventSpecification,
       { "ss-EventSpecification", "gsm_map.ss_EventSpecification",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Ss-InvocationNotificationArg/ss-EventSpecification", HFILL }},
     { &hf_gsm_map_ss_EventSpecification_item,
       { "Item", "gsm_map.ss_EventSpecification_item",
@@ -9340,7 +9371,7 @@ void proto_register_gsm_map(void) {
         "PositionMethodFailure-Param/positionMethodFailure-Diagnostic", HFILL }},
     { &hf_gsm_map_privateExtensionList,
       { "privateExtensionList", "gsm_map.privateExtensionList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ExtensionContainer/privateExtensionList", HFILL }},
     { &hf_gsm_map_pcsExtensions,
       { "pcsExtensions", "gsm_map.pcsExtensions",
@@ -9502,8 +9533,8 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_BcsmCamelTDPDataList,
     &ett_gsm_map_O_CSI,
     &ett_gsm_map_InsertSubscriberDataArg,
-    &ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_5,
-    &ett_gsm_map_SEQUNCE_OF_Teleservice,
+    &ett_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5,
+    &ett_gsm_map_SEQUNCE_SIZE_1_20_OF_Teleservice,
     &ett_gsm_map_T_provisionedSS,
     &ett_gsm_map_T_provisionedSS_item,
     &ett_gsm_map_T_cug_Info,
@@ -9514,7 +9545,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_T_ss_Data2,
     &ett_gsm_map_T_emlpp_Info,
     &ett_gsm_map_T_odb_Data,
-    &ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_2,
+    &ett_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_2,
     &ett_gsm_map_T_vbsSubscriptionData,
     &ett_gsm_map_T_vbsSubscriptionData_item,
     &ett_gsm_map_T_vgcsSubscriptionData,
@@ -9522,7 +9553,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_T_vlrCamelSubscriptionInfo,
     &ett_gsm_map_T_ss_CSI,
     &ett_gsm_map_T_ss_CamelData,
-    &ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1,
+    &ett_gsm_map_SEQUNCE_SIZE_1_10_OF_OCTET_STRING_SIZE_1,
     &ett_gsm_map_T_gprsSubscriptionData,
     &ett_gsm_map_T_gprsDataList,
     &ett_gsm_map_T_gprsDataList_item,
@@ -9540,27 +9571,28 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_T_molr_List,
     &ett_gsm_map_T_molr_List_item,
     &ett_gsm_map_InsertSubscriberDataRes,
+    &ett_gsm_map_SEQUNCE_SIZE_1_30_OF_OCTET_STRING_SIZE_1,
     &ett_gsm_map_CallBarringInfo,
     &ett_gsm_map_T_callBarringFeatureList,
     &ett_gsm_map_T_callBarringFeatureList_item,
     &ett_gsm_map_ForwardingFeatureList,
     &ett_gsm_map_DestinationNumberCriteria,
     &ett_gsm_map_T_destinationNumberList,
-    &ett_gsm_map_SEQUNCE_OF_INTEGER_1_15,
+    &ett_gsm_map_SEQUNCE_SIZE_1_3_OF_INTEGER_1_15,
     &ett_gsm_map_ForwardingInfo,
-    &ett_gsm_map_SEQUNCE_OF_ForwardingFeatureList,
+    &ett_gsm_map_SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList,
     &ett_gsm_map_Naea_PreferredCI,
     &ett_gsm_map_O_BcsmCamelTDP_CriteriaList,
     &ett_gsm_map_O_BcsmCamelTDP_CriteriaList_item,
     &ett_gsm_map_Ss_SubscriptionOption,
     &ett_gsm_map_DeleteSubscriberDataArg,
     &ett_gsm_map_T_gprsSubscriptionDataWithdraw,
-    &ett_gsm_map_SEQUNCE_OF_INTEGER_1_50,
+    &ett_gsm_map_SEQUNCE_SIZE_1_50_OF_INTEGER_1_50,
     &ett_gsm_map_T_lsaInformationWithdraw,
-    &ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3,
+    &ett_gsm_map_SEQUNCE_SIZE_1_20_OF_OCTET_STRING_SIZE_3,
     &ett_gsm_map_DeleteSubscriberDataRes,
     &ett_gsm_map_ResetArg,
-    &ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_3_8,
+    &ett_gsm_map_SEQUNCE_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8,
     &ett_gsm_map_RestoreDataArg,
     &ett_gsm_map_RestoreDataRes,
     &ett_gsm_map_ActivateTraceModeArg,
@@ -9606,6 +9638,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_Ccbs_Feature,
     &ett_gsm_map_Ss_ForBS,
     &ett_gsm_map_InterrogateSS_Res,
+    &ett_gsm_map_SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList,
     &ett_gsm_map_T_genericServiceInfo,
     &ett_gsm_map_T_ccbs_FeatureList,
     &ett_gsm_map_T_ccbs_FeatureList_item,
@@ -9641,7 +9674,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_T_subscriberIdentity,
     &ett_gsm_map_AnyTimeInterrogationRes,
     &ett_gsm_map_Ss_InvocationNotificationArg,
-    &ett_gsm_map_SEQUNCE_OF_OCTET_STRING_SIZE_1_20,
+    &ett_gsm_map_SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20,
     &ett_gsm_map_Ss_InvocationNotificationRes,
     &ett_gsm_map_PrepareGroupCallArg,
     &ett_gsm_map_PrepareGroupCallRes,

diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index cd58f6f9568b8b976719ad4d7bd03f5e86825456..29c74f67fcd4737a3bb4fb858876d643271a2354 100644 (file)
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -677,7 +677,7 @@ dissect_h248_annex_C_PDU(gboolean implicit_tag, tvbuff_t *tvb, packet_info *pinf
                        dissect_nsap(new_tvb, 0,tvb_length_remaining(new_tvb, 0), tree);
                        break;
                case 0x9001: /* TMR */
-                       offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_h248_package_annex_C_TMR, NULL);
+                       offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_package_annex_C_TMR, NULL);
                        break;
                case 0x9023: /* User Service Information */
                        offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_h248_package_annex_C_USI, &new_tvb);
@@ -709,7 +709,7 @@ guint offset=0;
                        proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "H.248: Dissector for Package/ID:0x%04x not implemented (yet).", name_major);
                        break;
                case 0x001e: /* Bearer Characteristics Q.1950 Annex A */
-                       offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_h248_package_bcp_BNCChar_PDU, NULL);
+                       offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_package_bcp_BNCChar_PDU, NULL);
                        break;
                case 0x0021: /* Generic Bearer Connection Q.1950 Annex A */
                        proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "H.248: Dissector for Package/ID:0x%04x not implemented (yet).", name_major);
@@ -934,7 +934,7 @@ static int dissect_authHeader_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
 
 static int
 dissect_h248_INTEGER_0_99(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -976,7 +976,7 @@ static int dissect_iP4Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
 
 static int
 dissect_h248_INTEGER_0_65535(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1129,7 +1129,7 @@ static int dissect_serviceChangeMgcId(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_h248_ErrorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1180,7 +1180,7 @@ static int dissect_error_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 
 static int
 dissect_h248_TransactionId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1198,7 +1198,7 @@ static int dissect_lastAck_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 
 static int
 dissect_h248_ContextID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1210,7 +1210,7 @@ static int dissect_contextId_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_h248_INTEGER_0_15(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1323,7 +1323,7 @@ static const value_string T_topologyDirection_vals[] = {
 
 static int
 dissect_h248_T_topologyDirection(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1335,7 +1335,7 @@ static int dissect_topologyDirection_impl(packet_info *pinfo, proto_tree *tree,
 
 static int
 dissect_h248_StreamID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1527,7 +1527,7 @@ static const value_string Relation_vals[] = {
 
 static int
 dissect_h248_Relation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1610,7 +1610,7 @@ static const value_string EventBufferControl_vals[] = {
 
 static int
 dissect_h248_EventBufferControl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1629,7 +1629,7 @@ static const value_string ServiceState_vals[] = {
 
 static int
 dissect_h248_ServiceState(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1668,7 +1668,7 @@ static const value_string StreamMode_vals[] = {
 
 static int
 dissect_h248_StreamMode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1855,7 +1855,7 @@ static const value_string ModemType_vals[] = {
 
 static int
 dissect_h248_ModemType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1894,7 +1894,7 @@ static int dissect_object_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 
 static int
 dissect_h248_INTEGER_0_255(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2035,7 +2035,7 @@ static const value_string MuxType_vals[] = {
 
 static int
 dissect_h248_MuxType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2080,7 +2080,7 @@ static int dissect_muxDescriptor_impl(packet_info *pinfo, proto_tree *tree, tvbu
 
 static int
 dissect_h248_RequestID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2186,7 +2186,7 @@ static const value_string SignalType_vals[] = {
 
 static int
 dissect_h248_SignalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3249,7 +3249,7 @@ static const value_string ServiceChangeMethod_vals[] = {
 
 static int
 dissect_h248_ServiceChangeMethod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3322,7 +3322,7 @@ static int dissect_serviceChangeProfile_impl(packet_info *pinfo, proto_tree *tre
 
 static int
 dissect_h248_INTEGER_0_4294967295(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -4150,7 +4150,7 @@ void proto_register_h248(void) {
         "Message/messageBody/messageError", HFILL }},
     { &hf_h248_transactions,
       { "transactions", "h248.transactions",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Message/messageBody/transactions", HFILL }},
     { &hf_h248_transactions_item,
       { "Item", "h248.transactions_item",
@@ -4206,7 +4206,7 @@ void proto_register_h248(void) {
         "Transaction/transactionReply", HFILL }},
     { &hf_h248_transactionResponseAck,
       { "transactionResponseAck", "h248.transactionResponseAck",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Transaction/transactionResponseAck", HFILL }},
     { &hf_h248_transactionId,
       { "transactionId", "h248.transactionId",
@@ -4214,7 +4214,7 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_actions,
       { "actions", "h248.actions",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "TransactionRequest/actions", HFILL }},
     { &hf_h248_actions_item,
       { "Item", "h248.actions_item",
@@ -4234,7 +4234,7 @@ void proto_register_h248(void) {
         "TransactionReply/transactionResult/transactionError", HFILL }},
     { &hf_h248_actionReplies,
       { "actionReplies", "h248.actionReplies",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "TransactionReply/transactionResult/actionReplies", HFILL }},
     { &hf_h248_actionReplies_item,
       { "Item", "h248.actionReplies_item",
@@ -4274,7 +4274,7 @@ void proto_register_h248(void) {
         "ActionRequest/contextAttrAuditReq", HFILL }},
     { &hf_h248_commandRequests,
       { "commandRequests", "h248.commandRequests",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ActionRequest/commandRequests", HFILL }},
     { &hf_h248_commandRequests_item,
       { "Item", "h248.commandRequests_item",
@@ -4290,7 +4290,7 @@ void proto_register_h248(void) {
         "ActionReply/contextReply", HFILL }},
     { &hf_h248_commandReply,
       { "commandReply", "h248.commandReply",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ActionReply/commandReply", HFILL }},
     { &hf_h248_commandReply_item,
       { "Item", "h248.commandReply_item",
@@ -4306,7 +4306,7 @@ void proto_register_h248(void) {
         "ContextRequest/emergency", HFILL }},
     { &hf_h248_topologyReq,
       { "topologyReq", "h248.topologyReq",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ContextRequest/topologyReq", HFILL }},
     { &hf_h248_topologyReq_item,
       { "Item", "h248.topologyReq_item",
@@ -4418,11 +4418,11 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_terminationIDList,
       { "terminationID", "h248.terminationID",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_descriptors,
       { "descriptors", "h248.descriptors",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AmmRequest/descriptors", HFILL }},
     { &hf_h248_descriptors_item,
       { "Item", "h248.descriptors_item",
@@ -4446,11 +4446,11 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_eventBufferDescriptor,
       { "eventBufferDescriptor", "h248.eventBufferDescriptor",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_signalsDescriptor,
       { "signalsDescriptor", "h248.signalsDescriptor",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_digitMapDescriptor,
       { "digitMapDescriptor", "h248.digitMapDescriptor",
@@ -4462,7 +4462,7 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_terminationAudit,
       { "terminationAudit", "h248.terminationAudit",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AmmsReply/terminationAudit", HFILL }},
     { &hf_h248_terminationID,
       { "terminationID", "h248.terminationID",
@@ -4470,7 +4470,7 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_contextAuditResult,
       { "contextAuditResult", "h248.contextAuditResult",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuditReply/contextAuditResult", HFILL }},
     { &hf_h248_error,
       { "error", "h248.error",
@@ -4482,7 +4482,7 @@ void proto_register_h248(void) {
         "AuditReply/auditResult", HFILL }},
     { &hf_h248_terminationAuditResult,
       { "terminationAuditResult", "h248.terminationAuditResult",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuditResult/terminationAuditResult", HFILL }},
     { &hf_h248_TerminationAudit_item,
       { "Item", "h248.TerminationAudit_item",
@@ -4494,11 +4494,11 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_statisticsDescriptor,
       { "statisticsDescriptor", "h248.statisticsDescriptor",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuditReturnParameter/statisticsDescriptor", HFILL }},
     { &hf_h248_packagesDescriptor,
       { "packagesDescriptor", "h248.packagesDescriptor",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuditReturnParameter/packagesDescriptor", HFILL }},
     { &hf_h248_emptyDescriptors,
       { "emptyDescriptors", "h248.emptyDescriptors",
@@ -4510,7 +4510,7 @@ void proto_register_h248(void) {
         "AuditDescriptor/auditToken", HFILL }},
     { &hf_h248_auditPropertyToken,
       { "auditPropertyToken", "h248.auditPropertyToken",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuditDescriptor/auditPropertyToken", HFILL }},
     { &hf_h248_auditPropertyToken_item,
       { "Item", "h248.auditPropertyToken_item",
@@ -4558,7 +4558,7 @@ void proto_register_h248(void) {
         "IndAudMediaDescriptor/streams/oneStream", HFILL }},
     { &hf_h248_multiStream,
       { "multiStream", "h248.multiStream",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "IndAudMediaDescriptor/streams/multiStream", HFILL }},
     { &hf_h248_multiStream_item,
       { "Item", "h248.multiStream_item",
@@ -4594,7 +4594,7 @@ void proto_register_h248(void) {
         "IndAudLocalControlDescriptor/reserveGroup", HFILL }},
     { &hf_h248_indAudPropertyParms,
       { "propertyParms", "h248.propertyParms",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_name,
       { "name", "h248.name",
@@ -4610,7 +4610,7 @@ void proto_register_h248(void) {
         "IndAudLocalRemoteDescriptor/propGroupID", HFILL }},
     { &hf_h248_iAPropertyGroup,
       { "propGrps", "h248.propGrps",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "IndAudLocalRemoteDescriptor/propGrps", HFILL }},
     { &hf_h248_IndAudPropertyGroup_item,
       { "Item", "h248.IndAudPropertyGroup_item",
@@ -4678,7 +4678,7 @@ void proto_register_h248(void) {
         "ObservedEventsDescriptor/requestId", HFILL }},
     { &hf_h248_observedEventLst,
       { "observedEventLst", "h248.observedEventLst",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ObservedEventsDescriptor/observedEventLst", HFILL }},
     { &hf_h248_observedEventLst_item,
       { "Item", "h248.observedEventLst_item",
@@ -4690,7 +4690,7 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_eventParList,
       { "eventParList", "h248.eventParList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_timeNotation,
       { "timeNotation", "h248.timeNotation",
@@ -4714,7 +4714,7 @@ void proto_register_h248(void) {
         "EventParameter/eventParameterName", HFILL }},
     { &hf_h248_value,
       { "value", "h248.value",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_extraInfo,
       { "extraInfo", "h248.extraInfo",
@@ -4738,7 +4738,7 @@ void proto_register_h248(void) {
         "ServiceChangeResult/serviceChangeResParms", HFILL }},
     { &hf_h248_wildcard,
       { "wildcard", "h248.wildcard",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "TerminationID/wildcard", HFILL }},
     { &hf_h248_wildcard_item,
       { "Item", "h248.wildcard_item",
@@ -4766,7 +4766,7 @@ void proto_register_h248(void) {
         "MediaDescriptor/streams/oneStream", HFILL }},
     { &hf_h248_mediaDescriptorMultiStream,
       { "multiStream", "h248.multiStream",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MediaDescriptor/streams/multiStream", HFILL }},
     { &hf_h248_mediaDescriptorMultiStream_item,
       { "Item", "h248.multiStream_item",
@@ -4802,7 +4802,7 @@ void proto_register_h248(void) {
         "LocalControlDescriptor/reserveGroup", HFILL }},
     { &hf_h248_propertyParms,
       { "propertyParms", "h248.propertyParms",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_propertyName,
       { "propertyName", "h248.propertyName",
@@ -4810,7 +4810,7 @@ void proto_register_h248(void) {
         "PropertyParm/propertyName", HFILL }},
     { &hf_h248_propertyParamValue,
       { "value", "h248.value",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "PropertyParm/value", HFILL }},
     { &hf_h248_value_item,
       { "Item", "h248.value_item",
@@ -4822,11 +4822,11 @@ void proto_register_h248(void) {
         "PropertyParms/_item", HFILL }},
     { &hf_h248_propGrps,
       { "propGrps", "h248.propGrps",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LocalRemoteDescriptor/propGrps", HFILL }},
     { &hf_h248_propGrps_item,
       { "Item", "h248.propGrps_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LocalRemoteDescriptor/propGrps/_item", HFILL }},
     { &hf_h248_PropertyGroup_item,
       { "Item", "h248.PropertyGroup_item",
@@ -4846,7 +4846,7 @@ void proto_register_h248(void) {
         "MuxDescriptor/muxType", HFILL }},
     { &hf_h248_termList,
       { "termList", "h248.termList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MuxDescriptor/termList", HFILL }},
     { &hf_h248_termList_item,
       { "Item", "h248.termList_item",
@@ -4858,7 +4858,7 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_eventList,
       { "eventList", "h248.eventList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "EventsDescriptor/eventList", HFILL }},
     { &hf_h248_pkgdName,
       { "pkgdName", "h248.pkgdName",
@@ -4870,7 +4870,7 @@ void proto_register_h248(void) {
         "RequestedEvent/eventAction", HFILL }},
     { &hf_h248_evParList,
       { "evParList", "h248.evParList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_h248_RequestedEvents_item,
       { "Item", "h248.RequestedEvents_item",
@@ -4894,7 +4894,7 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_secondaryEventList,
       { "eventList", "h248.eventList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SecondEventsDescriptor/eventList", HFILL }},
     { &hf_h248_eventList_item,
       { "Item", "h248.eventList_item",
@@ -4922,7 +4922,7 @@ void proto_register_h248(void) {
         "SignalRequest/seqSigList", HFILL }},
     { &hf_h248_signalList,
       { "signalList", "h248.signalList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SeqSigList/signalList", HFILL }},
     { &hf_h248_signalList_item,
       { "Item", "h248.signalList_item",
@@ -4946,7 +4946,7 @@ void proto_register_h248(void) {
         "Signal/notifyCompletion", HFILL }},
     { &hf_h248_sigParList,
       { "sigParList", "h248.sigParList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Signal/sigParList", HFILL }},
     { &hf_h248_sigParList_item,
       { "Item", "h248.sigParList_item",
@@ -4958,7 +4958,7 @@ void proto_register_h248(void) {
         "SigParameter/sigParameterName", HFILL }},
     { &hf_h248_mtl,
       { "mtl", "h248.mtl",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ModemDescriptor/mtl", HFILL }},
     { &hf_h248_mtl_item,
       { "Item", "h248.mtl_item",
@@ -4966,7 +4966,7 @@ void proto_register_h248(void) {
         "ModemDescriptor/mtl/_item", HFILL }},
     { &hf_h248_mpl,
       { "mpl", "h248.mpl",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ModemDescriptor/mpl", HFILL }},
     { &hf_h248_startTimer,
       { "startTimer", "h248.startTimer",
@@ -5006,7 +5006,7 @@ void proto_register_h248(void) {
         "", HFILL }},
     { &hf_h248_serviceChangeReason,
       { "serviceChangeReason", "h248.serviceChangeReason",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ServiceChangeParm/serviceChangeReason", HFILL }},
     { &hf_h248_serviceChangeDelay,
       { "serviceChangeDelay", "h248.serviceChangeDelay",
@@ -5042,7 +5042,7 @@ void proto_register_h248(void) {
         "StatisticsDescriptor/_item", HFILL }},
     { &hf_h248_statValue,
       { "statValue", "h248.statValue",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "StatisticsParameter/statValue", HFILL }},
     { &hf_h248_nonStandardIdentifier,
       { "nonStandardIdentifier", "h248.nonStandardIdentifier",

diff --git a/epan/dissectors/packet-h248_package_bcp.c b/epan/dissectors/packet-h248_package_bcp.c
index 185a8fa4773962344aa2eca8e9f1156f8cb037cc..a33d30e40c5f0b09a5d8e1307de1aef9f9fb781c 100644 (file)
--- a/epan/dissectors/packet-h248_package_bcp.c
+++ b/epan/dissectors/packet-h248_package_bcp.c
@@ -82,7 +82,7 @@ static const value_string BNCChar_vals[] = {
 
 static int
 dissect_h248_package_bcp_BNCChar(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-  offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }

diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 227d6f3c3b6fe211f5ed08c8cd971e5923022cb5..1c20a865427b5402cce27b014194c3278acc9d3c 100644 (file)
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -1476,7 +1476,7 @@ dissect_krb5_ctime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
 static int
 dissect_krb5_cusec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_cusec, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_cusec, NULL);
        return offset;
 }
 
@@ -1489,7 +1489,7 @@ dissect_krb5_stime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
 static int
 dissect_krb5_susec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_susec, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_susec, NULL);
        return offset;
 }
 
@@ -1497,7 +1497,7 @@ dissect_krb5_susec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
 static int
 dissect_krb5_error_code(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_error_code, &krb5_errorcode);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_error_code, &krb5_errorcode);
        if(krb5_errorcode && check_col(pinfo->cinfo, COL_INFO)) {
                col_add_fstr(pinfo->cinfo, COL_INFO,
                        "KRB Error: %s",
@@ -1527,7 +1527,7 @@ dissect_krb5_from(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse
 static int
 dissect_krb5_nonce(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_nonce, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_nonce, NULL);
        return offset;
 }
 
@@ -1540,7 +1540,7 @@ dissect_krb5_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
 {
        guint32 etype;
 
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &etype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &etype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(etype, krb5_encryption_types,
@@ -1562,7 +1562,7 @@ static guint32 authenticator_etype;
 static int
 dissect_krb5_authenticator_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &authenticator_etype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &authenticator_etype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(authenticator_etype, krb5_encryption_types,
@@ -1574,7 +1574,7 @@ static guint32 Ticket_etype;
 static int
 dissect_krb5_Ticket_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &Ticket_etype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &Ticket_etype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(Ticket_etype, krb5_encryption_types,
@@ -1586,7 +1586,7 @@ static guint32 AP_REP_etype;
 static int
 dissect_krb5_AP_REP_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &AP_REP_etype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &AP_REP_etype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(AP_REP_etype, krb5_encryption_types,
@@ -1598,7 +1598,7 @@ static guint32 PA_ENC_TIMESTAMP_etype;
 static int
 dissect_krb5_PA_ENC_TIMESTAMP_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &PA_ENC_TIMESTAMP_etype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &PA_ENC_TIMESTAMP_etype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(PA_ENC_TIMESTAMP_etype, krb5_encryption_types,
@@ -1617,7 +1617,7 @@ dissect_krb5_PA_ENC_TIMESTAMP_etype(packet_info *pinfo, proto_tree *tree, tvbuff
 static guint32 addr_type;
 static int dissect_krb5_addr_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_addr_type, &addr_type);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_addr_type, &addr_type);
        return offset;
 }
 static int dissect_krb5_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
@@ -1712,7 +1712,7 @@ dissect_krb5_msg_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
 {
        guint32 msgtype;
 
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_msg_type, &msgtype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_msg_type, &msgtype);
 
        if (do_col_info & check_col(pinfo->cinfo, COL_INFO)) {
                col_add_str(pinfo->cinfo, COL_INFO,
@@ -1732,7 +1732,7 @@ dissect_krb5_msg_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
 static int
 dissect_krb5_pvno(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_pvno, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_pvno, NULL);
 
        return offset;
 }
@@ -1749,7 +1749,7 @@ static int
 dissect_krb5_name_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
 
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_name_type, &name_type);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_name_type, &name_type);
        if(tree){
                proto_item_append_text(tree, " (%s):",
                        val_to_str(name_type, krb5_princ_types,
@@ -1858,7 +1858,7 @@ dissect_krb5_PA_PROV_SRV_LOCATION(packet_info *pinfo, proto_tree *tree, tvbuff_t
 static int
 dissect_krb5_kvno(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_kvno, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_kvno, NULL);
 
        return offset;
 }
@@ -1868,7 +1868,7 @@ dissect_krb5_kvno(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse
 static int
 dissect_krb5_seq_number(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_seq_number, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_seq_number, NULL);
 
        return offset;
 }
@@ -1879,7 +1879,7 @@ dissect_krb5_seq_number(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
 static int
 dissect_krb5_pausec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_pausec, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_pausec, NULL);
        return offset;
 }
 static int
@@ -2002,7 +2002,7 @@ guint32 krb_PA_DATA_type;
 static int
 dissect_krb5_PA_DATA_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_PA_DATA_type, &krb_PA_DATA_type);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_PA_DATA_type, &krb_PA_DATA_type);
        krb_PA_DATA_type&=0xff; /*this is really just one single byte */
 
        if(tree){
@@ -2167,7 +2167,7 @@ static guint32 keytype;
 static int
 dissect_krb5_keytype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_keytype, &keytype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_keytype, &keytype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(keytype, krb5_encryption_types,
@@ -2429,7 +2429,7 @@ static guint32 IF_RELEVANT_type;
 static int
 dissect_krb5_IF_RELEVANT_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_IF_RELEVANT_type, &IF_RELEVANT_type);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_IF_RELEVANT_type, &IF_RELEVANT_type);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(IF_RELEVANT_type, krb5_ad_types,
@@ -2480,7 +2480,7 @@ static guint32 adtype;
 static int
 dissect_krb5_adtype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_adtype, &adtype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_adtype, &adtype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(adtype, krb5_ad_types,
@@ -2537,7 +2537,7 @@ dissect_krb5_transited_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 {
        guint32 trtype;
 
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_transitedtype, &trtype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_transitedtype, &trtype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(trtype, krb5_transited_types,
@@ -2696,7 +2696,7 @@ static const value_string krb5_lr_types[] = {
 static int
 dissect_krb5_lr_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_lr_type, &lr_type);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_lr_type, &lr_type);
 
        return offset;
 }
@@ -2779,7 +2779,7 @@ dissect_krb5_EncKDCRepPart(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 static int
 dissect_krb5_authenticator_vno(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_authenticator_vno, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_authenticator_vno, NULL);
 
        return offset;
 }
@@ -2788,7 +2788,7 @@ dissect_krb5_authenticator_vno(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 static int
 dissect_krb5_checksum_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_checksum_type, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_checksum_type, NULL);
 
        return offset;
 }
@@ -2927,7 +2927,7 @@ dissect_krb5_SAFE_BODY_timestamp(packet_info *pinfo, proto_tree *tree, tvbuff_t
 static int
 dissect_krb5_SAFE_BODY_usec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_SAFE_BODY_usec, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_SAFE_BODY_usec, NULL);
        return offset;
 }
 
@@ -3168,7 +3168,7 @@ dissect_krb5_encrypted_authenticator(packet_info *pinfo, proto_tree *tree, tvbuf
 static int
 dissect_krb5_tkt_vno(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_tkt_vno, NULL);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_tkt_vno, NULL);
        return offset;
 }
 
@@ -3398,7 +3398,7 @@ static guint32 KDC_REP_etype;
 static int
 dissect_krb5_KDC_REP_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &KDC_REP_etype);
+       offset=dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_krb_etype, &KDC_REP_etype);
        if(tree){
                proto_item_append_text(tree, " %s",
                        val_to_str(KDC_REP_etype, krb5_encryption_types,

diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index 56237e8541f1cee8c6e56b729f19ef81fd5173d7..389fffce562e73058fe7e91a39e2fa43209a9864 100644 (file)
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -71,9 +71,9 @@ static int hf_logotypecertextn_imageInfo = -1;    /* LogotypeImageInfo */
 static int hf_logotypecertextn_audioDetails = -1;  /* LogotypeDetails */
 static int hf_logotypecertextn_audioInfo = -1;    /* LogotypeAudioInfo */
 static int hf_logotypecertextn_mediaType = -1;    /* IA5String */
-static int hf_logotypecertextn_logotypeHash = -1;  /* SEQUNCE_OF_HashAlgAndValue */
+static int hf_logotypecertextn_logotypeHash = -1;  /* SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue */
 static int hf_logotypecertextn_logotypeHash_item = -1;  /* HashAlgAndValue */
-static int hf_logotypecertextn_logotypeURI = -1;  /* SEQUNCE_OF_IA5String */
+static int hf_logotypecertextn_logotypeURI = -1;  /* SEQUNCE_SIZE_1_MAX_OF_IA5String */
 static int hf_logotypecertextn_logotypeURI_item = -1;  /* IA5String */
 static int hf_logotypecertextn_type = -1;         /* LogotypeImageType */
 static int hf_logotypecertextn_fileSize = -1;     /* INTEGER */
@@ -88,9 +88,9 @@ static int hf_logotypecertextn_channels = -1;     /* INTEGER */
 static int hf_logotypecertextn_sampleRate = -1;   /* INTEGER */
 static int hf_logotypecertextn_logotypeType = -1;  /* OBJECT_IDENTIFIER */
 static int hf_logotypecertextn_info = -1;         /* LogotypeInfo */
-static int hf_logotypecertextn_refStructHash = -1;  /* SEQUNCE_OF_HashAlgAndValue */
+static int hf_logotypecertextn_refStructHash = -1;  /* SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue */
 static int hf_logotypecertextn_refStructHash_item = -1;  /* HashAlgAndValue */
-static int hf_logotypecertextn_refStructURI = -1;  /* SEQUNCE_OF_IA5String */
+static int hf_logotypecertextn_refStructURI = -1;  /* SEQUNCE_SIZE_1_MAX_OF_IA5String */
 static int hf_logotypecertextn_refStructURI_item = -1;  /* IA5String */
 static int hf_logotypecertextn_hashAlg = -1;      /* AlgorithmIdentifier */
 static int hf_logotypecertextn_hashValue = -1;    /* OCTET_STRING */
@@ -112,8 +112,8 @@ static gint ett_logotypecertextn_SEQUNCE_OF_LogotypeAudio = -1;
 static gint ett_logotypecertextn_LogotypeImage = -1;
 static gint ett_logotypecertextn_LogotypeAudio = -1;
 static gint ett_logotypecertextn_LogotypeDetails = -1;
-static gint ett_logotypecertextn_SEQUNCE_OF_HashAlgAndValue = -1;
-static gint ett_logotypecertextn_SEQUNCE_OF_IA5String = -1;
+static gint ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue = -1;
+static gint ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String = -1;
 static gint ett_logotypecertextn_LogotypeImageInfo = -1;
 static gint ett_logotypecertextn_LogotypeImageResolution = -1;
 static gint ett_logotypecertextn_LogotypeAudioInfo = -1;
@@ -188,40 +188,40 @@ static int dissect_refStructHash_item(packet_info *pinfo, proto_tree *tree, tvbu
   return dissect_logotypecertextn_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash_item);
 }
 
-static const ber_sequence SEQUNCE_OF_HashAlgAndValue_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash_item },
 };
 
 static int
-dissect_logotypecertextn_SEQUNCE_OF_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_OF_HashAlgAndValue);
+                                   SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue);
 
   return offset;
 }
 static int dissect_logotypeHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_logotypecertextn_SEQUNCE_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeHash);
+  return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeHash);
 }
 static int dissect_refStructHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_logotypecertextn_SEQUNCE_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash);
+  return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash);
 }
 
-static const ber_sequence SEQUNCE_OF_IA5String_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_logotypeURI_item },
 };
 
 static int
-dissect_logotypecertextn_SEQUNCE_OF_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_IA5String_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_OF_IA5String);
+                                   SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of, hf_index, ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String);
 
   return offset;
 }
 static int dissect_logotypeURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_logotypecertextn_SEQUNCE_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeURI);
+  return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeURI);
 }
 static int dissect_refStructURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_logotypecertextn_SEQUNCE_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI);
+  return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI);
 }
 
 static const ber_sequence LogotypeDetails_sequence[] = {
@@ -255,7 +255,7 @@ static const value_string LogotypeImageType_vals[] = {
 
 static int
 dissect_logotypecertextn_LogotypeImageType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -267,7 +267,7 @@ static int dissect_type_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 
 static int
 dissect_logotypecertextn_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -592,7 +592,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeExtn", HFILL }},
     { &hf_logotypecertextn_communityLogos,
       { "communityLogos", "logotypecertextn.communityLogos",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeExtn/communityLogos", HFILL }},
     { &hf_logotypecertextn_communityLogos_item,
       { "Item", "logotypecertextn.communityLogos_item",
@@ -608,7 +608,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeExtn/subjectLogo", HFILL }},
     { &hf_logotypecertextn_otherLogos,
       { "otherLogos", "logotypecertextn.otherLogos",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeExtn/otherLogos", HFILL }},
     { &hf_logotypecertextn_otherLogos_item,
       { "Item", "logotypecertextn.otherLogos_item",
@@ -624,7 +624,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeInfo/indirect", HFILL }},
     { &hf_logotypecertextn_image,
       { "image", "logotypecertextn.image",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeData/image", HFILL }},
     { &hf_logotypecertextn_image_item,
       { "Item", "logotypecertextn.image_item",
@@ -632,7 +632,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeData/image/_item", HFILL }},
     { &hf_logotypecertextn_audio,
       { "audio", "logotypecertextn.audio",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeData/audio", HFILL }},
     { &hf_logotypecertextn_audio_item,
       { "Item", "logotypecertextn.audio_item",
@@ -660,7 +660,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeDetails/mediaType", HFILL }},
     { &hf_logotypecertextn_logotypeHash,
       { "logotypeHash", "logotypecertextn.logotypeHash",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeDetails/logotypeHash", HFILL }},
     { &hf_logotypecertextn_logotypeHash_item,
       { "Item", "logotypecertextn.logotypeHash_item",
@@ -668,7 +668,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeDetails/logotypeHash/_item", HFILL }},
     { &hf_logotypecertextn_logotypeURI,
       { "logotypeURI", "logotypecertextn.logotypeURI",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeDetails/logotypeURI", HFILL }},
     { &hf_logotypecertextn_logotypeURI_item,
       { "Item", "logotypecertextn.logotypeURI_item",
@@ -728,7 +728,7 @@ void proto_register_logotypecertextn(void) {
         "OtherLogotypeInfo/info", HFILL }},
     { &hf_logotypecertextn_refStructHash,
       { "refStructHash", "logotypecertextn.refStructHash",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeReference/refStructHash", HFILL }},
     { &hf_logotypecertextn_refStructHash_item,
       { "Item", "logotypecertextn.refStructHash_item",
@@ -736,7 +736,7 @@ void proto_register_logotypecertextn(void) {
         "LogotypeReference/refStructHash/_item", HFILL }},
     { &hf_logotypecertextn_refStructURI,
       { "refStructURI", "logotypecertextn.refStructURI",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "LogotypeReference/refStructURI", HFILL }},
     { &hf_logotypecertextn_refStructURI_item,
       { "Item", "logotypecertextn.refStructURI_item",
@@ -770,8 +770,8 @@ void proto_register_logotypecertextn(void) {
     &ett_logotypecertextn_LogotypeImage,
     &ett_logotypecertextn_LogotypeAudio,
     &ett_logotypecertextn_LogotypeDetails,
-    &ett_logotypecertextn_SEQUNCE_OF_HashAlgAndValue,
-    &ett_logotypecertextn_SEQUNCE_OF_IA5String,
+    &ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue,
+    &ett_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String,
     &ett_logotypecertextn_LogotypeImageInfo,
     &ett_logotypecertextn_LogotypeImageResolution,
     &ett_logotypecertextn_LogotypeAudioInfo,

diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 58fee813789e3a39ce8e38587220514bae48695d..b1b1a2e812df183c30704644b7796ac6231694ce 100644 (file)
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -196,7 +196,7 @@ static const value_string Version_vals[] = {
 
 static int
 dissect_ocsp_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -366,7 +366,7 @@ static const value_string OCSPResponseStatus_vals[] = {
 
 static int
 dissect_ocsp_OCSPResponseStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -701,7 +701,7 @@ static int dissect_crlUrl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_ocsp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -818,7 +818,7 @@ void proto_register_ocsp(void) {
         "ArchiveCutoff", HFILL }},
     { &hf_ocsp_AcceptableResponses_PDU,
       { "AcceptableResponses", "ocsp.AcceptableResponses",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AcceptableResponses", HFILL }},
     { &hf_ocsp_ServiceLocator_PDU,
       { "ServiceLocator", "ocsp.ServiceLocator",
@@ -846,7 +846,7 @@ void proto_register_ocsp(void) {
         "TBSRequest/requestorName", HFILL }},
     { &hf_ocsp_requestList,
       { "requestList", "ocsp.requestList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "TBSRequest/requestList", HFILL }},
     { &hf_ocsp_requestList_item,
       { "Item", "ocsp.requestList_item",
@@ -866,7 +866,7 @@ void proto_register_ocsp(void) {
         "", HFILL }},
     { &hf_ocsp_certs,
       { "certs", "ocsp.certs",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_ocsp_certs_item,
       { "Item", "ocsp.certs_item",
@@ -926,7 +926,7 @@ void proto_register_ocsp(void) {
         "ResponseData/producedAt", HFILL }},
     { &hf_ocsp_responses,
       { "responses", "ocsp.responses",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ResponseData/responses", HFILL }},
     { &hf_ocsp_responses_item,
       { "Item", "ocsp.responses_item",

diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index bafc0b2c15bbe1a1eda93b4d585be955ddfcdcfd..80c5ae70a3dba4fb7a5dd5a2bdd4a421c16404ca 100644 (file)
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -7,8 +7,9 @@
 
 /* packet-pkcs1.c
  * Routines for PKCS#1/RFC2313 packet dissection
+ *  Ronnie Sahlberg 2004
  *
- * $Id: packet-pkcs1-template.c 12203 2004-10-05 09:18:55Z guy $
+ * $Id: packet-pkcs1-template.c 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -88,7 +89,7 @@ static gint ett_pkcs1_DigestInfo = -1;
 
 static int
 dissect_pkcs1_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -135,7 +136,7 @@ dissect_pkcs1_RSAPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 
 static int
 dissect_pkcs1_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }

diff --git a/epan/dissectors/packet-pkcs1.h b/epan/dissectors/packet-pkcs1.h
index 76505ee474f64a5f92799ce58cfc776f88040e44..36ece89466da22e25560ec0f2d203718893c4a32 100644 (file)
--- a/epan/dissectors/packet-pkcs1.h
+++ b/epan/dissectors/packet-pkcs1.h
@@ -7,8 +7,9 @@
 
 /* packet-pkcs1.h
  * Routines for PKCS#1/RFC2313 packet dissection
+ *  Ronnie Sahlberg 2004
  *
- * $Id: packet-pkcs1-template.h 12203 2004-10-05 09:18:55Z guy $
+ * $Id: packet-pkcs1-template.h 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>

diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index 78661535930f2c0bf80421c6655944f070921c11..86fbc7252ecd7103341025f602647da2880d50a2 100644 (file)
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -9,7 +9,7 @@
  * Routines for PKINIT packet dissection
  *  Ronnie Sahlberg 2004
  *
- * $Id: packet-pkinit-template.c 12463 2004-11-01 17:49:53Z gerald $
+ * $Id: packet-pkinit-template.c 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -197,7 +197,7 @@ dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 
 static int
 dissect_pkinit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -212,7 +212,7 @@ static int dissect_dhNonce(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_pkinit_INTEGER_0_4294967295(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -378,7 +378,7 @@ void proto_register_pkinit(void) {
         "PaPkAsReq/signedAuthPack", HFILL }},
     { &hf_pkinit_trustedCertifiers,
       { "trustedCertifiers", "pkinit.trustedCertifiers",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "PaPkAsReq/trustedCertifiers", HFILL }},
     { &hf_pkinit_trustedCertifiers_item,
       { "Item", "pkinit.trustedCertifiers_item",
@@ -406,7 +406,7 @@ void proto_register_pkinit(void) {
         "AuthPack/clientPublicValue", HFILL }},
     { &hf_pkinit_supportedCMSTypes,
       { "supportedCMSTypes", "pkinit.supportedCMSTypes",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuthPack/supportedCMSTypes", HFILL }},
     { &hf_pkinit_supportedCMSTypes_item,
       { "Item", "pkinit.supportedCMSTypes_item",

diff --git a/epan/dissectors/packet-pkinit.h b/epan/dissectors/packet-pkinit.h
index 61c160efff9f11d641526d30729f7d61f48b1a23..0daba26cca572fb8303ab045df3eb0972d59f457 100644 (file)
--- a/epan/dissectors/packet-pkinit.h
+++ b/epan/dissectors/packet-pkinit.h
@@ -9,7 +9,7 @@
  * Routines for PKINIT packet dissection
  *  Ronnie Sahlberg 2004
  *
- * $Id: packet-pkinit-template.h 12203 2004-10-05 09:18:55Z guy $
+ * $Id: packet-pkinit-template.h 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>

diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index 265256cfbb11ea25d7511b6970ea7d5947c789c0..0047593371c367cd5bfbd389c2e354753938ff64 100644 (file)
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -10,7 +10,7 @@
 /* packet-pkix1explicit.c
  * Routines for PKIX1Explitic packet dissection
  *
- * $Id: packet-pkix1explicit-template.c 12465 2004-11-01 18:11:48Z gerald $
+ * $Id: packet-pkix1explicit-template.c 12617 2004-11-29 08:43:19Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -137,7 +137,7 @@ dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb,
 
 int
 dissect_pkix1explicit_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -220,7 +220,7 @@ dissect_pkix1explicit_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
 
 static int
 dissect_pkix1explicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -382,7 +382,7 @@ const value_string TerminalType_vals[] = {
 
 int
 dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -504,7 +504,7 @@ void proto_register_pkix1explicit(void) {
         "AttributeTypeAndValue/value", HFILL }},
     { &hf_pkix1explicit_RDNSequence_item,
       { "Item", "pkix1explicit.RDNSequence_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RDNSequence/_item", HFILL }},
     { &hf_pkix1explicit_RelativeDistinguishedName_item,
       { "Item", "pkix1explicit.RelativeDistinguishedName_item",

diff --git a/epan/dissectors/packet-pkix1explicit.h b/epan/dissectors/packet-pkix1explicit.h
index d5c219eb27faafdb010544aada9d86e54dfeaae1..b72180916da5b7807f1fdf7f2a9ce54f14485125 100644 (file)
--- a/epan/dissectors/packet-pkix1explicit.h
+++ b/epan/dissectors/packet-pkix1explicit.h
@@ -8,7 +8,7 @@
 /* packet-pkix1explicit.h
  * Routines for PKIX1Explicit packet dissection
  *
- * $Id: packet-pkix1explicit-template.h 12203 2004-10-05 09:18:55Z guy $
+ * $Id: packet-pkix1explicit-template.h 12617 2004-11-29 08:43:19Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>

diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c
index 8c23105051fd7e94344d69e8d6e60e5710585e55..3021c6b8dc9147fdcd78ffc9d1025bb2679892f7 100644 (file)
--- a/epan/dissectors/packet-pkix1implicit.c
+++ b/epan/dissectors/packet-pkix1implicit.c
@@ -8,7 +8,7 @@
 /* packet-pkix1implicit.c
  * Routines for PKIX1Implitic packet dissection
  *
- * $Id: packet-pkix1implicit-template.c 12552 2004-11-21 05:21:26Z sahlberg $
+ * $Id: packet-pkix1implicit-template.c 12669 2004-12-05 21:47:49Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -249,7 +249,7 @@ static int dissect_organization(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 
 static int
 dissect_pkix1implicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -331,7 +331,7 @@ void proto_register_pkix1implicit(void) {
         "Dummy", HFILL }},
     { &hf_pkix1implicit_AuthorityInfoAccessSyntax_PDU,
       { "AuthorityInfoAccessSyntax", "pkix1implicit.AuthorityInfoAccessSyntax",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuthorityInfoAccessSyntax", HFILL }},
     { &hf_pkix1implicit_nameAssigner,
       { "nameAssigner", "pkix1implicit.nameAssigner",
@@ -367,7 +367,7 @@ void proto_register_pkix1implicit(void) {
         "NoticeReference/organization", HFILL }},
     { &hf_pkix1implicit_noticeNumbers,
       { "noticeNumbers", "pkix1implicit.noticeNumbers",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "NoticeReference/noticeNumbers", HFILL }},
     { &hf_pkix1implicit_noticeNumbers_item,
       { "Item", "pkix1implicit.noticeNumbers_item",

diff --git a/epan/dissectors/packet-pkix1implicit.h b/epan/dissectors/packet-pkix1implicit.h
index f88246c5536150d847cb18492422a4b7ddb6e932..201ae786ab91a50e96a0c18f2e1d6ef291dd6b97 100644 (file)
--- a/epan/dissectors/packet-pkix1implicit.h
+++ b/epan/dissectors/packet-pkix1implicit.h
@@ -8,7 +8,7 @@
 /* packet-pkix1implicit.h
  * Routines for PKIX1Implicit packet dissection
  *
- * $Id: packet-pkix1implicit-template.h 12203 2004-10-05 09:18:55Z guy $
+ * $Id: packet-pkix1implicit-template.h 12669 2004-12-05 21:47:49Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>

diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c
index 49690847c54e7486821ec306d70aee0f0deec786..f26570f8368e73d15a5a9b555b225b5499a6edaa 100644 (file)
--- a/epan/dissectors/packet-pkixproxy.c
+++ b/epan/dissectors/packet-pkixproxy.c
@@ -81,7 +81,7 @@ static gint ett_pkixproxy_ProxyPolicy = -1;
 
 static int
 dissect_pkixproxy_ProxyCertPathLengthConstraint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }

diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c
index 536f421ef6fa5b1ff8c55046dbd996c26220682a..7e52413af80d4938d14203088e2ffc363a688d9b 100644 (file)
--- a/epan/dissectors/packet-pkixqualified.c
+++ b/epan/dissectors/packet-pkixqualified.c
@@ -144,7 +144,7 @@ static const value_string PredefinedBiometricType_vals[] = {
 
 static int
 dissect_pkixqualified_PredefinedBiometricType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -379,11 +379,11 @@ void proto_register_pkixqualified(void) {
         "Printablestring", HFILL }},
     { &hf_pkixqualified_BiometricSyntax_PDU,
       { "BiometricSyntax", "pkixqualified.BiometricSyntax",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "BiometricSyntax", HFILL }},
     { &hf_pkixqualified_QCStatements_PDU,
       { "QCStatements", "pkixqualified.QCStatements",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "QCStatements", HFILL }},
     { &hf_pkixqualified_SemanticsInformation_PDU,
       { "SemanticsInformation", "pkixqualified.SemanticsInformation",
@@ -435,7 +435,7 @@ void proto_register_pkixqualified(void) {
         "SemanticsInformation/semanticsIdentifier", HFILL }},
     { &hf_pkixqualified_nameRegistrationAuthorities,
       { "nameRegistrationAuthorities", "pkixqualified.nameRegistrationAuthorities",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SemanticsInformation/nameRegistrationAuthorities", HFILL }},
     { &hf_pkixqualified_NameRegistrationAuthorities_item,
       { "Item", "pkixqualified.NameRegistrationAuthorities_item",

diff --git a/epan/dissectors/packet-pkixqualified.h b/epan/dissectors/packet-pkixqualified.h
index aae818ceb649b72692a69c5bcf2c79d437a267e3..09619b5dda781d59acdf9b3baa89fa47a3242c7a 100644 (file)
--- a/epan/dissectors/packet-pkixqualified.h
+++ b/epan/dissectors/packet-pkixqualified.h
@@ -7,6 +7,7 @@
 
 /* packet-pkixqualified.h
  * Routines for RFC3739 PKIXqualified packet dissection
+ *  Ronnie Sahlberg 2004
  *
  * $Id: packet-pkixqualified-template.h 12434 2004-10-29 12:11:42Z sahlberg $
  *

diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 49dc222bb629fd6325422418494cee16e8440772..3bae243e906a77285706e17466b317b3a729c149 100644 (file)
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -131,7 +131,7 @@ static const value_string T_version_vals[] = {
 
 static int
 dissect_pkixtsp_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -187,7 +187,7 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_pkixtsp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -247,7 +247,7 @@ static const value_string PKIStatus_vals[] = {
 
 static int
 dissect_pkixtsp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -330,7 +330,7 @@ static const value_string tst_version_vals[] = {
 
 static int
 dissect_pkixtsp_tst_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -353,7 +353,7 @@ static int dissect_genTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_pkixtsp_INTEGER_1_999(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }

diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 2b585746cd7e2322a0ec4abaf537f7b309ffd103..e73b6657b6ffb0f8fdc34e92ef9372fd55e34d60 100644 (file)
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -129,7 +129,7 @@ static const value_string T_address_type_vals[] = {
 
 static int
 dissect_smrse_T_address_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -151,7 +151,7 @@ static const value_string T_numbering_plan_vals[] = {
 
 static int
 dissect_smrse_T_numbering_plan(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -332,7 +332,7 @@ static const value_string Connect_fail_vals[] = {
 
 static int
 dissect_smrse_Connect_fail(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -386,7 +386,7 @@ static int dissect_msg_waiting_set(packet_info *pinfo, proto_tree *tree, tvbuff_
 
 static int
 dissect_smrse_RP_MR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -422,7 +422,7 @@ static int dissect_sm_diag_info_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 
 static int
 dissect_smrse_SM_TC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -507,7 +507,7 @@ static const value_string Error_reason_vals[] = {
 
 static int
 dissect_smrse_Error_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }

diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 54c0775e38bfd4443e6667ef2c26ae5ec05027a6..36e6bd6d0605aea1cfa1ef2954f02ba26afe626b 100644 (file)
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -9,7 +9,7 @@
  * Routines for X.509 Authentication Framework packet dissection
  *  Ronnie Sahlberg 2004
  *
- * $Id: packet-x509af-template.c 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id: packet-x509af-template.c 12624 2004-11-30 04:08:16Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -229,7 +229,7 @@ const value_string Version_vals[] = {
 
 int
 dissect_x509af_Version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -241,7 +241,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 int
 dissect_x509af_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1055,7 +1055,7 @@ void proto_register_x509af(void) {
         "Certificate/signedCertificate/subjectUniqueIdentifier", HFILL }},
     { &hf_x509af_extensions,
       { "extensions", "x509af.extensions",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509af_algorithmIdentifier,
       { "algorithmIdentifier", "x509af.algorithmIdentifier",
@@ -1119,11 +1119,11 @@ void proto_register_x509af(void) {
         "", HFILL }},
     { &hf_x509af_certificationPath,
       { "certificationPath", "x509af.certificationPath",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Certificates/certificationPath", HFILL }},
     { &hf_x509af_ForwardCertificationPath_item,
       { "Item", "x509af.ForwardCertificationPath_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ForwardCertificationPath/_item", HFILL }},
     { &hf_x509af_CrossCertificates_item,
       { "Item", "x509af.CrossCertificates_item",
@@ -1131,7 +1131,7 @@ void proto_register_x509af(void) {
         "CrossCertificates/_item", HFILL }},
     { &hf_x509af_theCACertificates,
       { "theCACertificates", "x509af.theCACertificates",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CertificationPath/theCACertificates", HFILL }},
     { &hf_x509af_theCACertificates_item,
       { "Item", "x509af.theCACertificates_item",
@@ -1159,7 +1159,7 @@ void proto_register_x509af(void) {
         "CertificateList/signedCertificateList/nextUpdate", HFILL }},
     { &hf_x509af_revokedCertificates,
       { "revokedCertificates", "x509af.revokedCertificates",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CertificateList/signedCertificateList/revokedCertificates", HFILL }},
     { &hf_x509af_revokedCertificates_item,
       { "Item", "x509af.revokedCertificates_item",
@@ -1175,11 +1175,11 @@ void proto_register_x509af(void) {
         "CertificateList/signedCertificateList/revokedCertificates/_item/revocationDate", HFILL }},
     { &hf_x509af_crlEntryExtensions,
       { "crlEntryExtensions", "x509af.crlEntryExtensions",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CertificateList/signedCertificateList/revokedCertificates/_item/crlEntryExtensions", HFILL }},
     { &hf_x509af_crlExtensions,
       { "crlExtensions", "x509af.crlExtensions",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CertificateList/signedCertificateList/crlExtensions", HFILL }},
     { &hf_x509af_attributeCertificate,
       { "attributeCertificate", "x509af.attributeCertificate",
@@ -1187,7 +1187,7 @@ void proto_register_x509af(void) {
         "", HFILL }},
     { &hf_x509af_acPath,
       { "acPath", "x509af.acPath",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificationPath/acPath", HFILL }},
     { &hf_x509af_acPath_item,
       { "Item", "x509af.acPath_item",
@@ -1223,7 +1223,7 @@ void proto_register_x509af(void) {
         "AttributeCertificateInfo/attCertValidityPeriod", HFILL }},
     { &hf_x509af_attributes,
       { "attributes", "x509af.attributes",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificateInfo/attributes", HFILL }},
     { &hf_x509af_attributes_item,
       { "Item", "x509af.attributes_item",
@@ -1267,7 +1267,7 @@ void proto_register_x509af(void) {
         "AttributeCertificateAssertion/attCertValidity", HFILL }},
     { &hf_x509af_attType,
       { "attType", "x509af.attType",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificateAssertion/attType", HFILL }},
     { &hf_x509af_attType_item,
       { "Item", "x509af.attType_item",

diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 5f382c1a511ecd42b73fad99b96d995b497efeff..55553549064a9070e289cd585ba471883ed279ac 100644 (file)
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -9,7 +9,7 @@
  * Routines for X.509 Certificate Extensions packet dissection
  *  Ronnie Sahlberg 2004
  *
- * $Id: packet-x509ce-template.c 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id: packet-x509ce-template.c 12603 2004-11-25 21:00:17Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -92,7 +92,7 @@ static int hf_x509ce_notBefore = -1;              /* GeneralizedTime */
 static int hf_x509ce_notAfter = -1;               /* GeneralizedTime */
 static int hf_x509ce_CertificatePoliciesSyntax_item = -1;  /* PolicyInformation */
 static int hf_x509ce_policyIdentifier = -1;       /* CertPolicyId */
-static int hf_x509ce_policyQualifiers = -1;       /* SEQUNCE_OF_PolicyQualifierInfo */
+static int hf_x509ce_policyQualifiers = -1;       /* SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo */
 static int hf_x509ce_policyQualifiers_item = -1;  /* PolicyQualifierInfo */
 static int hf_x509ce_policyQualifierId = -1;      /* PolicyQualifierId */
 static int hf_x509ce_qualifier = -1;              /* PolicyQualifierValue */
@@ -219,7 +219,7 @@ static gint ett_x509ce_KeyPurposeIDs = -1;
 static gint ett_x509ce_PrivateKeyUsagePeriod = -1;
 static gint ett_x509ce_CertificatePoliciesSyntax = -1;
 static gint ett_x509ce_PolicyInformation = -1;
-static gint ett_x509ce_SEQUNCE_OF_PolicyQualifierInfo = -1;
+static gint ett_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo = -1;
 static gint ett_x509ce_PolicyQualifierInfo = -1;
 static gint ett_x509ce_PolicyMappingsSyntax = -1;
 static gint ett_x509ce_PolicyMappingsSyntax_item = -1;
@@ -650,19 +650,19 @@ static int dissect_policyQualifiers_item(packet_info *pinfo, proto_tree *tree, t
   return dissect_x509ce_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers_item);
 }
 
-static const ber_sequence SEQUNCE_OF_PolicyQualifierInfo_sequence_of[1] = {
+static const ber_sequence SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item },
 };
 
 static int
-dissect_x509ce_SEQUNCE_OF_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUNCE_OF_PolicyQualifierInfo);
+                                   SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo);
 
   return offset;
 }
 static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509ce_SEQUNCE_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
+  return dissect_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
 }
 
 static const ber_sequence PolicyInformation_sequence[] = {
@@ -768,7 +768,7 @@ static int dissect_containsSOAPublicKeyCerts_impl(packet_info *pinfo, proto_tree
 
 static int
 dissect_x509ce_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -803,7 +803,7 @@ dissect_x509ce_BasicConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb,
 
 int
 dissect_x509ce_BaseDistance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -871,7 +871,7 @@ static int dissect_nameConstraints_impl(packet_info *pinfo, proto_tree *tree, tv
 
 int
 dissect_x509ce_SkipCerts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -900,7 +900,7 @@ dissect_x509ce_PolicyConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb,
 
 int
 dissect_x509ce_CRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -932,7 +932,7 @@ const value_string CRLReason_vals[] = {
 
 int
 dissect_x509ce_CRLReason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1050,7 +1050,7 @@ static int dissect_subjectKeyIdRange_impl(packet_info *pinfo, proto_tree *tree,
 
 int
 dissect_x509ce_CRLStreamIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1196,7 +1196,7 @@ const value_string OrderedListSyntax_vals[] = {
 
 int
 dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1309,7 +1309,7 @@ static const value_string T_builtinNameForm_vals[] = {
 
 static int
 dissect_x509ce_T_builtinNameForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1589,7 +1589,7 @@ void proto_register_x509ce(void) {
         "KeyUsage", HFILL }},
     { &hf_x509ce_KeyPurposeIDs_PDU,
       { "KeyPurposeIDs", "x509ce.KeyPurposeIDs",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "KeyPurposeIDs", HFILL }},
     { &hf_x509ce_PrivateKeyUsagePeriod_PDU,
       { "PrivateKeyUsagePeriod", "x509ce.PrivateKeyUsagePeriod",
@@ -1597,19 +1597,19 @@ void proto_register_x509ce(void) {
         "PrivateKeyUsagePeriod", HFILL }},
     { &hf_x509ce_CertificatePoliciesSyntax_PDU,
       { "CertificatePoliciesSyntax", "x509ce.CertificatePoliciesSyntax",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CertificatePoliciesSyntax", HFILL }},
     { &hf_x509ce_PolicyMappingsSyntax_PDU,
       { "PolicyMappingsSyntax", "x509ce.PolicyMappingsSyntax",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "PolicyMappingsSyntax", HFILL }},
     { &hf_x509ce_GeneralNames_PDU,
       { "GeneralNames", "x509ce.GeneralNames",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "GeneralNames", HFILL }},
     { &hf_x509ce_AttributesSyntax_PDU,
       { "AttributesSyntax", "x509ce.AttributesSyntax",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributesSyntax", HFILL }},
     { &hf_x509ce_BasicConstraintsSyntax_PDU,
       { "BasicConstraintsSyntax", "x509ce.BasicConstraintsSyntax",
@@ -1641,11 +1641,11 @@ void proto_register_x509ce(void) {
         "HoldInstruction", HFILL }},
     { &hf_x509ce_CRLScopeSyntax_PDU,
       { "CRLScopeSyntax", "x509ce.CRLScopeSyntax",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CRLScopeSyntax", HFILL }},
     { &hf_x509ce_StatusReferrals_PDU,
       { "StatusReferrals", "x509ce.StatusReferrals",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "StatusReferrals", HFILL }},
     { &hf_x509ce_CRLStreamIdentifier_PDU,
       { "CRLStreamIdentifier", "x509ce.CRLStreamIdentifier",
@@ -1661,7 +1661,7 @@ void proto_register_x509ce(void) {
         "DeltaInformation", HFILL }},
     { &hf_x509ce_CRLDistPointsSyntax_PDU,
       { "CRLDistPointsSyntax", "x509ce.CRLDistPointsSyntax",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CRLDistPointsSyntax", HFILL }},
     { &hf_x509ce_IssuingDistPointSyntax_PDU,
       { "IssuingDistPointSyntax", "x509ce.IssuingDistPointSyntax",
@@ -1677,7 +1677,7 @@ void proto_register_x509ce(void) {
         "AuthorityKeyIdentifier/keyIdentifier", HFILL }},
     { &hf_x509ce_authorityCertIssuer,
       { "authorityCertIssuer", "x509ce.authorityCertIssuer",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AuthorityKeyIdentifier/authorityCertIssuer", HFILL }},
     { &hf_x509ce_authorityCertSerialNumber,
       { "authorityCertSerialNumber", "x509ce.authorityCertSerialNumber",
@@ -1705,7 +1705,7 @@ void proto_register_x509ce(void) {
         "PolicyInformation/policyIdentifier", HFILL }},
     { &hf_x509ce_policyQualifiers,
       { "policyQualifiers", "x509ce.policyQualifiers",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "PolicyInformation/policyQualifiers", HFILL }},
     { &hf_x509ce_policyQualifiers_item,
       { "Item", "x509ce.policyQualifiers_item",
@@ -1785,11 +1785,11 @@ void proto_register_x509ce(void) {
         "BasicConstraintsSyntax/pathLenConstraint", HFILL }},
     { &hf_x509ce_permittedSubtrees,
       { "permittedSubtrees", "x509ce.permittedSubtrees",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "NameConstraintsSyntax/permittedSubtrees", HFILL }},
     { &hf_x509ce_excludedSubtrees,
       { "excludedSubtrees", "x509ce.excludedSubtrees",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "NameConstraintsSyntax/excludedSubtrees", HFILL }},
     { &hf_x509ce_GeneralSubtrees_item,
       { "Item", "x509ce.GeneralSubtrees_item",
@@ -1845,7 +1845,7 @@ void proto_register_x509ce(void) {
         "PerAuthorityScope/subjectKeyIdRange", HFILL }},
     { &hf_x509ce_nameSubtrees,
       { "nameSubtrees", "x509ce.nameSubtrees",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "PerAuthorityScope/nameSubtrees", HFILL }},
     { &hf_x509ce_baseRevocationInfo,
       { "baseRevocationInfo", "x509ce.baseRevocationInfo",
@@ -1897,7 +1897,7 @@ void proto_register_x509ce(void) {
         "CRLReferral/deltaRefInfo", HFILL }},
     { &hf_x509ce_cRLScope,
       { "cRLScope", "x509ce.cRLScope",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CRLReferral/cRLScope", HFILL }},
     { &hf_x509ce_lastUpdate,
       { "lastUpdate", "x509ce.lastUpdate",
@@ -1929,11 +1929,11 @@ void proto_register_x509ce(void) {
         "DistributionPoint/reasons", HFILL }},
     { &hf_x509ce_cRLIssuer,
       { "cRLIssuer", "x509ce.cRLIssuer",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DistributionPoint/cRLIssuer", HFILL }},
     { &hf_x509ce_fullName,
       { "fullName", "x509ce.fullName",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DistributionPointName/fullName", HFILL }},
     { &hf_x509ce_nameRelativeToCRLIssuer,
       { "nameRelativeToCRLIssuer", "x509ce.nameRelativeToCRLIssuer",
@@ -1997,7 +1997,7 @@ void proto_register_x509ce(void) {
         "CertificateAssertion/subjectAltName", HFILL }},
     { &hf_x509ce_policy,
       { "policy", "x509ce.policy",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion/policy", HFILL }},
     { &hf_x509ce_pathToName,
       { "pathToName", "x509ce.pathToName",
@@ -2167,7 +2167,7 @@ void proto_register_x509ce(void) {
     &ett_x509ce_PrivateKeyUsagePeriod,
     &ett_x509ce_CertificatePoliciesSyntax,
     &ett_x509ce_PolicyInformation,
-    &ett_x509ce_SEQUNCE_OF_PolicyQualifierInfo,
+    &ett_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo,
     &ett_x509ce_PolicyQualifierInfo,
     &ett_x509ce_PolicyMappingsSyntax,
     &ett_x509ce_PolicyMappingsSyntax_item,

diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 5e0c48517c39e0bb628c8afc1bc5b20297412342..16010d2ddcf12306ed47395296470ddfe04ac6f6 100644 (file)
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -107,11 +107,11 @@ static int hf_x509if_superiorStructureRules_item = -1;  /* RuleIdentifier */
 static int hf_x509if_structuralObjectClass = -1;  /* OBJECT_IDENTIFIER */
 static int hf_x509if_auxiliaries = -1;            /* SET_OF_OBJECT_IDENTIFIER */
 static int hf_x509if_auxiliaries_item = -1;       /* OBJECT_IDENTIFIER */
-static int hf_x509if_mandatory = -1;              /* SET_OF_AttributeId */
+static int hf_x509if_mandatory = -1;              /* SET_SIZE_1_MAX_OF_AttributeId */
 static int hf_x509if_mandatory_item = -1;         /* AttributeId */
-static int hf_x509if_optional = -1;               /* SET_OF_AttributeId */
+static int hf_x509if_optional = -1;               /* SET_SIZE_1_MAX_OF_AttributeId */
 static int hf_x509if_optional_item = -1;          /* AttributeId */
-static int hf_x509if_precluded = -1;              /* SET_OF_AttributeId */
+static int hf_x509if_precluded = -1;              /* SET_SIZE_1_MAX_OF_AttributeId */
 static int hf_x509if_precluded_item = -1;         /* AttributeId */
 static int hf_x509if_attributeType = -1;          /* AttributeId */
 static int hf_x509if_mandatoryContexts = -1;      /* SET_OF_OBJECT_IDENTIFIER */
@@ -233,7 +233,7 @@ static gint ett_x509if_DITStructureRule = -1;
 static gint ett_x509if_SET_OF_RuleIdentifier = -1;
 static gint ett_x509if_DITContentRule = -1;
 static gint ett_x509if_SET_OF_OBJECT_IDENTIFIER = -1;
-static gint ett_x509if_SET_OF_AttributeId = -1;
+static gint ett_x509if_SET_SIZE_1_MAX_OF_AttributeId = -1;
 static gint ett_x509if_DITContextUse = -1;
 static gint ett_x509if_SearchRuleDescription = -1;
 static gint ett_x509if_SEQUNCE_OF_RequestAttribute = -1;
@@ -880,7 +880,7 @@ static int dissect_specificExclusions(packet_info *pinfo, proto_tree *tree, tvbu
 
 int
 dissect_x509if_BaseDistance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1061,7 +1061,7 @@ static const value_string ObjectClassKind_vals[] = {
 
 static int
 dissect_x509if_ObjectClassKind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1078,7 +1078,7 @@ const value_string AttributeUsage_vals[] = {
 
 int
 dissect_x509if_AttributeUsage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1087,7 +1087,7 @@ dissect_x509if_AttributeUsage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 
 int
 dissect_x509if_RuleIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1149,25 +1149,25 @@ static int dissect_optionalContexts(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_x509if_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_optionalContexts);
 }
 
-static const ber_sequence SET_OF_AttributeId_set_of[1] = {
+static const ber_sequence SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatory_item },
 };
 
 static int
-dissect_x509if_SET_OF_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
-                              SET_OF_AttributeId_set_of, hf_index, ett_x509if_SET_OF_AttributeId);
+                              SET_SIZE_1_MAX_OF_AttributeId_set_of, hf_index, ett_x509if_SET_SIZE_1_MAX_OF_AttributeId);
 
   return offset;
 }
 static int dissect_mandatory(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SET_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_mandatory);
+  return dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_mandatory);
 }
 static int dissect_optional(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SET_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_optional);
+  return dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_optional);
 }
 static int dissect_precluded(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SET_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_precluded);
+  return dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_precluded);
 }
 
 static const ber_sequence DITContentRule_sequence[] = {
@@ -1206,7 +1206,7 @@ dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
 
 static int
 dissect_x509if_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1787,7 +1787,7 @@ const value_string ImposedSubset_vals[] = {
 
 int
 dissect_x509if_ImposedSubset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1942,7 +1942,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_values,
       { "values", "x509if.values",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Attribute/values", HFILL }},
     { &hf_x509if_values_item,
       { "Item", "x509if.values_item",
@@ -1950,7 +1950,7 @@ void proto_register_x509if(void) {
         "Attribute/values/_item", HFILL }},
     { &hf_x509if_valuesWithContext,
       { "valuesWithContext", "x509if.valuesWithContext",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Attribute/valuesWithContext", HFILL }},
     { &hf_x509if_valuesWithContext_item,
       { "Item", "x509if.valuesWithContext_item",
@@ -1962,7 +1962,7 @@ void proto_register_x509if(void) {
         "Attribute/valuesWithContext/_item/value", HFILL }},
     { &hf_x509if_contextList,
       { "contextList", "x509if.contextList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_contextList_item,
       { "Item", "x509if.contextList_item",
@@ -1974,7 +1974,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_contextValues,
       { "contextValues", "x509if.contextValues",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Context/contextValues", HFILL }},
     { &hf_x509if_contextValues_item,
       { "Item", "x509if.contextValues_item",
@@ -1998,7 +1998,7 @@ void proto_register_x509if(void) {
         "AttributeValueAssertion/assertedContexts/allContexts", HFILL }},
     { &hf_x509if_selectedContexts,
       { "selectedContexts", "x509if.selectedContexts",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion/assertedContexts/selectedContexts", HFILL }},
     { &hf_x509if_selectedContexts_item,
       { "Item", "x509if.selectedContexts_item",
@@ -2010,7 +2010,7 @@ void proto_register_x509if(void) {
         "ContextAssertion/contextType", HFILL }},
     { &hf_x509if_contextValues1,
       { "contextValues", "x509if.contextValues",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ContextAssertion/contextValues", HFILL }},
     { &hf_x509if_contextValues_item1,
       { "Item", "x509if.contextValues_item",
@@ -2018,7 +2018,7 @@ void proto_register_x509if(void) {
         "ContextAssertion/contextValues/_item", HFILL }},
     { &hf_x509if_assertedContexts1,
       { "assertedContexts", "x509if.assertedContexts",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeTypeAssertion/assertedContexts", HFILL }},
     { &hf_x509if_assertedContexts_item,
       { "Item", "x509if.assertedContexts_item",
@@ -2026,11 +2026,11 @@ void proto_register_x509if(void) {
         "AttributeTypeAssertion/assertedContexts/_item", HFILL }},
     { &hf_x509if_rdnSequence,
       { "rdnSequence", "x509if.rdnSequence",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Name/rdnSequence", HFILL }},
     { &hf_x509if_RDNSequence_item,
       { "Item", "x509if.RDNSequence_item",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RDNSequence/_item", HFILL }},
     { &hf_x509if_RelativeDistinguishedName_item,
       { "Item", "x509if.RelativeDistinguishedName_item",
@@ -2046,7 +2046,7 @@ void proto_register_x509if(void) {
         "AttributeTypeAndDistinguishedValue/primaryDistinguished", HFILL }},
     { &hf_x509if_valuesWithContext1,
       { "valuesWithContext", "x509if.valuesWithContext",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeTypeAndDistinguishedValue/valuesWithContext", HFILL }},
     { &hf_x509if_valuesWithContext_item1,
       { "Item", "x509if.valuesWithContext_item",
@@ -2058,11 +2058,11 @@ void proto_register_x509if(void) {
         "AttributeTypeAndDistinguishedValue/valuesWithContext/_item/distingAttrValue", HFILL }},
     { &hf_x509if_base,
       { "base", "x509if.base",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SubtreeSpecification/base", HFILL }},
     { &hf_x509if_specificExclusions,
       { "specificExclusions", "x509if.specificExclusions",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SubtreeSpecification/specificExclusions", HFILL }},
     { &hf_x509if_specificExclusions_item,
       { "Item", "x509if.specificExclusions_item",
@@ -2070,11 +2070,11 @@ void proto_register_x509if(void) {
         "SubtreeSpecification/specificExclusions/_item", HFILL }},
     { &hf_x509if_chopBefore,
       { "chopBefore", "x509if.chopBefore",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_chopAfter,
       { "chopAfter", "x509if.chopAfter",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_minimum,
       { "minimum", "x509if.minimum",
@@ -2090,7 +2090,7 @@ void proto_register_x509if(void) {
         "SubtreeSpecification/specificationFilter", HFILL }},
     { &hf_x509if_specificExclusions1,
       { "specificExclusions", "x509if.specificExclusions",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ChopSpecification/specificExclusions", HFILL }},
     { &hf_x509if_specificExclusions_item1,
       { "Item", "x509if.specificExclusions_item",
@@ -2102,7 +2102,7 @@ void proto_register_x509if(void) {
         "Refinement/item", HFILL }},
     { &hf_x509if_and,
       { "and", "x509if.and",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Refinement/and", HFILL }},
     { &hf_x509if_and_item,
       { "Item", "x509if.and_item",
@@ -2110,7 +2110,7 @@ void proto_register_x509if(void) {
         "Refinement/and/_item", HFILL }},
     { &hf_x509if_or,
       { "or", "x509if.or",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Refinement/or", HFILL }},
     { &hf_x509if_or_item,
       { "Item", "x509if.or_item",
@@ -2130,7 +2130,7 @@ void proto_register_x509if(void) {
         "DITStructureRule/nameForm", HFILL }},
     { &hf_x509if_superiorStructureRules,
       { "superiorStructureRules", "x509if.superiorStructureRules",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DITStructureRule/superiorStructureRules", HFILL }},
     { &hf_x509if_superiorStructureRules_item,
       { "Item", "x509if.superiorStructureRules_item",
@@ -2142,7 +2142,7 @@ void proto_register_x509if(void) {
         "DITContentRule/structuralObjectClass", HFILL }},
     { &hf_x509if_auxiliaries,
       { "auxiliaries", "x509if.auxiliaries",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DITContentRule/auxiliaries", HFILL }},
     { &hf_x509if_auxiliaries_item,
       { "Item", "x509if.auxiliaries_item",
@@ -2150,7 +2150,7 @@ void proto_register_x509if(void) {
         "DITContentRule/auxiliaries/_item", HFILL }},
     { &hf_x509if_mandatory,
       { "mandatory", "x509if.mandatory",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DITContentRule/mandatory", HFILL }},
     { &hf_x509if_mandatory_item,
       { "Item", "x509if.mandatory_item",
@@ -2158,7 +2158,7 @@ void proto_register_x509if(void) {
         "DITContentRule/mandatory/_item", HFILL }},
     { &hf_x509if_optional,
       { "optional", "x509if.optional",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DITContentRule/optional", HFILL }},
     { &hf_x509if_optional_item,
       { "Item", "x509if.optional_item",
@@ -2166,7 +2166,7 @@ void proto_register_x509if(void) {
         "DITContentRule/optional/_item", HFILL }},
     { &hf_x509if_precluded,
       { "precluded", "x509if.precluded",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DITContentRule/precluded", HFILL }},
     { &hf_x509if_precluded_item,
       { "Item", "x509if.precluded_item",
@@ -2178,7 +2178,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_mandatoryContexts,
       { "mandatoryContexts", "x509if.mandatoryContexts",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DITContextUse/mandatoryContexts", HFILL }},
     { &hf_x509if_mandatoryContexts_item,
       { "Item", "x509if.mandatoryContexts_item",
@@ -2186,7 +2186,7 @@ void proto_register_x509if(void) {
         "DITContextUse/mandatoryContexts/_item", HFILL }},
     { &hf_x509if_optionalContexts,
       { "optionalContexts", "x509if.optionalContexts",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "DITContextUse/optionalContexts", HFILL }},
     { &hf_x509if_optionalContexts_item,
       { "Item", "x509if.optionalContexts_item",
@@ -2210,7 +2210,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_inputAttributeTypes,
       { "inputAttributeTypes", "x509if.inputAttributeTypes",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_inputAttributeTypes_item,
       { "Item", "x509if.inputAttributeTypes_item",
@@ -2222,7 +2222,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_outputAttributeTypes,
       { "outputAttributeTypes", "x509if.outputAttributeTypes",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_outputAttributeTypes_item,
       { "Item", "x509if.outputAttributeTypes_item",
@@ -2246,7 +2246,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_additionalControl,
       { "additionalControl", "x509if.additionalControl",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_additionalControl_item,
       { "Item", "x509if.additionalControl_item",
@@ -2266,7 +2266,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_name,
       { "name", "x509if.name",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "SearchRuleDescription/name", HFILL }},
     { &hf_x509if_name_item,
       { "Item", "x509if.name_item",
@@ -2286,7 +2286,7 @@ void proto_register_x509if(void) {
         "RequestAttribute/includeSubtypes", HFILL }},
     { &hf_x509if_selectedValues,
       { "selectedValues", "x509if.selectedValues",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RequestAttribute/selectedValues", HFILL }},
     { &hf_x509if_selectedValues_item,
       { "Item", "x509if.selectedValues_item",
@@ -2294,7 +2294,7 @@ void proto_register_x509if(void) {
         "RequestAttribute/selectedValues/_item", HFILL }},
     { &hf_x509if_defaultValues,
       { "defaultValues", "x509if.defaultValues",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RequestAttribute/defaultValues", HFILL }},
     { &hf_x509if_defaultValues_item,
       { "Item", "x509if.defaultValues_item",
@@ -2306,7 +2306,7 @@ void proto_register_x509if(void) {
         "RequestAttribute/defaultValues/_item/entryType", HFILL }},
     { &hf_x509if_values1,
       { "values", "x509if.values",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RequestAttribute/defaultValues/_item/values", HFILL }},
     { &hf_x509if_values_item1,
       { "Item", "x509if.values_item",
@@ -2314,7 +2314,7 @@ void proto_register_x509if(void) {
         "RequestAttribute/defaultValues/_item/values/_item", HFILL }},
     { &hf_x509if_contexts,
       { "contexts", "x509if.contexts",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_contexts_item,
       { "Item", "x509if.contexts_item",
@@ -2326,7 +2326,7 @@ void proto_register_x509if(void) {
         "RequestAttribute/contextCombination", HFILL }},
     { &hf_x509if_matchingUse,
       { "matchingUse", "x509if.matchingUse",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RequestAttribute/matchingUse", HFILL }},
     { &hf_x509if_matchingUse_item,
       { "Item", "x509if.matchingUse_item",
@@ -2334,7 +2334,7 @@ void proto_register_x509if(void) {
         "RequestAttribute/matchingUse/_item", HFILL }},
     { &hf_x509if_contextValue,
       { "contextValue", "x509if.contextValue",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ContextProfile/contextValue", HFILL }},
     { &hf_x509if_contextValue_item,
       { "Item", "x509if.contextValue_item",
@@ -2346,7 +2346,7 @@ void proto_register_x509if(void) {
         "ContextCombination/context", HFILL }},
     { &hf_x509if_and1,
       { "and", "x509if.and",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ContextCombination/and", HFILL }},
     { &hf_x509if_and_item1,
       { "Item", "x509if.and_item",
@@ -2354,7 +2354,7 @@ void proto_register_x509if(void) {
         "ContextCombination/and/_item", HFILL }},
     { &hf_x509if_or1,
       { "or", "x509if.or",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ContextCombination/or", HFILL }},
     { &hf_x509if_or_item1,
       { "Item", "x509if.or_item",
@@ -2378,7 +2378,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_and2,
       { "and", "x509if.and",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCombination/and", HFILL }},
     { &hf_x509if_and_item2,
       { "Item", "x509if.and_item",
@@ -2386,7 +2386,7 @@ void proto_register_x509if(void) {
         "AttributeCombination/and/_item", HFILL }},
     { &hf_x509if_or2,
       { "or", "x509if.or",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCombination/or", HFILL }},
     { &hf_x509if_or_item2,
       { "Item", "x509if.or_item",
@@ -2402,7 +2402,7 @@ void proto_register_x509if(void) {
         "ResultAttribute/outputValues", HFILL }},
     { &hf_x509if_selectedValues1,
       { "selectedValues", "x509if.selectedValues",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "", HFILL }},
     { &hf_x509if_selectedValues_item1,
       { "Item", "x509if.selectedValues_item",
@@ -2426,7 +2426,7 @@ void proto_register_x509if(void) {
         "RelaxationPolicy/basic", HFILL }},
     { &hf_x509if_tightenings,
       { "tightenings", "x509if.tightenings",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RelaxationPolicy/tightenings", HFILL }},
     { &hf_x509if_tightenings_item,
       { "Item", "x509if.tightenings_item",
@@ -2434,7 +2434,7 @@ void proto_register_x509if(void) {
         "RelaxationPolicy/tightenings/_item", HFILL }},
     { &hf_x509if_relaxations,
       { "relaxations", "x509if.relaxations",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "RelaxationPolicy/relaxations", HFILL }},
     { &hf_x509if_relaxations_item,
       { "Item", "x509if.relaxations_item",
@@ -2450,7 +2450,7 @@ void proto_register_x509if(void) {
         "RelaxationPolicy/minimum", HFILL }},
     { &hf_x509if_mapping,
       { "mapping", "x509if.mapping",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MRMapping/mapping", HFILL }},
     { &hf_x509if_mapping_item,
       { "Item", "x509if.mapping_item",
@@ -2458,7 +2458,7 @@ void proto_register_x509if(void) {
         "MRMapping/mapping/_item", HFILL }},
     { &hf_x509if_substitution,
       { "substitution", "x509if.substitution",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MRMapping/substitution", HFILL }},
     { &hf_x509if_substitution_item,
       { "Item", "x509if.substitution_item",
@@ -2533,7 +2533,7 @@ void proto_register_x509if(void) {
     &ett_x509if_SET_OF_RuleIdentifier,
     &ett_x509if_DITContentRule,
     &ett_x509if_SET_OF_OBJECT_IDENTIFIER,
-    &ett_x509if_SET_OF_AttributeId,
+    &ett_x509if_SET_SIZE_1_MAX_OF_AttributeId,
     &ett_x509if_DITContextUse,
     &ett_x509if_SearchRuleDescription,
     &ett_x509if_SEQUNCE_OF_RequestAttribute,

diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 14d6d4ee1ab027f2ecc0dae2841ff0f992e4ccad..c91dc2fb7e55dfc3d3639020da95336ef7ca5931 100644 (file)
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -8,8 +8,9 @@
 #define BER_UNI_TAG_TeletexString          20  /* until we fix the bug in asn2eth */
 /* packet-x509sat.c
  * Routines for X.509 Selected Attribute Types packet dissection
+ *  Ronnie Sahlberg 2004
  *
- * $Id: packet-x509sat-template.c 12546 2004-11-20 06:54:45Z sahlberg $
+ * $Id: packet-x509sat-template.c 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -441,7 +442,7 @@ static const value_string T_subset_vals[] = {
 
 static int
 dissect_x509sat_T_subset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -584,7 +585,7 @@ static const value_string PreferredDeliveryMethod_item_vals[] = {
 
 static int
 dissect_x509sat_PreferredDeliveryMethod_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -853,7 +854,7 @@ const value_string ZonalResult_vals[] = {
 
 int
 dissect_x509sat_ZonalResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -906,7 +907,7 @@ static int dissect_absolute(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_x509sat_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1047,7 +1048,7 @@ static const value_string T_intNamedDays_vals[] = {
 
 static int
 dissect_x509sat_T_intNamedDays(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1368,7 +1369,7 @@ static int dissect_entirely(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 int
 dissect_x509sat_TimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -1503,7 +1504,7 @@ void proto_register_x509sat(void) {
         "Criteria/type", HFILL }},
     { &hf_x509sat_and,
       { "and", "x509sat.and",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Criteria/and", HFILL }},
     { &hf_x509sat_and_item,
       { "Item", "x509sat.and_item",
@@ -1511,7 +1512,7 @@ void proto_register_x509sat(void) {
         "Criteria/and/_item", HFILL }},
     { &hf_x509sat_or,
       { "or", "x509sat.or",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Criteria/or", HFILL }},
     { &hf_x509sat_or_item,
       { "Item", "x509sat.or_item",
@@ -1591,7 +1592,7 @@ void proto_register_x509sat(void) {
         "PresentationAddress/tSelector", HFILL }},
     { &hf_x509sat_nAddresses,
       { "nAddresses", "x509sat.nAddresses",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "PresentationAddress/nAddresses", HFILL }},
     { &hf_x509sat_nAddresses_item,
       { "Item", "x509sat.nAddresses_item",
@@ -1603,7 +1604,7 @@ void proto_register_x509sat(void) {
         "ProtocolInformation/nAddress", HFILL }},
     { &hf_x509sat_profiles,
       { "profiles", "x509sat.profiles",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ProtocolInformation/profiles", HFILL }},
     { &hf_x509sat_profiles_item,
       { "Item", "x509sat.profiles_item",
@@ -1611,7 +1612,7 @@ void proto_register_x509sat(void) {
         "ProtocolInformation/profiles/_item", HFILL }},
     { &hf_x509sat_dn,
       { "dn", "x509sat.dn",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "NameAndOptionalUID/dn", HFILL }},
     { &hf_x509sat_uid,
       { "uid", "x509sat.uid",
@@ -1623,7 +1624,7 @@ void proto_register_x509sat(void) {
         "MultipleMatchingLocalities/matchingRuleUsed", HFILL }},
     { &hf_x509sat_attributeList,
       { "attributeList", "x509sat.attributeList",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "MultipleMatchingLocalities/attributeList", HFILL }},
     { &hf_x509sat_attributeList_item,
       { "Item", "x509sat.attributeList_item",
@@ -1691,7 +1692,7 @@ void proto_register_x509sat(void) {
         "", HFILL }},
     { &hf_x509sat_periodic,
       { "periodic", "x509sat.periodic",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "TimeSpecification/time/periodic", HFILL }},
     { &hf_x509sat_periodic_item,
       { "Item", "x509sat.periodic_item",
@@ -1707,7 +1708,7 @@ void proto_register_x509sat(void) {
         "TimeSpecification/timeZone", HFILL }},
     { &hf_x509sat_timesOfDay,
       { "timesOfDay", "x509sat.timesOfDay",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Period/timesOfDay", HFILL }},
     { &hf_x509sat_timesOfDay_item,
       { "Item", "x509sat.timesOfDay_item",
@@ -1719,7 +1720,7 @@ void proto_register_x509sat(void) {
         "Period/days", HFILL }},
     { &hf_x509sat_intDay,
       { "intDay", "x509sat.intDay",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Period/days/intDay", HFILL }},
     { &hf_x509sat_intDay_item,
       { "Item", "x509sat.intDay_item",
@@ -1743,7 +1744,7 @@ void proto_register_x509sat(void) {
         "Period/weeks/allWeeks", HFILL }},
     { &hf_x509sat_intWeek,
       { "intWeek", "x509sat.intWeek",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Period/weeks/intWeek", HFILL }},
     { &hf_x509sat_intWeek_item,
       { "Item", "x509sat.intWeek_item",
@@ -1763,7 +1764,7 @@ void proto_register_x509sat(void) {
         "Period/months/allMonths", HFILL }},
     { &hf_x509sat_intMonth,
       { "intMonth", "x509sat.intMonth",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Period/months/intMonth", HFILL }},
     { &hf_x509sat_intMonth_item,
       { "Item", "x509sat.intMonth_item",
@@ -1775,7 +1776,7 @@ void proto_register_x509sat(void) {
         "Period/months/bitMonth", HFILL }},
     { &hf_x509sat_years,
       { "years", "x509sat.years",
-        FT_UINT32, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "Period/years", HFILL }},
     { &hf_x509sat_years_item,
       { "Item", "x509sat.years_item",

diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h
index b76cfb164ec6ce7cadafdb15ef2cb852926d924a..b323633b2966b6b8efbd794e800ea651a933ffcb 100644 (file)
--- a/epan/dissectors/packet-x509sat.h
+++ b/epan/dissectors/packet-x509sat.h
@@ -7,8 +7,9 @@
 
 /* packet-x509sat.h
  * Routines for X.509 Selected Attribute Types packet dissection
+ *   Ronnie Sahlberg 2004
  *
- * $Id: packet-x509sat-template.h 12545 2004-11-20 05:58:13Z sahlberg $
+ * $Id: packet-x509sat-template.h 12573 2004-11-22 03:36:26Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>

diff --git a/tools/asn2eth.py b/tools/asn2eth.py
index c806385ecf227265cbb8da223466e60a070e40ee..448308f536f86618af892118d76db7af7d2d8499 100644 (file)
--- a/tools/asn2eth.py
+++ b/tools/asn2eth.py
@@ -688,6 +688,7 @@ class EthCtx:
     #print '# Dependency computation'
     for t in self.type_ord:
       if x.has_key(self.type[t]['ethname']):
+        #print 'Continue: %s : %s' % (t, self.type[t]['ethname'])
         continue
       stack = [t]
       stackx = {t : self.type_dep.get(t, [])[:]}
@@ -712,6 +713,9 @@ class EthCtx:
           #print 'Pop: %s' % (stack[-1])
           del stackx[stack[-1]]
           e = self.type[stack.pop()]['ethname']
+          if x.has_key(e):
+            continue
+          #print 'Add: %s' % (e)
           self.eth_type_ord1.append(e)
           x[e] = True
     i = 0
@@ -906,7 +910,7 @@ class EthCtx:
         attr = self.eth_get_type_attr(self.eth_type[t]['ref'][0]).copy()
         fx.write('TYPE = %(TYPE)-9s  DISPLAY = %(DISPLAY)-9s  STRINGS = %(STRINGS)s  BITMASK = %(BITMASK)s\n' % attr)
     fx.write('#.END\n\n')
-    self.output.file_close(fx)
+    self.output.file_close(fx, keep_anyway=True)
 
   #--- eth_output_val ------------------------------------------------------
   def eth_output_val(self):
@@ -1430,11 +1434,11 @@ class EthOut:
         fx.write(self.fhdr(fn))
     return fx
   #--- file_close -------------------------------------------------------
-  def file_close(self, fx, discard=False):
+  def file_close(self, fx, discard=False, keep_anyway=False):
     fx.close()
     if (discard): 
       os.unlink(fx.name)
-    else: 
+    elif (not keep_anyway): 
       self.created_files.append(os.path.normcase(os.path.abspath(fx.name)))
   #--- fhdr -------------------------------------------------------
   def fhdr(self, fn, comment=None):
@@ -1664,7 +1668,7 @@ class Type (Node):
         ectx.eth_reg_field(nm, nm, idx=idx, parent=parent, impl=self.HasImplicitTag(ectx))
     self.eth_reg_sub(nm, ectx)
 
-  def eth_get_size_constr(self, ):
+  def eth_get_size_constr(self):
     minv = '-1'
     maxv = '-1'
     ext = 'FALSE'
@@ -1720,13 +1724,22 @@ class Constraint (Node):
     return "Constraint: type=%s, subtype=%s" % (self.type, self.subtype)
 
   def eth_constrname(self):
+    def int2str(val):
+      try:
+        if (int(val) < 0):
+          return 'M' + str(-int(val))
+        else:
+          return str(val)
+      except (ValueError, TypeError):
+        return str(val)
+
     ext = ''
     if hasattr(self, 'ext') and self.ext:
       ext = '_'
     if self.type == 'SingleValue':
-      return str(self.subtype) + ext
+      return int2str(self.subtype) + ext
     elif self.type == 'ValueRange':
-      return str(self.subtype[0]) + '_' + str(self.subtype[1]) + ext
+      return int2str(self.subtype[0]) + '_' + int2str(self.subtype[1]) + ext
     elif self.type == 'Size':
       return 'SIZE_' + self.subtype.eth_constrname() + ext
     else:
@@ -1918,10 +1931,15 @@ class SequenceOfType (SqType):
     self.val.eth_reg(itmnm, ectx, idx='[##]', parent=ident)
 
   def eth_tname(self):
-    return "SEQUNCE_OF_" + self.val.eth_tname()
+    if not self.HasConstraint():
+      return "SEQUNCE_OF_" + self.val.eth_tname()
+    elif self.constr.type == 'Size' and (self.constr.subtype.type == 'SingleValue' or self.constr.subtype.type == 'ValueRange'):
+      return 'SEQUNCE_' + self.constr.eth_constrname() + '_OF_' + self.val.eth_tname()
+    else:
+      return '#' + self.type + '_' + str(id(self))
 
   def eth_ftype(self):
-    return ('FT_UINT32', 'BASE_DEC')
+    return ('FT_NONE', 'BASE_NONE')
 
   def eth_need_tree(self):
     return True
@@ -1942,19 +1960,33 @@ class SequenceOfType (SqType):
       out += self.out_item(f, self.val, False, '', ectx)
       out += "};\n"
     out += ectx.eth_type_fn_hdr(tname)
+    (minv, maxv, ext) = self.eth_get_size_constr()
     if (ectx.OBer()):
       body = ectx.eth_fn_call('dissect_ber_sequence_of', ret='offset',
                                 par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset'),
                                      (tname+'_sequence_of', 'hf_index', ectx.eth_type[tname]['tree'])))
     elif (ectx.NPer()):
-      body = ectx.eth_fn_call('dissect_pern_sequence_of', ret='offset',
-                              par=(('tvb', 'offset', 'pinfo', 'tree'),
-                                   ('hf_index', 'item', 'private_data'),
-                                   (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype']))))
+      if not self.HasConstraint():
+        body = ectx.eth_fn_call('dissect_pern_sequence_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree'),
+                                     ('hf_index', 'item', 'private_data'),
+                                     (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype']))))
+      else:
+        body = ectx.eth_fn_call('dissect_pern_constrained_sequence_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree'),
+                                     ('hf_index', 'item', 'private_data'),
+                                     (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype']))
+                                     (minv, maxv, ext)))
     elif (ectx.OPer()):
-      body = ectx.eth_fn_call('dissect_per_sequence_of', ret='offset',
-                              par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
-                                   (ectx.eth_type[tname]['tree'], 'dissect_'+ef)))
+      if not self.HasConstraint():
+        body = ectx.eth_fn_call('dissect_per_sequence_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
+                                     (ectx.eth_type[tname]['tree'], 'dissect_'+ef)))
+      else:
+        body = ectx.eth_fn_call('dissect_per_constrained_sequence_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
+                                     (ectx.eth_type[tname]['tree'], 'dissect_'+ef),
+                                     (minv, maxv)))
     else:
       body = '#error Can not decode %s' % (tname)
     out += ectx.eth_type_fn_body(tname, body)
@@ -1971,10 +2003,15 @@ class SetOfType (SqType):
     self.val.eth_reg(itmnm, ectx, idx='(##)', parent=ident)
 
   def eth_tname(self):
+    if not self.HasConstraint():
       return "SET_OF_" + self.val.eth_tname()
+    elif self.constr.type == 'Size' and (self.constr.subtype.type == 'SingleValue' or self.constr.subtype.type == 'ValueRange'):
+      return 'SET_' + self.constr.eth_constrname() + '_OF_' + self.val.eth_tname()
+    else:
+      return '#' + self.type + '_' + str(id(self))
 
   def eth_ftype(self):
-    return ('FT_UINT32', 'BASE_DEC')
+    return ('FT_NONE', 'BASE_NONE')
 
   def eth_need_tree(self):
     return True
@@ -1992,15 +2029,33 @@ class SetOfType (SqType):
       out += self.out_item(f, self.val, False, '', ectx)
       out += "};\n"
     out += ectx.eth_type_fn_hdr(tname)
+    (minv, maxv, ext) = self.eth_get_size_constr()
     if (ectx.OBer()):
       body = ectx.eth_fn_call('dissect_ber_set_of', ret='offset',
                                 par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset'),
                                      (tname+'_set_of', 'hf_index', ectx.eth_type[tname]['tree'])))
     elif (ectx.NPer()):
-      body = ectx.eth_fn_call('dissect_pern_set_of', ret='offset',
-                              par=(('tvb', 'offset', 'pinfo', 'tree'),
-                                   ('hf_index', 'item', 'private_data'),
-                                   (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype']))))
+      if not self.HasConstraint():
+        body = ectx.eth_fn_call('dissect_pern_set_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree'),
+                                     ('hf_index', 'item', 'private_data'),
+                                     (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype']))))
+      else:
+        body = ectx.eth_fn_call('dissect_pern_constrained_set_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree'),
+                                     ('hf_index', 'item', 'private_data'),
+                                     (ectx.eth_type[tname]['tree'], ef, 'dissect_%s_%s' % (ectx.eth_type[ectx.eth_hf[ef]['ethtype']]['proto'], ectx.eth_hf[ef]['ethtype']))
+                                     (minv, maxv, ext)))
+    elif (ectx.OPer()):
+      if not self.HasConstraint():
+        body = ectx.eth_fn_call('dissect_per_set_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
+                                     (ectx.eth_type[tname]['tree'], 'dissect_'+ef)))
+      else:
+        body = ectx.eth_fn_call('dissect_per_constrained_set_of', ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
+                                     (ectx.eth_type[tname]['tree'], 'dissect_'+ef),
+                                     (minv, maxv)))
     else:
       body = '#error Can not decode %s' % (tname)
     out += ectx.eth_type_fn_body(tname, body)
@@ -2032,103 +2087,103 @@ class Tag (Node):
  
 #--- SequenceType -------------------------------------------------------------
 class SequenceType (SqType):
-    def to_python (self, ctx):
-        # name, tag (None for no tag, EXPLICIT() for explicit), typ)
-        # or '' + (1,) for optional
-        # XXX should also collect names for SEQUENCE inside SEQUENCE or
-        # CHOICE or SEQUENCE_OF (where should the SEQUENCE_OF name come
-        # from?  for others, element or arm name would be fine)
-        seq_name = getattr (self, 'sequence_name', None)
-        if seq_name == None:
-            seq_name = 'None'
-        else:
-            seq_name = "'" + seq_name + "'"
-        if self.__dict__.has_key('ext_list'):
-          return "%sasn1.SEQUENCE ([%s], ext=[%s], seq_name = %s)" % (ctx.spaces (), 
-                                   self.elts_to_py (self.elt_list, ctx),
-                                   self.elts_to_py (self.ext_list, ctx), seq_name)
-        else:
-          return "%sasn1.SEQUENCE ([%s]), seq_name = %s" % (ctx.spaces (), 
-                                   self.elts_to_py (self.elt_list, ctx), seq_name)
-    def elts_to_py (self, list, ctx):
-        # we have elt_type, val= named_type, maybe default=, optional=
-        # named_type node: either ident = or typ =
-        # need to dismember these in order to generate Python output syntax.
-        ctx.indent ()
-        def elt_to_py (e):
-            assert (e.type == 'elt_type')
-            nt = e.val
-            optflag = e.optional
-#            assert (not hasattr (e, 'default')) # XXX add support for DEFAULT!
-            assert (nt.type == 'named_type')
-            tagstr = 'None'
-            identstr = nt.ident
-            if hasattr (nt.typ, 'type') and nt.typ.type == 'tag': # ugh
-                tagstr = mk_tag_str (ctx,nt.typ.tag.cls,
-                                     nt.typ.tag.tag_typ,nt.typ.tag.num)
-        
-
-                nt = nt.typ
-            return "('%s',%s,%s,%d)" % (identstr, tagstr,
-                                      nt.typ.to_python (ctx), optflag)
-        indentstr = ",\n" + ctx.spaces ()
-        rv = indentstr.join ([elt_to_py (e) for e in list])
-        ctx.outdent ()
-        return rv
+  def to_python (self, ctx):
+      # name, tag (None for no tag, EXPLICIT() for explicit), typ)
+      # or '' + (1,) for optional
+      # XXX should also collect names for SEQUENCE inside SEQUENCE or
+      # CHOICE or SEQUENCE_OF (where should the SEQUENCE_OF name come
+      # from?  for others, element or arm name would be fine)
+      seq_name = getattr (self, 'sequence_name', None)
+      if seq_name == None:
+          seq_name = 'None'
+      else:
+          seq_name = "'" + seq_name + "'"
+      if self.__dict__.has_key('ext_list'):
+        return "%sasn1.SEQUENCE ([%s], ext=[%s], seq_name = %s)" % (ctx.spaces (), 
+                                 self.elts_to_py (self.elt_list, ctx),
+                                 self.elts_to_py (self.ext_list, ctx), seq_name)
+      else:
+        return "%sasn1.SEQUENCE ([%s]), seq_name = %s" % (ctx.spaces (), 
+                                 self.elts_to_py (self.elt_list, ctx), seq_name)
+  def elts_to_py (self, list, ctx):
+      # we have elt_type, val= named_type, maybe default=, optional=
+      # named_type node: either ident = or typ =
+      # need to dismember these in order to generate Python output syntax.
+      ctx.indent ()
+      def elt_to_py (e):
+          assert (e.type == 'elt_type')
+          nt = e.val
+          optflag = e.optional
+          #assert (not hasattr (e, 'default')) # XXX add support for DEFAULT!
+          assert (nt.type == 'named_type')
+          tagstr = 'None'
+          identstr = nt.ident
+          if hasattr (nt.typ, 'type') and nt.typ.type == 'tag': # ugh
+              tagstr = mk_tag_str (ctx,nt.typ.tag.cls,
+                                   nt.typ.tag.tag_typ,nt.typ.tag.num)
+      
+
+              nt = nt.typ
+          return "('%s',%s,%s,%d)" % (identstr, tagstr,
+                                    nt.typ.to_python (ctx), optflag)
+      indentstr = ",\n" + ctx.spaces ()
+      rv = indentstr.join ([elt_to_py (e) for e in list])
+      ctx.outdent ()
+      return rv
 
-    def eth_reg_sub(self, ident, ectx):
-        for e in (self.elt_list):
-            e.val.eth_reg(ident, ectx, parent=ident)
-        if hasattr(self, 'ext_list'):
-            for e in (self.ext_list):
-                e.val.eth_reg(ident, ectx, parent=ident)
+  def eth_reg_sub(self, ident, ectx):
+      for e in (self.elt_list):
+          e.val.eth_reg(ident, ectx, parent=ident)
+      if hasattr(self, 'ext_list'):
+          for e in (self.ext_list):
+              e.val.eth_reg(ident, ectx, parent=ident)
 
-    def eth_need_tree(self):
-      return True
+  def eth_need_tree(self):
+    return True
 
-    def GetTTag(self, ectx):
-      return ('BER_CLASS_UNI', 'BER_UNI_TAG_SEQUENCE')
+  def GetTTag(self, ectx):
+    return ('BER_CLASS_UNI', 'BER_UNI_TAG_SEQUENCE')
 
-    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)
-      if hasattr(self, 'ext_list'):
-        ext = 'ASN1_EXTENSION_ROOT'
-      else:
-        ext = 'ASN1_NO_EXTENSIONS'
-      for e in (self.elt_list):
+  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)
+    if hasattr(self, 'ext_list'):
+      ext = 'ASN1_EXTENSION_ROOT'
+    else:
+      ext = 'ASN1_NO_EXTENSIONS'
+    for e in (self.elt_list):
+      f = fname + '/' + e.val.name
+      out += self.out_item(f, e.val, e.optional, ext, ectx)
+    if hasattr(self, 'ext_list'):
+      for e in (self.ext_list):
         f = fname + '/' + e.val.name
-        out += self.out_item(f, e.val, e.optional, ext, ectx)
-      if hasattr(self, 'ext_list'):
-        for e in (self.ext_list):
-          f = fname + '/' + e.val.name
-          out += self.out_item(f, e.val, e.optional, 'ASN1_NOT_EXTENSION_ROOT', ectx)
-      if (ectx.Ber()):
-        out += "  { 0, 0, 0, NULL }\n};\n"
-      else:
-        out += "  { NULL, 0, 0, NULL }\n};\n"
-      out += ectx.eth_type_fn_hdr(tname)
-      if (ectx.OBer()):
-        body = ectx.eth_fn_call('dissect_ber_sequence', ret='offset',
-                                par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset'),
-                                     (tname+'_sequence', 'hf_index', ectx.eth_type[tname]['tree'])))
-      elif (ectx.NPer()):
-        body = ectx.eth_fn_call('dissect_pern_sequence', ret='offset',
-                                par=(('tvb', 'offset', 'pinfo', 'tree'),
-                                     ('hf_index', 'item', 'private_data'),
-                                     (ectx.eth_type[tname]['tree'], tname+'_sequence', '"'+tname+'"')))
-      elif (ectx.OPer()):
-        body = ectx.eth_fn_call('dissect_per_sequence', ret='offset',
-                                par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
-                                     (ectx.eth_type[tname]['tree'], tname+'_sequence')))
-      else:
-        body = '#error Can not decode %s' % (tname)
-      out += ectx.eth_type_fn_body(tname, body)
-      out += ectx.eth_type_fn_ftr(tname)
-      return out
+        out += self.out_item(f, e.val, e.optional, 'ASN1_NOT_EXTENSION_ROOT', ectx)
+    if (ectx.Ber()):
+      out += "  { 0, 0, 0, NULL }\n};\n"
+    else:
+      out += "  { NULL, 0, 0, NULL }\n};\n"
+    out += ectx.eth_type_fn_hdr(tname)
+    if (ectx.OBer()):
+      body = ectx.eth_fn_call('dissect_ber_sequence', ret='offset',
+                              par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset'),
+                                   (tname+'_sequence', 'hf_index', ectx.eth_type[tname]['tree'])))
+    elif (ectx.NPer()):
+      body = ectx.eth_fn_call('dissect_pern_sequence', ret='offset',
+                              par=(('tvb', 'offset', 'pinfo', 'tree'),
+                                   ('hf_index', 'item', 'private_data'),
+                                   (ectx.eth_type[tname]['tree'], tname+'_sequence', '"'+tname+'"')))
+    elif (ectx.OPer()):
+      body = ectx.eth_fn_call('dissect_per_sequence', ret='offset',
+                              par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
+                                   (ectx.eth_type[tname]['tree'], tname+'_sequence')))
+    else:
+      body = '#error Can not decode %s' % (tname)
+    out += ectx.eth_type_fn_body(tname, body)
+    out += ectx.eth_type_fn_ftr(tname)
+    return out
 
 #--- SetType ------------------------------------------------------------------
 class SetType(SqType):
@@ -2161,10 +2216,21 @@ class SetType(SqType):
         out += self.out_item(f, e.val, e.optional, 'ASN1_NOT_EXTENSION_ROOT', ectx)
     out += "  { NULL, 0, 0, NULL }\n};\n"
     out += ectx.eth_type_fn_hdr(tname)
-    body = "  offset = dissect_per_set_new(tvb, offset, pinfo, tree,\n" \
-           "                               hf_index, item, private_data,\n"
-    body += '                               %s, %s_sequence_new, "%s");\n' \
-           % (ectx.eth_type[tname]['tree'], tname, tname)
+    if (ectx.OBer()):
+      body = ectx.eth_fn_call('dissect_ber_set', ret='offset',
+                              par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset'),
+                                   (tname+'_sequence', 'hf_index', ectx.eth_type[tname]['tree'])))
+    elif (ectx.NPer()):
+      body = ectx.eth_fn_call('dissect_pern_set', ret='offset',
+                              par=(('tvb', 'offset', 'pinfo', 'tree'),
+                                   ('hf_index', 'item', 'private_data'),
+                                   (ectx.eth_type[tname]['tree'], tname+'_sequence', '"'+tname+'"')))
+    elif (ectx.OPer()):
+      body = ectx.eth_fn_call('dissect_per_sequence', ret='offset',
+                              par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
+                                   (ectx.eth_type[tname]['tree'], tname+'_sequence')))
+    else:
+      body = '#error Can not decode %s' % (tname)
     out += ectx.eth_type_fn_body(tname, body)
     out += ectx.eth_type_fn_ftr(tname)
     return out
@@ -2438,10 +2504,10 @@ class EnumeratedType (Type):
       ext = 'TRUE'
     out += ectx.eth_type_fn_hdr(tname)
     if (ectx.Ber()):
-      body = ectx.eth_fn_call('dissect_ber_integer_new', ret='offset',
+      body = ectx.eth_fn_call('dissect_ber_integer', ret='offset',
                               par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset', 'hf_index', 'NULL'),))
     elif (ectx.NPer()):
-      body = "  offset = dissect_pern_constrained_integer_new(tvb, offset, pinfo, tree,\n"
+      body = "  offset = dissect_pern_constrained_integer(tvb, offset, pinfo, tree,\n"
       body += "                                               %s, %s, %s,\n" \
              % (0, maxv, ext)
       body += "                                               NULL);\n"
@@ -2638,9 +2704,13 @@ class RestrictedCharacterStringType (CharacterStringType):
                                    (minv, maxv, ext),
                                    ('NULL', 'NULL')))
     elif (ectx.OPer()):
-      body = ectx.eth_fn_call('dissect_per_'  + self.eth_tsname(), ret='offset',
-                              par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
-                                   (minv, maxv)))
+      if (self.eth_tsname() == 'GeneralString'):
+        body = ectx.eth_fn_call('dissect_per_'  + self.eth_tsname(), ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),))
+      else:
+        body = ectx.eth_fn_call('dissect_per_'  + self.eth_tsname(), ret='offset',
+                                par=(('tvb', 'offset', 'pinfo', 'tree', 'hf_index'),
+                                     (minv, maxv)))
     else:
       body = '#error Can not decode %s' % (tname)
     out += ectx.eth_type_fn_body(tname, body)
@@ -2874,7 +2944,7 @@ class IntegerType (Type):
     out = '\n'
     out += ectx.eth_type_fn_hdr(tname)
     if (ectx.Ber()):
-      body = ectx.eth_fn_call('dissect_ber_integer_new', ret='offset',
+      body = ectx.eth_fn_call('dissect_ber_integer', ret='offset',
                               par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset', 'hf_index', 'NULL'),))
     elif (not self.HasConstraint()):
       if (ectx.NAPI()):
@@ -4214,6 +4284,7 @@ def eth_do_module (ast, ectx):
       for f in (ectx.eth_hfpdu_ord + ectx.eth_hf_ord):
         print "%-30s %-20s %s" % (f, ectx.eth_hf[f]['ethtype'], len(ectx.eth_hf[f]['ref'])),
         print ', '.join(ectx.eth_hf[f]['ref'])
+      #print "\n# Order after dependencies"
       #print '\n'.join(ectx.eth_type_ord1)
       print "\n# Cyclic dependencies"
       for c in ectx.eth_dep_cycle: