osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

updates from tomas and anders 

create some missing makefiles for autogenerated dissectors

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



svn path=/trunk/; revision=12724
This commit is contained in:
Ronnie Sahlberg 2004-12-12 01:14:03 +00:00
parent dab0fabcad
commit 0e528dc7a1
49 changed files with 849 additions and 706 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asn1/MAP_Dialogue/Makefile Executable file
View File

@ -0,0 +1,5 @@
../../epan/dissectors/packet-MAP_DialoguePDU.c : ../../tools/asn2eth.py MAP_DialoguePDU.asn packet-MAP-DialoguePDU-template.c packet-MAP-DialoguePDU-template.h MAP_DialoguePDU.cnf
python ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn
cp packet-MAP_DialoguePDU.* ../../epan/dissectors

5
asn1/cmip/Makefile Executable file
View File

@ -0,0 +1,5 @@
../../epan/dissectors/packet-cmip.c : ../../tools/asn2eth.py CMIP.asn packet-cmip-template.c packet-cmip-template.h cmip.cnf
python ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn
cp packet-cmip.* ../../epan/dissectors

8
asn1/cmip/cmip.cnf
View File

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

8
asn1/cms/cms-exp.cnf
View File

@ -17,13 +17,13 @@ IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
ContentType TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SignedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
DigestAlgorithmIdentifiers TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
SignerInfos TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
DigestAlgorithmIdentifiers TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SignerInfos TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
EncapsulatedContentInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SignerInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SignerIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(SignerIdentifier_vals) BITMASK = 0
SignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
UnsignedAttributes TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
SignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
UnsignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SignatureValue TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0
IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
#.END

4
asn1/gsmmap/packet-gsm_map-template.c
View File

@ -170,7 +170,7 @@ static guint32 opcode=0;
static int
dissect_gsm_map_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
if (check_col(pinfo->cinfo, COL_INFO)){
col_set_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, gsm_map_opr_code_strings, "Unknown GSM-MAP (%u)"));
@ -543,7 +543,7 @@ dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offse
}
static int dissect_invokeid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL);
return dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_gsm_map_invokeid, NULL);
}

4
asn1/h248/packet-h248-template.c
View File

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

4
asn1/pkcs1/Makefile Executable file
View File

@ -0,0 +1,4 @@
../../epan/dissectors/packet-pkcs1.c : ../../tools/asn2eth.py PKCS1.asn packet-pkcs1-template.c packet-pkcs1-template.h pkcs1.cnf
python ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn
cp packet-pkcs1.* ../../epan/dissectors

5
asn1/pkinit/Makefile Executable file
View File

@ -0,0 +1,5 @@
../../epan/dissectors/packet-pkinit.c : ../../tools/asn2eth.py PKINIT.asn packet-pkinit-template.c packet-pkinit-template.h pkinit.cnf
python ../../tools/asn2eth.py -e -X -b -p pkinit -c pkinit.cnf -s packet-pkinit-template PKINIT.asn
cp packet-pkinit.* ../../epan/dissectors

5
asn1/pkix1explicit/Makefile Executable file
View File

@ -0,0 +1,5 @@
../../epan/dissectors/packet-pkix1explicit.c : ../../tools/asn2eth.py PKIX1EXPLICIT93.asn packet-pkix1explicit-template.c packet-pkix1explicit-template.h pkix1explicit.cnf
python ../../tools/asn2eth.py -e -X -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn
cp packet-pkix1explicit.* ../../epan/dissectors

5
asn1/pkix1implicit/Makefile Executable file
View File

@ -0,0 +1,5 @@
../../epan/dissectors/packet-pkix1implicit.c : ../../tools/asn2eth.py PKIX1IMPLICIT93.asn packet-pkix1implicit-template.c packet-pkix1implicit-template.h pkix1implicit.cnf
python ../../tools/asn2eth.py -e -X -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn
cp packet-pkix1implicit.* ../../epan/dissectors

5
asn1/pkixqualified/Makefile Executable file
View File

@ -0,0 +1,5 @@
../../epan/dissectors/packet-pkixqualified.c : ../../tools/asn2eth.py PKIXqualified.asn packet-pkixqualified-template.c packet-pkixqualified-template.h pkixqualified.cnf
python ../../tools/asn2eth.py -X -b -e -p pkixqualified -c pkixqualified.cnf -s packet-pkixqualified-template PKIXqualified.asn
cp packet-pkixqualified.* ../../epan/dissectors

6
asn1/x509af/x509af-exp.cnf
View File

@ -31,11 +31,11 @@ AlgorithmIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL
Validity TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Time_vals) BITMASK = 0
Extensions TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
Extensions TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
Extension TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
Certificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
ForwardCertificationPath TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
CrossCertificates TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
ForwardCertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
CrossCertificates TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
CertificationPath TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
CertificatePair TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
CertificateList TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0

20
asn1/x509ce/x509ce-exp.cnf
View File

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

8
asn1/x509if/x509if-exp.cnf
View File

@ -48,12 +48,12 @@ AttributeValueAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL
ContextAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
AttributeTypeAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
Name TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Name_vals) BITMASK = 0
RDNSequence TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
DistinguishedName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
RelativeDistinguishedName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
RDNSequence TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
DistinguishedName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
RelativeDistinguishedName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
AttributeTypeAndDistinguishedValue TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SubtreeSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
LocalName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
LocalName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
ChopSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
BaseDistance TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
Refinement TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Refinement_vals) BITMASK = 0

12
asn1/x509sat/x509sat-exp.cnf
View File

@ -37,20 +37,20 @@ UniqueIdentifier TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL
CountryName TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
Criteria TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(Criteria_vals) BITMASK = 0
EnhancedGuide TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
PostalAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
PostalAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
FacsimileTelephoneNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
X121Address TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
InternationalISDNNumber TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
DestinationIndicator TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
PreferredDeliveryMethod TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
PreferredDeliveryMethod TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
PresentationAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
ProtocolInformation TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
NameAndOptionalUID TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
MultipleMatchingLocalities TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
SubstringAssertion TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
CaseIgnoreListMatch TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
OctetSubstringAssertion TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
ZonalSelect TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
SubstringAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
CaseIgnoreListMatch TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
OctetSubstringAssertion TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
ZonalSelect TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
ZonalResult TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(ZonalResult_vals) BITMASK = 0
LanguageContextSyntax TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
TimeSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0

60
epan/dissectors/packet-MAP_DialoguePDU.c
View File

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

2
epan/dissectors/packet-MAP_DialoguePDU.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-MAP_DialoguePDU.h */
/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* ../../tools/asn2eth.py -X -b -k -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* Input file: packet-MAP-DialoguePDU-template.h */

8
epan/dissectors/packet-ber.c
View File

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

2
epan/dissectors/packet-ber.h
View File

@ -86,7 +86,7 @@ extern int dissect_ber_length(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
extern int dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb);
extern int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, ber_callback func);
extern int dissect_ber_integer_new(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
extern int dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
extern int dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);

54
epan/dissectors/packet-cmip.c
View File

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

2
epan/dissectors/packet-cmip.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-cmip.h */
/* ../../tools/asn2eth.py -e -X -b -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
/* ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */
/* Input file: packet-cmip-template.h */

30
epan/dissectors/packet-cms.c
View File

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

2
epan/dissectors/packet-cms.h
View File

@ -9,7 +9,7 @@
* Routines for RFC2630 Cryptographic Message Syntax packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-cms-template.h 12434 2004-10-29 12:11:42Z sahlberg $
* $Id: packet-cms-template.h 12573 2004-11-22 03:36:26Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

20
epan/dissectors/packet-ess.c
View File

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

377
epan/dissectors/packet-gsm_map.c
View File

File diff suppressed because it is too large Load Diff

120
epan/dissectors/packet-h248.c
View File

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

2
epan/dissectors/packet-h248_package_bcp.c
View File

@ -82,7 +82,7 @@ static const value_string BNCChar_vals[] = {
static int
dissect_h248_package_bcp_BNCChar(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
offset = dissect_ber_integer_new(FALSE, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}

54
epan/dissectors/packet-kerberos.c
View File

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

56
epan/dissectors/packet-logotypecertextn.c
View File

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

14
epan/dissectors/packet-ocsp.c
View File

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

7
epan/dissectors/packet-pkcs1.c
View File

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

3
epan/dissectors/packet-pkcs1.h
View File

@ -7,8 +7,9 @@
/* packet-pkcs1.h
* Routines for PKCS#1/RFC2313 packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-pkcs1-template.h 12203 2004-10-05 09:18:55Z guy $
* $Id: packet-pkcs1-template.h 12573 2004-11-22 03:36:26Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

10
epan/dissectors/packet-pkinit.c
View File

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

2
epan/dissectors/packet-pkinit.h
View File

@ -9,7 +9,7 @@
* Routines for PKINIT packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-pkinit-template.h 12203 2004-10-05 09:18:55Z guy $
* $Id: packet-pkinit-template.h 12573 2004-11-22 03:36:26Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

10
epan/dissectors/packet-pkix1explicit.c
View File

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

2
epan/dissectors/packet-pkix1explicit.h
View File

@ -8,7 +8,7 @@
/* packet-pkix1explicit.h
* Routines for PKIX1Explicit packet dissection
*
* $Id: packet-pkix1explicit-template.h 12203 2004-10-05 09:18:55Z guy $
* $Id: packet-pkix1explicit-template.h 12617 2004-11-29 08:43:19Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

8
epan/dissectors/packet-pkix1implicit.c
View File

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

2
epan/dissectors/packet-pkix1implicit.h
View File

@ -8,7 +8,7 @@
/* packet-pkix1implicit.h
* Routines for PKIX1Implicit packet dissection
*
* $Id: packet-pkix1implicit-template.h 12203 2004-10-05 09:18:55Z guy $
* $Id: packet-pkix1implicit-template.h 12669 2004-12-05 21:47:49Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

2
epan/dissectors/packet-pkixproxy.c
View File

@ -81,7 +81,7 @@ static gint ett_pkixproxy_ProxyPolicy = -1;
static int
dissect_pkixproxy_ProxyCertPathLengthConstraint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}

8
epan/dissectors/packet-pkixqualified.c
View File

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

1
epan/dissectors/packet-pkixqualified.h
View File

@ -7,6 +7,7 @@
/* packet-pkixqualified.h
* Routines for RFC3739 PKIXqualified packet dissection
* Ronnie Sahlberg 2004
*
* $Id: packet-pkixqualified-template.h 12434 2004-10-29 12:11:42Z sahlberg $
*

10
epan/dissectors/packet-pkixtsp.c
View File

@ -131,7 +131,7 @@ static const value_string T_version_vals[] = {
static int
dissect_pkixtsp_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -187,7 +187,7 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
static int
dissect_pkixtsp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -247,7 +247,7 @@ static const value_string PKIStatus_vals[] = {
static int
dissect_pkixtsp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -330,7 +330,7 @@ static const value_string tst_version_vals[] = {
static int
dissect_pkixtsp_tst_version(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -353,7 +353,7 @@ static int dissect_genTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
static int
dissect_pkixtsp_INTEGER_1_999(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}

12
epan/dissectors/packet-smrse.c
View File

@ -129,7 +129,7 @@ static const value_string T_address_type_vals[] = {
static int
dissect_smrse_T_address_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -151,7 +151,7 @@ static const value_string T_numbering_plan_vals[] = {
static int
dissect_smrse_T_numbering_plan(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -332,7 +332,7 @@ static const value_string Connect_fail_vals[] = {
static int
dissect_smrse_Connect_fail(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -386,7 +386,7 @@ static int dissect_msg_waiting_set(packet_info *pinfo, proto_tree *tree, tvbuff_
static int
dissect_smrse_RP_MR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -422,7 +422,7 @@ static int dissect_sm_diag_info_impl(packet_info *pinfo, proto_tree *tree, tvbuf
static int
dissect_smrse_SM_TC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -507,7 +507,7 @@ static const value_string Error_reason_vals[] = {
static int
dissect_smrse_Error_reason(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}

26
epan/dissectors/packet-x509af.c
View File

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

66
epan/dissectors/packet-x509ce.c
View File

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

120
epan/dissectors/packet-x509if.c
View File

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

39
epan/dissectors/packet-x509sat.c
View File

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

3
epan/dissectors/packet-x509sat.h
View File

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

317
tools/asn2eth.py
View File

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