diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-12-13 08:15:34 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-12-13 08:15:34 +0000 |
| commit | 8afae320de76b02165028db72b7c8266e54f9566 (patch) | |
| tree | 99088dd584f524a92e5cd1f30c341c4c395653eb | |
| parent | 084055c89517e2ef2fd80f4ba68dbbcb428ce64b (diff) | |
update of the asn2eth compiler to use the types ber_[choice|sequence]_t instead of ber_[choice|sequence]
regenerated all dissectors
fixed the choice/sequence struct to use unsigned entities for class and tag
(to reduce some compiler warning and because it should be signed quantities)
svn path=/trunk/; revision=12740
47 files changed, 916 insertions, 908 deletions
diff --git a/asn1/MAP_Dialogue/Makefile b/asn1/MAP_Dialogue/Makefile index d1bf03a00b..6c4127089f 100755 --- a/asn1/MAP_Dialogue/Makefile +++ b/asn1/MAP_Dialogue/Makefile @@ -1,5 +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 + python ../../tools/asn2eth.py -X -b -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/cmip.cnf b/asn1/cmip/cmip.cnf index e40c0e1efb..c9dd7aa4ab 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -12,6 +12,7 @@ InformationFramework x509if CMIPAbortInfo CMIPUserInfo ROS +InvokeIDType #.NO_EMIT diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 95951b121e..968636094b 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -35,6 +35,7 @@ #include <string.h> #include "packet-ber.h" +#include "packet-x509if.h" #include "packet-cmip.h" #define PNAME "X711 CMIP" diff --git a/asn1/cms/Makefile b/asn1/cms/Makefile index 3124abcd03..9fba674d4d 100755 --- a/asn1/cms/Makefile +++ b/asn1/cms/Makefile @@ -1,5 +1,5 @@ ../../epan/dissectors/packet-cms.c : ../../tools/asn2eth.py CryptographicMessageSyntax.asn packet-cms-template.c packet-cms-template.h cms.cnf - python ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn + python ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn cp packet-cms.* ../../epan/dissectors diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index aa570b6a91..230a1deec1 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -11,6 +11,7 @@ SignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET UnsignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET SignatureValue BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE +Countersignature BER_CLASS_UNI BER_UNI_TAG_SEQUENCE #.END #.TYPE_ATTR @@ -26,5 +27,6 @@ SignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL 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 +Countersignature TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 #.END diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index ca6f88f3f4..5577b435c3 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -13,6 +13,7 @@ InformationFramework x509if #.EXPORTS ContentInfo ContentType +Countersignature DigestAlgorithmIdentifiers EncapsulatedContentInfo IssuerAndSerialNumber diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 439f23e267..293ac94460 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -51,6 +51,9 @@ static int hf_cms_ci_contentType = -1; /* Initialize the subtree pointers */ #include "packet-cms-ett.c" +static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2eth stops generating these silly wrappers */ + + static char object_identifier_id[64]; /*64 chars should be long enough? */ #include "packet-cms-fn.c" diff --git a/asn1/gsmmap/Makefile b/asn1/gsmmap/Makefile index b55bfc55cf..7c03804228 100755 --- a/asn1/gsmmap/Makefile +++ b/asn1/gsmmap/Makefile @@ -1,5 +1,5 @@ ../../epan/dissectors/packet-gsm_map.c : ../../tools/asn2eth.py GSMMAP.asn packet-gsm_map-template.c packet-gsm_map-template.h gsmmap.cnf - python ../../tools/asn2eth.py -X -b -k -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn + python ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn cp packet-gsm_map.* ../../epan/dissectors diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index 1e894beeb1..6134d0e629 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -558,7 +558,7 @@ static int dissect_absent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } -static const ber_choice InvokeId_choice[] = { +static const ber_choice_t InvokeId_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeid }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent }, { 0, 0, 0, 0, NULL } @@ -575,7 +575,7 @@ static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_gsm_map_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_invokeId); } -static const ber_sequence InvokePDU_sequence[] = { +static const ber_sequence_t InvokePDU_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd }, { BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData }, @@ -593,7 +593,7 @@ static int dissect_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_gsm_map_InvokePDU(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_invoke); } -static const ber_sequence ReturnResult_result_sequence[] = { +static const ber_sequence_t ReturnResult_result_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd }, { BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_returnResultData }, { 0, 0, 0, NULL } @@ -606,7 +606,7 @@ dissect_returnResult_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return offset; } -static const ber_sequence ReturnResultPDU_sequence[] = { +static const ber_sequence_t ReturnResultPDU_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_returnResult_result }, { 0, 0, 0, NULL } @@ -631,7 +631,7 @@ static const value_string GSMMAPPDU_vals[] = { { 0, NULL } }; -static const ber_choice GSMMAPPDU_choice[] = { +static const ber_choice_t GSMMAPPDU_choice[] = { { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl }, #ifdef REMOVED diff --git a/asn1/h248/Makefile b/asn1/h248/Makefile index ea3dd6355f..01229a7d70 100755 --- a/asn1/h248/Makefile +++ b/asn1/h248/Makefile @@ -1,5 +1,5 @@ ../../epan/dissectors/packet-h248.c : ../../tools/asn2eth.py MEGACO.asn packet-h248-template.c packet-h248-template.h h248.cnf - python ../../tools/asn2eth.py -X -b -k -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn + python ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn cp packet-h248.* ../../epan/dissectors diff --git a/asn1/logotype-cert-extn/Makefile b/asn1/logotype-cert-extn/Makefile index ec035418cf..67b6a1281d 100755 --- a/asn1/logotype-cert-extn/Makefile +++ b/asn1/logotype-cert-extn/Makefile @@ -1,5 +1,5 @@ -../../epan/dissectors/packet-ess.c : ../../tools/asn2eth.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf - python ../../tools/asn2eth.py -X -b -k -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn +../../epan/dissectors/packet-logotypecertextn.c : ../../tools/asn2eth.py LogotypeCertExtn.asn packet-logotype-cert-extn-template.c packet-logotype-cert-extn-template.h logotype-cert-extn.cnf + python ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn cp packet-logotypecertextn.* ../../epan/dissectors diff --git a/asn1/ocsp/Makefile b/asn1/ocsp/Makefile index 29b6ec4e87..5bebacf7b0 100755 --- a/asn1/ocsp/Makefile +++ b/asn1/ocsp/Makefile @@ -1,5 +1,5 @@ ../../epan/dissectors/packet-ocsp.c : ../../tools/asn2eth.py OCSP.asn packet-ocsp-template.c packet-ocsp-template.h ocsp.cnf - python ../../tools/asn2eth.py -X -b -k -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn + python ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn cp packet-ocsp.* ../../epan/dissectors diff --git a/asn1/pkixproxy/Makefile b/asn1/pkixproxy/Makefile index 6199d4802e..db33a69ba8 100755 --- a/asn1/pkixproxy/Makefile +++ b/asn1/pkixproxy/Makefile @@ -1,5 +1,5 @@ ../../epan/dissectors/packet-pkixproxy.c : ../../tools/asn2eth.py PKIXProxy.asn packet-pkixproxy-template.c packet-pkixproxy-template.h pkixproxy.cnf - python ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn + python ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn cp packet-pkixproxy.* ../../epan/dissectors diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c index 5ecaf0c83c..05bcdd119b 100644 --- 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 -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ +/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ /* Input file: packet-MAP-DialoguePDU-template.c */ @@ -122,7 +122,7 @@ static int dissect_originationReference_impl(packet_info *pinfo, proto_tree *tre return dissect_MAP_DialoguePDU_OriginationReference(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_originationReference); } -static const ber_sequence T_map_open_sequence[] = { +static const ber_sequence_t T_map_open_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationReference_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originationReference_impl }, { 0, 0, 0, NULL } @@ -139,7 +139,7 @@ static int dissect_map_open_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_MAP_DialoguePDU_T_map_open(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_open); } -static const ber_sequence T_map_accept_sequence[] = { +static const ber_sequence_t T_map_accept_sequence[] = { { 0, 0, 0, NULL } }; @@ -154,7 +154,7 @@ static int dissect_map_accept_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_MAP_DialoguePDU_T_map_accept(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_accept); } -static const ber_sequence T_map_close_sequence[] = { +static const ber_sequence_t T_map_close_sequence[] = { { 0, 0, 0, NULL } }; @@ -188,7 +188,7 @@ static int dissect_reason(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_MAP_DialoguePDU_Reason(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_reason); } -static const ber_sequence T_map_refuse_sequence[] = { +static const ber_sequence_t T_map_refuse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason }, { 0, 0, 0, NULL } }; @@ -271,7 +271,7 @@ static const value_string MAP_UserAbortChoice_vals[] = { { 0, NULL } }; -static const ber_choice MAP_UserAbortChoice_choice[] = { +static const ber_choice_t MAP_UserAbortChoice_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_userSpecificReason_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_userResourceLimitation_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_resourceUnavailable_impl }, @@ -290,7 +290,7 @@ static int dissect_map_UserAbortChoice(packet_info *pinfo, proto_tree *tree, tvb return dissect_MAP_DialoguePDU_MAP_UserAbortChoice(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_UserAbortChoice); } -static const ber_sequence T_map_userAbort_sequence[] = { +static const ber_sequence_t T_map_userAbort_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice }, { 0, 0, 0, NULL } }; @@ -324,7 +324,7 @@ static int dissect_map_ProviderAbortReason(packet_info *pinfo, proto_tree *tree, return dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_ProviderAbortReason); } -static const ber_sequence T_map_providerAbort_sequence[] = { +static const ber_sequence_t T_map_providerAbort_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason }, { 0, 0, 0, NULL } }; @@ -351,7 +351,7 @@ static const value_string MAP_DialoguePDU_vals[] = { { 0, NULL } }; -static const ber_choice MAP_DialoguePDU_choice[] = { +static const ber_choice_t MAP_DialoguePDU_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_map_open_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_map_accept_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_map_close_impl }, @@ -369,7 +369,7 @@ dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence MAP_OpenInfo_sequence[] = { +static const ber_sequence_t MAP_OpenInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationReference_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originationReference_impl }, { 0, 0, 0, NULL } @@ -383,7 +383,7 @@ dissect_MAP_DialoguePDU_MAP_OpenInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, i return offset; } -static const ber_sequence MAP_AcceptInfo_sequence[] = { +static const ber_sequence_t MAP_AcceptInfo_sequence[] = { { 0, 0, 0, NULL } }; @@ -395,7 +395,7 @@ dissect_MAP_DialoguePDU_MAP_AcceptInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence MAP_CloseInfo_sequence[] = { +static const ber_sequence_t MAP_CloseInfo_sequence[] = { { 0, 0, 0, NULL } }; @@ -407,7 +407,7 @@ dissect_MAP_DialoguePDU_MAP_CloseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence MAP_RefuseInfo_sequence[] = { +static const ber_sequence_t MAP_RefuseInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason }, { 0, 0, 0, NULL } }; @@ -420,7 +420,7 @@ dissect_MAP_DialoguePDU_MAP_RefuseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence MAP_UserAbortInfo_sequence[] = { +static const ber_sequence_t MAP_UserAbortInfo_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice }, { 0, 0, 0, NULL } }; @@ -468,7 +468,7 @@ dissect_MAP_DialoguePDU_ProcedureCancellationReason(gboolean implicit_tag _U_, t return offset; } -static const ber_sequence MAP_ProviderAbortInfo_sequence[] = { +static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason }, { 0, 0, 0, NULL } }; diff --git a/epan/dissectors/packet-MAP_DialoguePDU.h b/epan/dissectors/packet-MAP_DialoguePDU.h index 8c0b4ff6a0..d78b55fdd4 100644 --- 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 -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */ +/* ../../tools/asn2eth.py -X -b -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 a243d4a194..7579f6081a 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -182,7 +182,7 @@ dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *t offset=dissect_ber_identifier(pinfo, NULL, tvb, offset, &class, &pc, &tag); offset=dissect_ber_length(pinfo, NULL, tvb, offset, &len, &ind); - if(len>tvb_length_remaining(tvb, offset)){ + if(len>(guint32)tvb_length_remaining(tvb, offset)){ /* hmm maybe something bad happened or the frame is short, since these are not vital outputs just return instead of throwing en exception. @@ -241,7 +241,7 @@ dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *t } /* were there more data to eat? */ - if(offset<tvb_length(tvb)){ + if(offset<(int)tvb_length(tvb)){ offset=dissect_unknown_ber(pinfo, tvb, offset, tree); } @@ -276,16 +276,16 @@ call_ber_oid_callback(char *oid, tvbuff_t *tvb, int offset, packet_info *pinfo, } -static int dissect_ber_sq_of(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); +static int dissect_ber_sq_of(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id); /* 8.1 General rules for encoding */ /* 8.1.2 Identifier octets */ -int get_ber_identifier(tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag) { +int get_ber_identifier(tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag) { guint8 id, t; - guint8 tmp_class; + gint8 tmp_class; gboolean tmp_pc; - guint32 tmp_tag; + gint32 tmp_tag; id = tvb_get_guint8(tvb, offset); offset += 1; @@ -316,12 +316,12 @@ int get_ber_identifier(tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, g return offset; } -int dissect_ber_identifier(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag) +int dissect_ber_identifier(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag) { int old_offset = offset; - guint8 tmp_class; + gint8 tmp_class; gboolean tmp_pc; - guint32 tmp_tag; + gint32 tmp_tag; offset = get_ber_identifier(tvb, offset, &tmp_class, &tmp_pc, &tmp_tag); @@ -472,7 +472,7 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name); ber_last_created_item = it; } if (out_tvb) { - if(len<=tvb_length_remaining(tvb, offset)){ + if(len<=(guint32)tvb_length_remaining(tvb, offset)){ *out_tvb = tvb_new_subset(tvb, offset, len, len); } else { *out_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_length_remaining(tvb, offset)); @@ -628,10 +628,10 @@ dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int off /* this function dissects a BER sequence */ -int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) { - guint8 class; +int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) { + gint8 class; gboolean pc, ind, ind_field; - guint32 tag; + gint32 tag; guint32 len; proto_tree *tree = parent_tree; proto_item *item = NULL; @@ -691,9 +691,9 @@ printf("SEQUENCE dissect_ber_sequence(%s) entered\n",name); /* loop over all entries until we reach the end of the sequence */ while (offset < end_offset){ - guint8 class; + gint8 class; gboolean pc; - guint32 tag; + gint32 tag; guint32 len; int hoffset, eoffset, count; @@ -839,13 +839,13 @@ printf("SEQUENCE dissect_ber_sequence(%s) subdissector ate %d bytes\n",name,coun * in case it was a CHOICE { } OPTIONAL */ int -dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice *choice, gint hf_id, gint ett_id) +dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *choice, gint hf_id, gint ett_id) { - guint8 class; + gint8 class; gboolean pc, ind; - guint32 tag; + gint32 tag; guint32 len; - const ber_choice *ch; + const ber_choice_t *ch; proto_tree *tree=parent_tree; proto_item *item=NULL; int end_offset, start_offset, count; @@ -1010,9 +1010,9 @@ printf("CHOICE dissect_ber_choice(%s) subdissector ate %d bytes\n",name,count); int dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, int name_len) { - guint8 class; + gint8 class; gboolean pc; - guint32 tag; + gint32 tag; guint32 len; int end_offset; char str_arr[256]; @@ -1053,10 +1053,10 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } #endif int -dissect_ber_restricted_string(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) { - guint8 class; +dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) { + gint8 class; gboolean pc; - guint32 tag; + gint32 tag; guint32 len; int eoffset; int hoffset = offset; @@ -1118,9 +1118,9 @@ dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i /* 8.19 Encoding of an object identifier value */ int dissect_ber_object_identifier(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *value_string) { - guint8 class; + gint8 class; gboolean pc; - guint32 tag; + gint32 tag; guint32 i, len; int eoffset; guint8 byte; @@ -1209,10 +1209,10 @@ printf("OBJECT IDENTIFIER dissect_ber_object_identifier(%s) entered\n",name); return eoffset; } -static int dissect_ber_sq_of(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) { - guint8 class; +static int dissect_ber_sq_of(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) { + gint8 class; gboolean pc, ind, ind_field; - guint32 tag; + gint32 tag; guint32 len; proto_tree *tree = parent_tree; proto_item *item = NULL; @@ -1300,9 +1300,9 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n",name); /* loop over all entries until we reach the end of the sequence */ while (offset < end_offset){ - guint8 class; + gint8 class; gboolean pc; - guint32 tag; + gint32 tag; guint32 len; int eoffset; int hoffset, count; @@ -1370,11 +1370,11 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n",name); return end_offset; } -int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) { +int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) { return dissect_ber_sq_of(implicit_tag, BER_UNI_TAG_SEQUENCE, pinfo, parent_tree, tvb, offset, seq, hf_id, ett_id); } -int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id) { +int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id) { return dissect_ber_sq_of(implicit_tag, BER_UNI_TAG_SET, pinfo, parent_tree, tvb, offset, seq, hf_id, ett_id); } @@ -1383,9 +1383,9 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tre { char str[32]; const guint8 *tmpstr; - guint8 class; + gint8 class; gboolean pc; - guint32 tag; + gint32 tag; guint32 len; int end_offset; @@ -1424,9 +1424,9 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tre /* 8.6 Encoding of a bitstring value */ int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const asn_namedbit *named_bits, gint hf_id, gint ett_id, tvbuff_t **out_tvb) { - guint8 class; + gint8 class; gboolean pc, ind; - guint32 tag; + gint32 tag; guint32 len; guint8 pad=0, b0, b1, val; int end_offset; @@ -1476,7 +1476,7 @@ int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree } } if (out_tvb) { - if(len<=tvb_length_remaining(tvb, offset)){ + if(len<=(guint32)tvb_length_remaining(tvb, offset)){ *out_tvb = tvb_new_subset(tvb, offset, len, len); } else { *out_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), tvb_length_remaining(tvb, offset)); diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index 59226cdcb8..9e31ef8ad2 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -74,8 +74,8 @@ typedef int (*ber_callback)(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, /* this function dissects the identifier octer of the BER TLV. * We only handle TAGs (and LENGTHs) that fit inside 32 bit integers. */ -extern int get_ber_identifier(tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag); -extern int dissect_ber_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, guint8 *class, gboolean *pc, guint32 *tag); +extern int get_ber_identifier(tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag); +extern int dissect_ber_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag); /* this function dissects the identifier octer of the BER TLV. * We only handle (TAGs and) LENGTHs that fit inside 32 bit integers. @@ -96,35 +96,35 @@ extern int dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *t #define BER_FLAGS_IMPLTAG 0x00000002 #define BER_FLAGS_NOOWNTAG 0x00000004 #define BER_FLAGS_NOTCHKTAG 0x00000008 -typedef struct _ber_sequence { - guint8 class; - guint32 tag; +typedef struct _ber_sequence_t { + gint8 class; + gint32 tag; guint32 flags; ber_callback func; -} ber_sequence; +} ber_sequence_t; /* this function dissects a BER sequence */ -extern int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); +extern int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id); -typedef struct _ber_choice { +typedef struct _ber_choice_t { guint32 value; - guint8 class; - guint32 tag; + gint8 class; + gint32 tag; guint32 flags; ber_callback func; -} ber_choice; +} ber_choice_t; /* this function dissects a BER choice */ -extern int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice *ch, gint hf_id, gint ett_id); +extern int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id); /* this function dissects a BER strings */ -extern int dissect_ber_restricted_string(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb); +extern int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb); extern int dissect_ber_GeneralString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *name_string, guint name_len); @@ -134,9 +134,9 @@ extern int dissect_ber_object_identifier(gboolean implicit_tag, packet_info *pin /* this function dissects a BER sequence of */ -extern int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); +extern int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id); -extern int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); +extern int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id); extern int dissect_ber_GeneralizedTime(gboolean implicit_tag, 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 3352204e7d..93ce093f7e 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -42,6 +42,7 @@ #include <string.h> #include "packet-ber.h" +#include "packet-x509if.h" #include "packet-cmip.h" #define PNAME "X711 CMIP" @@ -367,7 +368,7 @@ static int dissect_attributeValue(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cmip_T_attributeValue(FALSE, tvb, offset, pinfo, tree, hf_cmip_attributeValue); } -static const ber_sequence ModificationItem_sequence[] = { +static const ber_sequence_t ModificationItem_sequence[] = { { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyOperator_impl }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_attributeValue }, @@ -420,7 +421,7 @@ static const value_string ObjectClass_vals[] = { { 0, NULL } }; -static const ber_choice ObjectClass_choice[] = { +static const ber_choice_t ObjectClass_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ocglobalForm_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_oclocalForm_impl }, { 0, 0, 0, 0, NULL } @@ -460,7 +461,7 @@ static const value_string ObjectInstance_vals[] = { { 0, NULL } }; -static const ber_choice ObjectInstance_choice[] = { +static const ber_choice_t ObjectInstance_choice[] = { { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_distinguishedName_impl }, { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_nonSpecificForm_impl }, { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_localDistinguishedName_impl }, @@ -554,7 +555,7 @@ static const value_string AttributeId_vals[] = { { 0, NULL } }; -static const ber_choice AttributeId_choice[] = { +static const ber_choice_t AttributeId_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_globalForm_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_localForm_impl }, { 0, 0, 0, 0, NULL } @@ -580,7 +581,7 @@ static int dissect_attributeIdList_item(packet_info *pinfo, proto_tree *tree, tv return dissect_cmip_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_cmip_attributeIdList_item); } -static const ber_sequence AttributeIdError_sequence[] = { +static const ber_sequence_t AttributeIdError_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeId1 }, { 0, 0, 0, NULL } @@ -613,7 +614,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_cmip_T_value(FALSE, tvb, offset, pinfo, tree, hf_cmip_value); } -static const ber_sequence Attribute_sequence[] = { +static const ber_sequence_t Attribute_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_id }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value }, { 0, 0, 0, NULL } @@ -667,7 +668,7 @@ static const value_string GetInfoStatus_vals[] = { { 0, NULL } }; -static const ber_choice GetInfoStatus_choice[] = { +static const ber_choice_t GetInfoStatus_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attributeIdError_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attribute_impl }, { 0, 0, 0, 0, NULL } @@ -684,7 +685,7 @@ static int dissect_getInfoList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_GetInfoStatus(FALSE, tvb, offset, pinfo, tree, hf_cmip_getInfoList_item); } -static const ber_sequence SET_OF_GetInfoStatus_set_of[1] = { +static const ber_sequence_t SET_OF_GetInfoStatus_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_getInfoList_item }, }; @@ -699,7 +700,7 @@ static int dissect_getInfoList_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_SET_OF_GetInfoStatus(TRUE, tvb, offset, pinfo, tree, hf_cmip_getInfoList); } -static const ber_sequence GetListError_sequence[] = { +static const ber_sequence_t GetListError_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -766,7 +767,7 @@ static int dissect_attributeValue1(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_cmip_T_attributeValue1(FALSE, tvb, offset, pinfo, tree, hf_cmip_attributeValue1); } -static const ber_sequence AttributeError_sequence[] = { +static const ber_sequence_t AttributeError_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus2 }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_modifyOperator_impl }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeId2 }, @@ -792,7 +793,7 @@ static const value_string SetInfoStatus_vals[] = { { 0, NULL } }; -static const ber_choice SetInfoStatus_choice[] = { +static const ber_choice_t SetInfoStatus_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attributeError_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attribute_impl }, { 0, 0, 0, 0, NULL } @@ -809,7 +810,7 @@ static int dissect_setInfoList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_SetInfoStatus(FALSE, tvb, offset, pinfo, tree, hf_cmip_setInfoList_item); } -static const ber_sequence SET_OF_SetInfoStatus_set_of[1] = { +static const ber_sequence_t SET_OF_SetInfoStatus_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_setInfoList_item }, }; @@ -824,7 +825,7 @@ static int dissect_setInfoList_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_SET_OF_SetInfoStatus(TRUE, tvb, offset, pinfo, tree, hf_cmip_setInfoList); } -static const ber_sequence SetListError_sequence[] = { +static const ber_sequence_t SetListError_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -889,7 +890,7 @@ static int dissect_actionType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cmip_T_actionType(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionType); } -static const ber_sequence NoSuchArgumentAction_sequence[] = { +static const ber_sequence_t NoSuchArgumentAction_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType }, { 0, 0, 0, NULL } @@ -919,7 +920,7 @@ static int dissect_eventType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cmip_T_eventType(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventType); } -static const ber_sequence NoSuchArgumentEvent_sequence[] = { +static const ber_sequence_t NoSuchArgumentEvent_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType }, { 0, 0, 0, NULL } @@ -943,7 +944,7 @@ static const value_string NoSuchArgument_vals[] = { { 0, NULL } }; -static const ber_choice NoSuchArgument_choice[] = { +static const ber_choice_t NoSuchArgument_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actionId_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventId_impl }, { 0, 0, 0, 0, NULL } @@ -986,7 +987,7 @@ static int dissect_actionInfoArg(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cmip_T_actionInfoArg(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionInfoArg); } -static const ber_sequence ActionInfo_sequence[] = { +static const ber_sequence_t ActionInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType3 }, { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_actionInfoArg }, { 0, 0, 0, NULL } @@ -1033,7 +1034,7 @@ static int dissect_eventInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cmip_T_eventInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventInfo); } -static const ber_sequence InvalidArgumentValueEventValue_sequence[] = { +static const ber_sequence_t InvalidArgumentValueEventValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType1 }, { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_eventInfo }, { 0, 0, 0, NULL } @@ -1057,7 +1058,7 @@ static const value_string InvalidArgumentValue_vals[] = { { 0, NULL } }; -static const ber_choice InvalidArgumentValue_choice[] = { +static const ber_choice_t InvalidArgumentValue_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actionValue_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventValue_impl }, { 0, 0, 0, 0, NULL } @@ -1082,7 +1083,7 @@ static const value_string ErrorInfo_vals[] = { { 0, NULL } }; -static const ber_choice ErrorInfo_choice[] = { +static const ber_choice_t ErrorInfo_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType1 }, { 1, BER_CLASS_CON, 0, 0, dissect_actionArgument }, { 2, BER_CLASS_CON, 1, 0, dissect_argumentValue }, @@ -1100,7 +1101,7 @@ static int dissect_errorInfo1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cmip_ErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_errorInfo1); } -static const ber_sequence ActionErrorInfo_sequence[] = { +static const ber_sequence_t ActionErrorInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_errorStatus1 }, { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_errorInfo1 }, { 0, 0, 0, NULL } @@ -1117,7 +1118,7 @@ static int dissect_actionErrorInfo(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_cmip_ActionErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionErrorInfo); } -static const ber_sequence ActionError_sequence[] = { +static const ber_sequence_t ActionError_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1162,7 +1163,7 @@ static int dissect_errorInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cmip_T_errorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_errorInfo); } -static const ber_sequence SpecificErrorInfo_sequence[] = { +static const ber_sequence_t SpecificErrorInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_errorId }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_errorInfo }, { 0, 0, 0, NULL } @@ -1179,7 +1180,7 @@ static int dissect_specificErrorInfo(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_cmip_SpecificErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_specificErrorInfo); } -static const ber_sequence ProcessingFailure_sequence[] = { +static const ber_sequence_t ProcessingFailure_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, 0, dissect_specificErrorInfo }, @@ -1214,7 +1215,7 @@ static int dissect_deleteErrorInfo(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_cmip_T_deleteErrorInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_deleteErrorInfo); } -static const ber_sequence DeleteError_sequence[] = { +static const ber_sequence_t DeleteError_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1233,7 +1234,7 @@ static int dissect_deleteError_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_DeleteError(TRUE, tvb, offset, pinfo, tree, hf_cmip_deleteError); } -static const ber_sequence SET_OF_Attribute_set_of[1] = { +static const ber_sequence_t SET_OF_Attribute_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item }, }; @@ -1248,7 +1249,7 @@ static int dissect_attributeList_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_cmip_SET_OF_Attribute(TRUE, tvb, offset, pinfo, tree, hf_cmip_attributeList); } -static const ber_sequence SetResult_sequence[] = { +static const ber_sequence_t SetResult_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1339,7 +1340,7 @@ static const value_string Scope_vals[] = { { 0, NULL } }; -static const ber_choice Scope_choice[] = { +static const ber_choice_t Scope_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_namedNumbers }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_individualLevels_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseToNthLevel_impl }, @@ -1365,7 +1366,7 @@ static const value_string T_substrings_item_vals[] = { { 0, NULL } }; -static const ber_choice T_substrings_item_choice[] = { +static const ber_choice_t T_substrings_item_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_initialString_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_anyString_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_finalString_impl }, @@ -1383,7 +1384,7 @@ static int dissect_substrings_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_cmip_T_substrings_item(FALSE, tvb, offset, pinfo, tree, hf_cmip_substrings_item); } -static const ber_sequence T_substrings_sequence_of[1] = { +static const ber_sequence_t T_substrings_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_substrings_item }, }; @@ -1411,7 +1412,7 @@ static const value_string FilterItem_vals[] = { { 0, NULL } }; -static const ber_choice FilterItem_choice[] = { +static const ber_choice_t FilterItem_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_equality_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_substrings_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_greaterOrEqual_impl }, @@ -1434,7 +1435,7 @@ static int dissect_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cmip_FilterItem(FALSE, tvb, offset, pinfo, tree, hf_cmip_item); } -static const ber_sequence SET_OF_CMISFilter_set_of[1] = { +static const ber_sequence_t SET_OF_CMISFilter_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; @@ -1461,7 +1462,7 @@ static const value_string CMISFilter_vals[] = { { 0, NULL } }; -static const ber_choice CMISFilter_choice[] = { +static const ber_choice_t CMISFilter_choice[] = { { 8, BER_CLASS_CON, 8, 0, dissect_item }, { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_and_impl }, { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_or_impl }, @@ -1477,7 +1478,7 @@ dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa return offset; } -static const ber_sequence SET_OF_ModificationItem_set_of[1] = { +static const ber_sequence_t SET_OF_ModificationItem_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_modificationList_item }, }; @@ -1492,7 +1493,7 @@ static int dissect_modificationList_impl(packet_info *pinfo, proto_tree *tree, t return dissect_cmip_SET_OF_ModificationItem(TRUE, tvb, offset, pinfo, tree, hf_cmip_modificationList); } -static const ber_sequence SetArgument_sequence[] = { +static const ber_sequence_t SetArgument_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl }, @@ -1511,7 +1512,7 @@ dissect_cmip_SetArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p return offset; } -static const ber_sequence GetResult_sequence[] = { +static const ber_sequence_t GetResult_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1556,7 +1557,7 @@ static int dissect_actionReplyInfo(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_cmip_T_actionReplyInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_actionReplyInfo); } -static const ber_sequence ActionReply_sequence[] = { +static const ber_sequence_t ActionReply_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_actionType2 }, { BER_CLASS_CON, 4, 0, dissect_actionReplyInfo }, { 0, 0, 0, NULL } @@ -1573,7 +1574,7 @@ static int dissect_actionReply_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_ActionReply(TRUE, tvb, offset, pinfo, tree, hf_cmip_actionReply); } -static const ber_sequence ActionResult_sequence[] = { +static const ber_sequence_t ActionResult_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1592,7 +1593,7 @@ static int dissect_actionResult_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_cmip_ActionResult(TRUE, tvb, offset, pinfo, tree, hf_cmip_actionResult); } -static const ber_sequence DeleteResult_sequence[] = { +static const ber_sequence_t DeleteResult_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1624,7 +1625,7 @@ static const value_string LinkedReplyArgument_vals[] = { { 0, NULL } }; -static const ber_choice LinkedReplyArgument_choice[] = { +static const ber_choice_t LinkedReplyArgument_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_getResult_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_getListError_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_setResult_impl }, @@ -1671,7 +1672,7 @@ static int dissect_eventReplyInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cmip_T_eventReplyInfo(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventReplyInfo); } -static const ber_sequence EventReply_sequence[] = { +static const ber_sequence_t EventReply_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eventType2 }, { BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_eventReplyInfo }, { 0, 0, 0, NULL } @@ -1688,7 +1689,7 @@ static int dissect_eventReply(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cmip_EventReply(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventReply); } -static const ber_sequence EventReportResult_sequence[] = { +static const ber_sequence_t EventReportResult_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1731,7 +1732,7 @@ static int dissect_eventInfo1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cmip_T_eventInfo1(FALSE, tvb, offset, pinfo, tree, hf_cmip_eventInfo1); } -static const ber_sequence EventReportArgument_sequence[] = { +static const ber_sequence_t EventReportArgument_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventTime_impl }, @@ -1748,7 +1749,7 @@ dissect_cmip_EventReportArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence DeleteArgument_sequence[] = { +static const ber_sequence_t DeleteArgument_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl }, @@ -1773,7 +1774,7 @@ static const value_string T_managedOrSuperiorObjectInstance_vals[] = { { 0, NULL } }; -static const ber_choice T_managedOrSuperiorObjectInstance_choice[] = { +static const ber_choice_t T_managedOrSuperiorObjectInstance_choice[] = { { -1/*choice*/, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_managedObjectInstance }, { 8, BER_CLASS_CON, 8, 0, dissect_superiorObjectInstance }, { 0, 0, 0, 0, NULL } @@ -1790,7 +1791,7 @@ static int dissect_managedOrSuperiorObjectInstance(packet_info *pinfo, proto_tre return dissect_cmip_T_managedOrSuperiorObjectInstance(FALSE, tvb, offset, pinfo, tree, hf_cmip_managedOrSuperiorObjectInstance); } -static const ber_sequence CreateArgument_sequence[] = { +static const ber_sequence_t CreateArgument_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedOrSuperiorObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl }, @@ -1807,7 +1808,7 @@ dissect_cmip_CreateArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static const ber_sequence CreateResult_sequence[] = { +static const ber_sequence_t CreateResult_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_managedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentTime_impl }, @@ -1823,7 +1824,7 @@ dissect_cmip_CreateResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, return offset; } -static const ber_sequence ActionArgument_sequence[] = { +static const ber_sequence_t ActionArgument_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl }, @@ -1842,7 +1843,7 @@ dissect_cmip_ActionArgument(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static const ber_sequence BaseManagedObjectId_sequence[] = { +static const ber_sequence_t BaseManagedObjectId_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance }, { 0, 0, 0, NULL } @@ -1856,7 +1857,7 @@ dissect_cmip_BaseManagedObjectId(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence SET_OF_AttributeId_set_of[1] = { +static const ber_sequence_t SET_OF_AttributeId_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeIdList_item }, }; @@ -1871,7 +1872,7 @@ static int dissect_attributeIdList_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_cmip_SET_OF_AttributeId(TRUE, tvb, offset, pinfo, tree, hf_cmip_attributeIdList); } -static const ber_sequence GetArgument_sequence[] = { +static const ber_sequence_t GetArgument_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectClass }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_accessControl }, @@ -2004,7 +2005,7 @@ static int dissect_opcode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cmip_Opcode(FALSE, tvb, offset, pinfo, tree, hf_cmip_opcode); } -static const ber_sequence ReturnResultBody_sequence[] = { +static const ber_sequence_t ReturnResultBody_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_argument }, { 0, 0, 0, NULL } @@ -2057,7 +2058,7 @@ static const value_string InvokeId_vals[] = { { 0, NULL } }; -static const ber_choice InvokeId_choice[] = { +static const ber_choice_t InvokeId_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_present2 }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent }, { 0, 0, 0, 0, NULL } @@ -2084,7 +2085,7 @@ static const value_string InvokeLinkedId_vals[] = { { 0, NULL } }; -static const ber_choice InvokeLinkedId_choice[] = { +static const ber_choice_t InvokeLinkedId_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_present1_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_absent_impl }, { 0, 0, 0, 0, NULL } @@ -2102,14 +2103,14 @@ static int dissect_linkedId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, } -static int +int dissect_cmip_InvokeIDType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_cmip_InvokeId(implicit_tag, tvb, offset, pinfo, tree, hf_index); return offset; } -static const ber_sequence Invoke_sequence[] = { +static const ber_sequence_t Invoke_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_linkedId }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_opcode }, @@ -2132,7 +2133,7 @@ static int dissect_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_cmip_Invoke(TRUE, tvb, offset, pinfo, tree, hf_cmip_invoke); } -static const ber_sequence ReturnResult_sequence[] = { +static const ber_sequence_t ReturnResult_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_rRBody }, { 0, 0, 0, NULL } @@ -2153,7 +2154,7 @@ static int dissect_returnResult_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_cmip_ReturnResult(TRUE, tvb, offset, pinfo, tree, hf_cmip_returnResult); } -static const ber_sequence ReturnError_sequence[] = { +static const ber_sequence_t ReturnError_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { 0, 0, 0, NULL } }; @@ -2297,7 +2298,7 @@ static const value_string RejectProb_vals[] = { { 0, NULL } }; -static const ber_choice RejectProb_choice[] = { +static const ber_choice_t RejectProb_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_generalProblem_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invokeProblem_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResultProblem_impl }, @@ -2316,7 +2317,7 @@ static int dissect_rejectProblem(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cmip_RejectProb(FALSE, tvb, offset, pinfo, tree, hf_cmip_rejectProblem); } -static const ber_sequence Reject_sequence[] = { +static const ber_sequence_t Reject_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rejectProblem }, { 0, 0, 0, NULL } @@ -2346,7 +2347,7 @@ const value_string ROS_vals[] = { { 0, NULL } }; -static const ber_choice ROS_choice[] = { +static const ber_choice_t ROS_choice[] = { { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl }, { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl }, @@ -2384,7 +2385,7 @@ static int dissect_abortSource_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cmip_CMIPAbortSource(TRUE, tvb, offset, pinfo, tree, hf_cmip_abortSource); } -static const ber_sequence CMIPAbortInfo_sequence[] = { +static const ber_sequence_t CMIPAbortInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abortSource_impl }, { 0, 0, 0, NULL } }; @@ -2439,7 +2440,7 @@ static int dissect_protocolVersion_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_cmip_ProtocolVersion(TRUE, tvb, offset, pinfo, tree, hf_cmip_protocolVersion); } -static const ber_sequence CMIPUserInfo_sequence[] = { +static const ber_sequence_t CMIPUserInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocolVersion_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_functionalUnits_impl }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index e52f74b47d..5ea3770736 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -37,6 +37,7 @@ /*--- Included file: packet-cmip-exp.h ---*/ extern const value_string ROS_vals[]; +int dissect_cmip_InvokeIDType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cmip_ROS(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cmip_CMIPAbortInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cmip_CMIPUserInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index ee0ce649e5..cbbc061394 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-cms.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.c */ @@ -183,6 +183,9 @@ static gint ett_cms_ExtendedCertificateInfo = -1; /*--- End of included file: packet-cms-ett.c ---*/ +static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2eth stops generating these silly wrappers */ + + static char object_identifier_id[64]; /*64 chars should be long enough? */ @@ -247,7 +250,7 @@ static int dissect_content(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_T_content(FALSE, tvb, offset, pinfo, tree, hf_cms_content); } -static const ber_sequence ContentInfo_sequence[] = { +static const ber_sequence_t ContentInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, { BER_CLASS_CON, 0, 0, dissect_content }, { 0, 0, 0, NULL } @@ -299,7 +302,7 @@ static int dissect_digestAlgorithm_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_cms_DigestAlgorithmIdentifier(TRUE, tvb, offset, pinfo, tree, hf_cms_digestAlgorithm); } -static const ber_sequence DigestAlgorithmIdentifiers_set_of[1] = { +static const ber_sequence_t DigestAlgorithmIdentifiers_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_DigestAlgorithmIdentifiers_item }, }; @@ -349,7 +352,7 @@ static int dissect_eContent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_T_eContent(FALSE, tvb, offset, pinfo, tree, hf_cms_eContent); } -static const ber_sequence EncapsulatedContentInfo_sequence[] = { +static const ber_sequence_t EncapsulatedContentInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eContentType }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_eContent }, { 0, 0, 0, NULL } @@ -378,7 +381,7 @@ static int dissect_attrType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_cms_attrType); } -static const ber_sequence Attribute_sequence[] = { +static const ber_sequence_t Attribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attrType }, { 0, 0, 0, NULL } }; @@ -406,7 +409,7 @@ static int dissect_UnauthAttributes_item(packet_info *pinfo, proto_tree *tree, t return dissect_cms_Attribute(FALSE, tvb, offset, pinfo, tree, hf_cms_UnauthAttributes_item); } -static const ber_sequence UnauthAttributes_set_of[1] = { +static const ber_sequence_t UnauthAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnauthAttributes_item }, }; @@ -424,7 +427,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cms_UnauthAttributes(FALSE, tvb, offset, pinfo, tree, hf_cms_attributes); } -static const ber_sequence ExtendedCertificateInfo_sequence[] = { +static const ber_sequence_t ExtendedCertificateInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_attributes }, @@ -466,7 +469,7 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cms_Signature(FALSE, tvb, offset, pinfo, tree, hf_cms_signature); } -static const ber_sequence ExtendedCertificate_sequence[] = { +static const ber_sequence_t ExtendedCertificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extendedCertificateInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature }, @@ -492,7 +495,7 @@ static const value_string CertificateChoices_vals[] = { { 0, NULL } }; -static const ber_choice CertificateChoices_choice[] = { +static const ber_choice_t CertificateChoices_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate }, { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_extendedCertificate_impl }, { 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_attrCert_impl }, @@ -510,7 +513,7 @@ static int dissect_CertificateSet_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_cms_CertificateChoices(FALSE, tvb, offset, pinfo, tree, hf_cms_CertificateSet_item); } -static const ber_sequence CertificateSet_set_of[1] = { +static const ber_sequence_t CertificateSet_set_of[1] = { { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item }, }; @@ -528,7 +531,7 @@ static int dissect_certs_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_cms_CertificateSet(TRUE, tvb, offset, pinfo, tree, hf_cms_certs); } -static const ber_sequence CertificateRevocationLists_set_of[1] = { +static const ber_sequence_t CertificateRevocationLists_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificateRevocationLists_item }, }; @@ -543,7 +546,7 @@ static int dissect_crls_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cms_CertificateRevocationLists(TRUE, tvb, offset, pinfo, tree, hf_cms_crls); } -static const ber_sequence IssuerAndSerialNumber_sequence[] = { +static const ber_sequence_t IssuerAndSerialNumber_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, { 0, 0, 0, NULL } @@ -582,7 +585,7 @@ const value_string SignerIdentifier_vals[] = { { 0, NULL } }; -static const ber_choice SignerIdentifier_choice[] = { +static const ber_choice_t SignerIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, { 0, 0, 0, 0, NULL } @@ -599,7 +602,7 @@ static int dissect_sid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cms_SignerIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_sid); } -static const ber_sequence SignedAttributes_set_of[1] = { +static const ber_sequence_t SignedAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignedAttributes_item }, }; @@ -626,7 +629,7 @@ static int dissect_signatureValue(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cms_SignatureValue(FALSE, tvb, offset, pinfo, tree, hf_cms_signatureValue); } -static const ber_sequence UnsignedAttributes_set_of[1] = { +static const ber_sequence_t UnsignedAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnsignedAttributes_item }, }; @@ -641,7 +644,7 @@ static int dissect_unsignedAttrs_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_cms_UnsignedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unsignedAttrs); } -static const ber_sequence SignerInfo_sequence[] = { +static const ber_sequence_t SignerInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm }, @@ -663,7 +666,7 @@ static int dissect_SignerInfos_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_cms_SignerInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_SignerInfos_item); } -static const ber_sequence SignerInfos_set_of[1] = { +static const ber_sequence_t SignerInfos_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SignerInfos_item }, }; @@ -678,7 +681,7 @@ static int dissect_signerInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_cms_SignerInfos(FALSE, tvb, offset, pinfo, tree, hf_cms_signerInfos); } -static const ber_sequence SignedData_sequence[] = { +static const ber_sequence_t SignedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithms }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encapContentInfo }, @@ -696,7 +699,7 @@ dissect_cms_SignedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac return offset; } -static const ber_sequence OriginatorInfo_sequence[] = { +static const ber_sequence_t OriginatorInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_certs_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_crls_impl }, { 0, 0, 0, NULL } @@ -720,7 +723,7 @@ static const value_string RecipientIdentifier_vals[] = { { 0, NULL } }; -static const ber_choice RecipientIdentifier_choice[] = { +static const ber_choice_t RecipientIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, { 0, 0, 0, 0, NULL } @@ -760,7 +763,7 @@ static int dissect_encryptedKey(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_cms_EncryptedKey(FALSE, tvb, offset, pinfo, tree, hf_cms_encryptedKey); } -static const ber_sequence KeyTransRecipientInfo_sequence[] = { +static const ber_sequence_t KeyTransRecipientInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm }, @@ -792,7 +795,7 @@ static int dissect_publicKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_cms_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_publicKey); } -static const ber_sequence OriginatorPublicKey_sequence[] = { +static const ber_sequence_t OriginatorPublicKey_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_publicKey }, { 0, 0, 0, NULL } @@ -817,7 +820,7 @@ static const value_string OriginatorIdentifierOrKey_vals[] = { { 0, NULL } }; -static const ber_choice OriginatorIdentifierOrKey_choice[] = { +static const ber_choice_t OriginatorIdentifierOrKey_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, { 2, BER_CLASS_CON, 1, 0, dissect_originatorKey_impl }, @@ -884,7 +887,7 @@ static int dissect_keyAttr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_cms_T_keyAttr(FALSE, tvb, offset, pinfo, tree, hf_cms_keyAttr); } -static const ber_sequence OtherKeyAttribute_sequence[] = { +static const ber_sequence_t OtherKeyAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_keyAttrId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_keyAttr }, { 0, 0, 0, NULL } @@ -901,7 +904,7 @@ static int dissect_other(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_cms_OtherKeyAttribute(FALSE, tvb, offset, pinfo, tree, hf_cms_other); } -static const ber_sequence RecipientKeyIdentifier_sequence[] = { +static const ber_sequence_t RecipientKeyIdentifier_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_other }, @@ -926,7 +929,7 @@ static const value_string KeyAgreeRecipientIdentifier_vals[] = { { 0, NULL } }; -static const ber_choice KeyAgreeRecipientIdentifier_choice[] = { +static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_rKeyId_impl }, { 0, 0, 0, 0, NULL } @@ -943,7 +946,7 @@ static int dissect_rekRid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cms_KeyAgreeRecipientIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_rekRid); } -static const ber_sequence RecipientEncryptedKey_sequence[] = { +static const ber_sequence_t RecipientEncryptedKey_sequence[] = { { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rekRid }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedKey }, { 0, 0, 0, NULL } @@ -960,7 +963,7 @@ static int dissect_RecipientEncryptedKeys_item(packet_info *pinfo, proto_tree *t return dissect_cms_RecipientEncryptedKey(FALSE, tvb, offset, pinfo, tree, hf_cms_RecipientEncryptedKeys_item); } -static const ber_sequence RecipientEncryptedKeys_sequence_of[1] = { +static const ber_sequence_t RecipientEncryptedKeys_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RecipientEncryptedKeys_item }, }; @@ -975,7 +978,7 @@ static int dissect_recipientEncryptedKeys(packet_info *pinfo, proto_tree *tree, return dissect_cms_RecipientEncryptedKeys(FALSE, tvb, offset, pinfo, tree, hf_cms_recipientEncryptedKeys); } -static const ber_sequence KeyAgreeRecipientInfo_sequence[] = { +static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_originator }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_ukm }, @@ -1007,7 +1010,7 @@ static int dissect_keyIdentifier(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_cms_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_keyIdentifier); } -static const ber_sequence KEKIdentifier_sequence[] = { +static const ber_sequence_t KEKIdentifier_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_keyIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_other }, @@ -1025,7 +1028,7 @@ static int dissect_kekid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_cms_KEKIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_kekid); } -static const ber_sequence KEKRecipientInfo_sequence[] = { +static const ber_sequence_t KEKRecipientInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_kekid }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm }, @@ -1052,7 +1055,7 @@ static const value_string RecipientInfo_vals[] = { { 0, NULL } }; -static const ber_choice RecipientInfo_choice[] = { +static const ber_choice_t RecipientInfo_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ktri }, { 1, BER_CLASS_CON, 1, 0, dissect_kari_impl }, { 2, BER_CLASS_CON, 2, 0, dissect_kekri_impl }, @@ -1070,7 +1073,7 @@ static int dissect_RecipientInfos_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_cms_RecipientInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_RecipientInfos_item); } -static const ber_sequence RecipientInfos_set_of[1] = { +static const ber_sequence_t RecipientInfos_set_of[1] = { { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item }, }; @@ -1108,7 +1111,7 @@ static int dissect_encryptedContent_impl(packet_info *pinfo, proto_tree *tree, t return dissect_cms_EncryptedContent(TRUE, tvb, offset, pinfo, tree, hf_cms_encryptedContent); } -static const ber_sequence EncryptedContentInfo_sequence[] = { +static const ber_sequence_t EncryptedContentInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType1 }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contentEncryptionAlgorithm }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_encryptedContent_impl }, @@ -1126,7 +1129,7 @@ static int dissect_encryptedContentInfo(packet_info *pinfo, proto_tree *tree, tv return dissect_cms_EncryptedContentInfo(FALSE, tvb, offset, pinfo, tree, hf_cms_encryptedContentInfo); } -static const ber_sequence UnprotectedAttributes_set_of[1] = { +static const ber_sequence_t UnprotectedAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_UnprotectedAttributes_item }, }; @@ -1141,7 +1144,7 @@ static int dissect_unprotectedAttrs_impl(packet_info *pinfo, proto_tree *tree, t return dissect_cms_UnprotectedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unprotectedAttrs); } -static const ber_sequence EnvelopedData_sequence[] = { +static const ber_sequence_t EnvelopedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_recipientInfos }, @@ -1170,7 +1173,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_cms_Digest(FALSE, tvb, offset, pinfo, tree, hf_cms_digest); } -static const ber_sequence DigestedData_sequence[] = { +static const ber_sequence_t DigestedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encapContentInfo }, @@ -1186,7 +1189,7 @@ dissect_cms_DigestedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p return offset; } -static const ber_sequence EncryptedData_sequence[] = { +static const ber_sequence_t EncryptedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedContentInfo }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unprotectedAttrs_impl }, @@ -1212,7 +1215,7 @@ static int dissect_macAlgorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_cms_MessageAuthenticationCodeAlgorithm(FALSE, tvb, offset, pinfo, tree, hf_cms_macAlgorithm); } -static const ber_sequence AuthAttributes_set_of[1] = { +static const ber_sequence_t AuthAttributes_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthAttributes_item }, }; @@ -1239,7 +1242,7 @@ static int dissect_mac(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_cms_MessageAuthenticationCode(FALSE, tvb, offset, pinfo, tree, hf_cms_mac); } -static const ber_sequence AuthenticatedData_sequence[] = { +static const ber_sequence_t AuthenticatedData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_recipientInfos }, @@ -1261,7 +1264,7 @@ dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } -static int +int dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_cms_SignerInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index); diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index d407310dc6..79ceeaf026 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-cms.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ +/* ../../tools/asn2eth.py -X -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */ /* Input file: packet-cms-template.h */ @@ -49,6 +49,7 @@ int dissect_cms_SignedAttributes(gboolean implicit_tag, tvbuff_t *tvb, int offse int dissect_cms_UnsignedAttributes(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cms_SignatureValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_cms_Countersignature(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); /*--- End of included file: packet-cms-exp.h ---*/ diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 52f7f59194..a4681c6357 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -197,7 +197,7 @@ static int dissect_allOrFirstTier_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_ess_AllOrFirstTier(TRUE, tvb, offset, pinfo, tree, hf_ess_allOrFirstTier); } -static const ber_sequence SEQUNCE_OF_GeneralNames_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_GeneralNames_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo_item }, }; @@ -228,7 +228,7 @@ static const value_string ReceiptsFrom_vals[] = { { 0, NULL } }; -static const ber_choice ReceiptsFrom_choice[] = { +static const ber_choice_t ReceiptsFrom_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_allOrFirstTier_impl }, { 1, BER_CLASS_CON, 1, 0, dissect_receiptList_impl }, { 0, 0, 0, 0, NULL } @@ -245,7 +245,7 @@ static int dissect_receiptsFrom(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_ess_ReceiptsFrom(FALSE, tvb, offset, pinfo, tree, hf_ess_receiptsFrom); } -static const ber_sequence ReceiptRequest_sequence[] = { +static const ber_sequence_t ReceiptRequest_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo }, @@ -289,7 +289,7 @@ static int dissect_originatorSignatureValue(packet_info *pinfo, proto_tree *tree return dissect_ess_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ess_originatorSignatureValue); } -static const ber_sequence Receipt_sequence[] = { +static const ber_sequence_t Receipt_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier }, @@ -321,7 +321,7 @@ static int dissect_utf8String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ess_UTF8String(FALSE, tvb, offset, pinfo, tree, hf_ess_utf8String); } -static const ber_sequence ContentHints_sequence[] = { +static const ber_sequence_t ContentHints_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contentDescription }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, { 0, 0, 0, NULL } @@ -344,7 +344,7 @@ dissect_ess_MsgSigDigest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p return offset; } -static const ber_sequence ContentReference_sequence[] = { +static const ber_sequence_t ContentReference_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_originatorSignatureValue }, @@ -407,7 +407,7 @@ static const value_string ESSPrivacyMark_vals[] = { { 0, NULL } }; -static const ber_choice ESSPrivacyMark_choice[] = { +static const ber_choice_t ESSPrivacyMark_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_pString }, { 1, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String }, { 0, 0, 0, 0, NULL } @@ -447,7 +447,7 @@ static int dissect_value_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ess_T_value(TRUE, tvb, offset, pinfo, tree, hf_ess_value); } -static const ber_sequence SecurityCategory_sequence[] = { +static const ber_sequence_t SecurityCategory_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_type_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl }, { 0, 0, 0, NULL } @@ -464,7 +464,7 @@ static int dissect_SecurityCategories_item(packet_info *pinfo, proto_tree *tree, return dissect_ess_SecurityCategory(FALSE, tvb, offset, pinfo, tree, hf_ess_SecurityCategories_item); } -static const ber_sequence SecurityCategories_set_of[1] = { +static const ber_sequence_t SecurityCategories_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SecurityCategories_item }, }; @@ -483,7 +483,7 @@ static const value_string EntityIdentifier_vals[] = { { 0, NULL } }; -static const ber_choice EntityIdentifier_choice[] = { +static const ber_choice_t EntityIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, { 1, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier }, { 0, 0, 0, 0, NULL } @@ -533,7 +533,7 @@ static const value_string MLReceiptPolicy_vals[] = { { 0, NULL } }; -static const ber_choice MLReceiptPolicy_choice[] = { +static const ber_choice_t MLReceiptPolicy_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_none_impl }, { 1, BER_CLASS_CON, 1, 0, dissect_insteadOf_impl }, { 2, BER_CLASS_CON, 2, 0, dissect_inAdditionTo_impl }, @@ -551,7 +551,7 @@ static int dissect_mlReceiptPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_ess_MLReceiptPolicy(FALSE, tvb, offset, pinfo, tree, hf_ess_mlReceiptPolicy); } -static const ber_sequence MLData_sequence[] = { +static const ber_sequence_t MLData_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_expansionTime }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy }, @@ -569,7 +569,7 @@ static int dissect_MLExpansionHistory_item(packet_info *pinfo, proto_tree *tree, return dissect_ess_MLData(FALSE, tvb, offset, pinfo, tree, hf_ess_MLExpansionHistory_item); } -static const ber_sequence MLExpansionHistory_sequence_of[1] = { +static const ber_sequence_t MLExpansionHistory_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_MLExpansionHistory_item }, }; @@ -593,7 +593,7 @@ static int dissect_certHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_ess_Hash(FALSE, tvb, offset, pinfo, tree, hf_ess_certHash); } -static const ber_sequence IssuerSerial_sequence[] = { +static const ber_sequence_t IssuerSerial_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, { 0, 0, 0, NULL } @@ -610,7 +610,7 @@ static int dissect_issuerSerial(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_ess_IssuerSerial(FALSE, tvb, offset, pinfo, tree, hf_ess_issuerSerial); } -static const ber_sequence ESSCertID_sequence[] = { +static const ber_sequence_t ESSCertID_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_certHash }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerSerial }, { 0, 0, 0, NULL } @@ -627,7 +627,7 @@ static int dissect_certs_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ess_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs_item); } -static const ber_sequence SEQUNCE_OF_ESSCertID_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ESSCertID_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item }, }; @@ -642,7 +642,7 @@ static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_ess_SEQUNCE_OF_ESSCertID(FALSE, tvb, offset, pinfo, tree, hf_ess_certs); } -static const ber_sequence SEQUNCE_OF_PolicyInformation_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_PolicyInformation_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policies_item }, }; @@ -657,7 +657,7 @@ static int dissect_policies(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_ess_SEQUNCE_OF_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_ess_policies); } -static const ber_sequence SigningCertificate_sequence[] = { +static const ber_sequence_t SigningCertificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policies }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index c1aa55f531..c888387aec 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-gsm_map.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ +/* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.c */ @@ -767,7 +767,7 @@ static int dissect_diagnosticInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_OCTET_STRING_SIZE_1_200(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_diagnosticInfo); } -static const ber_sequence PrivateExtension_sequence[] = { +static const ber_sequence_t PrivateExtension_sequence[] = { { 0, 0, 0, NULL } }; @@ -782,7 +782,7 @@ static int dissect_PrivateExtensionList_item(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_PrivateExtension(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_PrivateExtensionList_item); } -static const ber_sequence PrivateExtensionList_sequence_of[1] = { +static const ber_sequence_t PrivateExtensionList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PrivateExtensionList_item }, }; @@ -797,7 +797,7 @@ static int dissect_privateExtensionList_impl(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_PrivateExtensionList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_privateExtensionList); } -static const ber_sequence PcsExtensions_sequence[] = { +static const ber_sequence_t PcsExtensions_sequence[] = { { 0, 0, 0, NULL } }; @@ -812,7 +812,7 @@ static int dissect_pcsExtensions_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_gsm_map_PcsExtensions(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_pcsExtensions); } -static const ber_sequence ExtensionContainer_sequence[] = { +static const ber_sequence_t ExtensionContainer_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_privateExtensionList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pcsExtensions_impl }, { 0, 0, 0, NULL } @@ -832,7 +832,7 @@ static int dissect_extensionContainer_impl(packet_info *pinfo, proto_tree *tree, return dissect_gsm_map_ExtensionContainer(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_extensionContainer); } -static const ber_sequence Bss_APDU_sequence[] = { +static const ber_sequence_t Bss_APDU_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_protocolId }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signalInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -1092,7 +1092,7 @@ static int dissect_gprsConnectionSuspended(packet_info *pinfo, proto_tree *tree, return dissect_gsm_map_NULL(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_gprsConnectionSuspended); } -static const ber_sequence Vlr_Capability_sequence[] = { +static const ber_sequence_t Vlr_Capability_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_supportedCamelPhases_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_solsaSupportIndicator_impl }, @@ -1173,7 +1173,7 @@ static int dissect_vlr_number_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_gsm_map_Vlr_Number(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_vlr_number); } -static const ber_sequence UpdateLocationArg_sequence[] = { +static const ber_sequence_t UpdateLocationArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msc_Number_impl }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_vlr_Number }, @@ -1203,7 +1203,7 @@ static int dissect_hlr_Number(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_gsm_map_Hlr_Number(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_hlr_Number); } -static const ber_sequence UpdateLocationRes_sequence[] = { +static const ber_sequence_t UpdateLocationRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -1253,7 +1253,7 @@ static int dissect_cancellationType(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_CancellationType(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_cancellationType); } -static const ber_sequence T_imsi_WithLMSI_sequence[] = { +static const ber_sequence_t T_imsi_WithLMSI_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_lmsi }, { 0, 0, 0, NULL } @@ -1277,7 +1277,7 @@ static const value_string T_identity_vals[] = { { 0, NULL } }; -static const ber_choice T_identity_choice[] = { +static const ber_choice_t T_identity_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imsi_WithLMSI }, { 0, 0, 0, 0, NULL } @@ -1294,7 +1294,7 @@ static int dissect_identity(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_gsm_map_T_identity(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_identity); } -static const ber_sequence CancelLocationArg_sequence[] = { +static const ber_sequence_t CancelLocationArg_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_identity }, { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cancellationType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -1309,7 +1309,7 @@ dissect_gsm_map_CancelLocationArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence CancelLocationRes_sequence[] = { +static const ber_sequence_t CancelLocationRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -1337,7 +1337,7 @@ static int dissect_sgsn_Number_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_Sgsn_Number(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_sgsn_Number); } -static const ber_sequence PurgeMS_Arg_sequence[] = { +static const ber_sequence_t PurgeMS_Arg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_vlr_Number_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sgsn_Number_impl }, @@ -1353,7 +1353,7 @@ dissect_gsm_map_PurgeMS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static const ber_sequence PurgeMS_Res_sequence[] = { +static const ber_sequence_t PurgeMS_Res_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_freezeTMSI_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_freezeP_TMSI_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -1422,7 +1422,7 @@ static int dissect_groupKey_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_OCTET_STRING_SIZE_8(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_groupKey); } -static const ber_sequence T_authenticationSetList_item_sequence[] = { +static const ber_sequence_t T_authenticationSetList_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_rand }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sres }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_kc }, @@ -1440,7 +1440,7 @@ static int dissect_authenticationSetList_item(packet_info *pinfo, proto_tree *tr return dissect_gsm_map_T_authenticationSetList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_authenticationSetList_item); } -static const ber_sequence T_authenticationSetList_sequence_of[1] = { +static const ber_sequence_t T_authenticationSetList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_authenticationSetList_item }, }; @@ -1455,7 +1455,7 @@ static int dissect_authenticationSetList(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_T_authenticationSetList(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_authenticationSetList); } -static const ber_sequence SendIdentificationRes_sequence[] = { +static const ber_sequence_t SendIdentificationRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_authenticationSetList }, { 0, 0, 0, NULL } @@ -1481,7 +1481,7 @@ static int dissect_targetCellId(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_gsm_map_OCTET_STRING_SIZE_5_7(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_targetCellId); } -static const ber_sequence PrepareHO_Arg_sequence[] = { +static const ber_sequence_t PrepareHO_Arg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_targetCellId }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ho_NumberNotRequired }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_bss_APDU }, @@ -1508,7 +1508,7 @@ static int dissect_handoverNumber(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_T_handoverNumber(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_handoverNumber); } -static const ber_sequence PrepareHO_Res_sequence[] = { +static const ber_sequence_t PrepareHO_Res_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_handoverNumber }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_bss_APDU }, { 0, 0, 0, NULL } @@ -1534,7 +1534,7 @@ static int dissect_targetMSC_Number(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_T_targetMSC_Number(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_targetMSC_Number); } -static const ber_sequence PrepareSubsequentHO_Arg_sequence[] = { +static const ber_sequence_t PrepareSubsequentHO_Arg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_targetCellId }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_targetMSC_Number }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_bss_APDU }, @@ -1579,7 +1579,7 @@ static int dissect_auts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_gsm_map_OCTET_STRING_SIZE_14(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_auts); } -static const ber_sequence T_re_synchronisationInfo_sequence[] = { +static const ber_sequence_t T_re_synchronisationInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_rand }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_auts }, { 0, 0, 0, NULL } @@ -1644,7 +1644,7 @@ static int dissect_lsaIdentityList_item(packet_info *pinfo, proto_tree *tree, tv return dissect_gsm_map_OCTET_STRING_SIZE_3(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_lsaIdentityList_item); } -static const ber_sequence SendAuthenticationInfoArg_sequence[] = { +static const ber_sequence_t SendAuthenticationInfoArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numberOfRequestedVectors }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_segmentationProhibited }, @@ -1664,7 +1664,7 @@ dissect_gsm_map_SendAuthenticationInfoArg(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static const ber_sequence SendAuthenticationInfoRes_item_sequence[] = { +static const ber_sequence_t SendAuthenticationInfoRes_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_rand }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sres }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_kc }, @@ -1682,7 +1682,7 @@ static int dissect_SendAuthenticationInfoRes_item(packet_info *pinfo, proto_tree return dissect_gsm_map_SendAuthenticationInfoRes_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_SendAuthenticationInfoRes_item); } -static const ber_sequence SendAuthenticationInfoRes_sequence_of[1] = { +static const ber_sequence_t SendAuthenticationInfoRes_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_SendAuthenticationInfoRes_item }, }; @@ -1776,7 +1776,7 @@ static const value_string BasicService_vals[] = { { 0, NULL } }; -static const ber_choice BasicService_choice[] = { +static const ber_choice_t BasicService_choice[] = { { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_bearerService_impl }, { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_teleservice_impl }, { 0, 0, 0, 0, NULL } @@ -1799,7 +1799,7 @@ static int dissect_basicServiceGroup(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_gsm_map_BasicService(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_basicServiceGroup); } -static const ber_sequence BasicServiceGroupList_sequence_of[1] = { +static const ber_sequence_t BasicServiceGroupList_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_BasicServiceGroupList_item }, }; @@ -1983,7 +1983,7 @@ static int dissect_defaultCallHandling_impl(packet_info *pinfo, proto_tree *tree return dissect_gsm_map_DefaultCallHandling(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_defaultCallHandling); } -static const ber_sequence BcsmCamelTDPData_sequence[] = { +static const ber_sequence_t BcsmCamelTDPData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_bcsmTriggerDetectionPoint }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serviceKey }, { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsmSCFAddress_impl }, @@ -2003,7 +2003,7 @@ static int dissect_BcsmCamelTDPDataList_item(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_BcsmCamelTDPData(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_BcsmCamelTDPDataList_item); } -static const ber_sequence BcsmCamelTDPDataList_sequence_of[1] = { +static const ber_sequence_t BcsmCamelTDPDataList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BcsmCamelTDPDataList_item }, }; @@ -2033,7 +2033,7 @@ static int dissect_camelCapabilityHandling_impl(packet_info *pinfo, proto_tree * return dissect_gsm_map_INTEGER_1_16(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_camelCapabilityHandling); } -static const ber_sequence O_CSI_sequence[] = { +static const ber_sequence_t O_CSI_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_o_BcsmCamelTDPDataList }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camelCapabilityHandling_impl }, @@ -2132,7 +2132,7 @@ 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_SIZE_1_50_OF_OCTET_STRING_SIZE_1_5_sequence_of[1] = { +static const ber_sequence_t 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 }, }; @@ -2147,7 +2147,7 @@ static int dissect_bearerServiceList_impl(packet_info *pinfo, proto_tree *tree, 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_SIZE_1_20_OF_Teleservice_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_SIZE_1_20_OF_Teleservice_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_teleserviceList_item }, }; @@ -2240,7 +2240,7 @@ static int dissect_noReplyConditionTime_impl(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_INTEGER(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_noReplyConditionTime); } -static const ber_sequence ForwardingFeatureList_sequence[] = { +static const ber_sequence_t ForwardingFeatureList_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService }, { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ss_Status_impl }, { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToNumber_impl }, @@ -2262,7 +2262,7 @@ 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_SIZE_1_32_OF_ForwardingFeatureList_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_SIZE_1_32_OF_ForwardingFeatureList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingFeatureList_item }, }; @@ -2277,7 +2277,7 @@ static int dissect_forwardingFeatureList(packet_info *pinfo, proto_tree *tree, t 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[] = { +static const ber_sequence_t ForwardingInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingFeatureList }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -2295,7 +2295,7 @@ static int dissect_forwardingInfo_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_gsm_map_ForwardingInfo(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_forwardingInfo); } -static const ber_sequence T_callBarringFeatureList_item_sequence[] = { +static const ber_sequence_t T_callBarringFeatureList_item_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService }, { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ss_Status_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -2313,7 +2313,7 @@ static int dissect_callBarringFeatureList_item(packet_info *pinfo, proto_tree *t return dissect_gsm_map_T_callBarringFeatureList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_callBarringFeatureList_item); } -static const ber_sequence T_callBarringFeatureList_sequence_of[1] = { +static const ber_sequence_t T_callBarringFeatureList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_callBarringFeatureList_item }, }; @@ -2328,7 +2328,7 @@ static int dissect_callBarringFeatureList(packet_info *pinfo, proto_tree *tree, return dissect_gsm_map_T_callBarringFeatureList(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_callBarringFeatureList); } -static const ber_sequence CallBarringInfo_sequence[] = { +static const ber_sequence_t CallBarringInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_callBarringFeatureList }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -2367,7 +2367,7 @@ static int dissect_ageOfLocationEstimate_impl(packet_info *pinfo, proto_tree *tr return dissect_gsm_map_INTEGER_0_32767(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ageOfLocationEstimate); } -static const ber_sequence T_cug_SubscriptionList_item_sequence[] = { +static const ber_sequence_t T_cug_SubscriptionList_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_cug_Index }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cug_Interlock }, { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_intraCUG_Options }, @@ -2387,7 +2387,7 @@ static int dissect_cug_SubscriptionList_item(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_T_cug_SubscriptionList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_cug_SubscriptionList_item); } -static const ber_sequence T_cug_SubscriptionList_sequence_of[1] = { +static const ber_sequence_t T_cug_SubscriptionList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cug_SubscriptionList_item }, }; @@ -2402,7 +2402,7 @@ static int dissect_cug_SubscriptionList(packet_info *pinfo, proto_tree *tree, tv return dissect_gsm_map_T_cug_SubscriptionList(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_cug_SubscriptionList); } -static const ber_sequence T_cug_FeatureList_item_sequence[] = { +static const ber_sequence_t T_cug_FeatureList_item_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_preferentialCUG_Indicator }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_interCUG_Restrictions }, @@ -2421,7 +2421,7 @@ static int dissect_cug_FeatureList_item(packet_info *pinfo, proto_tree *tree, tv return dissect_gsm_map_T_cug_FeatureList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_cug_FeatureList_item); } -static const ber_sequence T_cug_FeatureList_sequence_of[1] = { +static const ber_sequence_t T_cug_FeatureList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cug_FeatureList_item }, }; @@ -2436,7 +2436,7 @@ static int dissect_cug_FeatureList(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_gsm_map_T_cug_FeatureList(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_cug_FeatureList); } -static const ber_sequence T_cug_Info_sequence[] = { +static const ber_sequence_t T_cug_Info_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cug_SubscriptionList }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cug_FeatureList }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -2480,7 +2480,7 @@ static const value_string Ss_SubscriptionOption_vals[] = { { 0, NULL } }; -static const ber_choice Ss_SubscriptionOption_choice[] = { +static const ber_choice_t Ss_SubscriptionOption_choice[] = { { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_cliRestrictionOption_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_overrideCategory_impl }, { 0, 0, 0, 0, NULL } @@ -2497,7 +2497,7 @@ static int dissect_ss_SubscriptionOption(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_Ss_SubscriptionOption(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_ss_SubscriptionOption); } -static const ber_sequence T_ss_Data2_sequence[] = { +static const ber_sequence_t T_ss_Data2_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ss_Status_impl }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ss_SubscriptionOption }, @@ -2544,7 +2544,7 @@ static int dissect_priority_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_INTEGER_0_15(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_priority); } -static const ber_sequence T_emlpp_Info_sequence[] = { +static const ber_sequence_t T_emlpp_Info_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_maximumentitledPriority }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_defaultPriority }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -2572,7 +2572,7 @@ static const value_string T_provisionedSS_item_vals[] = { { 0, NULL } }; -static const ber_choice T_provisionedSS_item_choice[] = { +static const ber_choice_t T_provisionedSS_item_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_forwardingInfo_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callBarringInfo_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_cug_Info_impl }, @@ -2592,7 +2592,7 @@ static int dissect_provisionedSS_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_gsm_map_T_provisionedSS_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_provisionedSS_item); } -static const ber_sequence T_provisionedSS_sequence_of[1] = { +static const ber_sequence_t T_provisionedSS_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_provisionedSS_item }, }; @@ -2607,7 +2607,7 @@ static int dissect_provisionedSS_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_gsm_map_T_provisionedSS(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_provisionedSS); } -static const ber_sequence T_odb_Data_sequence[] = { +static const ber_sequence_t T_odb_Data_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_odb_GeneralData }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_odb_HPLMN_Data }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -2643,7 +2643,7 @@ 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_SIZE_1_10_OF_OCTET_STRING_SIZE_2_sequence_of[1] = { +static const ber_sequence_t 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 }, }; @@ -2658,7 +2658,7 @@ static int dissect_regionalSubscriptionData_impl(packet_info *pinfo, proto_tree 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[] = { +static const ber_sequence_t T_vbsSubscriptionData_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_groupid }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_broadcastInitEntitlement }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -2676,7 +2676,7 @@ static int dissect_vbsSubscriptionData_item(packet_info *pinfo, proto_tree *tree return dissect_gsm_map_T_vbsSubscriptionData_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_vbsSubscriptionData_item); } -static const ber_sequence T_vbsSubscriptionData_sequence_of[1] = { +static const ber_sequence_t T_vbsSubscriptionData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_vbsSubscriptionData_item }, }; @@ -2691,7 +2691,7 @@ static int dissect_vbsSubscriptionData_impl(packet_info *pinfo, proto_tree *tree return dissect_gsm_map_T_vbsSubscriptionData(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_vbsSubscriptionData); } -static const ber_sequence T_vgcsSubscriptionData_item_sequence[] = { +static const ber_sequence_t T_vgcsSubscriptionData_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_groupId }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -2708,7 +2708,7 @@ static int dissect_vgcsSubscriptionData_item(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_T_vgcsSubscriptionData_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_vgcsSubscriptionData_item); } -static const ber_sequence T_vgcsSubscriptionData_sequence_of[1] = { +static const ber_sequence_t T_vgcsSubscriptionData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_vgcsSubscriptionData_item }, }; @@ -2723,7 +2723,7 @@ 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_SIZE_1_10_OF_OCTET_STRING_SIZE_1_sequence_of[1] = { +static const ber_sequence_t 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 }, }; @@ -2738,7 +2738,7 @@ static int dissect_ss_EventList(packet_info *pinfo, proto_tree *tree, tvbuff_t * 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[] = { +static const ber_sequence_t T_ss_CamelData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ss_EventList }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsmSCF_Address }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -2756,7 +2756,7 @@ static int dissect_ss_CamelData(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_gsm_map_T_ss_CamelData(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_ss_CamelData); } -static const ber_sequence T_ss_CSI_sequence[] = { +static const ber_sequence_t T_ss_CSI_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ss_CamelData }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -2803,7 +2803,7 @@ static int dissect_destinationNumberList_item(packet_info *pinfo, proto_tree *tr return dissect_gsm_map_T_destinationNumberList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_destinationNumberList_item); } -static const ber_sequence T_destinationNumberList_sequence_of[1] = { +static const ber_sequence_t T_destinationNumberList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_destinationNumberList_item }, }; @@ -2830,7 +2830,7 @@ 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_SIZE_1_3_OF_INTEGER_1_15_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_SIZE_1_3_OF_INTEGER_1_15_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_destinationNumberLengthList_item }, }; @@ -2845,7 +2845,7 @@ static int dissect_destinationNumberLengthList_impl(packet_info *pinfo, proto_tr 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[] = { +static const ber_sequence_t DestinationNumberCriteria_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_matchType_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberList_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberLengthList_impl }, @@ -2881,7 +2881,7 @@ static int dissect_callTypeCriteria_impl(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_CallTypeCriteria(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_callTypeCriteria); } -static const ber_sequence O_BcsmCamelTDP_CriteriaList_item_sequence[] = { +static const ber_sequence_t O_BcsmCamelTDP_CriteriaList_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_o_BcsmTriggerDetectionPoint }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationNumberCriteria_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_basicServiceCriteria_impl }, @@ -2900,7 +2900,7 @@ static int dissect_O_BcsmCamelTDP_CriteriaList_item(packet_info *pinfo, proto_tr return dissect_gsm_map_O_BcsmCamelTDP_CriteriaList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_O_BcsmCamelTDP_CriteriaList_item); } -static const ber_sequence O_BcsmCamelTDP_CriteriaList_sequence_of[1] = { +static const ber_sequence_t O_BcsmCamelTDP_CriteriaList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_O_BcsmCamelTDP_CriteriaList_item }, }; @@ -2915,7 +2915,7 @@ static int dissect_o_BcsmCamelTDP_CriteriaList_impl(packet_info *pinfo, proto_tr return dissect_gsm_map_O_BcsmCamelTDP_CriteriaList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_o_BcsmCamelTDP_CriteriaList); } -static const ber_sequence T_vlrCamelSubscriptionInfo_sequence[] = { +static const ber_sequence_t T_vlrCamelSubscriptionInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_o_CSI_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_CSI_impl }, @@ -2935,7 +2935,7 @@ static int dissect_vlrCamelSubscriptionInfo_impl(packet_info *pinfo, proto_tree return dissect_gsm_map_T_vlrCamelSubscriptionInfo(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_vlrCamelSubscriptionInfo); } -static const ber_sequence Naea_PreferredCI_sequence[] = { +static const ber_sequence_t Naea_PreferredCI_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_naea_PreferredCIC_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -2991,7 +2991,7 @@ static int dissect_apn_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_gsm_map_OCTET_STRING_SIZE_2_63(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_apn); } -static const ber_sequence T_gprsDataList_item_sequence[] = { +static const ber_sequence_t T_gprsDataList_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pdp_ContextId }, { BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_pdp_Type_impl }, { BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pdp_Address_impl }, @@ -3013,7 +3013,7 @@ static int dissect_gprsDataList_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_gsm_map_T_gprsDataList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_gprsDataList_item); } -static const ber_sequence T_gprsDataList_sequence_of[1] = { +static const ber_sequence_t T_gprsDataList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_gprsDataList_item }, }; @@ -3028,7 +3028,7 @@ static int dissect_gprsDataList_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_gsm_map_T_gprsDataList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_gprsDataList); } -static const ber_sequence T_gprsSubscriptionData_sequence[] = { +static const ber_sequence_t T_gprsSubscriptionData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_completeDataListIncluded }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gprsDataList_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -3083,7 +3083,7 @@ static int dissect_lsaOnlyAccessIndicator_impl(packet_info *pinfo, proto_tree *t return dissect_gsm_map_T_lsaOnlyAccessIndicator(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lsaOnlyAccessIndicator); } -static const ber_sequence T_lsaDataList_item_sequence[] = { +static const ber_sequence_t T_lsaDataList_item_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lsaIdentity_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lsaAttributes_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lsaActiveModeIndicator_impl }, @@ -3102,7 +3102,7 @@ static int dissect_lsaDataList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_T_lsaDataList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_lsaDataList_item); } -static const ber_sequence T_lsaDataList_sequence_of[1] = { +static const ber_sequence_t T_lsaDataList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lsaDataList_item }, }; @@ -3117,7 +3117,7 @@ static int dissect_lsaDataList_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_T_lsaDataList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lsaDataList); } -static const ber_sequence T_lsaInformation_sequence[] = { +static const ber_sequence_t T_lsaInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_completeDataListIncluded }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lsaOnlyAccessIndicator_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lsaDataList_impl }, @@ -3148,7 +3148,7 @@ static int dissect_gmlc_List_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_T_gmlc_List_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_gmlc_List_item); } -static const ber_sequence T_gmlc_List_sequence_of[1] = { +static const ber_sequence_t T_gmlc_List_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gmlc_List_item }, }; @@ -3218,7 +3218,7 @@ static int dissect_locationEstimate_impl(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_OCTET_STRING_SIZE_1_20(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_locationEstimate); } -static const ber_sequence T_clientIdentity_sequence[] = { +static const ber_sequence_t T_clientIdentity_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_externalAddress_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -3253,7 +3253,7 @@ static int dissect_gmlc_Restriction_impl(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_T_gmlc_Restriction(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_gmlc_Restriction); } -static const ber_sequence T_externalClientList_item_sequence[] = { +static const ber_sequence_t T_externalClientList_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_clientIdentity }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gmlc_Restriction_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationToMSUser_impl }, @@ -3272,7 +3272,7 @@ static int dissect_externalClientList_item(packet_info *pinfo, proto_tree *tree, return dissect_gsm_map_T_externalClientList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_externalClientList_item); } -static const ber_sequence T_externalClientList_sequence_of[1] = { +static const ber_sequence_t T_externalClientList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_externalClientList_item }, }; @@ -3308,7 +3308,7 @@ static int dissect_plmnClientList_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_gsm_map_T_plmnClientList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_plmnClientList_item); } -static const ber_sequence T_plmnClientList_sequence_of[1] = { +static const ber_sequence_t T_plmnClientList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_plmnClientList_item }, }; @@ -3323,7 +3323,7 @@ static int dissect_plmnClientList_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_gsm_map_T_plmnClientList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_plmnClientList); } -static const ber_sequence T_lcs_PrivacyExceptionList_item_sequence[] = { +static const ber_sequence_t T_lcs_PrivacyExceptionList_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Status }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notificationToMSUser_impl }, @@ -3344,7 +3344,7 @@ static int dissect_lcs_PrivacyExceptionList_item(packet_info *pinfo, proto_tree return dissect_gsm_map_T_lcs_PrivacyExceptionList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_lcs_PrivacyExceptionList_item); } -static const ber_sequence T_lcs_PrivacyExceptionList_sequence_of[1] = { +static const ber_sequence_t T_lcs_PrivacyExceptionList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcs_PrivacyExceptionList_item }, }; @@ -3359,7 +3359,7 @@ static int dissect_lcs_PrivacyExceptionList_impl(packet_info *pinfo, proto_tree return dissect_gsm_map_T_lcs_PrivacyExceptionList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lcs_PrivacyExceptionList); } -static const ber_sequence T_molr_List_item_sequence[] = { +static const ber_sequence_t T_molr_List_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Status }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -3377,7 +3377,7 @@ static int dissect_molr_List_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_T_molr_List_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_molr_List_item); } -static const ber_sequence T_molr_List_sequence_of[1] = { +static const ber_sequence_t T_molr_List_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_molr_List_item }, }; @@ -3392,7 +3392,7 @@ static int dissect_molr_List_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_T_molr_List(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_molr_List); } -static const ber_sequence T_lcsInformation_sequence[] = { +static const ber_sequence_t T_lcsInformation_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gmlc_List_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_PrivacyExceptionList_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_molr_List_impl }, @@ -3410,7 +3410,7 @@ static int dissect_lcsInformation_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_gsm_map_T_lcsInformation(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lcsInformation); } -static const ber_sequence InsertSubscriberDataArg_sequence[] = { +static const ber_sequence_t InsertSubscriberDataArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_category_impl }, @@ -3443,7 +3443,7 @@ 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] = { +static const ber_sequence_t 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 }, }; @@ -3478,7 +3478,7 @@ static int dissect_regionalSubscriptionResponse_impl(packet_info *pinfo, proto_t return dissect_gsm_map_RegionalSubscriptionResponse(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_regionalSubscriptionResponse); } -static const ber_sequence InsertSubscriberDataRes_sequence[] = { +static const ber_sequence_t InsertSubscriberDataRes_sequence[] = { { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_teleserviceList_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_bearerServiceList_impl }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_List_impl }, @@ -3497,7 +3497,7 @@ dissect_gsm_map_InsertSubscriberDataRes(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence SEQUNCE_SIZE_1_50_OF_INTEGER_1_50_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_SIZE_1_50_OF_INTEGER_1_50_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_contextIdList_item }, }; @@ -3519,7 +3519,7 @@ static const value_string T_gprsSubscriptionDataWithdraw_vals[] = { { 0, NULL } }; -static const ber_choice T_gprsSubscriptionDataWithdraw_choice[] = { +static const ber_choice_t T_gprsSubscriptionDataWithdraw_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allGPRSData }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextIdList }, { 0, 0, 0, 0, NULL } @@ -3536,7 +3536,7 @@ 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_SIZE_1_20_OF_OCTET_STRING_SIZE_3_sequence_of[1] = { +static const ber_sequence_t 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 }, }; @@ -3558,7 +3558,7 @@ static const value_string T_lsaInformationWithdraw_vals[] = { { 0, NULL } }; -static const ber_choice T_lsaInformationWithdraw_choice[] = { +static const ber_choice_t T_lsaInformationWithdraw_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allLSAData }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lsaIdentityList }, { 0, 0, 0, 0, NULL } @@ -3575,7 +3575,7 @@ static int dissect_lsaInformationWithdraw(packet_info *pinfo, proto_tree *tree, return dissect_gsm_map_T_lsaInformationWithdraw(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_lsaInformationWithdraw); } -static const ber_sequence DeleteSubscriberDataArg_sequence[] = { +static const ber_sequence_t DeleteSubscriberDataArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_basicServiceList_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_List_impl }, @@ -3600,7 +3600,7 @@ dissect_gsm_map_DeleteSubscriberDataArg(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence DeleteSubscriberDataRes_sequence[] = { +static const ber_sequence_t DeleteSubscriberDataRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_regionalSubscriptionResponse_impl }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -3626,7 +3626,7 @@ 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_SIZE_1_50_OF_OCTET_STRING_SIZE_3_8_sequence_of[1] = { +static const ber_sequence_t 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 }, }; @@ -3641,7 +3641,7 @@ static int dissect_hlr_List(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, 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[] = { +static const ber_sequence_t ResetArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_hlr_List }, { 0, 0, 0, NULL } @@ -3655,7 +3655,7 @@ dissect_gsm_map_ResetArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p return offset; } -static const ber_sequence RestoreDataArg_sequence[] = { +static const ber_sequence_t RestoreDataArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lmsi }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -3671,7 +3671,7 @@ dissect_gsm_map_RestoreDataArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static const ber_sequence RestoreDataRes_sequence[] = { +static const ber_sequence_t RestoreDataRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_msNotReachable }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -3722,7 +3722,7 @@ static int dissect_mobileNotReachableReason_impl(packet_info *pinfo, proto_tree return dissect_gsm_map_INTEGER_0_255(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_mobileNotReachableReason); } -static const ber_sequence ActivateTraceModeArg_sequence[] = { +static const ber_sequence_t ActivateTraceModeArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_traceReference_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_traceType_impl }, @@ -3739,7 +3739,7 @@ dissect_gsm_map_ActivateTraceModeArg(gboolean implicit_tag _U_, tvbuff_t *tvb, i return offset; } -static const ber_sequence ActivateTraceModeRes_sequence[] = { +static const ber_sequence_t ActivateTraceModeRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } }; @@ -3752,7 +3752,7 @@ dissect_gsm_map_ActivateTraceModeRes(gboolean implicit_tag _U_, tvbuff_t *tvb, i return offset; } -static const ber_sequence DeactivateTraceModeArg_sequence[] = { +static const ber_sequence_t DeactivateTraceModeArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_traceReference_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -3767,7 +3767,7 @@ dissect_gsm_map_DeactivateTraceModeArg(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence DeactivateTraceModeRes_sequence[] = { +static const ber_sequence_t DeactivateTraceModeRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } }; @@ -3780,7 +3780,7 @@ dissect_gsm_map_DeactivateTraceModeRes(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence Cug_CheckInfo_sequence[] = { +static const ber_sequence_t Cug_CheckInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cug_Interlock }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cug_OutgoingAccess }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -3877,7 +3877,7 @@ static int dissect_forwardingReason_impl(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_T_forwardingReason(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_forwardingReason); } -static const ber_sequence T_camelInfo_sequence[] = { +static const ber_sequence_t T_camelInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_supportedCamelPhases }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_suppress_T_CSI }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -3912,7 +3912,7 @@ static int dissect_ext_ProtocolId(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_T_ext_ProtocolId(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_ext_ProtocolId); } -static const ber_sequence AdditionalSignalInfo_sequence[] = { +static const ber_sequence_t AdditionalSignalInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ext_ProtocolId }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signalInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -3930,7 +3930,7 @@ static int dissect_additionalSignalInfo_impl(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_AdditionalSignalInfo(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_additionalSignalInfo); } -static const ber_sequence SendRoutingInfoArg_sequence[] = { +static const ber_sequence_t SendRoutingInfoArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cug_CheckInfo_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_numberOfForwarding_impl }, @@ -3972,7 +3972,7 @@ static int dissect_roamingNumber(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_RoamingNumber(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_roamingNumber); } -static const ber_sequence ForwardingData_sequence[] = { +static const ber_sequence_t ForwardingData_sequence[] = { { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToNumber_impl }, { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToSubaddress_impl }, { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingOptions_impl }, @@ -4001,7 +4001,7 @@ static const value_string T_routingInfo_vals[] = { { 0, NULL } }; -static const ber_choice T_routingInfo_choice[] = { +static const ber_choice_t T_routingInfo_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_roamingNumber }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingData }, { 0, 0, 0, 0, NULL } @@ -4018,7 +4018,7 @@ static int dissect_routingInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_gsm_map_T_routingInfo(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_routingInfo); } -static const ber_sequence T_t_CSI_sequence[] = { +static const ber_sequence_t T_t_CSI_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_t_BcsmCamelTDPDataList }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camelCapabilityHandling_impl }, @@ -4036,7 +4036,7 @@ static int dissect_t_CSI_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_gsm_map_T_t_CSI(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_t_CSI); } -static const ber_sequence T_gmscCamelSubscriptionInfo_sequence[] = { +static const ber_sequence_t T_gmscCamelSubscriptionInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_t_CSI_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_o_CSI_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -4055,7 +4055,7 @@ static int dissect_gmscCamelSubscriptionInfo_impl(packet_info *pinfo, proto_tree return dissect_gsm_map_T_gmscCamelSubscriptionInfo(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_gmscCamelSubscriptionInfo); } -static const ber_sequence T_camelRoutingInfo_sequence[] = { +static const ber_sequence_t T_camelRoutingInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_forwardingData }, { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gmscCamelSubscriptionInfo_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -4080,7 +4080,7 @@ static const value_string T_extendedRoutingInfo_vals[] = { { 0, NULL } }; -static const ber_choice T_extendedRoutingInfo_choice[] = { +static const ber_choice_t T_extendedRoutingInfo_choice[] = { { 0, BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_routingInfo }, { 1, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_camelRoutingInfo_impl }, { 0, 0, 0, 0, NULL } @@ -4140,7 +4140,7 @@ static const value_string T_cellIdOrLAI_vals[] = { { 0, NULL } }; -static const ber_choice T_cellIdOrLAI_choice[] = { +static const ber_choice_t T_cellIdOrLAI_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cellIdFixedLength_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_laiFixedLength_impl }, { 0, 0, 0, 0, NULL } @@ -4157,7 +4157,7 @@ static int dissect_cellIdOrLAI(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_gsm_map_T_cellIdOrLAI(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_cellIdOrLAI); } -static const ber_sequence LocationInformation_sequence[] = { +static const ber_sequence_t LocationInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ageOfLocationInformation }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_geographicalInformation_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_vlr_number_impl }, @@ -4186,7 +4186,7 @@ static const value_string SubscriberState_vals[] = { { 0, NULL } }; -static const ber_choice SubscriberState_choice[] = { +static const ber_choice_t SubscriberState_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assumedIdle_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_camelBusy_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_notProvidedFromVLR_impl }, @@ -4204,7 +4204,7 @@ static int dissect_subscriberState(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_gsm_map_SubscriberState(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_subscriberState); } -static const ber_sequence SubscriberInfo_sequence[] = { +static const ber_sequence_t SubscriberInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformation_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_subscriberState }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -4237,7 +4237,7 @@ static int dissect_vmsc_Address_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_gsm_map_T_vmsc_Address(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_vmsc_Address); } -static const ber_sequence T_ccbs_Indicators_sequence[] = { +static const ber_sequence_t T_ccbs_Indicators_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Possible_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepCCBS_CallIndicator_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -4274,7 +4274,7 @@ static int dissect_numberPortabilityStatus_impl(packet_info *pinfo, proto_tree * return dissect_gsm_map_T_numberPortabilityStatus(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_numberPortabilityStatus); } -static const ber_sequence SendRoutingInfoRes_sequence[] = { +static const ber_sequence_t SendRoutingInfoRes_sequence[] = { { BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { -1/*choice*/ , -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_extendedRoutingInfo }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cug_CheckInfo_impl }, @@ -4317,7 +4317,7 @@ dissect_gsm_map_NetDetNotReachable(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence ProvideRoamingNumberArg_sequence[] = { +static const ber_sequence_t ProvideRoamingNumberArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msc_Number_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, @@ -4345,7 +4345,7 @@ dissect_gsm_map_ProvideRoamingNumberArg(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence ProvideRoamingNumberRes_sequence[] = { +static const ber_sequence_t ProvideRoamingNumberRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_roamingNumber }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -4371,7 +4371,7 @@ static int dissect_uui_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_gsm_map_OCTET_STRING_SIZE_1_131(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_uui); } -static const ber_sequence T_uu_Data_sequence[] = { +static const ber_sequence_t T_uu_Data_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uuIndicator_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uui_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uusCFInteraction_impl }, @@ -4390,7 +4390,7 @@ static int dissect_uu_Data_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_gsm_map_T_uu_Data(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_uu_Data); } -static const ber_sequence ResumeCallHandlingArg_sequence[] = { +static const ber_sequence_t ResumeCallHandlingArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callReferenceNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_basicServiceGroup }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardingData_impl }, @@ -4413,7 +4413,7 @@ dissect_gsm_map_ResumeCallHandlingArg(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence ResumeCallHandlingRes_sequence[] = { +static const ber_sequence_t ResumeCallHandlingRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -4438,7 +4438,7 @@ static int dissect_b_Subscriber_Address_impl(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_T_b_Subscriber_Address(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_b_Subscriber_Address); } -static const ber_sequence ProvideSIWFSNumberArg_sequence[] = { +static const ber_sequence_t ProvideSIWFSNumberArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_BearerCapability_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_isdn_BearerCapability_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_call_Direction_impl }, @@ -4470,7 +4470,7 @@ static int dissect_sIWFSNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_T_sIWFSNumber(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_sIWFSNumber); } -static const ber_sequence ProvideSIWFSNumberRes_sequence[] = { +static const ber_sequence_t ProvideSIWFSNumberRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sIWFSNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -4484,7 +4484,7 @@ dissect_gsm_map_ProvideSIWFSNumberRes(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence SIWFSSignallingModifyArg_sequence[] = { +static const ber_sequence_t SIWFSSignallingModifyArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_channelType_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chosenChannel_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -4499,7 +4499,7 @@ dissect_gsm_map_SIWFSSignallingModifyArg(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static const ber_sequence SIWFSSignallingModifyRes_sequence[] = { +static const ber_sequence_t SIWFSSignallingModifyRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_chosenChannel_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -4531,7 +4531,7 @@ static int dissect_ccbs_Monitoring_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_gsm_map_Ccbs_Monitoring(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ccbs_Monitoring); } -static const ber_sequence SetReportingStateArg_sequence[] = { +static const ber_sequence_t SetReportingStateArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lmsi_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Monitoring_impl }, @@ -4566,7 +4566,7 @@ static int dissect_ccbs_SubscriberStatus_impl(packet_info *pinfo, proto_tree *tr return dissect_gsm_map_Ccbs_SubscriberStatus(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ccbs_SubscriberStatus); } -static const ber_sequence SetReportingStateRes_sequence[] = { +static const ber_sequence_t SetReportingStateRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_SubscriberStatus_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -4617,7 +4617,7 @@ static int dissect_callOutcome_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_CallOutcome(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_callOutcome); } -static const ber_sequence T_eventReportData_sequence[] = { +static const ber_sequence_t T_eventReportData_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_SubscriberStatus_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -4634,7 +4634,7 @@ static int dissect_eventReportData_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_gsm_map_T_eventReportData(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_eventReportData); } -static const ber_sequence T_callReportdata_sequence[] = { +static const ber_sequence_t T_callReportdata_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_monitoringMode_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callOutcome_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -4652,7 +4652,7 @@ static int dissect_callReportdata_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_gsm_map_T_callReportdata(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_callReportdata); } -static const ber_sequence StatusReportArg_sequence[] = { +static const ber_sequence_t StatusReportArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventReportData_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_callReportdata_impl }, @@ -4668,7 +4668,7 @@ dissect_gsm_map_StatusReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } -static const ber_sequence StatusReportRes_sequence[] = { +static const ber_sequence_t StatusReportRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } }; @@ -4727,7 +4727,7 @@ static int dissect_b_subscriberSubaddress_impl(packet_info *pinfo, proto_tree *t return dissect_gsm_map_OCTET_STRING_SIZE_1_21(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_b_subscriberSubaddress); } -static const ber_sequence Ccbs_Feature_sequence[] = { +static const ber_sequence_t Ccbs_Feature_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 }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberSubaddress_impl }, @@ -4758,7 +4758,7 @@ static int dissect_translatedB_Number_impl(packet_info *pinfo, proto_tree *tree, return dissect_gsm_map_TranslatedB_Number(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_translatedB_Number); } -static const ber_sequence RemoteUserFreeArg_sequence[] = { +static const ber_sequence_t RemoteUserFreeArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callInfo_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ccbs_Feature_impl }, @@ -4777,7 +4777,7 @@ dissect_gsm_map_RemoteUserFreeArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence RemoteUserFreeRes_sequence[] = { +static const ber_sequence_t RemoteUserFreeRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ruf_Outcome_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -4791,7 +4791,7 @@ dissect_gsm_map_RemoteUserFreeRes(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence Ss_Data_sequence[] = { +static const ber_sequence_t Ss_Data_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ss_SubscriptionOption }, @@ -4811,7 +4811,7 @@ static int dissect_ss_Data_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_gsm_map_Ss_Data(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ss_Data); } -static const ber_sequence RegisterSS_Arg_sequence[] = { +static const ber_sequence_t RegisterSS_Arg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService }, { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_forwardedToNumber_impl }, @@ -4837,7 +4837,7 @@ static const value_string Ss_Info_vals[] = { { 0, NULL } }; -static const ber_choice Ss_Info_choice[] = { +static const ber_choice_t Ss_Info_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_forwardingInfo_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callBarringInfo_impl }, { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ss_Data_impl }, @@ -4852,7 +4852,7 @@ dissect_gsm_map_Ss_Info(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa return offset; } -static const ber_sequence Ss_ForBS_sequence[] = { +static const ber_sequence_t Ss_ForBS_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Code }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService }, { 0, 0, 0, NULL } @@ -4866,7 +4866,7 @@ 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] = { +static const ber_sequence_t SEQUNCE_SIZE_1_13_OF_ForwardingFeatureList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_forwardingFeatureList_item }, }; @@ -4881,7 +4881,7 @@ static int dissect_forwardingFeatureList1_impl(packet_info *pinfo, proto_tree *t 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[] = { +static const ber_sequence_t 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 }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_b_subscriberSubaddress_impl }, @@ -4900,7 +4900,7 @@ static int dissect_ccbs_FeatureList_item(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_T_ccbs_FeatureList_item(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_ccbs_FeatureList_item); } -static const ber_sequence T_ccbs_FeatureList_sequence_of[1] = { +static const ber_sequence_t T_ccbs_FeatureList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ccbs_FeatureList_item }, }; @@ -4915,7 +4915,7 @@ static int dissect_ccbs_FeatureList_impl(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_T_ccbs_FeatureList(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ccbs_FeatureList); } -static const ber_sequence T_genericServiceInfo_sequence[] = { +static const ber_sequence_t T_genericServiceInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ss_Status }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cliRestrictionOption_impl }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximumEntitledPriority_impl }, @@ -4944,7 +4944,7 @@ static const value_string InterrogateSS_Res_vals[] = { { 0, NULL } }; -static const ber_choice InterrogateSS_Res_choice[] = { +static const ber_choice_t 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_forwardingFeatureList1_impl }, @@ -4972,7 +4972,7 @@ static int dissect_ussd_String(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_gsm_map_OCTET_STRING_SIZE_1_160(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_ussd_String); } -static const ber_sequence Ussd_Arg_sequence[] = { +static const ber_sequence_t Ussd_Arg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_DataCodingScheme }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_String }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_alertingPattern }, @@ -4988,7 +4988,7 @@ dissect_gsm_map_Ussd_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p return offset; } -static const ber_sequence Ussd_Res_sequence[] = { +static const ber_sequence_t Ussd_Res_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_DataCodingScheme }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_ussd_String }, { 0, 0, 0, NULL } @@ -5056,7 +5056,7 @@ static int dissect_serviceIndicator_impl(packet_info *pinfo, proto_tree *tree, t return dissect_gsm_map_ServiceIndicator(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_serviceIndicator); } -static const ber_sequence T_ccbs_Data_sequence[] = { +static const ber_sequence_t T_ccbs_Data_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ccbs_Feature_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_translatedB_Number_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceIndicator_impl }, @@ -5076,7 +5076,7 @@ static int dissect_ccbs_Data_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_T_ccbs_Data(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ccbs_Data); } -static const ber_sequence RegisterCC_EntryArg_sequence[] = { +static const ber_sequence_t RegisterCC_EntryArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Data_impl }, { 0, 0, 0, NULL } @@ -5090,7 +5090,7 @@ dissect_gsm_map_RegisterCC_EntryArg(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence RegisterCC_EntryRes_sequence[] = { +static const ber_sequence_t RegisterCC_EntryRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Feature_impl }, { 0, 0, 0, NULL } }; @@ -5103,7 +5103,7 @@ dissect_gsm_map_RegisterCC_EntryRes(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence EraseCC_EntryArg_sequence[] = { +static const ber_sequence_t EraseCC_EntryArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Index_impl }, { 0, 0, 0, NULL } @@ -5117,7 +5117,7 @@ dissect_gsm_map_EraseCC_EntryArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence EraseCC_EntryRes_sequence[] = { +static const ber_sequence_t EraseCC_EntryRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ss_Code_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl }, { 0, 0, 0, NULL } @@ -5166,7 +5166,7 @@ static int dissect_sm_RP_SMEA_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_gsm_map_OCTET_STRING_SIZE_1_12(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_sm_RP_SMEA); } -static const ber_sequence RoutingInfoForSMArg_sequence[] = { +static const ber_sequence_t RoutingInfoForSMArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sm_RP_PRI_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_serviceCentreAddress_impl }, @@ -5204,7 +5204,7 @@ static const value_string T_additional_Number_vals[] = { { 0, NULL } }; -static const ber_choice T_additional_Number_choice[] = { +static const ber_choice_t T_additional_Number_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_msc_Number_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sgsn_Number_impl }, { 0, 0, 0, 0, NULL } @@ -5221,7 +5221,7 @@ static int dissect_additional_Number(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_gsm_map_T_additional_Number(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_additional_Number); } -static const ber_sequence T_locationInfoWithLMSI_sequence[] = { +static const ber_sequence_t T_locationInfoWithLMSI_sequence[] = { { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_networkNode_Number_impl }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lmsi }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -5241,7 +5241,7 @@ static int dissect_locationInfoWithLMSI_impl(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_T_locationInfoWithLMSI(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_locationInfoWithLMSI); } -static const ber_sequence RoutingInfoForSMRes_sequence[] = { +static const ber_sequence_t RoutingInfoForSMRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_locationInfoWithLMSI_impl }, { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -5265,7 +5265,7 @@ static const value_string Sm_RP_DA_vals[] = { { 0, NULL } }; -static const ber_choice Sm_RP_DA_choice[] = { +static const ber_choice_t Sm_RP_DA_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lmsi_impl }, { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_serviceCentreAddressDA_impl }, @@ -5292,7 +5292,7 @@ static const value_string Sm_RP_OA_vals[] = { { 0, NULL } }; -static const ber_choice Sm_RP_OA_choice[] = { +static const ber_choice_t Sm_RP_OA_choice[] = { { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_serviceCentreAddressOA_impl }, { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_noSM_RP_OA_impl }, @@ -5310,7 +5310,7 @@ static int dissect_sm_RP_OA(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_gsm_map_Sm_RP_OA(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_sm_RP_OA); } -static const ber_sequence Mo_forwardSM_Arg_sequence[] = { +static const ber_sequence_t Mo_forwardSM_Arg_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_DA }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_OA }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI }, @@ -5327,7 +5327,7 @@ dissect_gsm_map_Mo_forwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence Mo_forwardSM_Res_sequence[] = { +static const ber_sequence_t Mo_forwardSM_Res_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5341,7 +5341,7 @@ dissect_gsm_map_Mo_forwardSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence Mt_forwardSM_Arg_sequence[] = { +static const ber_sequence_t Mt_forwardSM_Arg_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_DA }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sm_RP_OA }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI }, @@ -5358,7 +5358,7 @@ dissect_gsm_map_Mt_forwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence Mt_forwardSM_Res_sequence[] = { +static const ber_sequence_t Mt_forwardSM_Res_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sm_RP_UI }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5405,7 +5405,7 @@ static int dissect_additionalSM_DeliveryOutcome_impl(packet_info *pinfo, proto_t return dissect_gsm_map_Sm_DeliveryOutcome(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_additionalSM_DeliveryOutcome); } -static const ber_sequence ReportSM_DeliveryStatusArg_sequence[] = { +static const ber_sequence_t ReportSM_DeliveryStatusArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msisdn }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_serviceCentreAddress }, { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sm_DeliveryOutcome }, @@ -5426,7 +5426,7 @@ dissect_gsm_map_ReportSM_DeliveryStatusArg(gboolean implicit_tag _U_, tvbuff_t * return offset; } -static const ber_sequence ReportSM_DeliveryStatusRes_sequence[] = { +static const ber_sequence_t ReportSM_DeliveryStatusRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_storedMSISDN }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5460,7 +5460,7 @@ static int dissect_mw_Status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_gsm_map_T_mw_Status(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_mw_Status); } -static const ber_sequence InformServiceCentreArg_sequence[] = { +static const ber_sequence_t InformServiceCentreArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_storedMSISDN }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_mw_Status }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -5475,7 +5475,7 @@ dissect_gsm_map_InformServiceCentreArg(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence AlertServiceCentreArg_sequence[] = { +static const ber_sequence_t AlertServiceCentreArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msisdn }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_serviceCentreAddress }, { 0, 0, 0, NULL } @@ -5507,7 +5507,7 @@ static int dissect_alertReason(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_gsm_map_T_alertReason(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_alertReason); } -static const ber_sequence ReadyForSM_Arg_sequence[] = { +static const ber_sequence_t ReadyForSM_Arg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_alertReason }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_alertReasonIndicator }, @@ -5523,7 +5523,7 @@ dissect_gsm_map_ReadyForSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static const ber_sequence ReadyForSM_Res_sequence[] = { +static const ber_sequence_t ReadyForSM_Res_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -5536,7 +5536,7 @@ dissect_gsm_map_ReadyForSM_Res(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static const ber_sequence RequestedInfo_sequence[] = { +static const ber_sequence_t RequestedInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_locationInformationFlag_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subscriberStateFlag_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -5554,7 +5554,7 @@ static int dissect_requestedInfo_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_gsm_map_RequestedInfo(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_requestedInfo); } -static const ber_sequence ProvideSubscriberInfoArg_sequence[] = { +static const ber_sequence_t ProvideSubscriberInfoArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lmsi_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_requestedInfo_impl }, @@ -5570,7 +5570,7 @@ dissect_gsm_map_ProvideSubscriberInfoArg(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static const ber_sequence ProvideSubscriberInfoRes_sequence[] = { +static const ber_sequence_t ProvideSubscriberInfoRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subscriberInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5591,7 +5591,7 @@ static const value_string T_subscriberIdentity_vals[] = { { 0, NULL } }; -static const ber_choice T_subscriberIdentity_choice[] = { +static const ber_choice_t T_subscriberIdentity_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, { 0, 0, 0, 0, NULL } @@ -5608,7 +5608,7 @@ static int dissect_subscriberIdentity(packet_info *pinfo, proto_tree *tree, tvbu return dissect_gsm_map_T_subscriberIdentity(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_subscriberIdentity); } -static const ber_sequence AnyTimeInterrogationArg_sequence[] = { +static const ber_sequence_t AnyTimeInterrogationArg_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_subscriberIdentity }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_requestedInfo_impl }, { BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_gsmSCF_Address_impl }, @@ -5624,7 +5624,7 @@ dissect_gsm_map_AnyTimeInterrogationArg(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence AnyTimeInterrogationRes_sequence[] = { +static const ber_sequence_t AnyTimeInterrogationRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_subscriberInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5638,7 +5638,7 @@ dissect_gsm_map_AnyTimeInterrogationRes(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence SEQUNCE_SIZE_1_2_OF_OCTET_STRING_SIZE_1_20_sequence_of[1] = { +static const ber_sequence_t 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 }, }; @@ -5653,7 +5653,7 @@ static int dissect_ss_EventSpecification_impl(packet_info *pinfo, proto_tree *tr 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[] = { +static const ber_sequence_t Ss_InvocationNotificationArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ss_Event_impl }, @@ -5670,7 +5670,7 @@ dissect_gsm_map_Ss_InvocationNotificationArg(gboolean implicit_tag _U_, tvbuff_t return offset; } -static const ber_sequence Ss_InvocationNotificationRes_sequence[] = { +static const ber_sequence_t Ss_InvocationNotificationRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -5695,7 +5695,7 @@ static int dissect_codec_Info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_gsm_map_OCTET_STRING_SIZE_5_10(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_codec_Info); } -static const ber_sequence PrepareGroupCallArg_sequence[] = { +static const ber_sequence_t PrepareGroupCallArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_teleservice }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_asciCallReference }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_codec_Info }, @@ -5728,7 +5728,7 @@ static int dissect_groupCallNumber(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_gsm_map_T_groupCallNumber(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_groupCallNumber); } -static const ber_sequence PrepareGroupCallRes_sequence[] = { +static const ber_sequence_t PrepareGroupCallRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_groupCallNumber }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5742,7 +5742,7 @@ dissect_gsm_map_PrepareGroupCallRes(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence SendGroupCallEndSignalArg_sequence[] = { +static const ber_sequence_t SendGroupCallEndSignalArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5756,7 +5756,7 @@ dissect_gsm_map_SendGroupCallEndSignalArg(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static const ber_sequence SendGroupCallEndSignalRes_sequence[] = { +static const ber_sequence_t SendGroupCallEndSignalRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -5769,7 +5769,7 @@ dissect_gsm_map_SendGroupCallEndSignalRes(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static const ber_sequence ProcessGroupCallSignallingArg_sequence[] = { +static const ber_sequence_t ProcessGroupCallSignallingArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkRequest_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkReleaseIndication_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_releaseGroupCall_impl }, @@ -5785,7 +5785,7 @@ dissect_gsm_map_ProcessGroupCallSignallingArg(gboolean implicit_tag _U_, tvbuff_ return offset; } -static const ber_sequence ForwardGroupCallSignallingArg_sequence[] = { +static const ber_sequence_t ForwardGroupCallSignallingArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkRequestAck_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_uplinkReleaseIndication_impl }, @@ -5819,7 +5819,7 @@ static int dissect_sgsn_Address_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_gsm_map_OCTET_STRING_SIZE_5_17(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_sgsn_Address); } -static const ber_sequence T_sgsn_Capability_sequence[] = { +static const ber_sequence_t T_sgsn_Capability_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_solsaSupportIndicator }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -5836,7 +5836,7 @@ static int dissect_sgsn_Capability_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_gsm_map_T_sgsn_Capability(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_sgsn_Capability); } -static const ber_sequence UpdateGprsLocationArg_sequence[] = { +static const ber_sequence_t UpdateGprsLocationArg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_imsi }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sgsn_Number }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_sgsn_Address }, @@ -5853,7 +5853,7 @@ dissect_gsm_map_UpdateGprsLocationArg(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence UpdateGprsLocationRes_sequence[] = { +static const ber_sequence_t UpdateGprsLocationRes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hlr_Number }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -5891,7 +5891,7 @@ static int dissect_ggsn_Number_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_Ggsn_Number(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ggsn_Number); } -static const ber_sequence SendRoutingInfoForGprsArg_sequence[] = { +static const ber_sequence_t SendRoutingInfoForGprsArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ggsn_Number_impl }, @@ -5907,7 +5907,7 @@ dissect_gsm_map_SendRoutingInfoForGprsArg(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static const ber_sequence SendRoutingInfoForGprsRes_sequence[] = { +static const ber_sequence_t SendRoutingInfoForGprsRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sgsn_Address_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mobileNotReachableReason_impl }, @@ -5923,7 +5923,7 @@ dissect_gsm_map_SendRoutingInfoForGprsRes(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static const ber_sequence FailureReportArg_sequence[] = { +static const ber_sequence_t FailureReportArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ggsn_Number_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl }, @@ -5939,7 +5939,7 @@ dissect_gsm_map_FailureReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence FailureReportRes_sequence[] = { +static const ber_sequence_t FailureReportRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -5953,7 +5953,7 @@ dissect_gsm_map_FailureReportRes(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence NoteMsPresentForGprsArg_sequence[] = { +static const ber_sequence_t NoteMsPresentForGprsArg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_sgsn_Address_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ggsn_Address_impl }, @@ -5969,7 +5969,7 @@ dissect_gsm_map_NoteMsPresentForGprsArg(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence NoteMsPresentForGprsRes_sequence[] = { +static const ber_sequence_t NoteMsPresentForGprsRes_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } }; @@ -6002,7 +6002,7 @@ static int dissect_lcsClientType_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_gsm_map_LcsClientType(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lcsClientType); } -static const ber_sequence LcsClientExternalID_sequence[] = { +static const ber_sequence_t LcsClientExternalID_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_externalAddress_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -6040,7 +6040,7 @@ static int dissect_lcsClientInternalID_impl(packet_info *pinfo, proto_tree *tree return dissect_gsm_map_LcsClientInternalID(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lcsClientInternalID); } -static const ber_sequence LcsClientName_sequence[] = { +static const ber_sequence_t LcsClientName_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dataCodingScheme_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nameString_impl }, { 0, 0, 0, NULL } @@ -6057,7 +6057,7 @@ static int dissect_lcsClientName_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_gsm_map_LcsClientName(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lcsClientName); } -static const ber_sequence Lcs_ClientID_sequence[] = { +static const ber_sequence_t Lcs_ClientID_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_lcsClientType_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcsClientExternalID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcsClientDialedByMS_impl }, @@ -6099,7 +6099,7 @@ static int dissect_lcs_Event(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_gsm_map_Lcs_Event(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_lcs_Event); } -static const ber_sequence LcsLocationInfo_sequence[] = { +static const ber_sequence_t LcsLocationInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_msc_Number }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lmsi_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -6139,7 +6139,7 @@ static int dissect_locationEstimateType_impl(packet_info *pinfo, proto_tree *tre return dissect_gsm_map_T_locationEstimateType(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_locationEstimateType); } -static const ber_sequence T_locationType_sequence[] = { +static const ber_sequence_t T_locationType_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_locationEstimateType_impl }, { 0, 0, 0, NULL } }; @@ -6185,7 +6185,7 @@ static int dissect_responseTimeCategory(packet_info *pinfo, proto_tree *tree, tv return dissect_gsm_map_T_responseTimeCategory(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_responseTimeCategory); } -static const ber_sequence T_responseTime_sequence[] = { +static const ber_sequence_t T_responseTime_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_responseTimeCategory }, { 0, 0, 0, NULL } }; @@ -6201,7 +6201,7 @@ static int dissect_responseTime_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_gsm_map_T_responseTime(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_responseTime); } -static const ber_sequence T_lcs_QoS_sequence[] = { +static const ber_sequence_t T_lcs_QoS_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_horizontal_accuracy_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_verticalCoordinateRequest_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_vertical_accuracy_impl }, @@ -6221,7 +6221,7 @@ static int dissect_lcs_QoS_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_gsm_map_T_lcs_QoS(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_lcs_QoS); } -static const ber_sequence ProvideSubscriberLocation_Arg_sequence[] = { +static const ber_sequence_t ProvideSubscriberLocation_Arg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_locationType }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_mlc_Number }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lcs_ClientID_impl }, @@ -6244,7 +6244,7 @@ dissect_gsm_map_ProvideSubscriberLocation_Arg(gboolean implicit_tag _U_, tvbuff_ return offset; } -static const ber_sequence ProvideSubscriberLocation_Res_sequence[] = { +static const ber_sequence_t ProvideSubscriberLocation_Res_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_locationEstimate }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ageOfLocationEstimate_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -6266,7 +6266,7 @@ static const value_string TargetMS_vals[] = { { 0, NULL } }; -static const ber_choice TargetMS_choice[] = { +static const ber_choice_t TargetMS_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_imsi_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_msisdn_impl }, { 0, 0, 0, 0, NULL } @@ -6295,7 +6295,7 @@ static int dissect_mlcNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_gsm_map_T_mlcNumber(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_mlcNumber); } -static const ber_sequence RoutingInfoForLCS_Arg_sequence[] = { +static const ber_sequence_t RoutingInfoForLCS_Arg_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mlcNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_targetMS }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -6310,7 +6310,7 @@ dissect_gsm_map_RoutingInfoForLCS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence RoutingInfoForLCS_Res_sequence[] = { +static const ber_sequence_t RoutingInfoForLCS_Res_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_targetMS }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_lcsLocationInfo_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, @@ -6349,7 +6349,7 @@ static int dissect_na_ESRK_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_gsm_map_T_na_ESRK(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_na_ESRK); } -static const ber_sequence SubscriberLocationReport_Arg_sequence[] = { +static const ber_sequence_t SubscriberLocationReport_Arg_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_lcs_Event }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcs_ClientID }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_lcsLocationInfo }, @@ -6372,7 +6372,7 @@ dissect_gsm_map_SubscriberLocationReport_Arg(gboolean implicit_tag _U_, tvbuff_t return offset; } -static const ber_sequence SubscriberLocationReport_Res_sequence[] = { +static const ber_sequence_t SubscriberLocationReport_Res_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6409,7 +6409,7 @@ static int dissect_networkResource(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_gsm_map_NetworkResource(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_networkResource); } -static const ber_sequence T_extensibleSystemFailureParam_sequence[] = { +static const ber_sequence_t T_extensibleSystemFailureParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_networkResource }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -6433,7 +6433,7 @@ static const value_string SystemFailureParam_vals[] = { { 0, NULL } }; -static const ber_choice SystemFailureParam_choice[] = { +static const ber_choice_t SystemFailureParam_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_networkResource }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extensibleSystemFailureParam }, { 0, 0, 0, 0, NULL } @@ -6447,7 +6447,7 @@ dissect_gsm_map_SystemFailureParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence DataMissingParam_sequence[] = { +static const ber_sequence_t DataMissingParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6460,7 +6460,7 @@ dissect_gsm_map_DataMissingParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence UnexpectedDataParam_sequence[] = { +static const ber_sequence_t UnexpectedDataParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6473,7 +6473,7 @@ dissect_gsm_map_UnexpectedDataParam(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence FacilityNotSupParam_sequence[] = { +static const ber_sequence_t FacilityNotSupParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6486,7 +6486,7 @@ dissect_gsm_map_FacilityNotSupParam(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence IncompatibleTerminalParam_sequence[] = { +static const ber_sequence_t IncompatibleTerminalParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6499,7 +6499,7 @@ dissect_gsm_map_IncompatibleTerminalParam(gboolean implicit_tag _U_, tvbuff_t *t return offset; } -static const ber_sequence ResourceLimitationParam_sequence[] = { +static const ber_sequence_t ResourceLimitationParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6530,7 +6530,7 @@ static int dissect_unknownSubscriberDiagnostic(packet_info *pinfo, proto_tree *t return dissect_gsm_map_T_unknownSubscriberDiagnostic(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_unknownSubscriberDiagnostic); } -static const ber_sequence UnknownSubscriberParam_sequence[] = { +static const ber_sequence_t UnknownSubscriberParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_unknownSubscriberDiagnostic }, { 0, 0, 0, NULL } @@ -6544,7 +6544,7 @@ dissect_gsm_map_UnknownSubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence NumberChangedParam_sequence[] = { +static const ber_sequence_t NumberChangedParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6557,7 +6557,7 @@ dissect_gsm_map_NumberChangedParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence UnidentifiedSubParam_sequence[] = { +static const ber_sequence_t UnidentifiedSubParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6588,7 +6588,7 @@ static int dissect_roamingNotAllowedCause(packet_info *pinfo, proto_tree *tree, return dissect_gsm_map_T_roamingNotAllowedCause(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_roamingNotAllowedCause); } -static const ber_sequence RoamingNotAllowedParam_sequence[] = { +static const ber_sequence_t RoamingNotAllowedParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_roamingNotAllowedCause }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -6602,7 +6602,7 @@ dissect_gsm_map_RoamingNotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence IllegalSubscriberParam_sequence[] = { +static const ber_sequence_t IllegalSubscriberParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6615,7 +6615,7 @@ dissect_gsm_map_IllegalSubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence IllegalEquipmentParam_sequence[] = { +static const ber_sequence_t IllegalEquipmentParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6628,7 +6628,7 @@ dissect_gsm_map_IllegalEquipmentParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence BearerServNotProvParam_sequence[] = { +static const ber_sequence_t BearerServNotProvParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6641,7 +6641,7 @@ dissect_gsm_map_BearerServNotProvParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence TeleservNotProvParam_sequence[] = { +static const ber_sequence_t TeleservNotProvParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6654,7 +6654,7 @@ dissect_gsm_map_TeleservNotProvParam(gboolean implicit_tag _U_, tvbuff_t *tvb, i return offset; } -static const ber_sequence TracingBufferFullParam_sequence[] = { +static const ber_sequence_t TracingBufferFullParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6667,7 +6667,7 @@ dissect_gsm_map_TracingBufferFullParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence NoRoamingNbParam_sequence[] = { +static const ber_sequence_t NoRoamingNbParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6699,7 +6699,7 @@ static int dissect_absentSubscriberReason_impl(packet_info *pinfo, proto_tree *t return dissect_gsm_map_T_absentSubscriberReason(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_absentSubscriberReason); } -static const ber_sequence AbsentSubscriberParam_sequence[] = { +static const ber_sequence_t AbsentSubscriberParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_absentSubscriberReason_impl }, { 0, 0, 0, NULL } @@ -6713,7 +6713,7 @@ dissect_gsm_map_AbsentSubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence BusySubscriberParam_sequence[] = { +static const ber_sequence_t BusySubscriberParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Possible_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ccbs_Busy_impl }, @@ -6728,7 +6728,7 @@ dissect_gsm_map_BusySubscriberParam(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence NoSubscriberReplyParam_sequence[] = { +static const ber_sequence_t NoSubscriberReplyParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6759,7 +6759,7 @@ static int dissect_callBarringCause(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_gsm_map_CallBarringCause(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_callBarringCause); } -static const ber_sequence T_extensibleCallBarredParam_sequence[] = { +static const ber_sequence_t T_extensibleCallBarredParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_callBarringCause }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unauthorisedMessageOriginator_impl }, @@ -6784,7 +6784,7 @@ static const value_string CallBarredParam_vals[] = { { 0, NULL } }; -static const ber_choice CallBarredParam_choice[] = { +static const ber_choice_t CallBarredParam_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_callBarringCause }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extensibleCallBarredParam }, { 0, 0, 0, 0, NULL } @@ -6798,7 +6798,7 @@ dissect_gsm_map_CallBarredParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } -static const ber_sequence ForwardingFailedParam_sequence[] = { +static const ber_sequence_t ForwardingFailedParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6811,7 +6811,7 @@ dissect_gsm_map_ForwardingFailedParam(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence Or_NotAllowedParam_sequence[] = { +static const ber_sequence_t Or_NotAllowedParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6824,7 +6824,7 @@ dissect_gsm_map_Or_NotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence ForwardingViolationParam_sequence[] = { +static const ber_sequence_t ForwardingViolationParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6857,7 +6857,7 @@ static int dissect_cug_RejectCause(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_gsm_map_T_cug_RejectCause(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_cug_RejectCause); } -static const ber_sequence Cug_RejectParam_sequence[] = { +static const ber_sequence_t Cug_RejectParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cug_RejectCause }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } @@ -6871,7 +6871,7 @@ dissect_gsm_map_Cug_RejectParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } -static const ber_sequence Ati_NotAllowedParam_sequence[] = { +static const ber_sequence_t Ati_NotAllowedParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6884,7 +6884,7 @@ dissect_gsm_map_Ati_NotAllowedParam(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence NoGroupCallNbParam_sequence[] = { +static const ber_sequence_t NoGroupCallNbParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -6897,7 +6897,7 @@ dissect_gsm_map_NoGroupCallNbParam(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence Ss_IncompatibilityCause_sequence[] = { +static const ber_sequence_t Ss_IncompatibilityCause_sequence[] = { { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Code_impl }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_basicService }, { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ss_Status_impl }, @@ -6928,7 +6928,7 @@ dissect_gsm_map_Pw_RegistrationFailureCause(gboolean implicit_tag _U_, tvbuff_t return offset; } -static const ber_sequence ShortTermDenialParam_sequence[] = { +static const ber_sequence_t ShortTermDenialParam_sequence[] = { { 0, 0, 0, NULL } }; @@ -6940,7 +6940,7 @@ dissect_gsm_map_ShortTermDenialParam(gboolean implicit_tag _U_, tvbuff_t *tvb, i return offset; } -static const ber_sequence LongTermDenialParam_sequence[] = { +static const ber_sequence_t LongTermDenialParam_sequence[] = { { 0, 0, 0, NULL } }; @@ -6952,7 +6952,7 @@ dissect_gsm_map_LongTermDenialParam(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence SubBusyForMT_SMS_Param_sequence[] = { +static const ber_sequence_t SubBusyForMT_SMS_Param_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gprsConnectionSuspended }, { 0, 0, 0, NULL } @@ -6989,7 +6989,7 @@ static int dissect_sm_EnumeratedDeliveryFailureCause(packet_info *pinfo, proto_t return dissect_gsm_map_T_sm_EnumeratedDeliveryFailureCause(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_sm_EnumeratedDeliveryFailureCause); } -static const ber_sequence Sm_DeliveryFailureCause_sequence[] = { +static const ber_sequence_t Sm_DeliveryFailureCause_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_sm_EnumeratedDeliveryFailureCause }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_diagnosticInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, @@ -7004,7 +7004,7 @@ dissect_gsm_map_Sm_DeliveryFailureCause(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence MessageWaitListFullParam_sequence[] = { +static const ber_sequence_t MessageWaitListFullParam_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -7017,7 +7017,7 @@ dissect_gsm_map_MessageWaitListFullParam(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static const ber_sequence AbsentSubscriberSM_Param_sequence[] = { +static const ber_sequence_t AbsentSubscriberSM_Param_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_absentSubscriberDiagnosticSM }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_additionalAbsentSubscriberDiagnosticSM_impl }, @@ -7032,7 +7032,7 @@ dissect_gsm_map_AbsentSubscriberSM_Param(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static const ber_sequence UnauthorizedRequestingNetwork_Param_sequence[] = { +static const ber_sequence_t UnauthorizedRequestingNetwork_Param_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -7066,7 +7066,7 @@ static int dissect_unauthorizedLCSClient_Diagnostic_impl(packet_info *pinfo, pro return dissect_gsm_map_T_unauthorizedLCSClient_Diagnostic(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_unauthorizedLCSClient_Diagnostic); } -static const ber_sequence UnauthorizedLCSClient_Param_sequence[] = { +static const ber_sequence_t UnauthorizedLCSClient_Param_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_unauthorizedLCSClient_Diagnostic_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -7105,7 +7105,7 @@ static int dissect_positionMethodFailure_Diagnostic_impl(packet_info *pinfo, pro return dissect_gsm_map_T_positionMethodFailure_Diagnostic(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_positionMethodFailure_Diagnostic); } -static const ber_sequence PositionMethodFailure_Param_sequence[] = { +static const ber_sequence_t PositionMethodFailure_Param_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_positionMethodFailure_Diagnostic_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl }, { 0, 0, 0, NULL } @@ -7119,7 +7119,7 @@ dissect_gsm_map_PositionMethodFailure_Param(gboolean implicit_tag _U_, tvbuff_t return offset; } -static const ber_sequence UnknownOrUnreachableLCSClient_Param_sequence[] = { +static const ber_sequence_t UnknownOrUnreachableLCSClient_Param_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer }, { 0, 0, 0, NULL } }; @@ -7622,7 +7622,7 @@ static int dissect_absent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i } -static const ber_choice InvokeId_choice[] = { +static const ber_choice_t InvokeId_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeid }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent }, { 0, 0, 0, 0, NULL } @@ -7639,7 +7639,7 @@ static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_gsm_map_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_gsm_map_invokeId); } -static const ber_sequence InvokePDU_sequence[] = { +static const ber_sequence_t InvokePDU_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd }, { BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData }, @@ -7657,7 +7657,7 @@ static int dissect_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_gsm_map_InvokePDU(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_invoke); } -static const ber_sequence ReturnResult_result_sequence[] = { +static const ber_sequence_t ReturnResult_result_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd }, { BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_returnResultData }, { 0, 0, 0, NULL } @@ -7670,7 +7670,7 @@ dissect_returnResult_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return offset; } -static const ber_sequence ReturnResultPDU_sequence[] = { +static const ber_sequence_t ReturnResultPDU_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_returnResult_result }, { 0, 0, 0, NULL } @@ -7695,7 +7695,7 @@ static const value_string GSMMAPPDU_vals[] = { { 0, NULL } }; -static const ber_choice GSMMAPPDU_choice[] = { +static const ber_choice_t GSMMAPPDU_choice[] = { { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl }, #ifdef REMOVED diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 742f59eff0..88b0583c2c 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-gsm_map.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ +/* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.h */ diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 29c74f67fc..51944cd1b3 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-h248.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ +/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ /* Input file: packet-h248-template.c */ @@ -912,7 +912,7 @@ static int dissect_ad_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_h248_AuthData(TRUE, tvb, offset, pinfo, tree, hf_h248_ad); } -static const ber_sequence AuthenticationHeader_sequence[] = { +static const ber_sequence_t AuthenticationHeader_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_secParmIndex_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqNum_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ad_impl }, @@ -996,7 +996,7 @@ static int dissect_manufacturerCode_impl(packet_info *pinfo, proto_tree *tree, t return dissect_h248_INTEGER_0_65535(TRUE, tvb, offset, pinfo, tree, hf_h248_manufacturerCode); } -static const ber_sequence IP4Address_sequence[] = { +static const ber_sequence_t IP4Address_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iP4Address_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl }, { 0, 0, 0, NULL } @@ -1025,7 +1025,7 @@ static int dissect_iP6Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_OCTET_STRING_SIZE_16(TRUE, tvb, offset, pinfo, tree, hf_h248_iP6Address); } -static const ber_sequence IP6Address_sequence[] = { +static const ber_sequence_t IP6Address_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iP6Address_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl }, { 0, 0, 0, NULL } @@ -1058,7 +1058,7 @@ static int dissect_digitMapBody_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_IA5String(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapBody); } -static const ber_sequence DomainName_sequence[] = { +static const ber_sequence_t DomainName_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_domName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_portNumber_impl }, { 0, 0, 0, NULL } @@ -1102,7 +1102,7 @@ static const value_string MId_vals[] = { { 0, NULL } }; -static const ber_choice MId_choice[] = { +static const ber_choice_t MId_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ip4Address_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ip6Address_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_domainName_impl }, @@ -1150,7 +1150,7 @@ static int dissect_errorText_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_ErrorText(TRUE, tvb, offset, pinfo, tree, hf_h248_errorText); } -static const ber_sequence ErrorDescriptor_sequence[] = { +static const ber_sequence_t ErrorDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorCode_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorText_impl }, { 0, 0, 0, NULL } @@ -1256,7 +1256,7 @@ static int dissect_wildcard_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_WildcardField(FALSE, tvb, offset, pinfo, tree, hf_h248_wildcard_item); } -static const ber_sequence SEQUNCE_OF_WildcardField_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_WildcardField_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_wildcard_item }, }; @@ -1283,7 +1283,7 @@ static int dissect_terminationId_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_h248_OCTET_STRING_SIZE_1_8(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationId); } -static const ber_sequence TerminationID_sequence[] = { +static const ber_sequence_t TerminationID_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_wildcard_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationId_impl }, { 0, 0, 0, NULL } @@ -1343,7 +1343,7 @@ static int dissect_streamID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_StreamID(TRUE, tvb, offset, pinfo, tree, hf_h248_streamID); } -static const ber_sequence TopologyRequest_sequence[] = { +static const ber_sequence_t TopologyRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationFrom_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationTo_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_topologyDirection_impl }, @@ -1362,7 +1362,7 @@ static int dissect_topologyReq_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_TopologyRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_topologyReq_item); } -static const ber_sequence SEQUNCE_OF_TopologyRequest_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_TopologyRequest_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_topologyReq_item }, }; @@ -1377,7 +1377,7 @@ static int dissect_topologyReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_SEQUNCE_OF_TopologyRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_topologyReq); } -static const ber_sequence ContextRequest_sequence[] = { +static const ber_sequence_t ContextRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_priority_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_emergency_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_topologyReq_impl }, @@ -1442,7 +1442,7 @@ static int dissect_iATSDServiceState_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_NULL(TRUE, tvb, offset, pinfo, tree, hf_h248_iATSDServiceState); } -static const ber_sequence ContextAttrAuditRequest_sequence[] = { +static const ber_sequence_t ContextAttrAuditRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_topology_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cAAREmergency_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cAARPriority_impl }, @@ -1460,7 +1460,7 @@ static int dissect_contextAttrAuditReq_impl(packet_info *pinfo, proto_tree *tree return dissect_h248_ContextAttrAuditRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_contextAttrAuditReq); } -static const ber_sequence TerminationIDList_sequence_of[1] = { +static const ber_sequence_t TerminationIDList_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TerminationIDList_item }, }; @@ -1501,7 +1501,7 @@ static int dissect_value_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_h248_PropertyID(FALSE, tvb, offset, pinfo, tree, hf_h248_value_item); } -static const ber_sequence SEQUNCE_OF_PropertyID_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_PropertyID_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_value_item }, }; @@ -1543,7 +1543,7 @@ static const value_string ExtraInfo_vals[] = { { 0, NULL } }; -static const ber_choice ExtraInfo_choice[] = { +static const ber_choice_t ExtraInfo_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_relation_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_range_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_sublist_impl }, @@ -1561,7 +1561,7 @@ static int dissect_extraInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_h248_ExtraInfo(FALSE, tvb, offset, pinfo, tree, hf_h248_extraInfo); } -static const ber_sequence PropertyParm_sequence[] = { +static const ber_sequence_t PropertyParm_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_propertyParamValue_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_extraInfo }, @@ -1582,7 +1582,7 @@ static int dissect_PropertyGroup_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_h248_PropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_PropertyGroup_item); } -static const ber_sequence PropertyParms_sequence_of[1] = { +static const ber_sequence_t PropertyParms_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PropertyParms_item }, }; @@ -1637,7 +1637,7 @@ static int dissect_serviceState_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_ServiceState(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceState); } -static const ber_sequence TerminationStateDescriptor_sequence[] = { +static const ber_sequence_t TerminationStateDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propertyParms_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_tSEventBufferControl_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceState_impl }, @@ -1676,7 +1676,7 @@ static int dissect_streamMode_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_StreamMode(TRUE, tvb, offset, pinfo, tree, hf_h248_streamMode); } -static const ber_sequence LocalControlDescriptor_sequence[] = { +static const ber_sequence_t LocalControlDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamMode_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveValue_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reserveGroup_impl }, @@ -1695,7 +1695,7 @@ static int dissect_localControlDescriptor_impl(packet_info *pinfo, proto_tree *t return dissect_h248_LocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_localControlDescriptor); } -static const ber_sequence PropertyGroup_sequence_of[1] = { +static const ber_sequence_t PropertyGroup_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PropertyGroup_item }, }; @@ -1710,7 +1710,7 @@ static int dissect_propGrps_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_PropertyGroup(FALSE, tvb, offset, pinfo, tree, hf_h248_propGrps_item); } -static const ber_sequence SEQUNCE_OF_PropertyGroup_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_PropertyGroup_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_propGrps_item }, }; @@ -1725,7 +1725,7 @@ static int dissect_propGrps_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_SEQUNCE_OF_PropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_propGrps); } -static const ber_sequence LocalRemoteDescriptor_sequence[] = { +static const ber_sequence_t LocalRemoteDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_propGrps_impl }, { 0, 0, 0, NULL } }; @@ -1744,7 +1744,7 @@ static int dissect_remoteDescriptor_impl(packet_info *pinfo, proto_tree *tree, t return dissect_h248_LocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_remoteDescriptor); } -static const ber_sequence StreamParms_sequence[] = { +static const ber_sequence_t StreamParms_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localControlDescriptor_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_localDescriptor_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_remoteDescriptor_impl }, @@ -1765,7 +1765,7 @@ static int dissect_streamParms_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_StreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_streamParms); } -static const ber_sequence StreamDescriptor_sequence[] = { +static const ber_sequence_t StreamDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_streamParms_impl }, { 0, 0, 0, NULL } @@ -1782,7 +1782,7 @@ static int dissect_mediaDescriptorMultiStream_item(packet_info *pinfo, proto_tre return dissect_h248_StreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_mediaDescriptorMultiStream_item); } -static const ber_sequence SEQUNCE_OF_StreamDescriptor_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_StreamDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mediaDescriptorMultiStream_item }, }; @@ -1804,7 +1804,7 @@ static const value_string T_streams_vals[] = { { 0, NULL } }; -static const ber_choice T_streams_choice[] = { +static const ber_choice_t T_streams_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mediaDescriptorOneStream_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mediaDescriptorMultiStream_impl }, { 0, 0, 0, 0, NULL } @@ -1821,7 +1821,7 @@ static int dissect_streams(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_h248_T_streams(FALSE, tvb, offset, pinfo, tree, hf_h248_streams); } -static const ber_sequence MediaDescriptor_sequence[] = { +static const ber_sequence_t MediaDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_termStateDescr_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_streams }, { 0, 0, 0, NULL } @@ -1863,7 +1863,7 @@ static int dissect_mtl_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_h248_ModemType(FALSE, tvb, offset, pinfo, tree, hf_h248_mtl_item); } -static const ber_sequence SEQUNCE_OF_ModemType_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ModemType_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_mtl_item }, }; @@ -1908,7 +1908,7 @@ static int dissect_t35Extension_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_INTEGER_0_255(TRUE, tvb, offset, pinfo, tree, hf_h248_t35Extension); } -static const ber_sequence H221NonStandard_sequence[] = { +static const ber_sequence_t H221NonStandard_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_t35CountryCode1_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_t35CountryCode2_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_t35Extension_impl }, @@ -1954,7 +1954,7 @@ static const value_string NonStandardIdentifier_vals[] = { { 0, NULL } }; -static const ber_choice NonStandardIdentifier_choice[] = { +static const ber_choice_t NonStandardIdentifier_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_object_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h221NonStandard_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_experimental_impl }, @@ -1987,7 +1987,7 @@ static int dissect_Value_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_h248_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_h248_Value_item); } -static const ber_sequence NonStandardData_sequence[] = { +static const ber_sequence_t NonStandardData_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_nonStandardIdentifier }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_data_impl }, { 0, 0, 0, NULL } @@ -2004,7 +2004,7 @@ static int dissect_nonStandardData_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_NonStandardData(TRUE, tvb, offset, pinfo, tree, hf_h248_nonStandardData); } -static const ber_sequence ModemDescriptor_sequence[] = { +static const ber_sequence_t ModemDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mtl_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mpl_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nonStandardData_impl }, @@ -2043,7 +2043,7 @@ static int dissect_muxType_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_h248_MuxType(TRUE, tvb, offset, pinfo, tree, hf_h248_muxType); } -static const ber_sequence SEQUNCE_OF_TerminationID_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_TerminationID_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_termList_item }, }; @@ -2058,7 +2058,7 @@ static int dissect_termList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_SEQUNCE_OF_TerminationID(TRUE, tvb, offset, pinfo, tree, hf_h248_termList); } -static const ber_sequence MuxDescriptor_sequence[] = { +static const ber_sequence_t MuxDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_muxType_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_termList_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nonStandardData_impl }, @@ -2127,7 +2127,7 @@ static int dissect_digitMapName_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_DigitMapName(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapName); } -static const ber_sequence DigitMapValue_sequence[] = { +static const ber_sequence_t DigitMapValue_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startTimer_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_shortTimer_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_longTimer_impl }, @@ -2154,7 +2154,7 @@ static const value_string EventDM_vals[] = { { 0, NULL } }; -static const ber_choice EventDM_choice[] = { +static const ber_choice_t EventDM_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_digitMapName_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_digitMapValue_impl }, { 0, 0, 0, 0, NULL } @@ -2214,7 +2214,7 @@ static int dissect_notifyCompletion_impl(packet_info *pinfo, proto_tree *tree, t return dissect_h248_NotifyCompletion(TRUE, tvb, offset, pinfo, tree, hf_h248_notifyCompletion); } -static const ber_sequence Value_sequence_of[1] = { +static const ber_sequence_t Value_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_Value_item }, }; @@ -2235,7 +2235,7 @@ static int dissect_statValue_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_Value(TRUE, tvb, offset, pinfo, tree, hf_h248_statValue); } -static const ber_sequence SigParameter_sequence[] = { +static const ber_sequence_t SigParameter_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sigParameterName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_extraInfo }, @@ -2253,7 +2253,7 @@ static int dissect_sigParList_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_SigParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_sigParList_item); } -static const ber_sequence SEQUNCE_OF_SigParameter_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_SigParameter_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sigParList_item }, }; @@ -2268,7 +2268,7 @@ static int dissect_sigParList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_SEQUNCE_OF_SigParameter(TRUE, tvb, offset, pinfo, tree, hf_h248_sigParList); } -static const ber_sequence Signal_sequence[] = { +static const ber_sequence_t Signal_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signalName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_sigType_impl }, @@ -2293,7 +2293,7 @@ static int dissect_signalList_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_Signal(FALSE, tvb, offset, pinfo, tree, hf_h248_signalList_item); } -static const ber_sequence SEQUNCE_OF_Signal_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_Signal_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signalList_item }, }; @@ -2308,7 +2308,7 @@ static int dissect_signalList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_SEQUNCE_OF_Signal(TRUE, tvb, offset, pinfo, tree, hf_h248_signalList); } -static const ber_sequence SeqSigList_sequence[] = { +static const ber_sequence_t SeqSigList_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_signalList_impl }, { 0, 0, 0, NULL } @@ -2332,7 +2332,7 @@ static const value_string SignalRequest_vals[] = { { 0, NULL } }; -static const ber_choice SignalRequest_choice[] = { +static const ber_choice_t SignalRequest_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signal_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_seqSigList_impl }, { 0, 0, 0, 0, NULL } @@ -2349,7 +2349,7 @@ static int dissect_SignalsDescriptor_item(packet_info *pinfo, proto_tree *tree, return dissect_h248_SignalRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_SignalsDescriptor_item); } -static const ber_sequence SignalsDescriptor_sequence_of[1] = { +static const ber_sequence_t SignalsDescriptor_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item }, }; @@ -2364,7 +2364,7 @@ static int dissect_signalsDescriptor_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_SignalsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_signalsDescriptor); } -static const ber_sequence SecondRequestedActions_sequence[] = { +static const ber_sequence_t SecondRequestedActions_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepActive_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_eventDM }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signalsDescriptor_impl }, @@ -2382,7 +2382,7 @@ static int dissect_secondaryEventAction_impl(packet_info *pinfo, proto_tree *tre return dissect_h248_SecondRequestedActions(TRUE, tvb, offset, pinfo, tree, hf_h248_secondaryEventAction); } -static const ber_sequence EventParameter_sequence[] = { +static const ber_sequence_t EventParameter_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventParameterName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_extraInfo }, @@ -2400,7 +2400,7 @@ static int dissect_EventParameters_item(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_EventParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_EventParameters_item); } -static const ber_sequence EventParameters_sequence_of[1] = { +static const ber_sequence_t EventParameters_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_EventParameters_item }, }; @@ -2418,7 +2418,7 @@ static int dissect_evParList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_EventParameters(TRUE, tvb, offset, pinfo, tree, hf_h248_evParList); } -static const ber_sequence SecondRequestedEvent_sequence[] = { +static const ber_sequence_t SecondRequestedEvent_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondaryEventAction_impl }, @@ -2437,7 +2437,7 @@ static int dissect_eventList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_SecondRequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_eventList_item); } -static const ber_sequence SEQUNCE_OF_SecondRequestedEvent_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_SecondRequestedEvent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_eventList_item }, }; @@ -2452,7 +2452,7 @@ static int dissect_secondaryEventList_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_SEQUNCE_OF_SecondRequestedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_secondaryEventList); } -static const ber_sequence SecondEventsDescriptor_sequence[] = { +static const ber_sequence_t SecondEventsDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_secondaryEventList_impl }, { 0, 0, 0, NULL } @@ -2469,7 +2469,7 @@ static int dissect_secondEvent_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_SecondEventsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_secondEvent); } -static const ber_sequence RequestedActions_sequence[] = { +static const ber_sequence_t RequestedActions_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keepActive_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_eventDM }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_secondEvent_impl }, @@ -2488,7 +2488,7 @@ static int dissect_eventAction_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_RequestedActions(TRUE, tvb, offset, pinfo, tree, hf_h248_eventAction); } -static const ber_sequence RequestedEvent_sequence[] = { +static const ber_sequence_t RequestedEvent_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_pkgdName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventAction_impl }, @@ -2507,7 +2507,7 @@ static int dissect_RequestedEvents_item(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_RequestedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_RequestedEvents_item); } -static const ber_sequence RequestedEvents_sequence_of[1] = { +static const ber_sequence_t RequestedEvents_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RequestedEvents_item }, }; @@ -2522,7 +2522,7 @@ static int dissect_eventList_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_RequestedEvents(TRUE, tvb, offset, pinfo, tree, hf_h248_eventList); } -static const ber_sequence EventsDescriptor_sequence[] = { +static const ber_sequence_t EventsDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_eventList_impl }, { 0, 0, 0, NULL } @@ -2539,7 +2539,7 @@ static int dissect_eventsDescriptor_impl(packet_info *pinfo, proto_tree *tree, t return dissect_h248_EventsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_eventsDescriptor); } -static const ber_sequence EventSpec_sequence[] = { +static const ber_sequence_t EventSpec_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl }, @@ -2557,7 +2557,7 @@ static int dissect_EventBufferDescriptor_item(packet_info *pinfo, proto_tree *tr return dissect_h248_EventSpec(FALSE, tvb, offset, pinfo, tree, hf_h248_EventBufferDescriptor_item); } -static const ber_sequence EventBufferDescriptor_sequence_of[1] = { +static const ber_sequence_t EventBufferDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_EventBufferDescriptor_item }, }; @@ -2572,7 +2572,7 @@ static int dissect_eventBufferDescriptor_impl(packet_info *pinfo, proto_tree *tr return dissect_h248_EventBufferDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_eventBufferDescriptor); } -static const ber_sequence DigitMapDescriptor_sequence[] = { +static const ber_sequence_t DigitMapDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapValue_impl }, { 0, 0, 0, NULL } @@ -2615,7 +2615,7 @@ static int dissect_auditToken_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_T_auditToken(TRUE, tvb, offset, pinfo, tree, hf_h248_auditToken); } -static const ber_sequence IndAudPropertyParm_sequence[] = { +static const ber_sequence_t IndAudPropertyParm_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_name_impl }, { 0, 0, 0, NULL } }; @@ -2634,7 +2634,7 @@ static int dissect_IndAudPropertyGroup_item(packet_info *pinfo, proto_tree *tree return dissect_h248_IndAudPropertyParm(FALSE, tvb, offset, pinfo, tree, hf_h248_IndAudPropertyGroup_item); } -static const ber_sequence IndAudPropertyParms_sequence_of[1] = { +static const ber_sequence_t IndAudPropertyParms_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IndAudPropertyParms_item }, }; @@ -2649,7 +2649,7 @@ static int dissect_indAudPropertyParms_impl(packet_info *pinfo, proto_tree *tree return dissect_h248_IndAudPropertyParms(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudPropertyParms); } -static const ber_sequence IndAudTerminationStateDescriptor_sequence[] = { +static const ber_sequence_t IndAudTerminationStateDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indAudPropertyParms_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_eventBufferControl_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iATSDServiceState_impl }, @@ -2667,7 +2667,7 @@ static int dissect_indAudTerminationStateDescriptor_impl(packet_info *pinfo, pro return dissect_h248_IndAudTerminationStateDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudTerminationStateDescriptor); } -static const ber_sequence IndAudLocalControlDescriptor_sequence[] = { +static const ber_sequence_t IndAudLocalControlDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDStreamMode_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDReserveValue_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iALCDReserveGroup_impl }, @@ -2686,7 +2686,7 @@ static int dissect_iASPLocalControlDescriptor_impl(packet_info *pinfo, proto_tre return dissect_h248_IndAudLocalControlDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_iASPLocalControlDescriptor); } -static const ber_sequence IndAudPropertyGroup_sequence_of[1] = { +static const ber_sequence_t IndAudPropertyGroup_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_IndAudPropertyGroup_item }, }; @@ -2701,7 +2701,7 @@ static int dissect_iAPropertyGroup_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_IndAudPropertyGroup(TRUE, tvb, offset, pinfo, tree, hf_h248_iAPropertyGroup); } -static const ber_sequence IndAudLocalRemoteDescriptor_sequence[] = { +static const ber_sequence_t IndAudLocalRemoteDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_propGroupID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iAPropertyGroup_impl }, { 0, 0, 0, NULL } @@ -2721,7 +2721,7 @@ static int dissect_iASPRemoteDescriptor_impl(packet_info *pinfo, proto_tree *tre return dissect_h248_IndAudLocalRemoteDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_iASPRemoteDescriptor); } -static const ber_sequence IndAudStreamParms_sequence[] = { +static const ber_sequence_t IndAudStreamParms_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPLocalControlDescriptor_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPLocalDescriptor_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASPRemoteDescriptor_impl }, @@ -2742,7 +2742,7 @@ static int dissect_indAudStreamParms_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_IndAudStreamParms(TRUE, tvb, offset, pinfo, tree, hf_h248_indAudStreamParms); } -static const ber_sequence IndAudStreamDescriptor_sequence[] = { +static const ber_sequence_t IndAudStreamDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indAudStreamParms_impl }, { 0, 0, 0, NULL } @@ -2759,7 +2759,7 @@ static int dissect_multiStream_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_IndAudStreamDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_multiStream_item); } -static const ber_sequence SEQUNCE_OF_IndAudStreamDescriptor_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_IndAudStreamDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_multiStream_item }, }; @@ -2781,7 +2781,7 @@ static const value_string indAudMediaDescriptorStreams_vals[] = { { 0, NULL } }; -static const ber_choice indAudMediaDescriptorStreams_choice[] = { +static const ber_choice_t indAudMediaDescriptorStreams_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_oneStream_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_multiStream_impl }, { 0, 0, 0, 0, NULL } @@ -2798,7 +2798,7 @@ static int dissect_indAudMediaDescriptorStreams(packet_info *pinfo, proto_tree * return dissect_h248_indAudMediaDescriptorStreams(FALSE, tvb, offset, pinfo, tree, hf_h248_indAudMediaDescriptorStreams); } -static const ber_sequence IndAudMediaDescriptor_sequence[] = { +static const ber_sequence_t IndAudMediaDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_indAudTerminationStateDescriptor_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_indAudMediaDescriptorStreams }, { 0, 0, 0, NULL } @@ -2815,7 +2815,7 @@ static int dissect_indaudmediaDescriptor_impl(packet_info *pinfo, proto_tree *tr return dissect_h248_IndAudMediaDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudmediaDescriptor); } -static const ber_sequence IndAudEventsDescriptor_sequence[] = { +static const ber_sequence_t IndAudEventsDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_iAEDPkgdName_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, @@ -2833,7 +2833,7 @@ static int dissect_indaudeventsDescriptor_impl(packet_info *pinfo, proto_tree *t return dissect_h248_IndAudEventsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudeventsDescriptor); } -static const ber_sequence IndAudEventBufferDescriptor_sequence[] = { +static const ber_sequence_t IndAudEventBufferDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iAEBDEventName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { 0, 0, 0, NULL } @@ -2850,7 +2850,7 @@ static int dissect_indaudeventBufferDescriptor_impl(packet_info *pinfo, proto_tr return dissect_h248_IndAudEventBufferDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudeventBufferDescriptor); } -static const ber_sequence IndAudSignal_sequence[] = { +static const ber_sequence_t IndAudSignal_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_iASignalName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { 0, 0, 0, NULL } @@ -2870,7 +2870,7 @@ static int dissect_iASignalList_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_IndAudSignal(TRUE, tvb, offset, pinfo, tree, hf_h248_iASignalList); } -static const ber_sequence IndAudSeqSigList_sequence[] = { +static const ber_sequence_t IndAudSeqSigList_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_id_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_iASignalList_impl }, { 0, 0, 0, NULL } @@ -2894,7 +2894,7 @@ static const value_string IndAudSignalsDescriptor_vals[] = { { 0, NULL } }; -static const ber_choice IndAudSignalsDescriptor_choice[] = { +static const ber_choice_t IndAudSignalsDescriptor_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indAudSignal_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indAudSeqSigList_impl }, { 0, 0, 0, 0, NULL } @@ -2911,7 +2911,7 @@ static int dissect_indaudsignalsDescriptor(packet_info *pinfo, proto_tree *tree, return dissect_h248_IndAudSignalsDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_indaudsignalsDescriptor); } -static const ber_sequence IndAudDigitMapDescriptor_sequence[] = { +static const ber_sequence_t IndAudDigitMapDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_digitMapName_impl }, { 0, 0, 0, NULL } }; @@ -2927,7 +2927,7 @@ static int dissect_indauddigitMapDescriptor_impl(packet_info *pinfo, proto_tree return dissect_h248_IndAudDigitMapDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indauddigitMapDescriptor); } -static const ber_sequence IndAudStatisticsDescriptor_sequence[] = { +static const ber_sequence_t IndAudStatisticsDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_statName_impl }, { 0, 0, 0, NULL } }; @@ -2943,7 +2943,7 @@ static int dissect_indaudstatisticsDescriptor_impl(packet_info *pinfo, proto_tre return dissect_h248_IndAudStatisticsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_indaudstatisticsDescriptor); } -static const ber_sequence IndAudPackagesDescriptor_sequence[] = { +static const ber_sequence_t IndAudPackagesDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_packageName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_packageVersion_impl }, { 0, 0, 0, NULL } @@ -2972,7 +2972,7 @@ static const value_string IndAuditParameter_vals[] = { { 0, NULL } }; -static const ber_choice IndAuditParameter_choice[] = { +static const ber_choice_t IndAuditParameter_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_indaudmediaDescriptor_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_indaudeventsDescriptor_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_indaudeventBufferDescriptor_impl }, @@ -2994,7 +2994,7 @@ static int dissect_auditPropertyToken_item(packet_info *pinfo, proto_tree *tree, return dissect_h248_IndAuditParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_auditPropertyToken_item); } -static const ber_sequence SEQUNCE_OF_IndAuditParameter_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_IndAuditParameter_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_auditPropertyToken_item }, }; @@ -3009,7 +3009,7 @@ static int dissect_auditPropertyToken_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_SEQUNCE_OF_IndAuditParameter(TRUE, tvb, offset, pinfo, tree, hf_h248_auditPropertyToken); } -static const ber_sequence AuditDescriptor_sequence[] = { +static const ber_sequence_t AuditDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditToken_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditPropertyToken_impl }, { 0, 0, 0, NULL } @@ -3045,7 +3045,7 @@ static const value_string AmmDescriptor_vals[] = { { 0, NULL } }; -static const ber_choice AmmDescriptor_choice[] = { +static const ber_choice_t AmmDescriptor_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mediaDescriptor_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modemDescriptor_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_muxDescriptor_impl }, @@ -3068,7 +3068,7 @@ static int dissect_descriptors_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_AmmDescriptor(FALSE, tvb, offset, pinfo, tree, hf_h248_descriptors_item); } -static const ber_sequence SEQUNCE_OF_AmmDescriptor_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_AmmDescriptor_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_descriptors_item }, }; @@ -3083,7 +3083,7 @@ static int dissect_descriptors_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_SEQUNCE_OF_AmmDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_descriptors); } -static const ber_sequence AmmRequest_sequence[] = { +static const ber_sequence_t AmmRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_descriptors_impl }, { 0, 0, 0, NULL } @@ -3106,7 +3106,7 @@ static int dissect_modReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_h248_AmmRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_modReq); } -static const ber_sequence SubtractRequest_sequence[] = { +static const ber_sequence_t SubtractRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl }, { 0, 0, 0, NULL } @@ -3123,7 +3123,7 @@ static int dissect_subtractReq_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_SubtractRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_subtractReq); } -static const ber_sequence AuditRequest_sequence[] = { +static const ber_sequence_t AuditRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_auditDescriptor_impl }, { 0, 0, 0, NULL } @@ -3143,7 +3143,7 @@ static int dissect_auditValueRequest_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_AuditRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_auditValueRequest); } -static const ber_sequence TimeNotation_sequence[] = { +static const ber_sequence_t TimeNotation_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_date_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_time_impl }, { 0, 0, 0, NULL } @@ -3166,7 +3166,7 @@ static int dissect_timestamp_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_h248_TimeNotation(TRUE, tvb, offset, pinfo, tree, hf_h248_timestamp); } -static const ber_sequence ObservedEvent_sequence[] = { +static const ber_sequence_t ObservedEvent_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_eventName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_streamID_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_eventParList_impl }, @@ -3185,7 +3185,7 @@ static int dissect_observedEventLst_item(packet_info *pinfo, proto_tree *tree, t return dissect_h248_ObservedEvent(FALSE, tvb, offset, pinfo, tree, hf_h248_observedEventLst_item); } -static const ber_sequence SEQUNCE_OF_ObservedEvent_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ObservedEvent_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_observedEventLst_item }, }; @@ -3200,7 +3200,7 @@ static int dissect_observedEventLst_impl(packet_info *pinfo, proto_tree *tree, t return dissect_h248_SEQUNCE_OF_ObservedEvent(TRUE, tvb, offset, pinfo, tree, hf_h248_observedEventLst); } -static const ber_sequence ObservedEventsDescriptor_sequence[] = { +static const ber_sequence_t ObservedEventsDescriptor_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_requestId_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_observedEventLst_impl }, { 0, 0, 0, NULL } @@ -3217,7 +3217,7 @@ static int dissect_observedEventsDescriptor_impl(packet_info *pinfo, proto_tree return dissect_h248_ObservedEventsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_observedEventsDescriptor); } -static const ber_sequence NotifyRequest_sequence[] = { +static const ber_sequence_t NotifyRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_observedEventsDescriptor_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl }, @@ -3268,7 +3268,7 @@ static const value_string ServiceChangeAddress_vals[] = { { 0, NULL } }; -static const ber_choice ServiceChangeAddress_choice[] = { +static const ber_choice_t ServiceChangeAddress_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_portNumber_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ip4Address_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ip6Address_impl }, @@ -3302,7 +3302,7 @@ static int dissect_profileName_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_IA5String_SIZE_1_67(TRUE, tvb, offset, pinfo, tree, hf_h248_profileName); } -static const ber_sequence ServiceChangeProfile_sequence[] = { +static const ber_sequence_t ServiceChangeProfile_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_profileName_impl }, { 0, 0, 0, NULL } }; @@ -3330,7 +3330,7 @@ static int dissect_serviceChangeDelay_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_INTEGER_0_4294967295(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceChangeDelay); } -static const ber_sequence ServiceChangeParm_sequence[] = { +static const ber_sequence_t ServiceChangeParm_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_serviceChangeMethod_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeAddress }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceChangeVersion_impl }, @@ -3355,7 +3355,7 @@ static int dissect_serviceChangeParms_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_ServiceChangeParm(TRUE, tvb, offset, pinfo, tree, hf_h248_serviceChangeParms); } -static const ber_sequence ServiceChangeRequest_sequence[] = { +static const ber_sequence_t ServiceChangeRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceChangeParms_impl }, { 0, 0, 0, NULL } @@ -3385,7 +3385,7 @@ static const value_string Command_vals[] = { { 0, NULL } }; -static const ber_choice Command_choice[] = { +static const ber_choice_t Command_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_addReq_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_moveReq_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modReq_impl }, @@ -3408,7 +3408,7 @@ static int dissect_command(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_h248_Command(FALSE, tvb, offset, pinfo, tree, hf_h248_command); } -static const ber_sequence CommandRequest_sequence[] = { +static const ber_sequence_t CommandRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_command }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_optional_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_wildcardReturn_impl }, @@ -3426,7 +3426,7 @@ static int dissect_commandRequests_item(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_CommandRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_commandRequests_item); } -static const ber_sequence SEQUNCE_OF_CommandRequest_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_CommandRequest_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_commandRequests_item }, }; @@ -3441,7 +3441,7 @@ static int dissect_commandRequests_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_SEQUNCE_OF_CommandRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_commandRequests); } -static const ber_sequence ActionRequest_sequence[] = { +static const ber_sequence_t ActionRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextId_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextRequest_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextAttrAuditReq_impl }, @@ -3460,7 +3460,7 @@ static int dissect_actions_item(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_h248_ActionRequest(FALSE, tvb, offset, pinfo, tree, hf_h248_actions_item); } -static const ber_sequence SEQUNCE_OF_ActionRequest_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ActionRequest_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actions_item }, }; @@ -3475,7 +3475,7 @@ static int dissect_actions_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_h248_SEQUNCE_OF_ActionRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_actions); } -static const ber_sequence TransactionRequest_sequence[] = { +static const ber_sequence_t TransactionRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actions_impl }, { 0, 0, 0, NULL } @@ -3492,7 +3492,7 @@ static int dissect_transactionRequest_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_TransactionRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_transactionRequest); } -static const ber_sequence TransactionPending_sequence[] = { +static const ber_sequence_t TransactionPending_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl }, { 0, 0, 0, NULL } }; @@ -3508,7 +3508,7 @@ static int dissect_transactionPending_impl(packet_info *pinfo, proto_tree *tree, return dissect_h248_TransactionPending(TRUE, tvb, offset, pinfo, tree, hf_h248_transactionPending); } -static const ber_sequence StatisticsParameter_sequence[] = { +static const ber_sequence_t StatisticsParameter_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_statName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_statValue_impl }, { 0, 0, 0, NULL } @@ -3525,7 +3525,7 @@ static int dissect_StatisticsDescriptor_item(packet_info *pinfo, proto_tree *tre return dissect_h248_StatisticsParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_StatisticsDescriptor_item); } -static const ber_sequence StatisticsDescriptor_sequence_of[1] = { +static const ber_sequence_t StatisticsDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_StatisticsDescriptor_item }, }; @@ -3540,7 +3540,7 @@ static int dissect_statisticsDescriptor_impl(packet_info *pinfo, proto_tree *tre return dissect_h248_StatisticsDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_statisticsDescriptor); } -static const ber_sequence PackagesItem_sequence[] = { +static const ber_sequence_t PackagesItem_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_packageName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_packageVersion_impl }, { 0, 0, 0, NULL } @@ -3557,7 +3557,7 @@ static int dissect_PackagesDescriptor_item(packet_info *pinfo, proto_tree *tree, return dissect_h248_PackagesItem(FALSE, tvb, offset, pinfo, tree, hf_h248_PackagesDescriptor_item); } -static const ber_sequence PackagesDescriptor_sequence_of[1] = { +static const ber_sequence_t PackagesDescriptor_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PackagesDescriptor_item }, }; @@ -3589,7 +3589,7 @@ static const value_string AuditReturnParameter_vals[] = { { 0, NULL } }; -static const ber_choice AuditReturnParameter_choice[] = { +static const ber_choice_t AuditReturnParameter_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mediaDescriptor_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modemDescriptor_impl }, @@ -3616,7 +3616,7 @@ static int dissect_TerminationAudit_item(packet_info *pinfo, proto_tree *tree, t return dissect_h248_AuditReturnParameter(FALSE, tvb, offset, pinfo, tree, hf_h248_TerminationAudit_item); } -static const ber_sequence TerminationAudit_sequence_of[1] = { +static const ber_sequence_t TerminationAudit_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item }, }; @@ -3634,7 +3634,7 @@ static int dissect_terminationAuditResult_impl(packet_info *pinfo, proto_tree *t return dissect_h248_TerminationAudit(TRUE, tvb, offset, pinfo, tree, hf_h248_terminationAuditResult); } -static const ber_sequence AmmsReply_sequence[] = { +static const ber_sequence_t AmmsReply_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_terminationAudit_impl }, { 0, 0, 0, NULL } @@ -3660,7 +3660,7 @@ static int dissect_subtractReply_impl(packet_info *pinfo, proto_tree *tree, tvbu return dissect_h248_AmmsReply(TRUE, tvb, offset, pinfo, tree, hf_h248_subtractReply); } -static const ber_sequence AuditResult_sequence[] = { +static const ber_sequence_t AuditResult_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationID_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_terminationAuditResult_impl }, { 0, 0, 0, NULL } @@ -3685,7 +3685,7 @@ static const value_string AuditReply_vals[] = { { 0, NULL } }; -static const ber_choice AuditReply_choice[] = { +static const ber_choice_t AuditReply_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextAuditResult_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_error_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_auditResult_impl }, @@ -3706,7 +3706,7 @@ static int dissect_auditValueReply(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_h248_AuditReply(FALSE, tvb, offset, pinfo, tree, hf_h248_auditValueReply); } -static const ber_sequence NotifyReply_sequence[] = { +static const ber_sequence_t NotifyReply_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl }, { 0, 0, 0, NULL } @@ -3723,7 +3723,7 @@ static int dissect_notifyReply_impl(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_h248_NotifyReply(TRUE, tvb, offset, pinfo, tree, hf_h248_notifyReply); } -static const ber_sequence ServiceChangeResParm_sequence[] = { +static const ber_sequence_t ServiceChangeResParm_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeMgcId }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_serviceChangeAddress }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serviceChangeVersion_impl }, @@ -3750,7 +3750,7 @@ static const value_string ServiceChangeResult_vals[] = { { 0, NULL } }; -static const ber_choice ServiceChangeResult_choice[] = { +static const ber_choice_t ServiceChangeResult_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceChangeResParms_impl }, { 0, 0, 0, 0, NULL } @@ -3767,7 +3767,7 @@ static int dissect_serviceChangeResult(packet_info *pinfo, proto_tree *tree, tvb return dissect_h248_ServiceChangeResult(FALSE, tvb, offset, pinfo, tree, hf_h248_serviceChangeResult); } -static const ber_sequence ServiceChangeReply_sequence[] = { +static const ber_sequence_t ServiceChangeReply_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_terminationIDList_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_serviceChangeResult }, { 0, 0, 0, NULL } @@ -3797,7 +3797,7 @@ static const value_string CommandReply_vals[] = { { 0, NULL } }; -static const ber_choice CommandReply_choice[] = { +static const ber_choice_t CommandReply_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_addReply_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_moveReply_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_modReply_impl }, @@ -3820,7 +3820,7 @@ static int dissect_commandReply_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_CommandReply(FALSE, tvb, offset, pinfo, tree, hf_h248_commandReply_item); } -static const ber_sequence SEQUNCE_OF_CommandReply_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_CommandReply_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_commandReply_item }, }; @@ -3835,7 +3835,7 @@ static int dissect_commandReply_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_SEQUNCE_OF_CommandReply(TRUE, tvb, offset, pinfo, tree, hf_h248_commandReply); } -static const ber_sequence ActionReply_sequence[] = { +static const ber_sequence_t ActionReply_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_contextId_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_errorDescriptor_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_contextReply_impl }, @@ -3854,7 +3854,7 @@ static int dissect_actionReplies_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_h248_ActionReply(FALSE, tvb, offset, pinfo, tree, hf_h248_actionReplies_item); } -static const ber_sequence SEQUNCE_OF_ActionReply_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ActionReply_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actionReplies_item }, }; @@ -3876,7 +3876,7 @@ static const value_string T_transactionResult_vals[] = { { 0, NULL } }; -static const ber_choice T_transactionResult_choice[] = { +static const ber_choice_t T_transactionResult_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionError_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_actionReplies_impl }, { 0, 0, 0, 0, NULL } @@ -3893,7 +3893,7 @@ static int dissect_transactionResult(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_T_transactionResult(FALSE, tvb, offset, pinfo, tree, hf_h248_transactionResult); } -static const ber_sequence TransactionReply_sequence[] = { +static const ber_sequence_t TransactionReply_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionId_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_immAckRequired_impl }, { BER_CLASS_CON, 2, 0, dissect_transactionResult }, @@ -3911,7 +3911,7 @@ static int dissect_transactionReply_impl(packet_info *pinfo, proto_tree *tree, t return dissect_h248_TransactionReply(TRUE, tvb, offset, pinfo, tree, hf_h248_transactionReply); } -static const ber_sequence TransactionAck_sequence[] = { +static const ber_sequence_t TransactionAck_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_firstAck_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_lastAck_impl }, { 0, 0, 0, NULL } @@ -3928,7 +3928,7 @@ static int dissect_TransactionResponseAck_item(packet_info *pinfo, proto_tree *t return dissect_h248_TransactionAck(FALSE, tvb, offset, pinfo, tree, hf_h248_TransactionResponseAck_item); } -static const ber_sequence TransactionResponseAck_sequence_of[1] = { +static const ber_sequence_t TransactionResponseAck_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_TransactionResponseAck_item }, }; @@ -3952,7 +3952,7 @@ static const value_string Transaction_vals[] = { { 0, NULL } }; -static const ber_choice Transaction_choice[] = { +static const ber_choice_t Transaction_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transactionRequest_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transactionPending_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_transactionReply_impl }, @@ -3971,7 +3971,7 @@ static int dissect_transactions_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_h248_Transaction(FALSE, tvb, offset, pinfo, tree, hf_h248_transactions_item); } -static const ber_sequence SEQUNCE_OF_Transaction_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_Transaction_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_transactions_item }, }; @@ -3993,7 +3993,7 @@ static const value_string T_messageBody_vals[] = { { 0, NULL } }; -static const ber_choice T_messageBody_choice[] = { +static const ber_choice_t T_messageBody_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_messageError_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_transactions_impl }, { 0, 0, 0, 0, NULL } @@ -4010,7 +4010,7 @@ static int dissect_messageBody(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_h248_T_messageBody(FALSE, tvb, offset, pinfo, tree, hf_h248_messageBody); } -static const ber_sequence Message_sequence[] = { +static const ber_sequence_t Message_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_version_impl }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_mId }, { BER_CLASS_CON, 2, 0, dissect_messageBody }, @@ -4028,7 +4028,7 @@ static int dissect_mess_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_h248_Message(TRUE, tvb, offset, pinfo, tree, hf_h248_mess); } -static const ber_sequence MegacoMessage_sequence[] = { +static const ber_sequence_t MegacoMessage_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authHeader_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_mess_impl }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index 95924da957..84099c67df 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-h248.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ +/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ /* Input file: packet-h248-template.h */ diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 7f7eb49ef4..f398d0b22a 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -1332,7 +1332,7 @@ static int dissect_krb5_SAFE(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_krb5_PRIV(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset); static int dissect_krb5_ERROR(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset); -static const ber_choice kerberos_applications_choice[] = { +static const ber_choice_t kerberos_applications_choice[] = { { KRB5_MSG_AUTHENTICATOR, BER_CLASS_APP, KRB5_MSG_AUTHENTICATOR, 0, dissect_krb5_Authenticator }, { KRB5_MSG_ENC_TICKET_PART, BER_CLASS_APP, KRB5_MSG_ENC_TICKET_PART, 0, dissect_krb5_EncTicketPart }, { KRB5_MSG_AS_REQ, BER_CLASS_APP, KRB5_MSG_AS_REQ, 0, dissect_krb5_KDC_REQ }, @@ -1548,7 +1548,7 @@ dissect_krb5_etype(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs } return offset; } -static ber_sequence etype_sequence_of[1] = { +static ber_sequence_t etype_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_krb5_etype }, }; static int @@ -1665,7 +1665,7 @@ static int dissect_krb5_address(packet_info *pinfo, proto_tree *tree, tvbuff_t * offset+=len; return offset; } -static ber_sequence HostAddress_sequence[] = { +static ber_sequence_t HostAddress_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_addr_type }, { BER_CLASS_CON, 1, 0, dissect_krb5_address }, { 0, 0, 0, NULL } @@ -1694,7 +1694,7 @@ dissect_krb5_s_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int * } * */ -static ber_sequence HostAddresses_sequence_of[1] = { +static ber_sequence_t HostAddresses_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_HostAddress }, }; static int @@ -1771,7 +1771,7 @@ dissect_krb5_name_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return offset; } -static ber_sequence name_stringe_sequence_of[1] = { +static ber_sequence_t name_stringe_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_GeneralString, BER_FLAGS_NOOWNTAG, dissect_krb5_name_string }, }; static int @@ -1782,7 +1782,7 @@ dissect_krb5_name_strings(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return offset; } -static ber_sequence PrincipalName_sequence[] = { +static ber_sequence_t PrincipalName_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_name_type }, { BER_CLASS_CON, 1, 0, dissect_krb5_name_strings }, { 0, 0, 0, NULL } @@ -1829,7 +1829,7 @@ dissect_krb5_PA_PAC_REQUEST_flag(packet_info *pinfo, proto_tree *tree, tvbuff_t } -static ber_sequence PA_PAC_REQUEST_sequence[] = { +static ber_sequence_t PA_PAC_REQUEST_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_PA_PAC_REQUEST_flag }, { 0, 0, 0, NULL } }; @@ -1888,7 +1888,7 @@ dissect_krb5_patimestamp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_patimestamp); return offset; } -static const ber_sequence PA_ENC_TS_ENC_sequence[] = { +static const ber_sequence_t PA_ENC_TS_ENC_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_patimestamp }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_krb5_pausec }, { 0, 0, 0, NULL } @@ -1939,7 +1939,7 @@ dissect_krb5_encrypted_PA_ENC_TIMESTAMP(packet_info *pinfo, proto_tree *tree, tv #endif return offset; } -static ber_sequence PA_ENC_TIMESTAMP_sequence[] = { +static ber_sequence_t PA_ENC_TIMESTAMP_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_PA_ENC_TIMESTAMP_etype }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -1965,7 +1965,7 @@ dissect_krb5_etype_info_salt(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return offset; } -static ber_sequence PA_ENCTYPE_INFO_ENTRY_sequence[] = { +static ber_sequence_t PA_ENCTYPE_INFO_ENTRY_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_etype }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -1980,7 +1980,7 @@ dissect_krb5_PA_ENCTYPE_INFO_ENTRY(packet_info *pinfo, proto_tree *tree, tvbuff_ return offset; } -static ber_sequence PA_ENCTYPE_INFO_sequence_of[1] = { +static ber_sequence_t PA_ENCTYPE_INFO_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_ENCTYPE_INFO_ENTRY }, }; static int @@ -2051,7 +2051,7 @@ dissect_krb5_PA_DATA_value(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t /*qqq*/ } -static ber_sequence PA_DATA_sequence[] = { +static ber_sequence_t PA_DATA_sequence[] = { { BER_CLASS_CON, 1, 0, dissect_krb5_PA_DATA_type }, { BER_CLASS_CON, 2, 0, dissect_krb5_PA_DATA_value }, { 0, 0, 0, NULL } @@ -2071,7 +2071,7 @@ dissect_krb5_PA_DATA(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of * padata[3] SEQUENCE OF PA-DATA OPTIONAL, * */ -static ber_sequence PA_DATA_sequence_of[1] = { +static ber_sequence_t PA_DATA_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_PA_DATA }, }; static int @@ -2197,7 +2197,7 @@ dissect_krb5_keyvalue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o * keytype [0] int32 * keyvalue [1] octet string */ -static ber_sequence EncryptionKey_sequence[] = { +static ber_sequence_t EncryptionKey_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_keytype }, { BER_CLASS_CON, 1, 0, @@ -2449,7 +2449,7 @@ dissect_krb5_IF_RELEVANT_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *t } return offset; } -static ber_sequence IF_RELEVANT_item_sequence[] = { +static ber_sequence_t IF_RELEVANT_item_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_IF_RELEVANT_type }, { BER_CLASS_CON, 1, 0, @@ -2464,7 +2464,7 @@ dissect_krb5_IF_RELEVANT_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return offset; } -static ber_sequence IF_RELEVANT_sequence_of[1] = { +static ber_sequence_t IF_RELEVANT_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_IF_RELEVANT_item }, }; @@ -2505,7 +2505,7 @@ dissect_krb5_advalue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of * ad-type [0] int32 * ad-data [1] octet string */ -static ber_sequence AuthorizationData_item_sequence[] = { +static ber_sequence_t AuthorizationData_item_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_adtype }, { BER_CLASS_CON, 1, 0, @@ -2520,7 +2520,7 @@ dissect_krb5_AuthorizationData_item(packet_info *pinfo, proto_tree *tree, tvbuff return offset; } -static ber_sequence AuthorizationData_sequence_of[1] = { +static ber_sequence_t AuthorizationData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_AuthorizationData_item }, }; static int @@ -2558,7 +2558,7 @@ dissect_krb5_transited_contents(packet_info *pinfo, proto_tree *tree, tvbuff_t * * tr-type [0] int32 * contents [1] octet string */ -static ber_sequence TransitedEncoding_sequence[] = { +static ber_sequence_t TransitedEncoding_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_transited_type }, { BER_CLASS_CON, 1, 0, @@ -2614,7 +2614,7 @@ dissect_krb5_renew_till(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int * authorization-data [10] AuthorizationData OPTIONAL * } */ -static ber_sequence EncTicketPart_sequence[] = { +static ber_sequence_t EncTicketPart_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_TicketFlags }, { BER_CLASS_CON, 1, 0, @@ -2660,7 +2660,7 @@ dissect_krb5_EncTicketPart(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, * seq-number [3] uint32 OPTIONAL * } */ -static ber_sequence EncAPRepPart_sequence[] = { +static ber_sequence_t EncAPRepPart_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_ctime }, { BER_CLASS_CON, 1, 0, @@ -2708,7 +2708,7 @@ dissect_krb5_lr_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o return offset; } -static ber_sequence LastReq_sequence[] = { +static ber_sequence_t LastReq_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_lr_type }, { BER_CLASS_CON, 1, 0, @@ -2722,7 +2722,7 @@ dissect_krb5_LastReq(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of return offset; } -static ber_sequence LastReq_sequence_of[1] = { +static ber_sequence_t LastReq_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_krb5_LastReq }, }; static int @@ -2740,7 +2740,7 @@ dissect_krb5_key_expiration(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return offset; } -static ber_sequence EncKDCRepPart_sequence[] = { +static ber_sequence_t EncKDCRepPart_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_key }, { BER_CLASS_CON, 1, 0, @@ -2803,7 +2803,7 @@ dissect_krb5_checksum_checksum(packet_info *pinfo, proto_tree *tree, tvbuff_t *t * Checksum ::= SEQUENCE { * } */ -static ber_sequence Checksum_sequence[] = { +static ber_sequence_t Checksum_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_checksum_type }, { BER_CLASS_CON, 1, 0, @@ -2831,7 +2831,7 @@ dissect_krb5_Checksum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o * authorization-data [8] AuthorizationData OPTIONAL * } */ -static ber_sequence Authenticator_sequence[] = { +static ber_sequence_t Authenticator_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_authenticator_vno }, { BER_CLASS_CON, 1, 0, @@ -2875,7 +2875,7 @@ dissect_krb5_encrypted_PRIV(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, offset=dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_krb_encrypted_PRIV, NULL); return offset; } -static ber_sequence ENC_PRIV_sequence[] = { +static ber_sequence_t ENC_PRIV_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_etype }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -2890,7 +2890,7 @@ dissect_krb5_ENC_PRIV(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, ENC_PRIV_sequence, hf_krb_ENC_PRIV, ett_krb_PRIV_enc); return offset; } -static ber_sequence PRIV_BODY_sequence[] = { +static ber_sequence_t PRIV_BODY_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_pvno }, { BER_CLASS_CON, 1, 0, @@ -2931,7 +2931,7 @@ dissect_krb5_SAFE_BODY_usec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return offset; } -static ber_sequence SAFE_BODY_sequence[] = { +static ber_sequence_t SAFE_BODY_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_SAFE_BODY_user_data }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -2958,7 +2958,7 @@ dissect_krb5_SAFE_BODY(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int -static ber_sequence SAFE_sequence[] = { +static ber_sequence_t SAFE_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_pvno }, { BER_CLASS_CON, 1, 0, @@ -3000,7 +3000,7 @@ dissect_krb5_SAFE(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse * } * */ -static ber_sequence KDC_REQ_BODY_sequence[] = { +static ber_sequence_t KDC_REQ_BODY_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_KDCOptions }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -3067,7 +3067,7 @@ dissect_krb5_KDC_REQ_BODY(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i * req-body[4] KDC-REQ-BODY * } */ -static ber_sequence KDC_REQ_sequence[] = { +static ber_sequence_t KDC_REQ_sequence[] = { { BER_CLASS_CON, 1, 0, dissect_krb5_pvno }, { BER_CLASS_CON, 2, 0, @@ -3145,7 +3145,7 @@ dissect_krb5_encrypted_authenticator_data(packet_info *pinfo, proto_tree *tree, #endif return offset; } -static ber_sequence encrypted_authenticator_sequence[] = { +static ber_sequence_t encrypted_authenticator_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_authenticator_etype }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -3214,7 +3214,7 @@ dissect_krb5_encrypted_Ticket_data(packet_info *pinfo, proto_tree *tree, tvbuff_ #endif return offset; } -static ber_sequence encrypted_Ticket_sequence[] = { +static ber_sequence_t encrypted_Ticket_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_Ticket_etype }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -3231,7 +3231,7 @@ dissect_krb5_Ticket_encrypted(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return offset; } -static ber_sequence Application_1_sequence[] = { +static ber_sequence_t Application_1_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_tkt_vno }, { BER_CLASS_CON, 1, 0, @@ -3252,7 +3252,7 @@ dissect_krb5_Application_1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, -static const ber_choice Ticket_choice[] = { +static const ber_choice_t Ticket_choice[] = { { 1, BER_CLASS_APP, 1, 0, dissect_krb5_Application_1 }, { 0, 0, 0, 0, NULL } @@ -3277,7 +3277,7 @@ dissect_krb5_Ticket(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int off * authenticator[4] EncryptedData * } */ -static ber_sequence AP_REQ_sequence[] = { +static ber_sequence_t AP_REQ_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_pvno }, { BER_CLASS_CON, 1, 0, @@ -3349,7 +3349,7 @@ dissect_krb5_encrypted_AP_REP_data(packet_info *pinfo, proto_tree *tree, tvbuff_ #endif return offset; } -static ber_sequence encrypted_AP_REP_sequence[] = { +static ber_sequence_t encrypted_AP_REP_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_AP_REP_etype }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -3373,7 +3373,7 @@ dissect_krb5_encrypted_AP_REP(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv * enc-part[2] EncryptedData * } */ -static ber_sequence AP_REP_sequence[] = { +static ber_sequence_t AP_REP_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_pvno }, { BER_CLASS_CON, 1, 0, @@ -3462,7 +3462,7 @@ dissect_krb5_encrypted_KDC_REP_data(packet_info *pinfo, proto_tree *tree, tvbuff #endif return offset; } -static ber_sequence encrypted_KDC_REP_sequence[] = { +static ber_sequence_t encrypted_KDC_REP_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_KDC_REP_etype }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, @@ -3490,7 +3490,7 @@ dissect_krb5_encrypted_KDC_REP(packet_info *pinfo, proto_tree *tree, tvbuff_t *t * enc-part[6] EncryptedData * } */ -static ber_sequence KDC_REP_sequence[] = { +static ber_sequence_t KDC_REP_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_pvno }, { BER_CLASS_CON, 1, 0, @@ -3577,7 +3577,7 @@ dissect_krb5_e_checksum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int * authentication method and optionally containing data for * the method: */ -static ber_sequence ERROR_sequence[] = { +static ber_sequence_t ERROR_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_krb5_pvno }, { BER_CLASS_CON, 1, 0, diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 389fffce56..1bf2c0118a 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-logotypecertextn.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ +/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ /* Input file: packet-logotype-cert-extn-template.c */ @@ -168,7 +168,7 @@ static int dissect_hashValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_logotypecertextn_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_hashValue); } -static const ber_sequence HashAlgAndValue_sequence[] = { +static const ber_sequence_t HashAlgAndValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlg }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashValue }, { 0, 0, 0, NULL } @@ -188,7 +188,7 @@ 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_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash_item }, }; @@ -206,7 +206,7 @@ static int dissect_refStructHash(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_HashAlgAndValue(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructHash); } -static const ber_sequence SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_IA5String_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_logotypeURI_item }, }; @@ -224,7 +224,7 @@ static int dissect_refStructURI(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_logotypecertextn_SEQUNCE_SIZE_1_MAX_OF_IA5String(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI); } -static const ber_sequence LogotypeDetails_sequence[] = { +static const ber_sequence_t LogotypeDetails_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mediaType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeURI }, @@ -303,7 +303,7 @@ static const value_string LogotypeImageResolution_vals[] = { { 0, NULL } }; -static const ber_choice LogotypeImageResolution_choice[] = { +static const ber_choice_t LogotypeImageResolution_choice[] = { { 1, BER_CLASS_CON, 1, 0, dissect_numBits_impl }, { 2, BER_CLASS_CON, 2, 0, dissect_tableSize_impl }, { 0, 0, 0, 0, NULL } @@ -320,7 +320,7 @@ static int dissect_resolution(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeImageResolution(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_resolution); } -static const ber_sequence LogotypeImageInfo_sequence[] = { +static const ber_sequence_t LogotypeImageInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_impl }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_xSize }, @@ -341,7 +341,7 @@ static int dissect_imageInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_logotypecertextn_LogotypeImageInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_imageInfo); } -static const ber_sequence LogotypeImage_sequence[] = { +static const ber_sequence_t LogotypeImage_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imageDetails }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imageInfo }, { 0, 0, 0, NULL } @@ -358,7 +358,7 @@ static int dissect_image_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image_item); } -static const ber_sequence SEQUNCE_OF_LogotypeImage_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_LogotypeImage_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_image_item }, }; @@ -373,7 +373,7 @@ static int dissect_image(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_logotypecertextn_SEQUNCE_OF_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image); } -static const ber_sequence LogotypeAudioInfo_sequence[] = { +static const ber_sequence_t LogotypeAudioInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_playTime }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_channels }, @@ -393,7 +393,7 @@ static int dissect_audioInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_logotypecertextn_LogotypeAudioInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audioInfo); } -static const ber_sequence LogotypeAudio_sequence[] = { +static const ber_sequence_t LogotypeAudio_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audioDetails }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_audioInfo }, { 0, 0, 0, NULL } @@ -410,7 +410,7 @@ static int dissect_audio_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_LogotypeAudio(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio_item); } -static const ber_sequence SEQUNCE_OF_LogotypeAudio_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_LogotypeAudio_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audio_item }, }; @@ -425,7 +425,7 @@ static int dissect_audio_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_SEQUNCE_OF_LogotypeAudio(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio); } -static const ber_sequence LogotypeData_sequence[] = { +static const ber_sequence_t LogotypeData_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_image }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_audio_impl }, { 0, 0, 0, NULL } @@ -442,7 +442,7 @@ static int dissect_direct_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_logotypecertextn_LogotypeData(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_direct); } -static const ber_sequence LogotypeReference_sequence[] = { +static const ber_sequence_t LogotypeReference_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructHash }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructURI }, { 0, 0, 0, NULL } @@ -466,7 +466,7 @@ static const value_string LogotypeInfo_vals[] = { { 0, NULL } }; -static const ber_choice LogotypeInfo_choice[] = { +static const ber_choice_t LogotypeInfo_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_direct_impl }, { 1, BER_CLASS_CON, 1, 0, dissect_indirect_impl }, { 0, 0, 0, 0, NULL } @@ -492,7 +492,7 @@ static int dissect_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_logotypecertextn_LogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_info); } -static const ber_sequence SEQUNCE_OF_LogotypeInfo_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_LogotypeInfo_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item }, }; @@ -519,7 +519,7 @@ static int dissect_logotypeType(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_logotypecertextn_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeType); } -static const ber_sequence OtherLogotypeInfo_sequence[] = { +static const ber_sequence_t OtherLogotypeInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_logotypeType }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info }, { 0, 0, 0, NULL } @@ -536,7 +536,7 @@ static int dissect_otherLogos_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_logotypecertextn_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos_item); } -static const ber_sequence SEQUNCE_OF_OtherLogotypeInfo_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_OtherLogotypeInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_otherLogos_item }, }; @@ -551,7 +551,7 @@ static int dissect_otherLogos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_logotypecertextn_SEQUNCE_OF_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos); } -static const ber_sequence LogotypeExtn_sequence[] = { +static const ber_sequence_t LogotypeExtn_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_communityLogos }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_issuerLogo }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_subjectLogo }, diff --git a/epan/dissectors/packet-logotypecertextn.h b/epan/dissectors/packet-logotypecertextn.h index 1c185a4093..cc367ebb63 100644 --- a/epan/dissectors/packet-logotypecertextn.h +++ b/epan/dissectors/packet-logotypecertextn.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-logotypecertextn.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ +/* ../../tools/asn2eth.py -X -b -e -p logotypecertextn -c logotype-cert-extn.cnf -s packet-logotype-cert-extn-template LogotypeCertExtn.asn */ /* Input file: packet-logotype-cert-extn-template.h */ diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 4922937f90..39aa52633d 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-ocsp.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ +/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ /* Input file: packet-ocsp-template.c */ @@ -219,7 +219,7 @@ static int dissect_issuerKeyHash(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ocsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_issuerKeyHash); } -static const ber_sequence CertID_sequence[] = { +static const ber_sequence_t CertID_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerNameHash }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerKeyHash }, @@ -241,7 +241,7 @@ static int dissect_certID(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_ocsp_CertID(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certID); } -static const ber_sequence Request_sequence[] = { +static const ber_sequence_t Request_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_reqCert }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_singleRequestExtensions }, { 0, 0, 0, NULL } @@ -258,7 +258,7 @@ static int dissect_requestList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_ocsp_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList_item); } -static const ber_sequence SEQUNCE_OF_Request_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_Request_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList_item }, }; @@ -273,7 +273,7 @@ static int dissect_requestList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_ocsp_SEQUNCE_OF_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList); } -static const ber_sequence TBSRequest_sequence[] = { +static const ber_sequence_t TBSRequest_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_requestorName }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList }, @@ -305,7 +305,7 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ocsp_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_signature); } -static const ber_sequence SEQUNCE_OF_Certificate_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_Certificate_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item }, }; @@ -320,7 +320,7 @@ static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_ocsp_SEQUNCE_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certs); } -static const ber_sequence Signature_sequence[] = { +static const ber_sequence_t Signature_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certs }, @@ -338,7 +338,7 @@ static int dissect_optionalSignature(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_ocsp_Signature(FALSE, tvb, offset, pinfo, tree, hf_ocsp_optionalSignature); } -static const ber_sequence OCSPRequest_sequence[] = { +static const ber_sequence_t OCSPRequest_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsRequest }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_optionalSignature }, { 0, 0, 0, NULL } @@ -406,7 +406,7 @@ static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_ocsp_T_response(FALSE, tvb, offset, pinfo, tree, hf_ocsp_response); } -static const ber_sequence ResponseBytes_sequence[] = { +static const ber_sequence_t ResponseBytes_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_responseType }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_response }, { 0, 0, 0, NULL } @@ -423,7 +423,7 @@ static int dissect_responseBytes(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ocsp_ResponseBytes(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responseBytes); } -static const ber_sequence OCSPResponse_sequence[] = { +static const ber_sequence_t OCSPResponse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_responseStatus }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_responseBytes }, { 0, 0, 0, NULL } @@ -456,7 +456,7 @@ static const value_string ResponderID_vals[] = { { 0, NULL } }; -static const ber_choice ResponderID_choice[] = { +static const ber_choice_t ResponderID_choice[] = { { 1, BER_CLASS_CON, 1, 0, dissect_byName }, { 2, BER_CLASS_CON, 2, 0, dissect_byKey }, { 0, 0, 0, 0, NULL } @@ -510,7 +510,7 @@ static int dissect_good_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ocsp_NULL(TRUE, tvb, offset, pinfo, tree, hf_ocsp_good); } -static const ber_sequence RevokedInfo_sequence[] = { +static const ber_sequence_t RevokedInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_revocationTime }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revocationReason }, { 0, 0, 0, NULL } @@ -549,7 +549,7 @@ static const value_string CertStatus_vals[] = { { 0, NULL } }; -static const ber_choice CertStatus_choice[] = { +static const ber_choice_t CertStatus_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_good_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_revoked_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_unknown_impl }, @@ -567,7 +567,7 @@ static int dissect_certStatus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_ocsp_CertStatus(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certStatus); } -static const ber_sequence SingleResponse_sequence[] = { +static const ber_sequence_t SingleResponse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certID }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_thisUpdate }, @@ -587,7 +587,7 @@ static int dissect_responses_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_ocsp_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses_item); } -static const ber_sequence SEQUNCE_OF_SingleResponse_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_SingleResponse_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses_item }, }; @@ -602,7 +602,7 @@ static int dissect_responses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_ocsp_SEQUNCE_OF_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses); } -static const ber_sequence ResponseData_sequence[] = { +static const ber_sequence_t ResponseData_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_producedAt }, @@ -622,7 +622,7 @@ static int dissect_tbsResponseData(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_ocsp_ResponseData(FALSE, tvb, offset, pinfo, tree, hf_ocsp_tbsResponseData); } -static const ber_sequence BasicOCSPResponse_sequence[] = { +static const ber_sequence_t BasicOCSPResponse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsResponseData }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature }, @@ -658,7 +658,7 @@ static int dissect_AcceptableResponses_item(packet_info *pinfo, proto_tree *tree return dissect_ocsp_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_ocsp_AcceptableResponses_item); } -static const ber_sequence AcceptableResponses_sequence_of[1] = { +static const ber_sequence_t AcceptableResponses_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_AcceptableResponses_item }, }; @@ -670,7 +670,7 @@ dissect_ocsp_AcceptableResponses(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence ServiceLocator_sequence[] = { +static const ber_sequence_t ServiceLocator_sequence[] = { { BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_locator }, { 0, 0, 0, NULL } @@ -709,7 +709,7 @@ static int dissect_crlNum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_ocsp_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_ocsp_crlNum); } -static const ber_sequence CrlID_sequence[] = { +static const ber_sequence_t CrlID_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_crlUrl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crlNum }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_crlTime }, diff --git a/epan/dissectors/packet-ocsp.h b/epan/dissectors/packet-ocsp.h index 3220ce7649..69b86749c8 100644 --- a/epan/dissectors/packet-ocsp.h +++ b/epan/dissectors/packet-ocsp.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-ocsp.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ +/* ../../tools/asn2eth.py -X -b -e -p ocsp -c ocsp.cnf -s packet-ocsp-template OCSP.asn */ /* Input file: packet-ocsp-template.h */ diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index 80c5ae70a3..c624b32501 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -118,7 +118,7 @@ static int dissect_coefficient(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_coefficient); } -static const ber_sequence RSAPublicKey_sequence[] = { +static const ber_sequence_t RSAPublicKey_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent }, { 0, 0, 0, NULL } @@ -144,7 +144,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkcs1_Version(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_version); } -static const ber_sequence RSAPrivateKey_sequence[] = { +static const ber_sequence_t RSAPrivateKey_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent }, @@ -188,7 +188,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_pkcs1_Digest(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_digest); } -static const ber_sequence DigestInfo_sequence[] = { +static const ber_sequence_t DigestInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index 86fbc7252e..bff82fedf4 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -146,7 +146,7 @@ static const value_string TrustedCA_vals[] = { { 0, NULL } }; -static const ber_choice TrustedCA_choice[] = { +static const ber_choice_t TrustedCA_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_caName }, { 2, BER_CLASS_CON, 2, 0, dissect_issuerAndSerial }, { 0, 0, 0, 0, NULL } @@ -163,7 +163,7 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree, return dissect_pkinit_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers_item); } -static const ber_sequence SEQUNCE_OF_TrustedCA_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_TrustedCA_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item }, }; @@ -178,7 +178,7 @@ static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_pkinit_SEQUNCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers); } -static const ber_sequence PaPkAsReq_sequence[] = { +static const ber_sequence_t PaPkAsReq_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_signedAuthPack }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_kdcCert }, @@ -220,7 +220,7 @@ static int dissect_paNonce(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkinit_INTEGER_0_4294967295(FALSE, tvb, offset, pinfo, tree, hf_pkinit_paNonce); } -static const ber_sequence PKAuthenticator_sequence[] = { +static const ber_sequence_t PKAuthenticator_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_cusec }, { BER_CLASS_CON, 1, 0, dissect_ctime }, { BER_CLASS_CON, 2, 0, dissect_paNonce }, @@ -239,7 +239,7 @@ static int dissect_pkAuthenticator(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_pkinit_PKAuthenticator(FALSE, tvb, offset, pinfo, tree, hf_pkinit_pkAuthenticator); } -static const ber_sequence SEQUNCE_OF_AlgorithmIdentifier_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_AlgorithmIdentifier_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_supportedCMSTypes_item }, }; @@ -254,7 +254,7 @@ static int dissect_supportedCMSTypes(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_pkinit_SEQUNCE_OF_AlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_pkinit_supportedCMSTypes); } -static const ber_sequence AuthPack_sequence[] = { +static const ber_sequence_t AuthPack_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_pkAuthenticator }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_clientPublicValue }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_supportedCMSTypes }, @@ -276,7 +276,7 @@ static const value_string PaPkAsRep_vals[] = { { 0, NULL } }; -static const ber_choice PaPkAsRep_choice[] = { +static const ber_choice_t PaPkAsRep_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_dhSignedData }, { 1, BER_CLASS_CON, 1, 0, dissect_encKeyPack }, { 0, 0, 0, 0, NULL } @@ -303,7 +303,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_pkinit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkinit_subjectPublicKey); } -static const ber_sequence KDCDHKeyInfo_sequence[] = { +static const ber_sequence_t KDCDHKeyInfo_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_subjectPublicKey }, { BER_CLASS_CON, 1, 0, dissect_dhNonce }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_dhKeyExpiration }, diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 0047593371..528c16eea1 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -186,7 +186,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_pkix1explicit_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_extnValue); } -static const ber_sequence Extension_sequence[] = { +static const ber_sequence_t Extension_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_extnValue }, @@ -204,7 +204,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_pkix1explicit_Extension(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_Extensions_item); } -static const ber_sequence Extensions_sequence_of[1] = { +static const ber_sequence_t Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, }; @@ -253,7 +253,7 @@ static int dissect_seed(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_pkix1explicit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_seed); } -static const ber_sequence ValidationParms_sequence[] = { +static const ber_sequence_t ValidationParms_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_seed }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pgenCounter }, { 0, 0, 0, NULL } @@ -270,7 +270,7 @@ static int dissect_validationParms(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_pkix1explicit_ValidationParms(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_validationParms); } -static const ber_sequence DomainParameters_sequence[] = { +static const ber_sequence_t DomainParameters_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_g }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_q }, @@ -315,7 +315,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in return dissect_pkix1explicit_T_value(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value); } -static const ber_sequence AttributeTypeAndValue_sequence[] = { +static const ber_sequence_t AttributeTypeAndValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value }, { 0, 0, 0, NULL } @@ -332,7 +332,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree return dissect_pkix1explicit_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RelativeDistinguishedName_item); } -static const ber_sequence RelativeDistinguishedName_set_of[1] = { +static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item }, }; @@ -347,7 +347,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_pkix1explicit_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RDNSequence_item); } -static const ber_sequence RDNSequence_sequence_of[1] = { +static const ber_sequence_t RDNSequence_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item }, }; @@ -403,7 +403,7 @@ static int dissect_value1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value1); } -static const ber_sequence TeletexDomainDefinedAttribute_sequence[] = { +static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type1 }, { BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value1 }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 3021c6b8dc..7eb494d84b 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -122,7 +122,7 @@ dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static const ber_sequence EDIPartyName_sequence[] = { +static const ber_sequence_t EDIPartyName_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl }, { 0, 0, 0, NULL } @@ -148,7 +148,7 @@ static int dissect_accessMethod(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_pkix1implicit_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_accessMethod); } -static const ber_sequence AccessDescription_sequence[] = { +static const ber_sequence_t AccessDescription_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_accessMethod }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_accessLocation }, { 0, 0, 0, NULL } @@ -165,7 +165,7 @@ static int dissect_AuthorityInfoAccessSyntax_item(packet_info *pinfo, proto_tree return dissect_pkix1implicit_AccessDescription(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_AuthorityInfoAccessSyntax_item); } -static const ber_sequence AuthorityInfoAccessSyntax_sequence_of[1] = { +static const ber_sequence_t AuthorityInfoAccessSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AuthorityInfoAccessSyntax_item }, }; @@ -224,7 +224,7 @@ static const value_string DisplayText_vals[] = { { 0, NULL } }; -static const ber_choice DisplayText_choice[] = { +static const ber_choice_t DisplayText_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_visibleString }, { 1, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_bmpString }, { 2, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String }, @@ -257,7 +257,7 @@ static int dissect_noticeNumbers_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_pkix1implicit_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers_item); } -static const ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_INTEGER_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item }, }; @@ -272,7 +272,7 @@ static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkix1implicit_SEQUNCE_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers); } -static const ber_sequence NoticeReference_sequence[] = { +static const ber_sequence_t NoticeReference_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers }, { 0, 0, 0, NULL } @@ -289,7 +289,7 @@ static int dissect_noticeRef(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_pkix1implicit_NoticeReference(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeRef); } -static const ber_sequence UserNotice_sequence[] = { +static const ber_sequence_t UserNotice_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index f26570f836..8d1d995fcb 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-pkixproxy.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.c */ @@ -113,7 +113,7 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_pkixproxy_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_policy); } -static const ber_sequence ProxyPolicy_sequence[] = { +static const ber_sequence_t ProxyPolicy_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyLanguage }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policy }, { 0, 0, 0, NULL } @@ -130,7 +130,7 @@ static int dissect_proxyPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_pkixproxy_ProxyPolicy(FALSE, tvb, offset, pinfo, tree, hf_pkixproxy_proxyPolicy); } -static const ber_sequence ProxyCertInfoExtension_sequence[] = { +static const ber_sequence_t ProxyCertInfoExtension_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pCPathLenConstraint }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_proxyPolicy }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h index 4db0dca80a..316fb1f953 100644 --- a/epan/dissectors/packet-pkixproxy.h +++ b/epan/dissectors/packet-pkixproxy.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-pkixproxy.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* ../../tools/asn2eth.py -X -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.h */ diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 9fddebf7a0..c7f8c7a674 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -174,7 +174,7 @@ static const value_string TypeOfBiometricData_vals[] = { { 0, NULL } }; -static const ber_choice TypeOfBiometricData_choice[] = { +static const ber_choice_t TypeOfBiometricData_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_predefinedBiometricType }, { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_biometricDataOid }, { 0, 0, 0, 0, NULL } @@ -216,7 +216,7 @@ static int dissect_sourceDataUri(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixqualified_IA5String(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_sourceDataUri); } -static const ber_sequence BiometricData_sequence[] = { +static const ber_sequence_t BiometricData_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_biometricDataHash }, @@ -235,7 +235,7 @@ static int dissect_BiometricSyntax_item(packet_info *pinfo, proto_tree *tree, tv return dissect_pkixqualified_BiometricData(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_BiometricSyntax_item); } -static const ber_sequence BiometricSyntax_sequence_of[1] = { +static const ber_sequence_t BiometricSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_BiometricSyntax_item }, }; @@ -273,7 +273,7 @@ static int dissect_statementInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixqualified_T_statementInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_statementInfo); } -static const ber_sequence QCStatement_sequence[] = { +static const ber_sequence_t QCStatement_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_statementId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statementInfo }, { 0, 0, 0, NULL } @@ -290,7 +290,7 @@ static int dissect_QCStatements_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_pkixqualified_QCStatement(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_QCStatements_item); } -static const ber_sequence QCStatements_sequence_of[1] = { +static const ber_sequence_t QCStatements_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_QCStatements_item }, }; @@ -302,7 +302,7 @@ dissect_pkixqualified_QCStatements(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence NameRegistrationAuthorities_sequence_of[1] = { +static const ber_sequence_t NameRegistrationAuthorities_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_NameRegistrationAuthorities_item }, }; @@ -317,7 +317,7 @@ static int dissect_nameRegistrationAuthorities(packet_info *pinfo, proto_tree *t return dissect_pkixqualified_NameRegistrationAuthorities(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_nameRegistrationAuthorities); } -static const ber_sequence SemanticsInformation_sequence[] = { +static const ber_sequence_t SemanticsInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_semanticsIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nameRegistrationAuthorities }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 96f72a7fad..ff37dd9211 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -151,7 +151,7 @@ static int dissect_hashedMessage(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixtsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_hashedMessage); } -static const ber_sequence MessageImprint_sequence[] = { +static const ber_sequence_t MessageImprint_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashedMessage }, { 0, 0, 0, NULL } @@ -215,7 +215,7 @@ static int dissect_ordering(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkixtsp_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_ordering); } -static const ber_sequence TimeStampReq_sequence[] = { +static const ber_sequence_t TimeStampReq_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_reqPolicy }, @@ -279,7 +279,7 @@ static int dissect_failInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkixtsp_PKIFailureInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_failInfo); } -static const ber_sequence PKIStatusInfo_sequence[] = { +static const ber_sequence_t PKIStatusInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pki_status }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo }, { 0, 0, 0, NULL } @@ -307,7 +307,7 @@ static int dissect_timeStampToken(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_pkixtsp_TimeStampToken(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_timeStampToken); } -static const ber_sequence TimeStampResp_sequence[] = { +static const ber_sequence_t TimeStampResp_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeStampToken }, { 0, 0, 0, NULL } @@ -364,7 +364,7 @@ static int dissect_micros_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_pkixtsp_INTEGER_1_999(TRUE, tvb, offset, pinfo, tree, hf_pkixtsp_micros); } -static const ber_sequence Accuracy_sequence[] = { +static const ber_sequence_t Accuracy_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_seconds }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_millis_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_micros_impl }, @@ -382,7 +382,7 @@ static int dissect_accuracy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_pkixtsp_Accuracy(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_accuracy); } -static const ber_sequence TSTInfo_sequence[] = { +static const ber_sequence_t TSTInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_tst_version }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policy }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint }, diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 958bebc314..029903abdc 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -212,7 +212,7 @@ static const value_string T_address_value_vals[] = { { 0, NULL } }; -static const ber_choice T_address_value_choice[] = { +static const ber_choice_t T_address_value_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_octet_format }, { 0, 0, 0, 0, NULL } }; @@ -228,7 +228,7 @@ static int dissect_address_value(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_smrse_T_address_value(FALSE, tvb, offset, pinfo, tree, hf_smrse_address_value); } -static const ber_sequence SMS_Address_sequence[] = { +static const ber_sequence_t SMS_Address_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_address_type }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numbering_plan }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value }, @@ -280,7 +280,7 @@ static int dissect_password(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_smrse_Password(FALSE, tvb, offset, pinfo, tree, hf_smrse_password); } -static const ber_sequence SMR_Bind_sequence[] = { +static const ber_sequence_t SMR_Bind_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sc_address }, { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_password }, { 0, 0, 0, NULL } @@ -306,7 +306,7 @@ static int dissect_moimsi_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_smrse_IMSI_Address(TRUE, tvb, offset, pinfo, tree, hf_smrse_moimsi); } -static const ber_sequence SMR_Bind_Confirm_sequence[] = { +static const ber_sequence_t SMR_Bind_Confirm_sequence[] = { { 0, 0, 0, NULL } }; @@ -340,7 +340,7 @@ static int dissect_connect_fail_reason(packet_info *pinfo, proto_tree *tree, tvb return dissect_smrse_Connect_fail(FALSE, tvb, offset, pinfo, tree, hf_smrse_connect_fail_reason); } -static const ber_sequence SMR_Bind_Failure_sequence[] = { +static const ber_sequence_t SMR_Bind_Failure_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_connect_fail_reason }, { 0, 0, 0, NULL } }; @@ -353,7 +353,7 @@ dissect_smrse_SMR_Bind_Failure(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static const ber_sequence SMR_Unbind_sequence[] = { +static const ber_sequence_t SMR_Unbind_sequence[] = { { 0, 0, 0, NULL } }; @@ -430,7 +430,7 @@ static int dissect_mt_tariffClass_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_smrse_SM_TC(TRUE, tvb, offset, pinfo, tree, hf_smrse_mt_tariffClass); } -static const ber_sequence RPDataMT_sequence[] = { +static const ber_sequence_t RPDataMT_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_priority_request }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_mms }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mt_message_reference }, @@ -450,7 +450,7 @@ dissect_smrse_RPDataMT(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac return offset; } -static const ber_sequence RPDataMO_sequence[] = { +static const ber_sequence_t RPDataMO_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mo_message_reference }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mo_originating_address }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_mo_user_data }, @@ -467,7 +467,7 @@ dissect_smrse_RPDataMO(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac return offset; } -static const ber_sequence RPAck_sequence[] = { +static const ber_sequence_t RPAck_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference }, { 0, 0, 0, NULL } }; @@ -515,7 +515,7 @@ static int dissect_error_reason(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_smrse_Error_reason(FALSE, tvb, offset, pinfo, tree, hf_smrse_error_reason); } -static const ber_sequence RPError_sequence[] = { +static const ber_sequence_t RPError_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_reason }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_msg_waiting_set }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference }, @@ -532,7 +532,7 @@ dissect_smrse_RPError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack return offset; } -static const ber_sequence RPAlertSC_sequence[] = { +static const ber_sequence_t RPAlertSC_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ms_address }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 2f7e97089c..8775efdf3f 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -281,7 +281,7 @@ static int dissect_parameters(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509af_T_parameters(FALSE, tvb, offset, pinfo, tree, hf_x509af_parameters); } -static const ber_sequence AlgorithmIdentifier_sequence[] = { +static const ber_sequence_t AlgorithmIdentifier_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_algorithmId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameters }, { 0, 0, 0, NULL } @@ -344,7 +344,7 @@ const value_string Time_vals[] = { { 0, NULL } }; -static const ber_choice Time_choice[] = { +static const ber_choice_t Time_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime }, { 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime }, { 0, 0, 0, 0, NULL } @@ -373,7 +373,7 @@ static int dissect_revocationDate(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509af_Time(FALSE, tvb, offset, pinfo, tree, hf_x509af_revocationDate); } -static const ber_sequence Validity_sequence[] = { +static const ber_sequence_t Validity_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter }, { 0, 0, 0, NULL } @@ -406,7 +406,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509af_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509af_subjectPublicKey); } -static const ber_sequence SubjectPublicKeyInfo_sequence[] = { +static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKey }, { 0, 0, 0, NULL } @@ -466,7 +466,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_x509af_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_x509af_extnValue); } -static const ber_sequence Extension_sequence[] = { +static const ber_sequence_t Extension_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical }, { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_extnValue }, @@ -484,7 +484,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509af_Extension(FALSE, tvb, offset, pinfo, tree, hf_x509af_Extensions_item); } -static const ber_sequence Extensions_sequence_of[1] = { +static const ber_sequence_t Extensions_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item }, }; @@ -505,7 +505,7 @@ static int dissect_crlExtensions(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509af_Extensions(FALSE, tvb, offset, pinfo, tree, hf_x509af_crlExtensions); } -static const ber_sequence T_signedCertificate_sequence[] = { +static const ber_sequence_t T_signedCertificate_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature }, @@ -530,7 +530,7 @@ static int dissect_signedCertificate(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_T_signedCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificate); } -static const ber_sequence Certificate_sequence[] = { +static const ber_sequence_t Certificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted }, @@ -560,7 +560,7 @@ static int dissect_certificate(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509af_Certificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificate); } -static const ber_sequence CrossCertificates_set_of[1] = { +static const ber_sequence_t CrossCertificates_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item }, }; @@ -575,7 +575,7 @@ static int dissect_ForwardCertificationPath_item(packet_info *pinfo, proto_tree return dissect_x509af_CrossCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_ForwardCertificationPath_item); } -static const ber_sequence ForwardCertificationPath_sequence_of[1] = { +static const ber_sequence_t ForwardCertificationPath_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item }, }; @@ -590,7 +590,7 @@ static int dissect_certificationPath(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_ForwardCertificationPath(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificationPath); } -static const ber_sequence Certificates_sequence[] = { +static const ber_sequence_t Certificates_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certificationPath }, { 0, 0, 0, NULL } @@ -604,7 +604,7 @@ dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static const ber_sequence CertificatePair_sequence[] = { +static const ber_sequence_t CertificatePair_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA }, { 0, 0, 0, NULL } @@ -621,7 +621,7 @@ static int dissect_theCACertificates_item(packet_info *pinfo, proto_tree *tree, return dissect_x509af_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates_item); } -static const ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_CertificatePair_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item }, }; @@ -636,7 +636,7 @@ static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_SEQUNCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates); } -static const ber_sequence CertificationPath_sequence[] = { +static const ber_sequence_t CertificationPath_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_theCACertificates }, { 0, 0, 0, NULL } @@ -650,7 +650,7 @@ dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence T_revokedCertificates_item_sequence[] = { +static const ber_sequence_t T_revokedCertificates_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_revokedUserCertificate }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_crlEntryExtensions }, @@ -668,7 +668,7 @@ static int dissect_revokedCertificates_item(packet_info *pinfo, proto_tree *tree return dissect_x509af_T_revokedCertificates_item(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates_item); } -static const ber_sequence T_revokedCertificates_sequence_of[1] = { +static const ber_sequence_t T_revokedCertificates_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item }, }; @@ -683,7 +683,7 @@ static int dissect_revokedCertificates(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509af_T_revokedCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates); } -static const ber_sequence T_signedCertificateList_sequence[] = { +static const ber_sequence_t T_signedCertificateList_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer }, @@ -705,7 +705,7 @@ static int dissect_signedCertificateList(packet_info *pinfo, proto_tree *tree, t return dissect_x509af_T_signedCertificateList(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificateList); } -static const ber_sequence CertificateList_sequence[] = { +static const ber_sequence_t CertificateList_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificateList }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted }, @@ -720,7 +720,7 @@ dissect_x509af_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int off return offset; } -static const ber_sequence IssuerSerial_sequence[] = { +static const ber_sequence_t IssuerSerial_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerUID }, @@ -745,7 +745,7 @@ static const value_string InfoSubject_vals[] = { { 0, NULL } }; -static const ber_choice InfoSubject_choice[] = { +static const ber_choice_t InfoSubject_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID }, { 1, BER_CLASS_CON, 1, 0, dissect_infoSubjectName }, { 0, 0, 0, 0, NULL } @@ -762,7 +762,7 @@ static int dissect_info_subject(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509af_InfoSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_info_subject); } -static const ber_sequence AttCertValidityPeriod_sequence[] = { +static const ber_sequence_t AttCertValidityPeriod_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notBeforeTime }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notAfterTime }, { 0, 0, 0, NULL } @@ -779,7 +779,7 @@ static int dissect_attCertValidityPeriod(packet_info *pinfo, proto_tree *tree, t return dissect_x509af_AttCertValidityPeriod(FALSE, tvb, offset, pinfo, tree, hf_x509af_attCertValidityPeriod); } -static const ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_Attribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item }, }; @@ -794,7 +794,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509af_SEQUNCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes); } -static const ber_sequence AttributeCertificateInfo_sequence[] = { +static const ber_sequence_t AttributeCertificateInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName }, @@ -818,7 +818,7 @@ static int dissect_signedAttributeCertificateInfo(packet_info *pinfo, proto_tree return dissect_x509af_AttributeCertificateInfo(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedAttributeCertificateInfo); } -static const ber_sequence AttributeCertificate_sequence[] = { +static const ber_sequence_t AttributeCertificate_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeCertificateInfo }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted }, @@ -836,7 +836,7 @@ static int dissect_attributeCertificate(packet_info *pinfo, proto_tree *tree, tv return dissect_x509af_AttributeCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributeCertificate); } -static const ber_sequence ACPathData_sequence[] = { +static const ber_sequence_t ACPathData_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate }, { 0, 0, 0, NULL } @@ -853,7 +853,7 @@ static int dissect_acPath_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509af_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath_item); } -static const ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ACPathData_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item }, }; @@ -868,7 +868,7 @@ static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509af_SEQUNCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath); } -static const ber_sequence AttributeCertificationPath_sequence[] = { +static const ber_sequence_t AttributeCertificationPath_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeCertificate }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acPath }, { 0, 0, 0, NULL } @@ -889,7 +889,7 @@ static const value_string AssertionSubject_vals[] = { { 0, NULL } }; -static const ber_choice AssertionSubject_choice[] = { +static const ber_choice_t AssertionSubject_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID }, { 1, BER_CLASS_CON, 1, 0, dissect_assertionSubjectName }, { 0, 0, 0, 0, NULL } @@ -906,7 +906,7 @@ static int dissect_assertion_subject(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509af_AssertionSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_assertion_subject); } -static const ber_sequence SET_OF_AttributeType_set_of[1] = { +static const ber_sequence_t SET_OF_AttributeType_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item }, }; @@ -921,7 +921,7 @@ static int dissect_attType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509af_SET_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509af_attType); } -static const ber_sequence AttributeCertificateAssertion_sequence[] = { +static const ber_sequence_t AttributeCertificateAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_attCertValidity }, diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 3f918750f4..0e42750845 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -341,7 +341,7 @@ static int dissect_uniformResourceIdentifier_impl(packet_info *pinfo, proto_tree return dissect_x509ce_IA5String(TRUE, tvb, offset, pinfo, tree, hf_x509ce_uniformResourceIdentifier); } -static const ber_sequence EDIPartyName_sequence[] = { +static const ber_sequence_t EDIPartyName_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl }, { 0, 0, 0, NULL } @@ -401,7 +401,7 @@ const value_string GeneralName_vals[] = { { 0, NULL } }; -static const ber_choice GeneralName_choice[] = { +static const ber_choice_t GeneralName_choice[] = { { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rfc822Name_impl }, { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dNSName_impl }, { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_directoryName_impl }, @@ -438,7 +438,7 @@ static int dissect_deltaLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509ce_GeneralName(FALSE, tvb, offset, pinfo, tree, hf_x509ce_deltaLocation); } -static const ber_sequence GeneralNames_sequence_of[1] = { +static const ber_sequence_t GeneralNames_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item }, }; @@ -462,7 +462,7 @@ static int dissect_fullName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509ce_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_x509ce_fullName); } -static const ber_sequence AuthorityKeyIdentifier_sequence[] = { +static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keyIdentifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertIssuer_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertSerialNumber_impl }, @@ -528,7 +528,7 @@ static int dissect_KeyPurposeIDs_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_x509ce_KeyPurposeId(FALSE, tvb, offset, pinfo, tree, hf_x509ce_KeyPurposeIDs_item); } -static const ber_sequence KeyPurposeIDs_sequence_of[1] = { +static const ber_sequence_t KeyPurposeIDs_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_KeyPurposeIDs_item }, }; @@ -572,7 +572,7 @@ static int dissect_privateKeyValid_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_x509ce_GeneralizedTime(TRUE, tvb, offset, pinfo, tree, hf_x509ce_privateKeyValid); } -static const ber_sequence PrivateKeyUsagePeriod_sequence[] = { +static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notBefore_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notAfter_impl }, { 0, 0, 0, NULL } @@ -633,7 +633,7 @@ static int dissect_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_x509ce_PolicyQualifierValue(FALSE, tvb, offset, pinfo, tree, hf_x509ce_qualifier); } -static const ber_sequence PolicyQualifierInfo_sequence[] = { +static const ber_sequence_t PolicyQualifierInfo_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyQualifierId }, { BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_qualifier }, { 0, 0, 0, NULL } @@ -650,7 +650,7 @@ 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_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item }, }; @@ -665,7 +665,7 @@ static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers); } -static const ber_sequence PolicyInformation_sequence[] = { +static const ber_sequence_t PolicyInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policyQualifiers }, { 0, 0, 0, NULL } @@ -682,7 +682,7 @@ static int dissect_CertificatePoliciesSyntax_item(packet_info *pinfo, proto_tree return dissect_x509ce_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CertificatePoliciesSyntax_item); } -static const ber_sequence CertificatePoliciesSyntax_sequence_of[1] = { +static const ber_sequence_t CertificatePoliciesSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificatePoliciesSyntax_item }, }; @@ -694,7 +694,7 @@ dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tv return offset; } -static const ber_sequence PolicyMappingsSyntax_item_sequence[] = { +static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_issuerDomainPolicy }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subjectDomainPolicy }, { 0, 0, 0, NULL } @@ -711,7 +711,7 @@ static int dissect_PolicyMappingsSyntax_item(packet_info *pinfo, proto_tree *tre return dissect_x509ce_PolicyMappingsSyntax_item(FALSE, tvb, offset, pinfo, tree, hf_x509ce_PolicyMappingsSyntax_item); } -static const ber_sequence PolicyMappingsSyntax_sequence_of[1] = { +static const ber_sequence_t PolicyMappingsSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PolicyMappingsSyntax_item }, }; @@ -723,7 +723,7 @@ dissect_x509ce_PolicyMappingsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence AttributesSyntax_sequence_of[1] = { +static const ber_sequence_t AttributesSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributesSyntax_item }, }; @@ -785,7 +785,7 @@ static int dissect_modulus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509ce_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509ce_modulus); } -static const ber_sequence BasicConstraintsSyntax_sequence[] = { +static const ber_sequence_t BasicConstraintsSyntax_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cA }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pathLenConstraint }, { 0, 0, 0, NULL } @@ -814,7 +814,7 @@ static int dissect_maximum_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509ce_BaseDistance(TRUE, tvb, offset, pinfo, tree, hf_x509ce_maximum); } -static const ber_sequence GeneralSubtree_sequence[] = { +static const ber_sequence_t GeneralSubtree_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimum_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximum_impl }, @@ -832,7 +832,7 @@ static int dissect_GeneralSubtrees_item(packet_info *pinfo, proto_tree *tree, tv return dissect_x509ce_GeneralSubtree(FALSE, tvb, offset, pinfo, tree, hf_x509ce_GeneralSubtrees_item); } -static const ber_sequence GeneralSubtrees_sequence_of[1] = { +static const ber_sequence_t GeneralSubtrees_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralSubtrees_item }, }; @@ -850,7 +850,7 @@ static int dissect_excludedSubtrees_impl(packet_info *pinfo, proto_tree *tree, t return dissect_x509ce_GeneralSubtrees(TRUE, tvb, offset, pinfo, tree, hf_x509ce_excludedSubtrees); } -static const ber_sequence NameConstraintsSyntax_sequence[] = { +static const ber_sequence_t NameConstraintsSyntax_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permittedSubtrees_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_excludedSubtrees_impl }, { 0, 0, 0, NULL } @@ -882,7 +882,7 @@ static int dissect_inhibitPolicyMapping_impl(packet_info *pinfo, proto_tree *tre return dissect_x509ce_SkipCerts(TRUE, tvb, offset, pinfo, tree, hf_x509ce_inhibitPolicyMapping); } -static const ber_sequence PolicyConstraintsSyntax_sequence[] = { +static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requireExplicitPolicy_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inhibitPolicyMapping_impl }, { 0, 0, 0, NULL } @@ -953,7 +953,7 @@ const value_string DistributionPointName_vals[] = { { 0, NULL } }; -static const ber_choice DistributionPointName_choice[] = { +static const ber_choice_t DistributionPointName_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fullName_impl }, { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_nameRelativeToCRLIssuer_impl }, { 0, 0, 0, 0, NULL } @@ -1025,7 +1025,7 @@ static int dissect_reasonFlags(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509ce_ReasonFlags(FALSE, tvb, offset, pinfo, tree, hf_x509ce_reasonFlags); } -static const ber_sequence NumberRange_sequence[] = { +static const ber_sequence_t NumberRange_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startingNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endingNumber_impl }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_modulus }, @@ -1058,7 +1058,7 @@ static int dissect_cRLStreamIdentifier_impl(packet_info *pinfo, proto_tree *tree return dissect_x509ce_CRLStreamIdentifier(TRUE, tvb, offset, pinfo, tree, hf_x509ce_cRLStreamIdentifier); } -static const ber_sequence BaseRevocationInfo_sequence[] = { +static const ber_sequence_t BaseRevocationInfo_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLStreamIdentifier_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cRLNumber_impl }, { BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseThisUpdate_impl }, @@ -1076,7 +1076,7 @@ static int dissect_baseRevocationInfo_impl(packet_info *pinfo, proto_tree *tree, return dissect_x509ce_BaseRevocationInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_baseRevocationInfo); } -static const ber_sequence PerAuthorityScope_sequence[] = { +static const ber_sequence_t PerAuthorityScope_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_authorityName_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_onlyContains_impl }, @@ -1099,7 +1099,7 @@ static int dissect_CRLScopeSyntax_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509ce_PerAuthorityScope(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLScopeSyntax_item); } -static const ber_sequence CRLScopeSyntax_sequence_of[1] = { +static const ber_sequence_t CRLScopeSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLScopeSyntax_item }, }; @@ -1114,7 +1114,7 @@ static int dissect_cRLScope(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509ce_CRLScopeSyntax(FALSE, tvb, offset, pinfo, tree, hf_x509ce_cRLScope); } -static const ber_sequence DeltaRefInfo_sequence[] = { +static const ber_sequence_t DeltaRefInfo_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastDelta }, { 0, 0, 0, NULL } @@ -1131,7 +1131,7 @@ static int dissect_deltaRefInfo_impl(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509ce_DeltaRefInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_deltaRefInfo); } -static const ber_sequence CRLReferral_sequence[] = { +static const ber_sequence_t CRLReferral_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_issuer_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_location_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deltaRefInfo_impl }, @@ -1158,7 +1158,7 @@ const value_string StatusReferral_vals[] = { { 0, NULL } }; -static const ber_choice StatusReferral_choice[] = { +static const ber_choice_t StatusReferral_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cRLReferral_impl }, { 0, 0, 0, 0, NULL } }; @@ -1174,7 +1174,7 @@ static int dissect_StatusReferrals_item(packet_info *pinfo, proto_tree *tree, tv return dissect_x509ce_StatusReferral(FALSE, tvb, offset, pinfo, tree, hf_x509ce_StatusReferrals_item); } -static const ber_sequence StatusReferrals_sequence_of[1] = { +static const ber_sequence_t StatusReferrals_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item }, }; @@ -1201,7 +1201,7 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int o return offset; } -static const ber_sequence DeltaInformation_sequence[] = { +static const ber_sequence_t DeltaInformation_sequence[] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation }, { BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nextDelta }, { 0, 0, 0, NULL } @@ -1215,7 +1215,7 @@ dissect_x509ce_DeltaInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } -static const ber_sequence DistributionPoint_sequence[] = { +static const ber_sequence_t DistributionPoint_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasons_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLIssuer_impl }, @@ -1233,7 +1233,7 @@ static int dissect_CRLDistPointsSyntax_item(packet_info *pinfo, proto_tree *tree return dissect_x509ce_DistributionPoint(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLDistPointsSyntax_item); } -static const ber_sequence CRLDistPointsSyntax_sequence_of[1] = { +static const ber_sequence_t CRLDistPointsSyntax_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLDistPointsSyntax_item }, }; @@ -1245,7 +1245,7 @@ dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence IssuingDistPointSyntax_sequence[] = { +static const ber_sequence_t IssuingDistPointSyntax_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsUserPublicKeyCerts_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsCACerts_impl }, @@ -1273,7 +1273,7 @@ dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse return offset; } -static const ber_sequence CertificateExactAssertion_sequence[] = { +static const ber_sequence_t CertificateExactAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer1 }, { 0, 0, 0, NULL } @@ -1324,7 +1324,7 @@ const value_string AltNameType_vals[] = { { 0, NULL } }; -static const ber_choice AltNameType_choice[] = { +static const ber_choice_t AltNameType_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_builtinNameForm }, { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_otherNameForm }, { 0, 0, 0, 0, NULL } @@ -1341,7 +1341,7 @@ static int dissect_subjectAltName_impl(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509ce_AltNameType(TRUE, tvb, offset, pinfo, tree, hf_x509ce_subjectAltName); } -static const ber_sequence CertPolicySet_sequence_of[1] = { +static const ber_sequence_t CertPolicySet_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_CertPolicySet_item }, }; @@ -1356,7 +1356,7 @@ static int dissect_policy_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509ce_CertPolicySet(TRUE, tvb, offset, pinfo, tree, hf_x509ce_policy); } -static const ber_sequence CertificateAssertion_sequence[] = { +static const ber_sequence_t CertificateAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuer1_impl }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl }, @@ -1386,7 +1386,7 @@ static int dissect_issuedByThisCAAssertion1_impl(packet_info *pinfo, proto_tree return dissect_x509ce_CertificateAssertion(TRUE, tvb, offset, pinfo, tree, hf_x509ce_issuedByThisCAAssertion1); } -static const ber_sequence CertificatePairExactAssertion_sequence[] = { +static const ber_sequence_t CertificatePairExactAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedToThisCAAssertion_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedByThisCAAssertion_impl }, { 0, 0, 0, NULL } @@ -1400,7 +1400,7 @@ dissect_x509ce_CertificatePairExactAssertion(gboolean implicit_tag _U_, tvbuff_t return offset; } -static const ber_sequence CertificatePairAssertion_sequence[] = { +static const ber_sequence_t CertificatePairAssertion_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedToThisCAAssertion1_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedByThisCAAssertion1_impl }, { 0, 0, 0, NULL } @@ -1414,7 +1414,7 @@ dissect_x509ce_CertificatePairAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence CertificateListExactAssertion_sequence[] = { +static const ber_sequence_t CertificateListExactAssertion_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer1 }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint }, { 0, 0, 0, NULL } @@ -1428,7 +1428,7 @@ dissect_x509ce_CertificateListExactAssertion(gboolean implicit_tag _U_, tvbuff_t return offset; } -static const ber_sequence CertificateListAssertion_sequence[] = { +static const ber_sequence_t CertificateListAssertion_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuer1 }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minCRLNumber_impl }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maxCRLNumber_impl }, @@ -1446,7 +1446,7 @@ dissect_x509ce_CertificateListAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence PkiPathMatchSyntax_sequence[] = { +static const ber_sequence_t PkiPathMatchSyntax_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_firstIssuer }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_lastSubject }, { 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index d2aba394d9..56ae4c5b41 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -419,7 +419,7 @@ static int dissect_distingAttrValue(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_ValuesWithContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_distingAttrValue); } -static const ber_sequence SET_OF_AttributeValue_set_of[1] = { +static const ber_sequence_t SET_OF_AttributeValue_set_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_values_item }, }; @@ -457,7 +457,7 @@ static int dissect_includeSubtypes(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509if_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_x509if_includeSubtypes); } -static const ber_sequence Context_sequence[] = { +static const ber_sequence_t Context_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_fallback }, @@ -475,7 +475,7 @@ static int dissect_contextList_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_Context(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextList_item); } -static const ber_sequence SET_OF_Context_set_of[1] = { +static const ber_sequence_t SET_OF_Context_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contextList_item }, }; @@ -490,7 +490,7 @@ static int dissect_contextList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509if_SET_OF_Context(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextList); } -static const ber_sequence T_valuesWithContext_item_sequence[] = { +static const ber_sequence_t T_valuesWithContext_item_sequence[] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList }, { 0, 0, 0, NULL } @@ -507,7 +507,7 @@ static int dissect_valuesWithContext_item(packet_info *pinfo, proto_tree *tree, return dissect_x509if_T_valuesWithContext_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext_item); } -static const ber_sequence T_valuesWithContext_set_of[1] = { +static const ber_sequence_t T_valuesWithContext_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valuesWithContext_item }, }; @@ -522,7 +522,7 @@ static int dissect_valuesWithContext(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_T_valuesWithContext(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext); } -static const ber_sequence Attribute_sequence[] = { +static const ber_sequence_t Attribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_values }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_valuesWithContext }, @@ -594,7 +594,7 @@ static int dissect_contextValues_item1(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509if_ContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextValues_item1); } -static const ber_sequence SET_OF_ContextValue_set_of[1] = { +static const ber_sequence_t SET_OF_ContextValue_set_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValues_item1 }, }; @@ -609,7 +609,7 @@ static int dissect_contextValues1(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_SET_OF_ContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextValues1); } -static const ber_sequence ContextAssertion_sequence[] = { +static const ber_sequence_t ContextAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType1 }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues1 }, { 0, 0, 0, NULL } @@ -629,7 +629,7 @@ static int dissect_assertedContexts_item(packet_info *pinfo, proto_tree *tree, t return dissect_x509if_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts_item); } -static const ber_sequence SET_OF_ContextAssertion_set_of[1] = { +static const ber_sequence_t SET_OF_ContextAssertion_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedContexts_item }, }; @@ -651,7 +651,7 @@ static const value_string T_assertedContexts_vals[] = { { 0, NULL } }; -static const ber_choice T_assertedContexts_choice[] = { +static const ber_choice_t T_assertedContexts_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_allContexts }, { 1, BER_CLASS_CON, 1, 0, dissect_selectedContexts }, { 0, 0, 0, 0, NULL } @@ -668,7 +668,7 @@ static int dissect_assertedContexts(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_T_assertedContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts); } -static const ber_sequence AttributeValueAssertion_sequence[] = { +static const ber_sequence_t AttributeValueAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_assertion }, { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts }, @@ -683,7 +683,7 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence SEQUNCE_OF_ContextAssertion_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ContextAssertion_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_assertedContexts_item }, }; @@ -698,7 +698,7 @@ static int dissect_assertedContexts1(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_SEQUNCE_OF_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts1); } -static const ber_sequence AttributeTypeAssertion_sequence[] = { +static const ber_sequence_t AttributeTypeAssertion_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_assertedContexts1 }, { 0, 0, 0, NULL } @@ -712,7 +712,7 @@ dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, return offset; } -static const ber_sequence T_valuesWithContext_item1_sequence[] = { +static const ber_sequence_t T_valuesWithContext_item1_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_distingAttrValue }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList }, { 0, 0, 0, NULL } @@ -729,7 +729,7 @@ static int dissect_valuesWithContext_item1(packet_info *pinfo, proto_tree *tree, return dissect_x509if_T_valuesWithContext_item1(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext_item1); } -static const ber_sequence T_valuesWithContext1_set_of[1] = { +static const ber_sequence_t T_valuesWithContext1_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_valuesWithContext_item1 }, }; @@ -744,7 +744,7 @@ static int dissect_valuesWithContext1(packet_info *pinfo, proto_tree *tree, tvbu return dissect_x509if_T_valuesWithContext1(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext1); } -static const ber_sequence AttributeTypeAndDistinguishedValue_sequence[] = { +static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value1 }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_primaryDistinguished }, @@ -763,7 +763,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree return dissect_x509if_AttributeTypeAndDistinguishedValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_RelativeDistinguishedName_item); } -static const ber_sequence RelativeDistinguishedName_set_of[1] = { +static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item }, }; @@ -778,7 +778,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_x509if_RDNSequence_item); } -static const ber_sequence RDNSequence_sequence_of[1] = { +static const ber_sequence_t RDNSequence_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item }, }; @@ -799,7 +799,7 @@ const value_string Name_vals[] = { { 0, NULL } }; -static const ber_choice Name_choice[] = { +static const ber_choice_t Name_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence }, { 0, 0, 0, 0, NULL } }; @@ -844,7 +844,7 @@ static const value_string T_specificExclusions_item_vals[] = { { 0, NULL } }; -static const ber_choice T_specificExclusions_item_choice[] = { +static const ber_choice_t T_specificExclusions_item_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_chopBefore }, { 1, BER_CLASS_CON, 1, 0, dissect_chopAfter }, { 0, 0, 0, 0, NULL } @@ -861,7 +861,7 @@ static int dissect_specificExclusions_item(packet_info *pinfo, proto_tree *tree, return dissect_x509if_T_specificExclusions_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_specificExclusions_item); } -static const ber_sequence T_specificExclusions_set_of[1] = { +static const ber_sequence_t T_specificExclusions_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item }, }; @@ -936,7 +936,7 @@ static int dissect_newMatchingRule(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509if_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_newMatchingRule); } -static const ber_sequence SET_OF_Refinement_set_of[1] = { +static const ber_sequence_t SET_OF_Refinement_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; @@ -963,7 +963,7 @@ const value_string Refinement_vals[] = { { 0, NULL } }; -static const ber_choice Refinement_choice[] = { +static const ber_choice_t Refinement_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_item }, { 1, BER_CLASS_CON, 1, 0, dissect_and }, { 2, BER_CLASS_CON, 2, 0, dissect_or }, @@ -979,7 +979,7 @@ dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, return offset; } -static const ber_sequence SubtreeSpecification_sequence[] = { +static const ber_sequence_t SubtreeSpecification_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_base }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum }, @@ -1003,7 +1003,7 @@ static const value_string T_specificExclusions_item1_vals[] = { { 0, NULL } }; -static const ber_choice T_specificExclusions_item1_choice[] = { +static const ber_choice_t T_specificExclusions_item1_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_chopBefore }, { 1, BER_CLASS_CON, 1, 0, dissect_chopAfter }, { 0, 0, 0, 0, NULL } @@ -1020,7 +1020,7 @@ static int dissect_specificExclusions_item1(packet_info *pinfo, proto_tree *tree return dissect_x509if_T_specificExclusions_item1(FALSE, tvb, offset, pinfo, tree, hf_x509if_specificExclusions_item1); } -static const ber_sequence T_specificExclusions1_set_of[1] = { +static const ber_sequence_t T_specificExclusions1_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item1 }, }; @@ -1035,7 +1035,7 @@ static int dissect_specificExclusions1(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509if_T_specificExclusions1(FALSE, tvb, offset, pinfo, tree, hf_x509if_specificExclusions1); } -static const ber_sequence ChopSpecification_sequence[] = { +static const ber_sequence_t ChopSpecification_sequence[] = { { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions1 }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum }, { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_maximum }, @@ -1098,7 +1098,7 @@ static int dissect_superiorStructureRules_item(packet_info *pinfo, proto_tree *t return dissect_x509if_RuleIdentifier(FALSE, tvb, offset, pinfo, tree, hf_x509if_superiorStructureRules_item); } -static const ber_sequence SET_OF_RuleIdentifier_set_of[1] = { +static const ber_sequence_t SET_OF_RuleIdentifier_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules_item }, }; @@ -1113,7 +1113,7 @@ static int dissect_superiorStructureRules(packet_info *pinfo, proto_tree *tree, return dissect_x509if_SET_OF_RuleIdentifier(FALSE, tvb, offset, pinfo, tree, hf_x509if_superiorStructureRules); } -static const ber_sequence DITStructureRule_sequence[] = { +static const ber_sequence_t DITStructureRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ruleIdentifier }, { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_nameForm }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_superiorStructureRules }, @@ -1128,7 +1128,7 @@ dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int of return offset; } -static const ber_sequence SET_OF_OBJECT_IDENTIFIER_set_of[1] = { +static const ber_sequence_t SET_OF_OBJECT_IDENTIFIER_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_auxiliaries_item }, }; @@ -1149,7 +1149,7 @@ 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_SIZE_1_MAX_OF_AttributeId_set_of[1] = { +static const ber_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatory_item }, }; @@ -1170,7 +1170,7 @@ static int dissect_precluded(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb return dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_precluded); } -static const ber_sequence DITContentRule_sequence[] = { +static const ber_sequence_t DITContentRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_structuralObjectClass }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_auxiliaries }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatory }, @@ -1187,7 +1187,7 @@ dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } -static const ber_sequence DITContextUse_sequence[] = { +static const ber_sequence_t DITContextUse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatoryContexts }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_optionalContexts }, @@ -1245,7 +1245,7 @@ static int dissect_selectedValues_item(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509if_SelectedValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues_item); } -static const ber_sequence SEQUNCE_OF_SelectedValues_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_SelectedValues_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_selectedValues_item }, }; @@ -1286,7 +1286,7 @@ static int dissect_values_item1(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509if_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_values_item1); } -static const ber_sequence SEQUNCE_OF_DefaultValueValues_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_DefaultValueValues_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_values_item1 }, }; @@ -1301,7 +1301,7 @@ static int dissect_values1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509if_SEQUNCE_OF_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_values1); } -static const ber_sequence T_defaultValues_item_sequence[] = { +static const ber_sequence_t T_defaultValues_item_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entryType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_values1 }, { 0, 0, 0, NULL } @@ -1318,7 +1318,7 @@ static int dissect_defaultValues_item(packet_info *pinfo, proto_tree *tree, tvbu return dissect_x509if_T_defaultValues_item(FALSE, tvb, offset, pinfo, tree, hf_x509if_defaultValues_item); } -static const ber_sequence T_defaultValues_sequence_of[1] = { +static const ber_sequence_t T_defaultValues_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_defaultValues_item }, }; @@ -1333,7 +1333,7 @@ static int dissect_defaultValues(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_T_defaultValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_defaultValues); } -static const ber_sequence SEQUNCE_OF_AttributeValue_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_AttributeValue_sequence_of[1] = { { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValue_item }, }; @@ -1351,7 +1351,7 @@ static int dissect_selectedValues1(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509if_SEQUNCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues1); } -static const ber_sequence ContextProfile_sequence[] = { +static const ber_sequence_t ContextProfile_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contextValue }, { 0, 0, 0, NULL } @@ -1368,7 +1368,7 @@ static int dissect_contexts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts_item); } -static const ber_sequence SEQUNCE_OF_ContextProfile_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ContextProfile_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contexts_item }, }; @@ -1383,7 +1383,7 @@ static int dissect_contexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509if_SEQUNCE_OF_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts); } -static const ber_sequence SEQUNCE_OF_ContextCombination_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ContextCombination_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item1 }, }; @@ -1410,7 +1410,7 @@ const value_string ContextCombination_vals[] = { { 0, NULL } }; -static const ber_choice ContextCombination_choice[] = { +static const ber_choice_t ContextCombination_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_context }, { 1, BER_CLASS_CON, 1, 0, dissect_and1 }, { 2, BER_CLASS_CON, 2, 0, dissect_or1 }, @@ -1426,7 +1426,7 @@ dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence MatchingUse_sequence[] = { +static const ber_sequence_t MatchingUse_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_restrictionType }, { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_restrictionValue }, { 0, 0, 0, NULL } @@ -1443,7 +1443,7 @@ static int dissect_matchingUse_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse_item); } -static const ber_sequence SEQUNCE_OF_MatchingUse_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_MatchingUse_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_matchingUse_item }, }; @@ -1458,7 +1458,7 @@ static int dissect_matchingUse(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509if_SEQUNCE_OF_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse); } -static const ber_sequence RequestAttribute_sequence[] = { +static const ber_sequence_t RequestAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_includeSubtypes }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_selectedValues }, @@ -1480,7 +1480,7 @@ static int dissect_inputAttributeTypes_item(packet_info *pinfo, proto_tree *tree return dissect_x509if_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes_item); } -static const ber_sequence SEQUNCE_OF_RequestAttribute_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_RequestAttribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inputAttributeTypes_item }, }; @@ -1495,7 +1495,7 @@ static int dissect_inputAttributeTypes(packet_info *pinfo, proto_tree *tree, tvb return dissect_x509if_SEQUNCE_OF_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes); } -static const ber_sequence SEQUNCE_OF_AttributeCombination_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_AttributeCombination_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item2 }, }; @@ -1522,7 +1522,7 @@ const value_string AttributeCombination_vals[] = { { 0, NULL } }; -static const ber_choice AttributeCombination_choice[] = { +static const ber_choice_t AttributeCombination_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_attribute }, { 1, BER_CLASS_CON, 1, 0, dissect_and2 }, { 2, BER_CLASS_CON, 2, 0, dissect_or2 }, @@ -1545,7 +1545,7 @@ static const value_string T_outputValues_vals[] = { { 0, NULL } }; -static const ber_choice T_outputValues_choice[] = { +static const ber_choice_t T_outputValues_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues1 }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly }, { 0, 0, 0, 0, NULL } @@ -1562,7 +1562,7 @@ static int dissect_outputValues(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509if_T_outputValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputValues); } -static const ber_sequence ResultAttribute_sequence[] = { +static const ber_sequence_t ResultAttribute_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_contexts }, @@ -1580,7 +1580,7 @@ static int dissect_outputAttributeTypes_item(packet_info *pinfo, proto_tree *tre return dissect_x509if_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes_item); } -static const ber_sequence SEQUNCE_OF_ResultAttribute_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_ResultAttribute_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_outputAttributeTypes_item }, }; @@ -1595,7 +1595,7 @@ static int dissect_outputAttributeTypes(packet_info *pinfo, proto_tree *tree, tv return dissect_x509if_SEQUNCE_OF_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes); } -static const ber_sequence ControlOptions_sequence[] = { +static const ber_sequence_t ControlOptions_sequence[] = { { 0, 0, 0, NULL } }; @@ -1616,7 +1616,7 @@ static int dissect_searchRuleControls(packet_info *pinfo, proto_tree *tree, tvbu return dissect_x509if_ControlOptions(FALSE, tvb, offset, pinfo, tree, hf_x509if_searchRuleControls); } -static const ber_sequence Mapping_sequence[] = { +static const ber_sequence_t Mapping_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mappingFunction }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_level }, { 0, 0, 0, NULL } @@ -1633,7 +1633,7 @@ static int dissect_mapping_item(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509if_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping_item); } -static const ber_sequence SEQUNCE_OF_Mapping_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_Mapping_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mapping_item }, }; @@ -1648,7 +1648,7 @@ static int dissect_mapping(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509if_SEQUNCE_OF_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping); } -static const ber_sequence MRSubstitution_sequence[] = { +static const ber_sequence_t MRSubstitution_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute }, { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_oldMatchingRule }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_newMatchingRule }, @@ -1666,7 +1666,7 @@ static int dissect_substitution_item(packet_info *pinfo, proto_tree *tree, tvbuf return dissect_x509if_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution_item); } -static const ber_sequence SEQUNCE_OF_MRSubstitution_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_MRSubstitution_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substitution_item }, }; @@ -1681,7 +1681,7 @@ static int dissect_substitution(packet_info *pinfo, proto_tree *tree, tvbuff_t * return dissect_x509if_SEQUNCE_OF_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution); } -static const ber_sequence MRMapping_sequence[] = { +static const ber_sequence_t MRMapping_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mapping }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_substitution }, { 0, 0, 0, NULL } @@ -1704,7 +1704,7 @@ static int dissect_relaxations_item(packet_info *pinfo, proto_tree *tree, tvbuff return dissect_x509if_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations_item); } -static const ber_sequence SEQUNCE_OF_MRMapping_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_MRMapping_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tightenings_item }, }; @@ -1722,7 +1722,7 @@ static int dissect_relaxations(packet_info *pinfo, proto_tree *tree, tvbuff_t *t return dissect_x509if_SEQUNCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations); } -static const ber_sequence RelaxationPolicy_sequence[] = { +static const ber_sequence_t RelaxationPolicy_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_basic }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_tightenings }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_relaxations }, @@ -1742,7 +1742,7 @@ static int dissect_relaxation(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509if_RelaxationPolicy(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxation); } -static const ber_sequence SEQUNCE_OF_AttributeType_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_AttributeType_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_additionalControl_item }, }; @@ -1795,7 +1795,7 @@ static int dissect_imposedSubset(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509if_ImposedSubset(FALSE, tvb, offset, pinfo, tree, hf_x509if_imposedSubset); } -static const ber_sequence EntryLimit_sequence[] = { +static const ber_sequence_t EntryLimit_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_default }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max }, { 0, 0, 0, NULL } @@ -1812,7 +1812,7 @@ static int dissect_entryLimit(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509if_EntryLimit(FALSE, tvb, offset, pinfo, tree, hf_x509if_entryLimit); } -static const ber_sequence SET_OF_DirectoryString_set_of[1] = { +static const ber_sequence_t SET_OF_DirectoryString_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_name_item }, }; @@ -1827,7 +1827,7 @@ static int dissect_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_x509if_SET_OF_DirectoryString(FALSE, tvb, offset, pinfo, tree, hf_x509if_name); } -static const ber_sequence SearchRuleDescription_sequence[] = { +static const ber_sequence_t SearchRuleDescription_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType }, @@ -1857,7 +1857,7 @@ dissect_x509if_SearchRuleDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, i return offset; } -static const ber_sequence SearchRule_sequence[] = { +static const ber_sequence_t SearchRule_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_serviceType }, @@ -1884,7 +1884,7 @@ dissect_x509if_SearchRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, return offset; } -static const ber_sequence SearchRuleId_sequence[] = { +static const ber_sequence_t SearchRuleId_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id }, { BER_CLASS_CON, 0, 0, dissect_dmdId }, { 0, 0, 0, NULL } @@ -1905,7 +1905,7 @@ const value_string OutputValues_vals[] = { { 0, NULL } }; -static const ber_choice OutputValues_choice[] = { +static const ber_choice_t OutputValues_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_selectedValues1 }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_matchedValuesOnly }, { 0, 0, 0, 0, NULL } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 8c902548e0..3dddffdbb8 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -347,7 +347,7 @@ static const value_string CriteriaItem_vals[] = { { 0, NULL } }; -static const ber_choice CriteriaItem_choice[] = { +static const ber_choice_t CriteriaItem_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_equality }, { 1, BER_CLASS_CON, 1, 0, dissect_substrings }, { 2, BER_CLASS_CON, 2, 0, dissect_greaterOrEqual }, @@ -367,7 +367,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int return dissect_x509sat_CriteriaItem(FALSE, tvb, offset, pinfo, tree, hf_x509sat_type); } -static const ber_sequence SET_OF_Criteria_set_of[1] = { +static const ber_sequence_t SET_OF_Criteria_set_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item }, }; @@ -394,7 +394,7 @@ const value_string Criteria_vals[] = { { 0, NULL } }; -static const ber_choice Criteria_choice[] = { +static const ber_choice_t Criteria_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_type }, { 1, BER_CLASS_CON, 1, 0, dissect_and }, { 2, BER_CLASS_CON, 2, 0, dissect_or }, @@ -450,7 +450,7 @@ static int dissect_subset(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509sat_T_subset(FALSE, tvb, offset, pinfo, tree, hf_x509sat_subset); } -static const ber_sequence EnhancedGuide_sequence[] = { +static const ber_sequence_t EnhancedGuide_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_objectClass }, { BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_subset }, @@ -465,7 +465,7 @@ dissect_x509sat_EnhancedGuide(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs return offset; } -static const ber_sequence PostalAddress_sequence_of[1] = { +static const ber_sequence_t PostalAddress_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_PostalAddress_item }, }; @@ -509,7 +509,7 @@ static int dissect_answerback(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_PrintableString(FALSE, tvb, offset, pinfo, tree, hf_x509sat_answerback); } -static const ber_sequence TelexNumber_sequence[] = { +static const ber_sequence_t TelexNumber_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telexNumber }, { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_countryCode }, { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_answerback }, @@ -524,7 +524,7 @@ dissect_x509sat_TelexNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset return offset; } -static const ber_sequence FacsimileTelephoneNumber_sequence[] = { +static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telephoneNumber }, { 0, 0, 0, NULL } }; @@ -593,7 +593,7 @@ static int dissect_PreferredDeliveryMethod_item(packet_info *pinfo, proto_tree * return dissect_x509sat_PreferredDeliveryMethod_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_PreferredDeliveryMethod_item); } -static const ber_sequence PreferredDeliveryMethod_sequence_of[1] = { +static const ber_sequence_t PreferredDeliveryMethod_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_PreferredDeliveryMethod_item }, }; @@ -638,7 +638,7 @@ static int dissect_final1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_final1); } -static const ber_sequence SET_OF_OCTET_STRING_set_of[1] = { +static const ber_sequence_t SET_OF_OCTET_STRING_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddresses_item }, }; @@ -653,7 +653,7 @@ static int dissect_nAddresses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_SET_OF_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses); } -static const ber_sequence PresentationAddress_sequence[] = { +static const ber_sequence_t PresentationAddress_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_pSelector }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_sSelector }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_tSelector }, @@ -669,7 +669,7 @@ dissect_x509sat_PresentationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence SET_OF_OBJECT_IDENTIFIER_set_of[1] = { +static const ber_sequence_t SET_OF_OBJECT_IDENTIFIER_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_profiles_item }, }; @@ -684,7 +684,7 @@ static int dissect_profiles(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509sat_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles); } -static const ber_sequence ProtocolInformation_sequence[] = { +static const ber_sequence_t ProtocolInformation_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddress }, { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_profiles }, { 0, 0, 0, NULL } @@ -698,7 +698,7 @@ dissect_x509sat_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static const ber_sequence NameAndOptionalUID_sequence[] = { +static const ber_sequence_t NameAndOptionalUID_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dn }, { BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_uid }, { 0, 0, 0, NULL } @@ -712,7 +712,7 @@ dissect_x509sat_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence SEQUNCE_OF_AttributeValueAssertion_sequence_of[1] = { +static const ber_sequence_t SEQUNCE_OF_AttributeValueAssertion_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item }, }; @@ -727,7 +727,7 @@ static int dissect_attributeList(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509sat_SEQUNCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList); } -static const ber_sequence MultipleMatchingLocalities_sequence[] = { +static const ber_sequence_t MultipleMatchingLocalities_sequence[] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_matchingRuleUsed }, { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList }, { 0, 0, 0, NULL } @@ -750,7 +750,7 @@ static const value_string SubstringAssertion_item_vals[] = { { 0, NULL } }; -static const ber_choice SubstringAssertion_item_choice[] = { +static const ber_choice_t SubstringAssertion_item_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_initial }, { 1, BER_CLASS_CON, 1, 0, dissect_any }, { 2, BER_CLASS_CON, 2, 0, dissect_final }, @@ -769,7 +769,7 @@ static int dissect_SubstringAssertion_item(packet_info *pinfo, proto_tree *tree, return dissect_x509sat_SubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_SubstringAssertion_item); } -static const ber_sequence SubstringAssertion_sequence_of[1] = { +static const ber_sequence_t SubstringAssertion_sequence_of[1] = { { -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item }, }; @@ -781,7 +781,7 @@ dissect_x509sat_SubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence CaseIgnoreListMatch_sequence_of[1] = { +static const ber_sequence_t CaseIgnoreListMatch_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_CaseIgnoreListMatch_item }, }; @@ -801,7 +801,7 @@ static const value_string OctetSubstringAssertion_item_vals[] = { { 0, NULL } }; -static const ber_choice OctetSubstringAssertion_item_choice[] = { +static const ber_choice_t OctetSubstringAssertion_item_choice[] = { { 0, BER_CLASS_CON, 0, 0, dissect_initial1 }, { 1, BER_CLASS_CON, 1, 0, dissect_any1 }, { 2, BER_CLASS_CON, 2, 0, dissect_final1 }, @@ -819,7 +819,7 @@ static int dissect_OctetSubstringAssertion_item(packet_info *pinfo, proto_tree * return dissect_x509sat_OctetSubstringAssertion_item(FALSE, tvb, offset, pinfo, tree, hf_x509sat_OctetSubstringAssertion_item); } -static const ber_sequence OctetSubstringAssertion_sequence_of[1] = { +static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = { { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item }, }; @@ -831,7 +831,7 @@ dissect_x509sat_OctetSubstringAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb return offset; } -static const ber_sequence ZonalSelect_sequence_of[1] = { +static const ber_sequence_t ZonalSelect_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ZonalSelect_item }, }; @@ -886,7 +886,7 @@ static int dissect_at(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o return dissect_x509sat_GeneralizedTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_at); } -static const ber_sequence T_absolute_sequence[] = { +static const ber_sequence_t T_absolute_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startTime }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime }, { 0, 0, 0, NULL } @@ -933,7 +933,7 @@ static int dissect_second1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509sat_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second1); } -static const ber_sequence DayTime_sequence[] = { +static const ber_sequence_t DayTime_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_hour }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_minute }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_second1 }, @@ -954,7 +954,7 @@ static int dissect_endDayTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_DayTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_endDayTime); } -static const ber_sequence DayTimeBand_sequence[] = { +static const ber_sequence_t DayTimeBand_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startDayTime }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endDayTime }, { 0, 0, 0, NULL } @@ -971,7 +971,7 @@ static int dissect_timesOfDay_item(packet_info *pinfo, proto_tree *tree, tvbuff_ return dissect_x509sat_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay_item); } -static const ber_sequence SET_OF_DayTimeBand_set_of[1] = { +static const ber_sequence_t SET_OF_DayTimeBand_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_timesOfDay_item }, }; @@ -986,7 +986,7 @@ static int dissect_timesOfDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv return dissect_x509sat_SET_OF_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay); } -static const ber_sequence SET_OF_INTEGER_set_of[1] = { +static const ber_sequence_t SET_OF_INTEGER_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intDay_item }, }; @@ -1086,7 +1086,7 @@ const value_string NamedDay_vals[] = { { 0, NULL } }; -static const ber_choice NamedDay_choice[] = { +static const ber_choice_t NamedDay_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_intNamedDays }, { 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitNamedDays }, { 0, 0, 0, 0, NULL } @@ -1125,7 +1125,7 @@ const value_string XDayOf_vals[] = { { 0, NULL } }; -static const ber_choice XDayOf_choice[] = { +static const ber_choice_t XDayOf_choice[] = { { 1, BER_CLASS_CON, 1, 0, dissect_first }, { 2, BER_CLASS_CON, 2, 0, dissect_second }, { 3, BER_CLASS_CON, 3, 0, dissect_third }, @@ -1153,7 +1153,7 @@ static const value_string T_days_vals[] = { { 0, NULL } }; -static const ber_choice T_days_choice[] = { +static const ber_choice_t T_days_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intDay }, { 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitDay }, { 2, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf }, @@ -1220,7 +1220,7 @@ static const value_string T_weeks_vals[] = { { 0, NULL } }; -static const ber_choice T_weeks_choice[] = { +static const ber_choice_t T_weeks_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allWeeks }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intWeek }, { 2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitWeek }, @@ -1274,7 +1274,7 @@ static const value_string T_months_vals[] = { { 0, NULL } }; -static const ber_choice T_months_choice[] = { +static const ber_choice_t T_months_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allMonths }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intMonth }, { 2, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitMonth }, @@ -1292,7 +1292,7 @@ static int dissect_months(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i return dissect_x509sat_T_months(FALSE, tvb, offset, pinfo, tree, hf_x509sat_months); } -static const ber_sequence Period_sequence[] = { +static const ber_sequence_t Period_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_timesOfDay }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_days }, { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_weeks }, @@ -1312,7 +1312,7 @@ static int dissect_periodic_item(packet_info *pinfo, proto_tree *tree, tvbuff_t return dissect_x509sat_Period(FALSE, tvb, offset, pinfo, tree, hf_x509sat_periodic_item); } -static const ber_sequence SET_OF_Period_set_of[1] = { +static const ber_sequence_t SET_OF_Period_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_periodic_item }, }; @@ -1334,7 +1334,7 @@ static const value_string T_time_vals[] = { { 0, NULL } }; -static const ber_choice T_time_choice[] = { +static const ber_choice_t T_time_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_absolute }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_periodic }, { 0, 0, 0, 0, NULL } @@ -1377,7 +1377,7 @@ static int dissect_timeZone(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, return dissect_x509sat_TimeZone(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timeZone); } -static const ber_sequence TimeSpecification_sequence[] = { +static const ber_sequence_t TimeSpecification_sequence[] = { { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notThisTime }, { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeZone }, @@ -1392,7 +1392,7 @@ dissect_x509sat_TimeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int return offset; } -static const ber_sequence T_between_sequence[] = { +static const ber_sequence_t T_between_sequence[] = { { BER_CLASS_CON, 0, 0, dissect_startTime }, { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime }, { BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entirely }, @@ -1418,7 +1418,7 @@ const value_string TimeAssertion_vals[] = { { 0, NULL } }; -static const ber_choice TimeAssertion_choice[] = { +static const ber_choice_t TimeAssertion_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_now }, { 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_at }, { 2, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_between }, @@ -1440,7 +1440,7 @@ const value_string LocaleContextSyntax_vals[] = { { 0, NULL } }; -static const ber_choice LocaleContextSyntax_choice[] = { +static const ber_choice_t LocaleContextSyntax_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_localeID1 }, { 1, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_localeID2 }, { 0, 0, 0, 0, NULL } diff --git a/plugins/Xplugin_table.h b/plugins/Xplugin_table.h index e75639851a..4aeb7802ea 100644 --- a/plugins/Xplugin_table.h +++ b/plugins/Xplugin_table.h @@ -257,11 +257,11 @@ typedef int (*addr_dissect_ber_identifier) (packet_info *, proto_tree *, tvbuff_ typedef int (*addr_dissect_ber_length) (packet_info *, proto_tree *, tvbuff_t *, int, guint32 *, gboolean *); typedef int (*addr_dissect_ber_integer) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint, guint32 *); typedef int (*addr_dissect_ber_boolean) (packet_info *, proto_tree *, tvbuff_t *, int, gint); -typedef int (*addr_dissect_ber_choice) (packet_info *, proto_tree *, tvbuff_t *, int, const ber_choice *, gint, gint); +typedef int (*addr_dissect_ber_choice) (packet_info *, proto_tree *, tvbuff_t *, int, const ber_choice_t *, gint, gint); typedef int (*addr_dissect_ber_GeneralizedTime) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint); -typedef int (*addr_dissect_ber_sequence) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence *, gint, gint); -typedef int (*addr_dissect_ber_sequence_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence *, gint, gint); -typedef int (*addr_dissect_ber_set_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence *, gint, gint); +typedef int (*addr_dissect_ber_sequence) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint); +typedef int (*addr_dissect_ber_sequence_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint); +typedef int (*addr_dissect_ber_set_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint); typedef int (*addr_dissect_ber_octet_string) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint, tvbuff_t **); typedef int (*addr_dissect_ber_bitstring) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const asn_namedbit *, gint, gint, tvbuff_t **); typedef int (*addr_dissect_ber_restricted_string) (gboolean, guint32, packet_info *, proto_tree *, tvbuff_t *, int, gint, tvbuff_t **); diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c index da09c84073..adeb2069d7 100644 --- a/plugins/plugin_api_list.c +++ b/plugins/plugin_api_list.c @@ -422,11 +422,11 @@ int dissect_ber_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int dissect_ber_length(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, guint32 *length, gboolean *ind); int dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value); int dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id); -int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice *ch, gint hf_id, gint ett_id); +int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id); int dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id); -int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); -int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); -int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); +int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id); +int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id); +int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id); int dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **tvb_out); int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn_namedbit const *named_bits, gint hf_id, gint ett_id, tvbuff_t **tvb_out); int dissect_ber_restricted_string(gboolean implicit_tag, guint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **tvb_out); diff --git a/tools/asn2eth.py b/tools/asn2eth.py index 51b1259a47..4be0cb0c53 100644 --- a/tools/asn2eth.py +++ b/tools/asn2eth.py @@ -1956,7 +1956,7 @@ class SequenceOfType (SqType): ef = ectx.field[f]['ethname'] out = '' if (ectx.Ber()): - out = "static const ber_sequence %s_sequence_of[1] = {\n" % (tname) + out = "static const ber_sequence_t %s_sequence_of[1] = {\n" % (tname) out += self.out_item(f, self.val, False, '', ectx) out += "};\n" out += ectx.eth_type_fn_hdr(tname) @@ -2025,7 +2025,7 @@ class SetOfType (SqType): ef = ectx.field[f]['ethname'] out = '' if (ectx.Ber()): - out = "static const ber_sequence %s_set_of[1] = {\n" % (tname) + out = "static const ber_sequence_t %s_set_of[1] = {\n" % (tname) out += self.out_item(f, self.val, False, '', ectx) out += "};\n" out += ectx.eth_type_fn_hdr(tname) @@ -2146,10 +2146,7 @@ class SequenceType (SqType): def eth_type_fn(self, proto, tname, ectx): fname = ectx.eth_type[tname]['ref'][0] - if (ectx.OBer()): - out = "static const %s_sequence %s_sequence[] = {\n" % (ectx.encp(), tname) - else: - out = "static const %s_sequence_t %s_sequence[] = {\n" % (ectx.encp(), tname) + out = "static const %s_sequence_t %s_sequence[] = {\n" % (ectx.encp(), tname) if hasattr(self, 'ext_list'): ext = 'ASN1_EXTENSION_ROOT' else: @@ -2385,10 +2382,7 @@ class ChoiceType (Type): for e in (lst): if (e.GetTag(ectx)[0] != t): tagval = False - if (ectx.OBer()): - out += "static const %s_choice %s_choice[] = {\n" % (ectx.encp(), tname) - else: - out += "static const %s_choice_t %s_choice[] = {\n" % (ectx.encp(), tname) + out += "static const %s_choice_t %s_choice[] = {\n" % (ectx.encp(), tname) cnt = 0 if hasattr(self, 'ext_list'): ext = 'ASN1_EXTENSION_ROOT' |