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

ASN1: Register PDU-dissectors as NEW 

Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Stig Bjørlykke 2014-10-06 15:31:47 +02:00
parent 94d35481b7
commit 4e1b5ea866
147 changed files with 3519 additions and 2326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/HI2Operations/HI2Operations.cnf
View File

@ -10,9 +10,9 @@ EN301040 EN301040
#.EXPORTS
#.REGISTER
#.REGISTER_NEW
#.PDU
#.PDU_NEW
IRIsContent
#.NO_EMIT

2
asn1/HI2Operations/packet-HI2Operations-template.c
View File

@ -68,7 +68,7 @@ void proto_register_HI2Operations(void) {
proto_register_field_array(proto_HI2Operations, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
new_register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
}

4
asn1/acp133/acp133.cnf
View File

@ -7,7 +7,7 @@
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.PDU
#.PDU_NEW
ACPPreferredDelivery
ALType
Community
@ -65,7 +65,7 @@ Kmid
&id ObjectIdentifierType
#.END
#.REGISTER
#.REGISTER_NEW
# X.402

2
asn1/atn-cm/atn-cm.cnf
View File

@ -6,7 +6,7 @@
#.EXPORTS
#.PDU
#.PDU_NEW
CMAircraftMessage
CMGroundMessage
#.END

8
asn1/atn-cm/packet-atn-cm-template.c
View File

@ -91,13 +91,13 @@ dissect_atn_cm(
dissect_CMGroundMessage_PDU(
tvb,
pinfo,
sub_tree);
sub_tree, NULL);
break;
case dm:
dissect_CMAircraftMessage_PDU(
tvb,
pinfo,
sub_tree);
sub_tree, NULL);
break;
default:
break;
@ -126,7 +126,7 @@ dissect_atn_cm_heur(
dissect_CMGroundMessage_PDU(
tvb,
pinfo,
NULL);
NULL, NULL);
/* no exception thrown: looks like it is a CM PDU */
is_atn_cm = TRUE; }
CATCH_ALL {
@ -138,7 +138,7 @@ dissect_atn_cm_heur(
dissect_CMAircraftMessage_PDU(
tvb,
pinfo,
NULL);
NULL, NULL);
/* no exception thrown: looks like it is a CM PDU */
is_atn_cm = TRUE;}
CATCH_ALL {

2
asn1/atn-cpdlc/atn-cpdlc.cnf
View File

@ -11,7 +11,7 @@
#.OMIT_ASSIGNMENT
#.END
#.PDU
#.PDU_NEW
AircraftPDUs
GroundPDUs
ProtectedAircraftPDUs

36
asn1/atn-cpdlc/packet-atn-cpdlc-template.c
View File

@ -69,22 +69,26 @@ void proto_reg_handoff_atn_cpdlc(void);
static const char *object_identifier_id;
/* forward declarations */
static void dissect_GroundPDUs_PDU(
static int dissect_GroundPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
static void dissect_AircraftPDUs_PDU(
proto_tree *tree _U_,
void *data _U_);
static int dissect_AircraftPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
static void dissect_ProtectedGroundPDUs_PDU(
proto_tree *tree _U_,
void *data _U_);
static int dissect_ProtectedGroundPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
static void dissect_ProtectedAircraftPDUs_PDU(
proto_tree *tree _U_,
void *data _U_);
static int dissect_ProtectedAircraftPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
proto_tree *tree _U_,
void *data _U_);
#include "packet-atn-cpdlc-hf.c"
@ -172,12 +176,12 @@ dissect_atn_cpdlc(
dissect_ProtectedGroundPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}else { /* downlink PDU's = Aircraft PDU's */
dissect_ProtectedAircraftPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}
break;
case cpdlc:
@ -186,12 +190,12 @@ dissect_atn_cpdlc(
dissect_GroundPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}else { /* downlink PDU's = Aircraft PDU's */
dissect_AircraftPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}
break;
default:
@ -217,7 +221,7 @@ dissect_atn_cpdlc_heur(
switch(type){
case um:
TRY {
dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL);
dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL, NULL);
is_atn_cpdlc = TRUE;
is_pm = TRUE;
break;}
@ -226,7 +230,7 @@ dissect_atn_cpdlc_heur(
is_pm = FALSE;}
ENDTRY;
TRY {
dissect_GroundPDUs_PDU(tvb, pinfo, NULL);
dissect_GroundPDUs_PDU(tvb, pinfo, NULL, NULL);
is_pm = FALSE;
is_atn_cpdlc = TRUE;
break;}
@ -237,7 +241,7 @@ dissect_atn_cpdlc_heur(
break;
case dm:
TRY {
dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL);
dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL, NULL);
is_atn_cpdlc = TRUE;
is_pm = TRUE;
break;}
@ -246,7 +250,7 @@ dissect_atn_cpdlc_heur(
is_pm = FALSE; }
ENDTRY;
TRY{
dissect_AircraftPDUs_PDU(tvb, pinfo, NULL);
dissect_AircraftPDUs_PDU(tvb, pinfo, NULL, NULL);
is_atn_cpdlc = TRUE;
is_pm = FALSE;
break;}

4
asn1/atn-ulcs/atn-ulcs.cnf
View File

@ -16,7 +16,7 @@ PDV-list/presentation-data-values/single-ASN1-type pdv-list_presentation-data-va
PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_arbitrary
#.END
#.PDU
#.PDU_NEW
Fully-encoded-data
ACSE-apdu
#.END
@ -74,7 +74,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar
dissect_ACSE_apdu_PDU(
tvb_new_subset_remaining(tvb_usr, 0),
pinfo,
atn_ulcs_tree);
atn_ulcs_tree, NULL);
break;
case 3: /* USER data; call subdissector for CM, CPDLC ... */

9
asn1/atn-ulcs/packet-atn-ulcs-template.c
View File

@ -174,10 +174,11 @@ static int dissect_atn_ulcs_T_externalt_encoding_arbitrary(
proto_tree *tree _U_,
int hf_index _U_);
static void dissect_ACSE_apdu_PDU(
static int dissect_ACSE_apdu_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
proto_tree *tree _U_,
void *data _U_);
guint32 dissect_per_object_descriptor_t(
tvbuff_t *tvb,
@ -604,7 +605,7 @@ dissect_atn_ulcs(
dissect_Fully_encoded_data_PDU(
tvb,
pinfo,
atn_ulcs_tree);
atn_ulcs_tree, NULL);
return offset +
tvb_reported_length_remaining(tvb, offset ) ;
@ -712,7 +713,7 @@ dissect_atn_ulcs(
dissect_ACSE_apdu_PDU(
tvb_new_subset_remaining(tvb, offset),
pinfo,
atn_ulcs_tree);
atn_ulcs_tree, NULL);
return offset +
tvb_reported_length_remaining(tvb, offset );

2
asn1/c1222/c1222.cnf
View File

@ -7,7 +7,7 @@ IMPORT ../acse/acse.inf
#.EXPORTS
#.PDU
#.PDU_NEW
MESSAGE
#.NO_EMIT

10
asn1/c1222/packet-c1222-template.c
View File

@ -1066,13 +1066,9 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
/* create the c1222 protocol tree */
if (tree) {
c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA);
c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222);
dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree);
}
return tvb_captured_length(tvb);
c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA);
c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222);
return dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree, NULL);
}
/**

2
asn1/camel/camel.cnf
View File

@ -41,7 +41,7 @@ OPERATION.&ResultType
#.END
#.REGISTER
#.REGISTER_NEW
CAP-GPRS-ReferenceNumber B "0.4.0.0.1.1.5.2" "id-CAP-GPRS-ReferenceNumber"
CAP-U-ABORT-REASON B "0.4.0.0.1.1.2.2" "id-CAP-U-ABORT-Reason"

2
asn1/cdt/cdt.cnf
View File

@ -4,7 +4,7 @@
#.EXPORTS
CompressedData
#.REGISTER
#.REGISTER_NEW
CompressedData B "1.3.26.0.4406.0.4.2" "cdt"
#.FN_BODY CompressedData

2
asn1/cdt/packet-cdt-template.c
View File

@ -92,7 +92,7 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_set_str (pinfo->cinfo, COL_PROTOCOL, "CDT");
col_clear (pinfo->cinfo, COL_INFO);
dissect_CompressedData_PDU (tvb, pinfo, tree);
dissect_CompressedData_PDU (tvb, pinfo, tree, NULL);
}
void proto_register_cdt (void) {

4
asn1/cmip/cmip.cnf
View File

@ -91,7 +91,7 @@ static const value_string cmip_error_code_vals[] = {
# X.721
#.REGISTER
#.REGISTER_NEW
BaseManagedObjectId B "2.9.2.21.7.13" "BaseManagedObjectId(13)"
# X.721
SimpleNameType B "2.9.3.2.7.1" "discriminatorId(1)"
@ -216,7 +216,7 @@ Priority
RejectProblem
#.PDU
#.PDU_NEW
#.FN_HDR CMIPAbortInfo

2
asn1/cmp/cmp.cnf
View File

@ -50,7 +50,7 @@ RevDetails
RevRepContent
RevReqContent
#.REGISTER
#.REGISTER_NEW
PBMParameter B "1.2.840.113533.7.66.13" "id-PasswordBasedMac"
DHBMParameter B "1.2.640.113533.7.66.30" "id-DHBasedMac"
CAProtEncCertValue B "1.3.6.1.5.5.7.4.1" "id-it-caProtEncCert"

2
asn1/cms/cms.cnf
View File

@ -31,7 +31,7 @@ SignerInfos
SignatureValue
UnsignedAttributes
#.REGISTER
#.REGISTER_NEW
ContentInfo B "1.2.840.113549.1.9.16.1.6" "id-ct-contentInfo"
#OctetString B "1.2.840.113549.1.7.1" "id-data" see x509sat.cnf
SignedData B "1.2.840.113549.1.7.2" "id-signedData"

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

@ -160,8 +160,8 @@ void proto_register_cms(void) {
proto_register_field_array(proto_cms, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU);
register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU);
new_register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU);
new_register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU);
register_ber_oid_syntax(".p7s", NULL, "ContentInfo");
register_ber_oid_syntax(".p7m", NULL, "ContentInfo");
register_ber_oid_syntax(".p7c", NULL, "ContentInfo");

2
asn1/credssp/credssp.cnf
View File

@ -1,7 +1,7 @@
# credssp.cnf
# Credential Security Support Provider (CredSSP) conformance file
#.PDU
#.PDU_NEW
TSRequest
#.FN_PARS TSRequest/authInfo VAL_PTR = &auth_tvb

10
asn1/credssp/packet-credssp-template.c
View File

@ -63,8 +63,8 @@ static gint ett_credssp = -1;
/*
* Dissect CredSSP PDUs
*/
static void
dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
static int
dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data)
{
proto_item *item=NULL;
proto_tree *tree=NULL;
@ -77,7 +77,7 @@ dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_clear(pinfo->cinfo, COL_INFO);
creds_type = -1;
dissect_TSRequest_PDU(tvb, pinfo, tree);
return dissect_TSRequest_PDU(tvb, pinfo, tree, data);
}
static gboolean
@ -121,7 +121,7 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data);
}
dissect_credssp(tvb, pinfo, parent_tree);
dissect_credssp(tvb, pinfo, parent_tree, NULL);
return TRUE;
}
}
@ -162,7 +162,7 @@ void proto_register_credssp(void) {
/* Register protocol */
proto_credssp = proto_register_protocol(PNAME, PSNAME, PFNAME);
register_dissector("credssp", dissect_credssp, proto_credssp);
new_register_dissector("credssp", dissect_credssp, proto_credssp);
/* Register fields and subtrees */
proto_register_field_array(proto_credssp, hf, array_length(hf));

2
asn1/crmf/crmf.cnf
View File

@ -42,7 +42,7 @@ SinglePubInfo
SubsequentMessage
UTF8Pairs
#.REGISTER
#.REGISTER_NEW
EncKeyWithID B "1.2.840.113549.1.9.16.1.21" "id-ct-encKeyWithID"
PBMParameter B "1.2.840.113533.7.66.13" "PasswordBasedMac"
RegToken B "1.3.6.1.5.5.7.5.1.1" "id-regCtrl-regToken"

3
asn1/disp/disp.cnf
View File

@ -29,8 +29,7 @@ ModificationParameter/secondaryShadows modifiedSecondaryShadows
CoordinateShadowUpdateArgumentData/updateStrategy/standard standardUpdate
Information/signedInformation/information information-data
#.REGISTER
#.REGISTER_NEW
ShadowingAgreementInfo S dop.oid "agreement.2.5.19.1"
EstablishParameter S dop.oid "establish.rolea.2.5.19.1"
EstablishParameter S dop.oid "establish.roleb.2.5.19.1"

2
asn1/dop/dop.cnf
View File

@ -71,7 +71,7 @@ TerminateOperationalBindingArgumentData/terminateAt terminateAtTime
TerminateOperationalBindingResultData/terminateAt terminateAtGeneralizedTime
#.REGISTER
#.REGISTER_NEW
DSEType B "2.5.12.0" "id-doa-dseType"
SupplierInformation B "2.5.12.5" "id-doa-supplierKnowledge"
ConsumerInformation B "2.5.12.6" "id-doa-consumerKnowledge"

4
asn1/dsp/dsp.cnf
View File

@ -43,11 +43,11 @@ MasterOrShadowAccessPoint/category access-point-category
ChainingArguments/targetObject targetObjectDN
#.PDU
#.PDU_NEW
AccessPoint
MasterAndShadowAccessPoints
#.REGISTER
#.REGISTER_NEW
AccessPoint B "2.5.12.1" "id-doa-myAccessPoint"
AccessPoint B "2.5.12.2" "id-doa-superiorKnowledge"
MasterAndShadowAccessPoints B "2.5.12.3" "id-doa-specificKnowledge"

4
asn1/ess/ess.cnf
View File

@ -8,9 +8,9 @@
#.EXPORTS
ESSSecurityLabel_PDU
#.PDU
#.PDU_NEW
#.REGISTER
#.REGISTER_NEW
ReceiptRequest B "1.2.840.113549.1.9.16.2.1" "id-aa-receiptRequest"
ContentIdentifier B "1.2.840.113549.1.9.16.2.7" "id-aa-contentIdentifier"
Receipt B "1.2.840.113549.1.9.16.1.1" "id-ct-receipt"

2
asn1/ftam/ftam.cnf
View File

@ -20,7 +20,7 @@ F-CHECK-response
Other-Pattern
#.END
#.PDU
#.PDU_NEW
#.NO_EMIT ONLY_VALS
PDU

2
asn1/goose/goose.cnf
View File

@ -5,7 +5,7 @@
#.EXPORTS
#.PDU
#.PDU_NEW
#.NO_EMIT ONLY_VALS
GOOSEpdu

2
asn1/gsm_map/gsm_map.cnf
View File

@ -180,7 +180,7 @@ USSD-Res
UU-Data
VelocityEstimate
#.END
#.REGISTER
#.REGISTER_NEW
MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS"
# This table creates the value_sting to name GSM MAP operation codes and errors

2
asn1/h245/h245.cnf
View File

@ -20,7 +20,7 @@ MulticastAddress
Capability
#.END
#.PDU
#.PDU_NEW
OpenLogicalChannel
#.MAKE_ENUM

2
asn1/h245/packet-h245-template.c
View File

@ -452,7 +452,7 @@ dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
upcoming_channel = NULL;
codec_type = NULL;
dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree);
dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree, NULL);
if (h245_pi != NULL)
h245_pi->msg_type = H245_OpenLogChn;

2
asn1/h248/h248.cnf
View File

@ -5,7 +5,7 @@
#.EXPORTS
#.PDU
#.PDU_NEW
#.NO_EMIT
MtpAddress

2
asn1/hnbap/hnbap.cnf
View File

@ -7,7 +7,7 @@ PER
ALIGNED
#.END
#.PDU
#.PDU_NEW
HNBAP-PDU
##.MAKE_DEFINES

8
asn1/hnbap/packet-hnbap-template.c
View File

@ -125,8 +125,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
return (dissector_try_uint_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0;
}
static void
dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int
dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_item *hnbap_item = NULL;
proto_tree *hnbap_tree = NULL;
@ -138,7 +138,7 @@ dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
hnbap_item = proto_tree_add_item(tree, proto_hnbap, tvb, 0, -1, ENC_NA);
hnbap_tree = proto_item_add_subtree(hnbap_item, ett_hnbap);
dissect_HNBAP_PDU_PDU(tvb, pinfo, hnbap_tree);
return dissect_HNBAP_PDU_PDU(tvb, pinfo, hnbap_tree, data);
}
/*--- proto_register_hnbap -------------------------------------------*/
@ -166,7 +166,7 @@ module_t *hnbap_module;
proto_register_subtree_array(ett, array_length(ett));
/* Register dissector */
register_dissector("hnbap", dissect_hnbap, proto_hnbap);
new_register_dissector("hnbap", dissect_hnbap, proto_hnbap);
/* Register dissector tables */
hnbap_ies_dissector_table = register_dissector_table("hnbap.ies", "HNBAP-PROTOCOL-IES", FT_UINT32, BASE_DEC);

2
asn1/inap/inap.cnf
View File

@ -46,8 +46,6 @@ ERROR.&ParameterType
OPERATION.&ArgumentType
OPERATION.&ResultType
#.PDU
# This table creates the value_sting to name Inap operation codes and errors
# in file packet-inap-table.c which is included in the template file
#

2
asn1/ldap/ldap.cnf
View File

@ -31,7 +31,7 @@ LDAPOID TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
Mechanism TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
AssertionValue TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL
#.REGISTER
#.REGISTER_NEW
SearchControlValue B "1.2.840.113556.1.4.319" "pagedResultsControl"
SortKeyList B "1.2.840.113556.1.4.473" "sortKeyList"
SortResult B "1.2.840.113556.1.4.474" "sortResult"

9
asn1/ldap/packet-ldap-template.c
View File

@ -1950,6 +1950,15 @@ register_ldap_name_dissector(const char *attr_type_p, dissector_t dissector, int
register_ldap_name_dissector_handle(attr_type_p, dissector_handle);
}
void
new_register_ldap_name_dissector(const char *attr_type_p, new_dissector_t dissector, int proto)
{
dissector_handle_t dissector_handle;
dissector_handle=new_create_dissector_handle(dissector, proto);
register_ldap_name_dissector_handle(attr_type_p, dissector_handle);
}
/*--- proto_register_ldap -------------------------------------------*/
void proto_register_ldap(void) {

1
asn1/ldap/packet-ldap-template.h
View File

@ -101,6 +101,7 @@ typedef struct ldap_call_response {
void register_ldap_name_dissector_handle(const char *attr_type, dissector_handle_t dissector);
void register_ldap_name_dissector(const char *attr_type, dissector_t dissector, int proto);
void new_register_ldap_name_dissector(const char *attr_type, new_dissector_t dissector, int proto);
WS_DLL_PUBLIC
int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_);

4
asn1/logotypecertextn/logotypecertextn.cnf
View File

@ -5,9 +5,9 @@
#.EXPORTS
#.PDU
#.PDU_NEW
#.REGISTER
#.REGISTER_NEW
LogotypeExtn B "1.3.6.1.5.5.7.1.12" "id-pe-logotype"
LogotypeExtn B "1.3.6.1.5.5.7.20.1" "id-pe-logo-loyalty"
LogotypeExtn B "1.3.6.1.5.5.7.20.2" "id-pe-logo-background"

2
asn1/mms/mms.cnf
View File

@ -9,7 +9,7 @@ ISO-8650-ACSE-1 acse
#.EXPORTS
MMSpdu
#.PDU
#.PDU_NEW
#.NO_EMIT

2
asn1/nbap/nbap.cnf
View File

@ -9,7 +9,7 @@ PER
ALIGNED
#.END
#.PDU
#.PDU_NEW
NBAP-PDU
#.MAKE_DEFINES

8
asn1/nbap/packet-nbap-template.c
View File

@ -447,8 +447,8 @@ static void nbap_init(void){
lchId_type_table[i+1] = *lch_contents[i];
}
}
static void
dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int
dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_item *nbap_item = NULL;
proto_tree *nbap_tree = NULL;
@ -465,7 +465,7 @@ dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
nbap_hsdsch_channel_info[i].entity = hs;
}
dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree);
return dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree, data);
}
/*--- proto_register_nbap -------------------------------------------*/
@ -518,7 +518,7 @@ void proto_register_nbap(void)
expert_register_field_array(expert_nbap, ei, array_length(ei));
/* Register dissector */
register_dissector("nbap", dissect_nbap, proto_nbap);
new_register_dissector("nbap", dissect_nbap, proto_nbap);
nbap_module = prefs_register_protocol(proto_nbap, NULL);

5
asn1/novell_pkis/novell_pkis.cnf
View File

@ -4,11 +4,12 @@
#.EXPORTS
#.REGISTER
#.REGISTER_NEW
SecurityAttributes B "2.16.840.1.113719.1.9.4.1" "pa-sa"
RelianceLimits B "2.16.840.1.113719.1.9.4.2" "pa-rl"
#.PDU
#.PDU_NEW
# PKIS-MESSAGE
#.NO_EMIT

2
asn1/ns_cert_exts/ns_cert_exts.cnf
View File

@ -5,7 +5,7 @@
#.EXPORTS
#.REGISTER
#.REGISTER_NEW
CertType B "2.16.840.1.113730.1.1" "ns_cert_exts.cert_type"
BaseUrl B "2.16.840.1.113730.1.2" "ns_cert_exts.base_url"
RevocationUrl B "2.16.840.1.113730.1.3" "ns_cert_exts.revocation-url"

4
asn1/ocsp/ocsp.cnf
View File

@ -18,9 +18,9 @@ PKIX1Explicit88 pkix1explicit
#.EXPORTS
OCSPResponse
#.PDU
#.PDU_NEW
#.REGISTER
#.REGISTER_NEW
BasicOCSPResponse B "1.3.6.1.5.5.7.48.1.1" "id-pkix-ocsp-basic"
ReOcspNonce B "1.3.6.1.5.5.7.48.1.2" "id-pkix-ocsp-nonce"
CrlID B "1.3.6.1.5.5.7.48.1.3" "id-pkix-ocsp-crl"

4
asn1/p1/p1.cnf
View File

@ -287,8 +287,6 @@ AsymmetricTokenData/name/recipient-name token-recipient-name
TokenData/type token-data-type
CertificateSelectors/content-integrity-check selectors-content-integrity-check
#.PDU
# This table creates the value_sting to name P3 operation codes and errors
# in file packet-p3-table.c which is included in the template file
#
@ -340,7 +338,7 @@ OPERATION.&ResultType
#.END
#.REGISTER
#.REGISTER_NEW
RecipientReassignmentProhibited N p1.extension 1
OriginatorRequestedAlternateRecipient N p1.extension 2
DLExpansionProhibited N p1.extension 3

2
asn1/p22/p22.cnf
View File

@ -81,7 +81,7 @@ ForwardedContentToken/_item/body-part-choice/message-or-content-body-part forwar
ForwardedContentToken/_item/body-part-choice T_body_part_token_choice
#.REGISTER
#.REGISTER_NEW
AbsenceAdvice B "2.6.1.19.0" "id-on-absence-advice"
ChangeOfAddressAdvice B "2.6.1.19.1" "id-on-change-of-address-advice"
IPMAssemblyInstructions B "2.6.1.17.2" "id-mst-assembly-instructions"

2
asn1/p7/p7.cnf
View File

@ -206,7 +206,7 @@ OPERATION.&ArgumentType
OPERATION.&ResultType
#.END
#.REGISTER
#.REGISTER_NEW
# MSGeneralAttributeTypes
ReportLocation B "2.6.4.3.42" "id-att-ac-correlated-report-list"
SequenceNumber B "2.6.4.3.76" "id-att-ac-report-subject-entry"

4
asn1/p772/p772.cnf
View File

@ -40,7 +40,7 @@ AddressListDesignator/type address_list_type
MessageType/type message_type_type
OtherRecipientDesignator/type other_recipient_type
#.PDU
#.PDU_NEW
PrimaryPrecedence
CopyPrecedence
MessageType
@ -59,7 +59,7 @@ OriginatorPlad
Acp127NotificationType
SecurityInformationLabels
#.REGISTER
#.REGISTER_NEW
PrimaryPrecedence B "1.3.26.0.4406.0.2.0" "primary-precedence"
CopyPrecedence B "1.3.26.0.4406.0.2.1" "copy-precedence"
MessageType B "1.3.26.0.4406.0.2.2" "message-type"

2
asn1/pkcs1/pkcs1.cnf
View File

@ -15,7 +15,7 @@ DigestInfo
#.FIELD_RENAME
#.REGISTER
#.REGISTER_NEW
DSA-Params B "1.2.840.10040.4.1" "id-dsa"
DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber"
KEA-Params-Id B "2.16.840.1.101.2.1.1.22" "id-keyExchangeAlgorithm"

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

@ -77,7 +77,7 @@ static gboolean try_null_password = FALSE;
static void dissect_AuthenticatedSafe_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static void dissect_SafeContents_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static void dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data);
#include "packet-pkcs12-hf.c"
@ -494,7 +494,7 @@ void proto_register_pkcs12(void) {
"Whether to try and decrypt the encrypted data within the"
" PKCS#12 with a NULL password", &try_null_password);
register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU);
new_register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU);
register_ber_oid_syntax(".p12", NULL, "PKCS#12");
register_ber_oid_syntax(".pfx", NULL, "PKCS#12");
}

6
asn1/pkcs12/pkcs12.cnf
View File

@ -11,7 +11,7 @@ PKCS-5 x509af
#.EXPORTS
#.REGISTER
#.REGISTER_NEW
KeyBag B "1.2.840.113549.1.12.10.1.1" "keyBag"
PKCS8ShroudedKeyBag B "1.2.840.113549.1.12.10.1.2" "pkcs8ShroudedKeyBag"
CertBag B "1.2.840.113549.1.12.10.1.3" "certBag"
@ -50,7 +50,7 @@ PBMAC1Params B "1.2.840.113549.1.5.14" "id-PBMAC1"
PrivateKeyInfo/version privateKeyVersion
PBKDF2Params/salt saltChoice
#.PDU
#.PDU_NEW
AuthenticatedSafe
PrivateKeyInfo
@ -145,7 +145,7 @@ PrivateKeyInfo
dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
dissector_handle=new_create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
dissector_change_string("ber.oid", object_identifier_id, dissector_handle);
PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item);

2
asn1/pkinit/pkinit.cnf
View File

@ -11,7 +11,7 @@ PKIX1Explicit88 pkix1explicit
PaPkAsReq
PaPkAsRep
#.REGISTER
#.REGISTER_NEW
AuthPack B "1.3.6.1.5.2.3.1" "id-pkauthdata"
KDCDHKeyInfo B "1.3.6.1.5.2.3.2" "id-pkdhkeydata"
KRB5PrincipalName B "1.3.6.1.5.2.2" "id-pkinit-san"

4
asn1/pkix1explicit/pkix1explicit.cnf
View File

@ -18,13 +18,13 @@ Version
Time
UniqueIdentifier
#.REGISTER
#.REGISTER_NEW
DirectoryString B "1.3.6.1.5.5.7.2.1" "id-qt-cps"
DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber"
IPAddrBlocks B "1.3.6.1.5.5.7.1.7" "id-pe-ipAddrBlocks"
ASIdentifiers B "1.3.6.1.5.5.7.1.8" "id-pe-autonomousSysIds"
#.PDU
#.PDU_NEW
#.NO_EMIT

4
asn1/pkix1implicit/pkix1implicit.cnf
View File

@ -17,9 +17,9 @@ AuthorityInfoAccessSyntax
KeyIdentifier
UserNotice
#.PDU
#.PDU_NEW
#.REGISTER
#.REGISTER_NEW
AuthorityInfoAccessSyntax B "1.3.6.1.5.5.7.1.1" "id-pe-authorityInfoAccessSyntax"
Dummy B "1.3.6.1.5.5.7.3.1" "id-kp-serverAuth"
Dummy B "1.3.6.1.5.5.7.3.2" "id-kp-clientAuth"

6
asn1/pkixac/pkixac.cnf
View File

@ -22,9 +22,7 @@ V2Form
#.EXPORTS
#.PDU
#.REGISTER
#.PDU_NEW
#.NO_EMIT
@ -36,7 +34,7 @@ V2Form
Clearance
RFC3281Clearance
#.REGISTER
#.REGISTER_NEW
AAControls B "1.3.6.1.5.5.7.1.6" "id-pe-aaControls"
ProxyInfo B "1.3.6.1.5.5.7.1.10" "id-pe-ac-proxying"
SvceAuthInfo B "1.3.6.1.5.5.7.10.1" "id-aca-authenticationInfo"

4
asn1/pkixproxy/pkixproxy.cnf
View File

@ -5,9 +5,9 @@
#.EXPORTS
#.PDU
#.PDU_NEW
#.REGISTER
#.REGISTER_NEW
ProxyCertInfoExtension B "1.3.6.1.5.5.7.1.14" "id-pe-proxyCertInfo"
#.NO_EMIT

2
asn1/pkixqualified/pkixqualified.cnf
View File

@ -7,7 +7,7 @@
#.EXPORTS
#.REGISTER
#.REGISTER_NEW
BiometricSyntax B "1.3.6.1.5.5.7.1.2" "id-pe-biometricInfo"
QCStatements B "1.3.6.1.5.5.7.1.3" "id-pe-qcStatements"
SemanticsInformation B "1.3.6.1.5.5.7.11.1" "id-qcs-pkixQCSyntax-v1"

6
asn1/pkixtsp/pkixtsp.cnf
View File

@ -11,9 +11,7 @@ PKIX1Implicit88 pkix1implicit
#.EXPORTS
#.PDU
#.REGISTER
#.PDU_NEW
#.NO_EMIT
@ -24,7 +22,7 @@ TSTInfo/version Tst_version
PKIStatusInfo/status pki_status
TSTInfo/version tst_version
#.REGISTER
#.REGISTER_NEW
TSTInfo B "1.2.840.113549.1.9.16.1.4" "id-ct-TSTInfo"
#.END

2
asn1/pres/packet-pres-template.c
View File

@ -333,7 +333,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
}
/* dissect the packet */
dissect_UD_type_PDU(tvb, pinfo, clpres_tree);
dissect_UD_type_PDU(tvb, pinfo, clpres_tree, NULL);
return tvb_captured_length(tvb);
}

2
asn1/pres/pres.cnf
View File

@ -5,7 +5,7 @@
#.EXPORTS
#.PDU
#.PDU_NEW
UD-type
#.NO_EMIT

6
asn1/q932/packet-q932-template.c
View File

@ -163,13 +163,13 @@ dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
case BER_CLASS_CON:
switch (tag) {
case 10 : /* Network Facility Extension */
dissect_NetworkFacilityExtension_PDU(next_tvb, pinfo, tree);
dissect_NetworkFacilityExtension_PDU(next_tvb, pinfo, tree, NULL);
break;
case 18 : /* Network Protocol Profile */
dissect_NetworkProtocolProfile_PDU(next_tvb, pinfo, tree);
dissect_NetworkProtocolProfile_PDU(next_tvb, pinfo, tree, NULL);
break;
case 11 : /* Interpretation Component */
dissect_InterpretationComponent_PDU(next_tvb, pinfo, tree);
dissect_InterpretationComponent_PDU(next_tvb, pinfo, tree, NULL);
break;
/* ROSE APDU */
case 1 : /* invoke */

2
asn1/q932/q932.cnf
View File

@ -2,7 +2,7 @@
# Q.932 conformation file
# 2007 Tomas Kukosa
#.PDU
#.PDU_NEW
InterpretationComponent
NetworkFacilityExtension

8
asn1/rnsap/packet-rnsap-template.c
View File

@ -122,8 +122,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
return (dissector_try_string(rnsap_proc_uout_dissector_table, ProcedureID, tvb, pinfo, tree, NULL)) ? tvb_captured_length(tvb) : 0;
}
static void
dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int
dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_item *rnsap_item = NULL;
proto_tree *rnsap_tree = NULL;
@ -135,7 +135,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA);
rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap);
dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
return dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree, data);
}
/*--- proto_register_rnsap -------------------------------------------*/
@ -161,7 +161,7 @@ void proto_register_rnsap(void) {
proto_register_subtree_array(ett, array_length(ett));
/* Register dissector */
register_dissector("rnsap", dissect_rnsap, proto_rnsap);
new_register_dissector("rnsap", dissect_rnsap, proto_rnsap);
/* Register dissector tables */
rnsap_ies_dissector_table = register_dissector_table("rnsap.ies", "RNSAP-PROTOCOL-IES", FT_UINT32, BASE_DEC);

2
asn1/rnsap/rnsap.cnf
View File

@ -11,7 +11,7 @@ ALIGNED
EDPCH-Information-RLReconfPrepare-FDD
Non-Serving-RL-Preconfig-Info
#.PDU
#.PDU_NEW
RNSAP-PDU
#.MAKE_DEFINES

2
asn1/rrlp/packet-rrlp-template.c
View File

@ -83,7 +83,7 @@ void proto_register_rrlp(void) {
/* Register protocol */
proto_rrlp = proto_register_protocol(PNAME, PSNAME, PFNAME);
register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp);
new_register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp);
/* Register fields and subtrees */
proto_register_field_array(proto_rrlp, hf, array_length(hf));

2
asn1/rrlp/rrlp.cnf
View File

@ -7,7 +7,7 @@ PER
UNALIGNED
#.END
#.PDU
#.PDU_NEW
PDU
#.OMIT_ASSIGNMENTS_EXCEPT MAP-LCS-DataTypes

8
asn1/rua/packet-rua-template.c
View File

@ -110,8 +110,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
return (dissector_try_uint_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0;
}
static void
dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int
dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_item *rua_item = NULL;
proto_tree *rua_tree = NULL;
@ -123,7 +123,7 @@ dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
rua_item = proto_tree_add_item(tree, proto_rua, tvb, 0, -1, ENC_NA);
rua_tree = proto_item_add_subtree(rua_item, ett_rua);
dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree);
return dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree, data);
}
/*--- proto_register_rua -------------------------------------------*/
@ -151,7 +151,7 @@ module_t *rua_module;
proto_register_subtree_array(ett, array_length(ett));
/* Register dissector */
register_dissector("rua", dissect_rua, proto_rua);
new_register_dissector("rua", dissect_rua, proto_rua);
/* Register dissector tables */
rua_ies_dissector_table = register_dissector_table("rua.ies", "RUA-PROTOCOL-IES", FT_UINT32, BASE_DEC);

2
asn1/rua/rua.cnf
View File

@ -7,7 +7,7 @@ PER
ALIGNED
#.END
#.PDU
#.PDU_NEW
RUA-PDU
#.MAKE_ENUM

2
asn1/smrse/smrse.cnf
View File

@ -9,7 +9,7 @@
SemiOctetString
#.END
#.PDU
#.PDU_NEW
#.TYPE_RENAME

14
asn1/snmp/packet-snmp-template.c
View File

@ -2137,8 +2137,8 @@ dissect_snmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
static void
dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int
dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_tree *smux_tree = NULL;
proto_item *item = NULL;
@ -2147,12 +2147,10 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX");
if (tree) {
item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_NA);
smux_tree = proto_item_add_subtree(item, ett_smux);
}
item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_NA);
smux_tree = proto_item_add_subtree(item, ett_smux);
dissect_SMUX_PDUs_PDU(tvb, pinfo, smux_tree);
return dissect_SMUX_PDUs_PDU(tvb, pinfo, smux_tree, data);
}
@ -2638,7 +2636,7 @@ proto_reg_handoff_smux(void)
{
dissector_handle_t smux_handle;
smux_handle = create_dissector_handle(dissect_smux, proto_smux);
smux_handle = new_create_dissector_handle(dissect_smux, proto_smux);
dissector_add_uint("tcp.port", TCP_PORT_SMUX, smux_handle);
}

2
asn1/snmp/snmp.cnf
View File

@ -2,7 +2,7 @@
# snmp conformation file
#.PDU
#.PDU_NEW
SMUX-PDUs
#.NO_EMIT

2
asn1/spnego/spnego.cnf
View File

@ -3,7 +3,7 @@
#.EXPORTS
#.PDU
#.PDU_NEW
#.NO_EMIT ONLY_VALS
NegotiationToken

2
asn1/sv/sv.cnf
View File

@ -5,7 +5,7 @@
#.EXPORTS
#.PDU
#.PDU_NEW
#.NO_EMIT ONLY_VALS
SampledValues

2
asn1/t124/t124.cnf
View File

@ -89,7 +89,7 @@ PSDNConnection
ATMConnection
ExtendedE164NetworkAddress
TransportAddress
#.PDU
#----------------------------------------------------------------------------------------
#.PDU_NEW

2
asn1/t125/t125.cnf
View File

@ -64,7 +64,7 @@ AssignedChannelId
TokenId
DynamicChannelId
ChannelId
#.PDU
#----------------------------------------------------------------------------------------
#.PDU_NEW

4
asn1/tcap/tcap.cnf
View File

@ -14,11 +14,11 @@ Release-response-reason
DialoguePDU
UniDialoguePDU
#.REGISTER
#.REGISTER_NEW
DialoguePDU B "0.0.17.773.1.1.1" "id-as-dialogue"
UniDialoguePDU B "0.0.17.773.1.2.1" "id-as-uniDialogue"
#.PDU
#.PDU_NEW
#.NO_EMIT ONLY_VALS

40
asn1/tetra/packet-tetra-template.c
View File

@ -233,29 +233,29 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre
switch(channel_type) {
case TETRA_CHAN_AACH:
dissect_AACH_PDU(pdu, pinfo, tetra_sub_tree );
dissect_AACH_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case TETRA_CHAN_SCH_F:
p = tvb_get_guint8(pdu, 0);
switch(p >> 6) {
case 0:
if (dir == TETRA_DOWNLINK)
dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL);
else
dissect_MAC_DATA_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_DATA_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case 1: /* MAC-FRAG or MAC-END */
if((p >> 5) == 3) {
if (dir == TETRA_DOWNLINK)
dissect_MAC_END_DOWNLINK_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_END_DOWNLINK_PDU(pdu, pinfo, tetra_sub_tree, NULL);
else
dissect_MAC_END_UPLINK_PDU(pdu, pinfo, tetra_sub_tree);
dissect_MAC_END_UPLINK_PDU(pdu, pinfo, tetra_sub_tree, NULL);
} else
dissect_MAC_FRAG_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_FRAG_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case 2:
dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
}
break;
@ -263,16 +263,16 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre
p = tvb_get_guint8(pdu, 0);
switch(p >> 6) {
case 0:
dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case 1: /* MAC-FRAG or MAC-END */
if((p >> 5) == 3)
dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree, NULL);
else
dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case 2:
dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
}
break;
@ -280,38 +280,38 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre
p = tvb_get_guint8(pdu, 0);
switch(p >> 7) {
case 0: /* MAC-ACCESS */
dissect_MAC_ACCESS_PDU(pdu, pinfo, tetra_sub_tree);
dissect_MAC_ACCESS_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case 1: /* MAC-END-HU */
dissect_MAC_END_HU_PDU(pdu, pinfo, tetra_sub_tree);
dissect_MAC_END_HU_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
}
break;
case TETRA_CHAN_BSCH:
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "BSCH");
dissect_BSCH_PDU(pdu, pinfo, tetra_sub_tree );
dissect_BSCH_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case TETRA_CHAN_BNCH:
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "BNCH");
dissect_BNCH_PDU(pdu, pinfo, tetra_sub_tree );
dissect_BNCH_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case TETRA_CHAN_STCH:
p = tvb_get_guint8(pdu, 0);
switch(p >> 6) {
case 0:
dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case 1: /* MAC-FRAG or MAC-END */
if((p >> 5) == 3) {
if (dir == TETRA_DOWNLINK)
dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree, NULL);
else
dissect_MAC_END_UP114_PDU(pdu, pinfo, tetra_sub_tree);
dissect_MAC_END_UP114_PDU(pdu, pinfo, tetra_sub_tree, NULL);
} else
dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
case 2:
dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree );
dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL);
break;
}
break;

2
asn1/tetra/tetra.cnf
View File

@ -54,7 +54,7 @@ CALLMODE
#.END
#.PDU
#.PDU_NEW
AACH
MAC-FRAG
MAC-FRAG120

2
asn1/wlancertextn/wlancertextn.cnf
View File

@ -5,7 +5,7 @@
#.EXPORTS
#.REGISTER
#.REGISTER_NEW
SSIDList B "1.3.6.1.5.5.7.1.13" "id-pe-wlanSSID"
SSIDList B "1.3.6.1.5.5.7.10.6" "id-aca-wlanSSID"

8
asn1/x2ap/packet-x2ap-template.c
View File

@ -112,8 +112,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
return (dissector_try_uint(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0;
}
static void
dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static int
dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_item *x2ap_item = NULL;
proto_tree *x2ap_tree = NULL;
@ -125,7 +125,7 @@ dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, ENC_NA);
x2ap_tree = proto_item_add_subtree(x2ap_item, ett_x2ap);
dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree);
return dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree, data);
}
/*--- proto_register_x2ap -------------------------------------------*/
@ -162,7 +162,7 @@ void proto_register_x2ap(void) {
proto_register_subtree_array(ett, array_length(ett));
/* Register dissector */
register_dissector("x2ap", dissect_x2ap, proto_x2ap);
new_register_dissector("x2ap", dissect_x2ap, proto_x2ap);
/* Register dissector tables */
x2ap_ies_dissector_table = register_dissector_table("x2ap.ies", "X2AP-PROTOCOL-IES", FT_UINT32, BASE_DEC);

2
asn1/x2ap/x2ap.cnf
View File

@ -11,7 +11,7 @@ ALIGNED
# Get rid of unused code warnings
#.END
#.PDU
#.PDU_NEW
X2AP-PDU
#.MAKE_ENUM

20
asn1/x509af/packet-x509af-template.c
View File

@ -106,9 +106,9 @@ void proto_register_x509af(void) {
proto_register_subtree_array(ett, array_length(ett));
register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU);
register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU);
register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU);
new_register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU);
new_register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU);
new_register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU);
register_ber_oid_syntax(".cer", NULL, "Certificate");
register_ber_oid_syntax(".crt", NULL, "Certificate");
@ -156,15 +156,15 @@ void proto_reg_handoff_x509af(void) {
/* these will generally be encoded as ";binary" in LDAP */
register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af);
register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af);
new_register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af);
new_register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af);
register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af);
register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af);
new_register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af);
new_register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af);
register_ldap_name_dissector("authorityRevocationList", dissect_CertificateList_PDU, proto_x509af);
register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af);
new_register_ldap_name_dissector("authorityRevocationList", dissect_CertificateList_PDU, proto_x509af);
new_register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af);
register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af);
new_register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af);
}

4
asn1/x509af/x509af.cnf
View File

@ -31,9 +31,9 @@ Time
Validity
Version
#.PDU
#.PDU_NEW
#.REGISTER
#.REGISTER_NEW
Certificate B "2.5.4.36" "id-at-userCertificate"
Certificate B "2.5.4.37" "id-at-cAcertificate"
CertificateList B "2.5.4.38" "id-at-authorityRevocationList"

6
asn1/x509ce/packet-x509ce-template.c
View File

@ -62,11 +62,11 @@ x509ce_enable_ciplus(void)
{
dissector_handle_t dh25, dh26, dh27;
dh25 = create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce);
dh25 = new_create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce);
dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.25", dh25);
dh26 = create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce);
dh26 = new_create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce);
dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.26", dh26);
dh27 = create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce);
dh27 = new_create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce);
dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.27", dh27);
}

4
asn1/x509ce/x509ce.cnf
View File

@ -89,13 +89,13 @@ ScramblerCapabilities
CiplusInfo
CicamBrandId
#.PDU
#.PDU_NEW
ScramblerCapabilities
CiplusInfo
CicamBrandId
#.REGISTER
#.REGISTER_NEW
CertificatePoliciesSyntax B "2.5.29.3" "id-ce-certificatePolicies"
AttributesSyntax B "2.5.29.9" "id-ce-subjectDirectoryAttributes"
SubjectKeyIdentifier B "2.5.29.14" "id-ce-subjectKeyIdentifier"

4
asn1/x509if/x509if.cnf
View File

@ -98,7 +98,7 @@ SearchRuleDescription
SearchRuleId
SubtreeSpecification
#.PDU
#.PDU_NEW
DistinguishedName
#.NO_EMIT
@ -136,7 +136,7 @@ RequestAttribute/defaultValues/_item/values/_item ra_values_item
RequestAttribute/selectedValues ra_selectedValues
RequestAttribute/selectedValues/_item ra_selectedValues_item
#.REGISTER
#.REGISTER_NEW
DistinguishedName B "2.5.4.1" "id-at-aliasedEntryName"
DistinguishedName B "2.5.4.31" "id-at-member"
DistinguishedName B "2.5.4.32" "id-at-owner"

2
asn1/x509sat/x509sat.cnf
View File

@ -101,7 +101,7 @@ TelexNumber
UniqueIdentifier
X121Address
#.REGISTER
#.REGISTER_NEW
ObjectIdentifier B "2.5.4.0" "id-at-objectClass"
# - see x509if.cnf for "id-at-aliasedEntryName"
DirectoryString B "2.5.4.2" "id-at-knowledgeInformation"

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

@ -3758,10 +3758,12 @@ dissect_HI2Operations_IRIsContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
/*--- PDUs ---*/
static void dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_HI2Operations_IRIsContent(FALSE, tvb, 0, &asn1_ctx, tree, hf_HI2Operations_IRIsContent_PDU);
offset = dissect_HI2Operations_IRIsContent(FALSE, tvb, offset, &asn1_ctx, tree, hf_HI2Operations_IRIsContent_PDU);
return offset;
}
@ -5157,7 +5159,7 @@ void proto_register_HI2Operations(void) {
proto_register_field_array(proto_HI2Operations, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
new_register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
}

250
epan/dissectors/packet-acp133.c
View File

@ -1043,130 +1043,180 @@ dissect_acp133_AddressCapabilities(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
/*--- PDUs ---*/
static void dissect_ACPPreferredDelivery_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ACPPreferredDelivery_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_ACPPreferredDelivery(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_ACPPreferredDelivery_PDU);
offset = dissect_acp133_ACPPreferredDelivery(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_ACPPreferredDelivery_PDU);
return offset;
}
static void dissect_ALType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ALType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_ALType(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_ALType_PDU);
offset = dissect_acp133_ALType(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_ALType_PDU);
return offset;
}
static void dissect_Community_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Community_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_Community(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Community_PDU);
offset = dissect_acp133_Community(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_Community_PDU);
return offset;
}
static void dissect_OnSupported_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_OnSupported_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_OnSupported(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_OnSupported_PDU);
offset = dissect_acp133_OnSupported(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_OnSupported_PDU);
return offset;
}
static void dissect_ACPLegacyFormat_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ACPLegacyFormat_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_ACPLegacyFormat(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_ACPLegacyFormat_PDU);
offset = dissect_acp133_ACPLegacyFormat(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_ACPLegacyFormat_PDU);
return offset;
}
static void dissect_ACPNoAttachments_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ACPNoAttachments_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_ACPNoAttachments(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_ACPNoAttachments_PDU);
offset = dissect_acp133_ACPNoAttachments(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_ACPNoAttachments_PDU);
return offset;
}
static void dissect_Active_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Active_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_Active(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Active_PDU);
offset = dissect_acp133_Active(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_Active_PDU);
return offset;
}
static void dissect_Addressees_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Addressees_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_Addressees(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Addressees_PDU);
offset = dissect_acp133_Addressees(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_Addressees_PDU);
return offset;
}
static void dissect_Classification_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Classification_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_Classification(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Classification_PDU);
offset = dissect_acp133_Classification(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_Classification_PDU);
return offset;
}
static void dissect_DistributionCode_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_DistributionCode_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_DistributionCode(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_DistributionCode_PDU);
offset = dissect_acp133_DistributionCode(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_DistributionCode_PDU);
return offset;
}
static void dissect_EmConCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EmConCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_EmConCapability(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_EmConCapability_PDU);
offset = dissect_acp133_EmConCapability(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_EmConCapability_PDU);
return offset;
}
static void dissect_EmConState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EmConState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_EmConState(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_EmConState_PDU);
offset = dissect_acp133_EmConState(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_EmConState_PDU);
return offset;
}
static void dissect_JPEG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_JPEG_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_JPEG(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_JPEG_PDU);
offset = dissect_acp133_JPEG(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_JPEG_PDU);
return offset;
}
static void dissect_MaxMessageSize_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MaxMessageSize_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_MaxMessageSize(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_MaxMessageSize_PDU);
offset = dissect_acp133_MaxMessageSize(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_MaxMessageSize_PDU);
return offset;
}
static void dissect_MonthlyUKMs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MonthlyUKMs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_MonthlyUKMs(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_MonthlyUKMs_PDU);
offset = dissect_acp133_MonthlyUKMs(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_MonthlyUKMs_PDU);
return offset;
}
static void dissect_MsgProtocolInfoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MsgProtocolInfoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_MsgProtocolInfoCapability(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_MsgProtocolInfoCapability_PDU);
offset = dissect_acp133_MsgProtocolInfoCapability(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_MsgProtocolInfoCapability_PDU);
return offset;
}
static void dissect_Remarks_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Remarks_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_Remarks(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Remarks_PDU);
offset = dissect_acp133_Remarks(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_Remarks_PDU);
return offset;
}
static void dissect_RIParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_RIParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_RIParameters(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_RIParameters_PDU);
offset = dissect_acp133_RIParameters(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_RIParameters_PDU);
return offset;
}
static void dissect_WebAccessCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_WebAccessCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_WebAccessCapability(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_WebAccessCapability_PDU);
offset = dissect_acp133_WebAccessCapability(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_WebAccessCapability_PDU);
return offset;
}
static void dissect_Kmid_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Kmid_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_Kmid(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Kmid_PDU);
offset = dissect_acp133_Kmid(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_Kmid_PDU);
return offset;
}
static void dissect_MLReceiptPolicy_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MLReceiptPolicy_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_MLReceiptPolicy(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_MLReceiptPolicy_PDU);
offset = dissect_acp133_MLReceiptPolicy(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_MLReceiptPolicy_PDU);
return offset;
}
static void dissect_DLSubmitPermission_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_DLSubmitPermission_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_DLSubmitPermission(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_DLSubmitPermission_PDU);
offset = dissect_acp133_DLSubmitPermission(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_DLSubmitPermission_PDU);
return offset;
}
static void dissect_DLPolicy_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_DLPolicy_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_DLPolicy(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_DLPolicy_PDU);
offset = dissect_acp133_DLPolicy(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_DLPolicy_PDU);
return offset;
}
static void dissect_AddressCapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AddressCapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_AddressCapabilities(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_AddressCapabilities_PDU);
offset = dissect_acp133_AddressCapabilities(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_AddressCapabilities_PDU);
return offset;
}
static void dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_acp133_Capability(FALSE, tvb, 0, &asn1_ctx, tree, hf_acp133_Capability_PDU);
offset = dissect_acp133_Capability(FALSE, tvb, offset, &asn1_ctx, tree, hf_acp133_Capability_PDU);
return offset;
}
@ -1579,56 +1629,56 @@ void proto_reg_handoff_acp133(void) {
/*--- Included file: packet-acp133-dis-tab.c ---*/
#line 1 "../../asn1/acp133/packet-acp133-dis-tab.c"
register_ber_oid_dissector("2.6.5.2.4", dissect_DLSubmitPermission_PDU, proto_acp133, "id-at-mhs-dl-submit-permissions");
register_ber_oid_dissector("2.6.5.2.13", dissect_DLPolicy_PDU, proto_acp133, "id-at-mhs-dl-policy");
register_ber_oid_dissector("2.6.5.2.16", dissect_AddressCapabilities_PDU, proto_acp133, "id-at-mhs-or-addresses-with-capabilities");
register_ber_oid_dissector("2.6.5.2.19", dissect_Capability_PDU, proto_acp133, "id-at-mhs-deliverable-classes");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.14", dissect_Kmid_PDU, proto_acp133, "id-at-alid");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.20", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-janUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.21", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-febUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.22", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-marUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.23", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-aprUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.24", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-mayUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.25", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-junUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.26", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-julUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.27", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-augUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.28", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-sepUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.29", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-octUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.30", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-novUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.1.5.31", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-decUKMs");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.46", dissect_Addressees_PDU, proto_acp133, "id-at-actionAddressees");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.47", dissect_Addressees_PDU, proto_acp133, "id-at-additionalAddressees");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.48", dissect_Addressees_PDU, proto_acp133, "id-at-additionalSecondPartyAddressees");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.50", dissect_Addressees_PDU, proto_acp133, "id-at-allowableOriginators");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.52", dissect_Community_PDU, proto_acp133, "id-at-community");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.56", dissect_Classification_PDU, proto_acp133, "id-at-entryClassification");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.59", dissect_Addressees_PDU, proto_acp133, "id-at-infoAddressees");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.67", dissect_Classification_PDU, proto_acp133, "id-at-nameClassification");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.71", dissect_Addressees_PDU, proto_acp133, "id-at-plaAddressees");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.76", dissect_Remarks_PDU, proto_acp133, "id-at-remarks");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.78", dissect_Classification_PDU, proto_acp133, "id-at-rIClassification");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.79", dissect_RIParameters_PDU, proto_acp133, "id-at-rIInfo");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.80", dissect_Addressees_PDU, proto_acp133, "id-at-secondPartyAddressees");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.104", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionCodeAction");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.105", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionCodeInfo");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.108", dissect_ACPPreferredDelivery_PDU, proto_acp133, "id-at-aCPPreferredDelivery");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.112", dissect_ALType_PDU, proto_acp133, "id-at-aLType");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.123", dissect_OnSupported_PDU, proto_acp133, "id-at-onSupported");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.135", dissect_MLReceiptPolicy_PDU, proto_acp133, "id-at-aLReceiptPolicy");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.142", dissect_ACPLegacyFormat_PDU, proto_acp133, "id-at-aCPLegacyFormat");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.146", dissect_JPEG_PDU, proto_acp133, "id-at-aCPNetwAccessSchemaEdB");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.147", dissect_JPEG_PDU, proto_acp133, "id-at-aCPNetworkSchemaEdB");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.162", dissect_MaxMessageSize_PDU, proto_acp133, "id-at-maxMessageSize");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.163", dissect_MsgProtocolInfoCapability_PDU, proto_acp133, "id-at-msgProtocolInfoCapability");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.164", dissect_Active_PDU, proto_acp133, "id-at-active");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.165", dissect_EmConCapability_PDU, proto_acp133, "id-at-emConCapability");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.166", dissect_EmConState_PDU, proto_acp133, "id-at-emConState");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.167", dissect_WebAccessCapability_PDU, proto_acp133, "id-at-webAccessCapability");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.168", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionExemptAction");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.169", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionExemptInfo");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.170", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionKeywordAction");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.171", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionKeywordInfo");
register_ber_oid_dissector("2.16.840.1.101.2.2.1.189", dissect_ACPNoAttachments_PDU, proto_acp133, "id-at-aCPNoAttachments");
new_register_ber_oid_dissector("2.6.5.2.4", dissect_DLSubmitPermission_PDU, proto_acp133, "id-at-mhs-dl-submit-permissions");
new_register_ber_oid_dissector("2.6.5.2.13", dissect_DLPolicy_PDU, proto_acp133, "id-at-mhs-dl-policy");
new_register_ber_oid_dissector("2.6.5.2.16", dissect_AddressCapabilities_PDU, proto_acp133, "id-at-mhs-or-addresses-with-capabilities");
new_register_ber_oid_dissector("2.6.5.2.19", dissect_Capability_PDU, proto_acp133, "id-at-mhs-deliverable-classes");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.14", dissect_Kmid_PDU, proto_acp133, "id-at-alid");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.20", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-janUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.21", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-febUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.22", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-marUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.23", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-aprUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.24", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-mayUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.25", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-junUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.26", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-julUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.27", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-augUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.28", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-sepUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.29", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-octUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.30", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-novUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.1.5.31", dissect_MonthlyUKMs_PDU, proto_acp133, "id-at-decUKMs");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.46", dissect_Addressees_PDU, proto_acp133, "id-at-actionAddressees");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.47", dissect_Addressees_PDU, proto_acp133, "id-at-additionalAddressees");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.48", dissect_Addressees_PDU, proto_acp133, "id-at-additionalSecondPartyAddressees");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.50", dissect_Addressees_PDU, proto_acp133, "id-at-allowableOriginators");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.52", dissect_Community_PDU, proto_acp133, "id-at-community");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.56", dissect_Classification_PDU, proto_acp133, "id-at-entryClassification");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.59", dissect_Addressees_PDU, proto_acp133, "id-at-infoAddressees");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.67", dissect_Classification_PDU, proto_acp133, "id-at-nameClassification");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.71", dissect_Addressees_PDU, proto_acp133, "id-at-plaAddressees");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.76", dissect_Remarks_PDU, proto_acp133, "id-at-remarks");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.78", dissect_Classification_PDU, proto_acp133, "id-at-rIClassification");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.79", dissect_RIParameters_PDU, proto_acp133, "id-at-rIInfo");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.80", dissect_Addressees_PDU, proto_acp133, "id-at-secondPartyAddressees");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.104", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionCodeAction");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.105", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionCodeInfo");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.108", dissect_ACPPreferredDelivery_PDU, proto_acp133, "id-at-aCPPreferredDelivery");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.112", dissect_ALType_PDU, proto_acp133, "id-at-aLType");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.123", dissect_OnSupported_PDU, proto_acp133, "id-at-onSupported");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.135", dissect_MLReceiptPolicy_PDU, proto_acp133, "id-at-aLReceiptPolicy");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.142", dissect_ACPLegacyFormat_PDU, proto_acp133, "id-at-aCPLegacyFormat");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.146", dissect_JPEG_PDU, proto_acp133, "id-at-aCPNetwAccessSchemaEdB");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.147", dissect_JPEG_PDU, proto_acp133, "id-at-aCPNetworkSchemaEdB");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.162", dissect_MaxMessageSize_PDU, proto_acp133, "id-at-maxMessageSize");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.163", dissect_MsgProtocolInfoCapability_PDU, proto_acp133, "id-at-msgProtocolInfoCapability");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.164", dissect_Active_PDU, proto_acp133, "id-at-active");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.165", dissect_EmConCapability_PDU, proto_acp133, "id-at-emConCapability");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.166", dissect_EmConState_PDU, proto_acp133, "id-at-emConState");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.167", dissect_WebAccessCapability_PDU, proto_acp133, "id-at-webAccessCapability");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.168", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionExemptAction");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.169", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionExemptInfo");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.170", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionKeywordAction");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.171", dissect_DistributionCode_PDU, proto_acp133, "id-at-distributionKeywordInfo");
new_register_ber_oid_dissector("2.16.840.1.101.2.2.1.189", dissect_ACPNoAttachments_PDU, proto_acp133, "id-at-aCPNoAttachments");
/*--- End of included file: packet-acp133-dis-tab.c ---*/

22
epan/dissectors/packet-atn-cm.c
View File

@ -618,15 +618,21 @@ dissect_atn_cm_CMGroundMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
/*--- PDUs ---*/
static void dissect_CMAircraftMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CMAircraftMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_cm_CMAircraftMessage(tvb, 0, &asn1_ctx, tree, hf_atn_cm_CMAircraftMessage_PDU);
offset = dissect_atn_cm_CMAircraftMessage(tvb, offset, &asn1_ctx, tree, hf_atn_cm_CMAircraftMessage_PDU);
offset += 7; offset >>= 3;
return offset;
}
static void dissect_CMGroundMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CMGroundMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_cm_CMGroundMessage(tvb, 0, &asn1_ctx, tree, hf_atn_cm_CMGroundMessage_PDU);
offset = dissect_atn_cm_CMGroundMessage(tvb, offset, &asn1_ctx, tree, hf_atn_cm_CMGroundMessage_PDU);
offset += 7; offset >>= 3;
return offset;
}
@ -658,13 +664,13 @@ dissect_atn_cm(
dissect_CMGroundMessage_PDU(
tvb,
pinfo,
sub_tree);
sub_tree, NULL);
break;
case dm:
dissect_CMAircraftMessage_PDU(
tvb,
pinfo,
sub_tree);
sub_tree, NULL);
break;
default:
break;
@ -693,7 +699,7 @@ dissect_atn_cm_heur(
dissect_CMGroundMessage_PDU(
tvb,
pinfo,
NULL);
NULL, NULL);
/* no exception thrown: looks like it is a CM PDU */
is_atn_cm = TRUE; }
CATCH_ALL {
@ -705,7 +711,7 @@ dissect_atn_cm_heur(
dissect_CMAircraftMessage_PDU(
tvb,
pinfo,
NULL);
NULL, NULL);
/* no exception thrown: looks like it is a CM PDU */
is_atn_cm = TRUE;}
CATCH_ALL {

74
epan/dissectors/packet-atn-cpdlc.c
View File

@ -77,22 +77,26 @@ void proto_reg_handoff_atn_cpdlc(void);
static const char *object_identifier_id;
/* forward declarations */
static void dissect_GroundPDUs_PDU(
static int dissect_GroundPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
static void dissect_AircraftPDUs_PDU(
proto_tree *tree _U_,
void *data _U_);
static int dissect_AircraftPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
static void dissect_ProtectedGroundPDUs_PDU(
proto_tree *tree _U_,
void *data _U_);
static int dissect_ProtectedGroundPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
static void dissect_ProtectedAircraftPDUs_PDU(
proto_tree *tree _U_,
void *data _U_);
static int dissect_ProtectedAircraftPDUs_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
proto_tree *tree _U_,
void *data _U_);
/*--- Included file: packet-atn-cpdlc-hf.c ---*/
@ -700,7 +704,7 @@ static int hf_atn_cpdlc_windSpeedEnglish = -1; /* WindSpeedEnglish */
static int hf_atn_cpdlc_windSpeedMetric = -1; /* WindSpeedMetric */
/*--- End of included file: packet-atn-cpdlc-hf.c ---*/
#line 90 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
#line 94 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
/*--- Included file: packet-atn-cpdlc-ett.c ---*/
@ -849,7 +853,7 @@ static gint ett_atn_cpdlc_Winds = -1;
static gint ett_atn_cpdlc_WindSpeed = -1;
/*--- End of included file: packet-atn-cpdlc-ett.c ---*/
#line 92 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
#line 96 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
static gint ett_atn_cpdlc = -1;
@ -5265,30 +5269,42 @@ dissect_atn_cpdlc_ProtectedAircraftPDUs(tvbuff_t *tvb _U_, int offset _U_, asn1_
/*--- PDUs ---*/
static void dissect_GroundPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_GroundPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_cpdlc_GroundPDUs(tvb, 0, &asn1_ctx, tree, hf_atn_cpdlc_GroundPDUs_PDU);
offset = dissect_atn_cpdlc_GroundPDUs(tvb, offset, &asn1_ctx, tree, hf_atn_cpdlc_GroundPDUs_PDU);
offset += 7; offset >>= 3;
return offset;
}
static void dissect_AircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_cpdlc_AircraftPDUs(tvb, 0, &asn1_ctx, tree, hf_atn_cpdlc_AircraftPDUs_PDU);
offset = dissect_atn_cpdlc_AircraftPDUs(tvb, offset, &asn1_ctx, tree, hf_atn_cpdlc_AircraftPDUs_PDU);
offset += 7; offset >>= 3;
return offset;
}
static void dissect_ProtectedGroundPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ProtectedGroundPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_cpdlc_ProtectedGroundPDUs(tvb, 0, &asn1_ctx, tree, hf_atn_cpdlc_ProtectedGroundPDUs_PDU);
offset = dissect_atn_cpdlc_ProtectedGroundPDUs(tvb, offset, &asn1_ctx, tree, hf_atn_cpdlc_ProtectedGroundPDUs_PDU);
offset += 7; offset >>= 3;
return offset;
}
static void dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_cpdlc_ProtectedAircraftPDUs(tvb, 0, &asn1_ctx, tree, hf_atn_cpdlc_ProtectedAircraftPDUs_PDU);
offset = dissect_atn_cpdlc_ProtectedAircraftPDUs(tvb, offset, &asn1_ctx, tree, hf_atn_cpdlc_ProtectedAircraftPDUs_PDU);
offset += 7; offset >>= 3;
return offset;
}
/*--- End of included file: packet-atn-cpdlc-fn.c ---*/
#line 95 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
#line 99 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
/* Wireshark ID of CPDLC protocol */
static int proto_atn_cpdlc = -1;
@ -5369,12 +5385,12 @@ dissect_atn_cpdlc(
dissect_ProtectedGroundPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}else { /* downlink PDU's = Aircraft PDU's */
dissect_ProtectedAircraftPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}
break;
case cpdlc:
@ -5383,12 +5399,12 @@ dissect_atn_cpdlc(
dissect_GroundPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}else { /* downlink PDU's = Aircraft PDU's */
dissect_AircraftPDUs_PDU(
tvb,
pinfo,
atn_cpdlc_tree);
atn_cpdlc_tree, NULL);
}
break;
default:
@ -5414,7 +5430,7 @@ dissect_atn_cpdlc_heur(
switch(type){
case um:
TRY {
dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL);
dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL, NULL);
is_atn_cpdlc = TRUE;
is_pm = TRUE;
break;}
@ -5423,7 +5439,7 @@ dissect_atn_cpdlc_heur(
is_pm = FALSE;}
ENDTRY;
TRY {
dissect_GroundPDUs_PDU(tvb, pinfo, NULL);
dissect_GroundPDUs_PDU(tvb, pinfo, NULL, NULL);
is_pm = FALSE;
is_atn_cpdlc = TRUE;
break;}
@ -5434,7 +5450,7 @@ dissect_atn_cpdlc_heur(
break;
case dm:
TRY {
dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL);
dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL, NULL);
is_atn_cpdlc = TRUE;
is_pm = TRUE;
break;}
@ -5443,7 +5459,7 @@ dissect_atn_cpdlc_heur(
is_pm = FALSE; }
ENDTRY;
TRY{
dissect_AircraftPDUs_PDU(tvb, pinfo, NULL);
dissect_AircraftPDUs_PDU(tvb, pinfo, NULL, NULL);
is_atn_cpdlc = TRUE;
is_pm = FALSE;
break;}
@ -7910,7 +7926,7 @@ void proto_register_atn_cpdlc (void)
NULL, HFILL }},
/*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/
#line 308 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
#line 312 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
};
static gint *ett[] = {
@ -8061,7 +8077,7 @@ void proto_register_atn_cpdlc (void)
&ett_atn_cpdlc_WindSpeed,
/*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/
#line 312 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
#line 316 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c"
&ett_atn_cpdlc
};

35
epan/dissectors/packet-atn-ulcs.c
View File

@ -182,10 +182,11 @@ static int dissect_atn_ulcs_T_externalt_encoding_arbitrary(
proto_tree *tree _U_,
int hf_index _U_);
static void dissect_ACSE_apdu_PDU(
static int dissect_ACSE_apdu_PDU(
tvbuff_t *tvb _U_,
packet_info *pinfo _U_,
proto_tree *tree _U_);
proto_tree *tree _U_,
void *data _U_);
guint32 dissect_per_object_descriptor_t(
tvbuff_t *tvb,
@ -279,7 +280,7 @@ static int hf_atn_ulcs_ACSE_requirements_authentication = -1;
static int hf_atn_ulcs_ACSE_requirements_application_context_negotiation = -1;
/*--- End of included file: packet-atn-ulcs-hf.c ---*/
#line 197 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
#line 198 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
/*--- Included file: packet-atn-ulcs-ett.c ---*/
@ -311,7 +312,7 @@ static gint ett_atn_ulcs_RelativeDistinguishedName = -1;
static gint ett_atn_ulcs_AttributeTypeAndValue = -1;
/*--- End of included file: packet-atn-ulcs-ett.c ---*/
#line 199 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
#line 200 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
static gint ett_atn_ulcs = -1;
static gint ett_atn_acse = -1;
@ -408,7 +409,7 @@ dissect_atn_ulcs_T_pdv_list_presentation_data_values_arbitrary(tvbuff_t *tvb _U_
dissect_ACSE_apdu_PDU(
tvb_new_subset_remaining(tvb_usr, 0),
pinfo,
atn_ulcs_tree);
atn_ulcs_tree, NULL);
break;
case 3: /* USER data; call subdissector for CM, CPDLC ... */
@ -1583,20 +1584,26 @@ dissect_atn_ulcs_ACSE_apdu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
/*--- PDUs ---*/
static void dissect_Fully_encoded_data_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Fully_encoded_data_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_ulcs_Fully_encoded_data(tvb, 0, &asn1_ctx, tree, hf_atn_ulcs_Fully_encoded_data_PDU);
offset = dissect_atn_ulcs_Fully_encoded_data(tvb, offset, &asn1_ctx, tree, hf_atn_ulcs_Fully_encoded_data_PDU);
offset += 7; offset >>= 3;
return offset;
}
static void dissect_ACSE_apdu_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ACSE_apdu_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
dissect_atn_ulcs_ACSE_apdu(tvb, 0, &asn1_ctx, tree, hf_atn_ulcs_ACSE_apdu_PDU);
offset = dissect_atn_ulcs_ACSE_apdu(tvb, offset, &asn1_ctx, tree, hf_atn_ulcs_ACSE_apdu_PDU);
offset += 7; offset >>= 3;
return offset;
}
/*--- End of included file: packet-atn-ulcs-fn.c ---*/
#line 203 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
#line 204 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
#if 0
/* re-implementing external data: packet-per.c */
@ -2001,7 +2008,7 @@ dissect_atn_ulcs(
dissect_Fully_encoded_data_PDU(
tvb,
pinfo,
atn_ulcs_tree);
atn_ulcs_tree, NULL);
return offset +
tvb_reported_length_remaining(tvb, offset ) ;
@ -2109,7 +2116,7 @@ dissect_atn_ulcs(
dissect_ACSE_apdu_PDU(
tvb_new_subset_remaining(tvb, offset),
pinfo,
atn_ulcs_tree);
atn_ulcs_tree, NULL);
return offset +
tvb_reported_length_remaining(tvb, offset );
@ -2481,7 +2488,7 @@ void proto_register_atn_ulcs (void)
NULL, HFILL }},
/*--- End of included file: packet-atn-ulcs-hfarr.c ---*/
#line 795 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
#line 796 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
{&hf_atn_ses_type,
{ "SPDU Type",
"atn-ulcs.ses.type",
@ -2569,7 +2576,7 @@ void proto_register_atn_ulcs (void)
&ett_atn_ulcs_AttributeTypeAndValue,
/*--- End of included file: packet-atn-ulcs-ettarr.c ---*/
#line 853 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
#line 854 "../../asn1/atn-ulcs/packet-atn-ulcs-template.c"
&ett_atn_ses,
&ett_atn_pres,
&ett_atn_acse,

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

@ -1559,10 +1559,12 @@ dissect_c1222_MESSAGE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
/*--- PDUs ---*/
static void dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_c1222_MESSAGE(FALSE, tvb, 0, &asn1_ctx, tree, hf_c1222_MESSAGE_PDU);
offset = dissect_c1222_MESSAGE(FALSE, tvb, offset, &asn1_ctx, tree, hf_c1222_MESSAGE_PDU);
return offset;
}
@ -1586,13 +1588,9 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
/* create the c1222 protocol tree */
if (tree) {
c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA);
c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222);
dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree);
}
return tvb_captured_length(tvb);
c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA);
c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222);
return dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree, NULL);
}
/**
@ -1957,7 +1955,7 @@ void proto_register_c1222(void) {
"OCTET_STRING_SIZE_CONSTR002", HFILL }},
/*--- End of included file: packet-c1222-hfarr.c ---*/
#line 1336 "../../asn1/c1222/packet-c1222-template.c"
#line 1332 "../../asn1/c1222/packet-c1222-template.c"
};
/* List of subtrees */
@ -1980,7 +1978,7 @@ void proto_register_c1222(void) {
&ett_c1222_Calling_authentication_value_c1221_U,
/*--- End of included file: packet-c1222-ettarr.c ---*/
#line 1346 "../../asn1/c1222/packet-c1222-template.c"
#line 1342 "../../asn1/c1222/packet-c1222-template.c"
};
static ei_register_info ei[] = {

16
epan/dissectors/packet-camel.c
View File

@ -6673,10 +6673,12 @@ static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
offset = dissect_camel_PAR_taskRefused(FALSE, tvb, offset, &asn1_ctx, tree, hf_camel_PAR_taskRefused_PDU);
return offset;
}
static void dissect_CAP_GPRS_ReferenceNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CAP_GPRS_ReferenceNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_camel_CAP_GPRS_ReferenceNumber(FALSE, tvb, 0, &asn1_ctx, tree, hf_camel_CAP_GPRS_ReferenceNumber_PDU);
offset = dissect_camel_CAP_GPRS_ReferenceNumber(FALSE, tvb, offset, &asn1_ctx, tree, hf_camel_CAP_GPRS_ReferenceNumber_PDU);
return offset;
}
static int dissect_PlayAnnouncementArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
@ -7035,10 +7037,12 @@ static int dissect_ResetTimerSMSArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
offset = dissect_camel_ResetTimerSMSArg(FALSE, tvb, offset, &asn1_ctx, tree, hf_camel_ResetTimerSMSArg_PDU);
return offset;
}
static void dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CAP_U_ABORT_REASON_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_camel_CAP_U_ABORT_REASON(FALSE, tvb, 0, &asn1_ctx, tree, hf_camel_CAP_U_ABORT_REASON_PDU);
offset = dissect_camel_CAP_U_ABORT_REASON(FALSE, tvb, offset, &asn1_ctx, tree, hf_camel_CAP_U_ABORT_REASON_PDU);
return offset;
}
@ -8097,8 +8101,8 @@ void proto_reg_handoff_camel(void) {
/*--- Included file: packet-camel-dis-tab.c ---*/
#line 1 "../../asn1/camel/packet-camel-dis-tab.c"
register_ber_oid_dissector("0.4.0.0.1.1.5.2", dissect_CAP_GPRS_ReferenceNumber_PDU, proto_camel, "id-CAP-GPRS-ReferenceNumber");
register_ber_oid_dissector("0.4.0.0.1.1.2.2", dissect_CAP_U_ABORT_REASON_PDU, proto_camel, "id-CAP-U-ABORT-Reason");
new_register_ber_oid_dissector("0.4.0.0.1.1.5.2", dissect_CAP_GPRS_ReferenceNumber_PDU, proto_camel, "id-CAP-GPRS-ReferenceNumber");
new_register_ber_oid_dissector("0.4.0.0.1.1.2.2", dissect_CAP_U_ABORT_REASON_PDU, proto_camel, "id-CAP-U-ABORT-Reason");
/*--- End of included file: packet-camel-dis-tab.c ---*/

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

@ -328,10 +328,12 @@ dissect_cdt_CompressedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
/*--- PDUs ---*/
static void dissect_CompressedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CompressedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cdt_CompressedData(FALSE, tvb, 0, &asn1_ctx, tree, hf_cdt_CompressedData_PDU);
offset = dissect_cdt_CompressedData(FALSE, tvb, offset, &asn1_ctx, tree, hf_cdt_CompressedData_PDU);
return offset;
}
@ -361,7 +363,7 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_set_str (pinfo->cinfo, COL_PROTOCOL, "CDT");
col_clear (pinfo->cinfo, COL_INFO);
dissect_CompressedData_PDU (tvb, pinfo, tree);
dissect_CompressedData_PDU (tvb, pinfo, tree, NULL);
}
void proto_register_cdt (void) {
@ -449,7 +451,7 @@ void proto_reg_handoff_cdt (void) {
/*--- Included file: packet-cdt-dis-tab.c ---*/
#line 1 "../../asn1/cdt/packet-cdt-dis-tab.c"
register_ber_oid_dissector("1.3.26.0.4406.0.4.2", dissect_CompressedData_PDU, proto_cdt, "cdt");
new_register_ber_oid_dissector("1.3.26.0.4406.0.4.2", dissect_CompressedData_PDU, proto_cdt, "cdt");
/*--- End of included file: packet-cdt-dis-tab.c ---*/

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

@ -4061,310 +4061,432 @@ dissect_cmip_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
/*--- PDUs ---*/
static void dissect_BaseManagedObjectId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_BaseManagedObjectId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_BaseManagedObjectId(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_BaseManagedObjectId_PDU);
offset = dissect_cmip_BaseManagedObjectId(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_BaseManagedObjectId_PDU);
return offset;
}
static void dissect_EventTypeId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EventTypeId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_EventTypeId(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_EventTypeId_PDU);
offset = dissect_cmip_EventTypeId(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_EventTypeId_PDU);
return offset;
}
static void dissect_ObjectClass_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ObjectClass_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ObjectClass(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ObjectClass_PDU);
offset = dissect_cmip_ObjectClass(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ObjectClass_PDU);
return offset;
}
static void dissect_ActiveDestination_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ActiveDestination_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ActiveDestination(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ActiveDestination_PDU);
offset = dissect_cmip_ActiveDestination(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ActiveDestination_PDU);
return offset;
}
static void dissect_AdditionalText_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AdditionalText_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AdditionalText(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AdditionalText_PDU);
offset = dissect_cmip_AdditionalText(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AdditionalText_PDU);
return offset;
}
static void dissect_AdditionalInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AdditionalInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AdditionalInformation(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AdditionalInformation_PDU);
offset = dissect_cmip_AdditionalInformation(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AdditionalInformation_PDU);
return offset;
}
static void dissect_Allomorphs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Allomorphs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_Allomorphs(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_Allomorphs_PDU);
offset = dissect_cmip_Allomorphs(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_Allomorphs_PDU);
return offset;
}
static void dissect_AdministrativeState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AdministrativeState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AdministrativeState(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AdministrativeState_PDU);
offset = dissect_cmip_AdministrativeState(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AdministrativeState_PDU);
return offset;
}
static void dissect_AttributeIdentifierList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AttributeIdentifierList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AttributeIdentifierList(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AttributeIdentifierList_PDU);
offset = dissect_cmip_AttributeIdentifierList(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AttributeIdentifierList_PDU);
return offset;
}
static void dissect_AttributeList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AttributeList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AttributeList(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AttributeList_PDU);
offset = dissect_cmip_AttributeList(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AttributeList_PDU);
return offset;
}
static void dissect_AttributeValueChangeDefinition_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AttributeValueChangeDefinition_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AttributeValueChangeDefinition(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AttributeValueChangeDefinition_PDU);
offset = dissect_cmip_AttributeValueChangeDefinition(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AttributeValueChangeDefinition_PDU);
return offset;
}
static void dissect_AlarmStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AlarmStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AlarmStatus(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AlarmStatus_PDU);
offset = dissect_cmip_AlarmStatus(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AlarmStatus_PDU);
return offset;
}
static void dissect_AvailabilityStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AvailabilityStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_AvailabilityStatus(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_AvailabilityStatus_PDU);
offset = dissect_cmip_AvailabilityStatus(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_AvailabilityStatus_PDU);
return offset;
}
static void dissect_BackedUpStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_BackedUpStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_BackedUpStatus(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_BackedUpStatus_PDU);
offset = dissect_cmip_BackedUpStatus(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_BackedUpStatus_PDU);
return offset;
}
static void dissect_BackUpDestinationList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_BackUpDestinationList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_BackUpDestinationList(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_BackUpDestinationList_PDU);
offset = dissect_cmip_BackUpDestinationList(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_BackUpDestinationList_PDU);
return offset;
}
static void dissect_BackUpRelationshipObject_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_BackUpRelationshipObject_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_BackUpRelationshipObject(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_BackUpRelationshipObject_PDU);
offset = dissect_cmip_BackUpRelationshipObject(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_BackUpRelationshipObject_PDU);
return offset;
}
static void dissect_CapacityAlarmThreshold_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CapacityAlarmThreshold_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_CapacityAlarmThreshold(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_CapacityAlarmThreshold_PDU);
offset = dissect_cmip_CapacityAlarmThreshold(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_CapacityAlarmThreshold_PDU);
return offset;
}
static void dissect_ConfirmedMode_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ConfirmedMode_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ConfirmedMode(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ConfirmedMode_PDU);
offset = dissect_cmip_ConfirmedMode(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ConfirmedMode_PDU);
return offset;
}
static void dissect_ControlStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ControlStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ControlStatus(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ControlStatus_PDU);
offset = dissect_cmip_ControlStatus(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ControlStatus_PDU);
return offset;
}
static void dissect_CorrelatedNotifications_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CorrelatedNotifications_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_CorrelatedNotifications(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_CorrelatedNotifications_PDU);
offset = dissect_cmip_CorrelatedNotifications(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_CorrelatedNotifications_PDU);
return offset;
}
static void dissect_CurrentLogSize_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CurrentLogSize_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_CurrentLogSize(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_CurrentLogSize_PDU);
offset = dissect_cmip_CurrentLogSize(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_CurrentLogSize_PDU);
return offset;
}
static void dissect_Destination_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Destination_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_Destination(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_Destination_PDU);
offset = dissect_cmip_Destination(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_Destination_PDU);
return offset;
}
static void dissect_DiscriminatorConstruct_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_DiscriminatorConstruct_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_DiscriminatorConstruct(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_DiscriminatorConstruct_PDU);
offset = dissect_cmip_DiscriminatorConstruct(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_DiscriminatorConstruct_PDU);
return offset;
}
static void dissect_EventTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EventTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_EventTime(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_EventTime_PDU);
offset = dissect_cmip_EventTime(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_EventTime_PDU);
return offset;
}
static void dissect_GroupObjects_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_GroupObjects_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_GroupObjects(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_GroupObjects_PDU);
offset = dissect_cmip_GroupObjects(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_GroupObjects_PDU);
return offset;
}
static void dissect_IntervalsOfDay_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_IntervalsOfDay_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_IntervalsOfDay(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_IntervalsOfDay_PDU);
offset = dissect_cmip_IntervalsOfDay(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_IntervalsOfDay_PDU);
return offset;
}
static void dissect_LifecycleState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_LifecycleState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_LifecycleState(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_LifecycleState_PDU);
offset = dissect_cmip_LifecycleState(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_LifecycleState_PDU);
return offset;
}
static void dissect_LogFullAction_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_LogFullAction_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_LogFullAction(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_LogFullAction_PDU);
offset = dissect_cmip_LogFullAction(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_LogFullAction_PDU);
return offset;
}
static void dissect_LoggingTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_LoggingTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_LoggingTime(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_LoggingTime_PDU);
offset = dissect_cmip_LoggingTime(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_LoggingTime_PDU);
return offset;
}
static void dissect_LogRecordId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_LogRecordId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_LogRecordId(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_LogRecordId_PDU);
offset = dissect_cmip_LogRecordId(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_LogRecordId_PDU);
return offset;
}
static void dissect_MaxLogSize_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MaxLogSize_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_MaxLogSize(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_MaxLogSize_PDU);
offset = dissect_cmip_MaxLogSize(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_MaxLogSize_PDU);
return offset;
}
static void dissect_MonitoredAttributes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MonitoredAttributes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_MonitoredAttributes(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_MonitoredAttributes_PDU);
offset = dissect_cmip_MonitoredAttributes(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_MonitoredAttributes_PDU);
return offset;
}
static void dissect_NameBinding_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_NameBinding_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_NameBinding(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_NameBinding_PDU);
offset = dissect_cmip_NameBinding(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_NameBinding_PDU);
return offset;
}
static void dissect_NotificationIdentifier_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_NotificationIdentifier_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_NotificationIdentifier(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_NotificationIdentifier_PDU);
offset = dissect_cmip_NotificationIdentifier(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_NotificationIdentifier_PDU);
return offset;
}
static void dissect_NumberOfRecords_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_NumberOfRecords_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_NumberOfRecords(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_NumberOfRecords_PDU);
offset = dissect_cmip_NumberOfRecords(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_NumberOfRecords_PDU);
return offset;
}
static void dissect_OperationalState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_OperationalState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_OperationalState(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_OperationalState_PDU);
offset = dissect_cmip_OperationalState(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_OperationalState_PDU);
return offset;
}
static void dissect_Packages_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Packages_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_Packages(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_Packages_PDU);
offset = dissect_cmip_Packages(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_Packages_PDU);
return offset;
}
static void dissect_PerceivedSeverity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_PerceivedSeverity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_PerceivedSeverity(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_PerceivedSeverity_PDU);
offset = dissect_cmip_PerceivedSeverity(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_PerceivedSeverity_PDU);
return offset;
}
static void dissect_PrioritisedObject_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_PrioritisedObject_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_PrioritisedObject(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_PrioritisedObject_PDU);
offset = dissect_cmip_PrioritisedObject(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_PrioritisedObject_PDU);
return offset;
}
static void dissect_ProbableCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ProbableCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ProbableCause(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ProbableCause_PDU);
offset = dissect_cmip_ProbableCause(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ProbableCause_PDU);
return offset;
}
static void dissect_ProceduralStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ProceduralStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ProceduralStatus(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ProceduralStatus_PDU);
offset = dissect_cmip_ProceduralStatus(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ProceduralStatus_PDU);
return offset;
}
static void dissect_ProposedRepairActions_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ProposedRepairActions_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ProposedRepairActions(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ProposedRepairActions_PDU);
offset = dissect_cmip_ProposedRepairActions(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ProposedRepairActions_PDU);
return offset;
}
static void dissect_SecurityAlarmCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SecurityAlarmCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SecurityAlarmCause(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SecurityAlarmCause_PDU);
offset = dissect_cmip_SecurityAlarmCause(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SecurityAlarmCause_PDU);
return offset;
}
static void dissect_SecurityAlarmSeverity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SecurityAlarmSeverity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SecurityAlarmSeverity(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SecurityAlarmSeverity_PDU);
offset = dissect_cmip_SecurityAlarmSeverity(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SecurityAlarmSeverity_PDU);
return offset;
}
static void dissect_SecurityAlarmDetector_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SecurityAlarmDetector_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SecurityAlarmDetector(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SecurityAlarmDetector_PDU);
offset = dissect_cmip_SecurityAlarmDetector(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SecurityAlarmDetector_PDU);
return offset;
}
static void dissect_ServiceProvider_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ServiceProvider_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ServiceProvider(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ServiceProvider_PDU);
offset = dissect_cmip_ServiceProvider(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ServiceProvider_PDU);
return offset;
}
static void dissect_ServiceUser_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ServiceUser_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ServiceUser(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ServiceUser_PDU);
offset = dissect_cmip_ServiceUser(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ServiceUser_PDU);
return offset;
}
static void dissect_SimpleNameType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SimpleNameType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SimpleNameType(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SimpleNameType_PDU);
offset = dissect_cmip_SimpleNameType(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SimpleNameType_PDU);
return offset;
}
static void dissect_SourceIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SourceIndicator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SourceIndicator(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SourceIndicator_PDU);
offset = dissect_cmip_SourceIndicator(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SourceIndicator_PDU);
return offset;
}
static void dissect_SpecificProblems_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SpecificProblems_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SpecificProblems(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SpecificProblems_PDU);
offset = dissect_cmip_SpecificProblems(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SpecificProblems_PDU);
return offset;
}
static void dissect_StandbyStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_StandbyStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_StandbyStatus(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_StandbyStatus_PDU);
offset = dissect_cmip_StandbyStatus(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_StandbyStatus_PDU);
return offset;
}
static void dissect_StartTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_StartTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_StartTime(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_StartTime_PDU);
offset = dissect_cmip_StartTime(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_StartTime_PDU);
return offset;
}
static void dissect_StopTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_StopTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_StopTime(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_StopTime_PDU);
offset = dissect_cmip_StopTime(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_StopTime_PDU);
return offset;
}
static void dissect_SupportedFeatures_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SupportedFeatures_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SupportedFeatures(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SupportedFeatures_PDU);
offset = dissect_cmip_SupportedFeatures(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SupportedFeatures_PDU);
return offset;
}
static void dissect_SystemId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SystemId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SystemId(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SystemId_PDU);
offset = dissect_cmip_SystemId(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SystemId_PDU);
return offset;
}
static void dissect_SystemTitle_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SystemTitle_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_SystemTitle(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_SystemTitle_PDU);
offset = dissect_cmip_SystemTitle(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_SystemTitle_PDU);
return offset;
}
static void dissect_ThresholdInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ThresholdInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_ThresholdInfo(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_ThresholdInfo_PDU);
offset = dissect_cmip_ThresholdInfo(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_ThresholdInfo_PDU);
return offset;
}
static void dissect_TrendIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_TrendIndication_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_TrendIndication(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_TrendIndication_PDU);
offset = dissect_cmip_TrendIndication(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_TrendIndication_PDU);
return offset;
}
static void dissect_UnknownStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_UnknownStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_UnknownStatus(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_UnknownStatus_PDU);
offset = dissect_cmip_UnknownStatus(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_UnknownStatus_PDU);
return offset;
}
static void dissect_UsageState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_UsageState_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_UsageState(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_UsageState_PDU);
offset = dissect_cmip_UsageState(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_UsageState_PDU);
return offset;
}
static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmip_WeekMask(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmip_WeekMask_PDU);
offset = dissect_cmip_WeekMask(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmip_WeekMask_PDU);
return offset;
}
@ -5720,76 +5842,76 @@ void proto_register_cmip(void) {
/*--- Included file: packet-cmip-dis-tab.c ---*/
#line 1 "../../asn1/cmip/packet-cmip-dis-tab.c"
register_ber_oid_dissector("2.9.2.21.7.13", dissect_BaseManagedObjectId_PDU, proto_cmip, "BaseManagedObjectId(13)");
register_ber_oid_dissector("2.9.3.2.7.1", dissect_SimpleNameType_PDU, proto_cmip, "discriminatorId(1)");
register_ber_oid_dissector("2.9.3.2.7.2", dissect_SimpleNameType_PDU, proto_cmip, "logId(2)");
register_ber_oid_dissector("2.9.3.2.7.3", dissect_LogRecordId_PDU, proto_cmip, "logRecordId(3)");
register_ber_oid_dissector("2.9.3.2.7.4", dissect_SystemId_PDU, proto_cmip, "systemId(4)");
register_ber_oid_dissector("2.9.3.2.7.5", dissect_SystemTitle_PDU, proto_cmip, "systemTitle(5)");
register_ber_oid_dissector("2.9.3.2.7.6", dissect_AdditionalInformation_PDU, proto_cmip, "additionalInformation(6)");
register_ber_oid_dissector("2.9.3.2.7.7", dissect_AdditionalText_PDU, proto_cmip, "additionalText(7)");
register_ber_oid_dissector("2.9.3.2.7.8", dissect_AttributeIdentifierList_PDU, proto_cmip, "attributeIdentifierList(8)");
register_ber_oid_dissector("2.9.3.2.7.9", dissect_AttributeList_PDU, proto_cmip, "attributeList(9)");
register_ber_oid_dissector("2.9.3.2.7.10", dissect_AttributeValueChangeDefinition_PDU, proto_cmip, "attributeValueChangeDefinition(10)");
register_ber_oid_dissector("2.9.3.2.7.11", dissect_BackedUpStatus_PDU, proto_cmip, "backedUpStatus(11)");
register_ber_oid_dissector("2.9.3.2.7.12", dissect_CorrelatedNotifications_PDU, proto_cmip, "correlatedNotifications(12)");
register_ber_oid_dissector("2.9.3.2.7.13", dissect_EventTime_PDU, proto_cmip, "eventTime(13)");
register_ber_oid_dissector("2.9.3.2.7.14", dissect_EventTypeId_PDU, proto_cmip, "eventType(14)");
register_ber_oid_dissector("2.9.3.2.7.15", dissect_MonitoredAttributes_PDU, proto_cmip, "monitoredAttributes(15)");
register_ber_oid_dissector("2.9.3.2.7.16", dissect_NotificationIdentifier_PDU, proto_cmip, "notificationIdentifier(16)");
register_ber_oid_dissector("2.9.3.2.7.17", dissect_PerceivedSeverity_PDU, proto_cmip, "perceivedSeverity(17)");
register_ber_oid_dissector("2.9.3.2.7.18", dissect_ProbableCause_PDU, proto_cmip, "probableCause(18)");
register_ber_oid_dissector("2.9.3.2.7.19", dissect_ProposedRepairActions_PDU, proto_cmip, "proposedRepairActions(19)");
register_ber_oid_dissector("2.9.3.2.7.20", dissect_AttributeValueChangeDefinition_PDU, proto_cmip, "relationshipChangeDefinition(20)");
register_ber_oid_dissector("2.9.3.2.7.21", dissect_SecurityAlarmCause_PDU, proto_cmip, "securityAlarmCause(21)");
register_ber_oid_dissector("2.9.3.2.7.22", dissect_SecurityAlarmDetector_PDU, proto_cmip, "securityAlarmDetector(22)");
register_ber_oid_dissector("2.9.3.2.7.23", dissect_SecurityAlarmSeverity_PDU, proto_cmip, "securityAlarmSeverity(23)");
register_ber_oid_dissector("2.9.3.2.7.24", dissect_ServiceProvider_PDU, proto_cmip, "serviceProvider(24)");
register_ber_oid_dissector("2.9.3.2.7.25", dissect_ServiceUser_PDU, proto_cmip, "serviceUser(25)");
register_ber_oid_dissector("2.9.3.2.7.26", dissect_SourceIndicator_PDU, proto_cmip, "sourceIndicator(26)");
register_ber_oid_dissector("2.9.3.2.7.27", dissect_SpecificProblems_PDU, proto_cmip, "specificProblems(27)");
register_ber_oid_dissector("2.9.3.2.7.28", dissect_AttributeValueChangeDefinition_PDU, proto_cmip, "stateChangeDefinition(28)");
register_ber_oid_dissector("2.9.3.2.7.29", dissect_ThresholdInfo_PDU, proto_cmip, "thresholdInfo(29)");
register_ber_oid_dissector("2.9.3.2.7.30", dissect_TrendIndication_PDU, proto_cmip, "trendIndication(30)");
register_ber_oid_dissector("2.9.3.2.7.31", dissect_AdministrativeState_PDU, proto_cmip, "administrativeState(31)");
register_ber_oid_dissector("2.9.3.2.7.32", dissect_AlarmStatus_PDU, proto_cmip, "alarmStatus(32)");
register_ber_oid_dissector("2.9.3.2.7.33", dissect_AvailabilityStatus_PDU, proto_cmip, "availabilityStatus(33)");
register_ber_oid_dissector("2.9.3.2.7.34", dissect_ControlStatus_PDU, proto_cmip, "controlStatus(34)");
register_ber_oid_dissector("2.9.3.2.7.35", dissect_OperationalState_PDU, proto_cmip, "operationalState(35)");
register_ber_oid_dissector("2.9.3.2.7.36", dissect_ProceduralStatus_PDU, proto_cmip, "proceduralStatus(36)");
register_ber_oid_dissector("2.9.3.2.7.37", dissect_StandbyStatus_PDU, proto_cmip, "standbyStatus(37)");
register_ber_oid_dissector("2.9.3.2.7.38", dissect_UnknownStatus_PDU, proto_cmip, "unknownStatus(38)");
register_ber_oid_dissector("2.9.3.2.7.39", dissect_UsageState_PDU, proto_cmip, "usageState(39)");
register_ber_oid_dissector("2.9.3.2.7.40", dissect_BackUpRelationshipObject_PDU, proto_cmip, "backUpObject(40)");
register_ber_oid_dissector("2.9.3.2.7.41", dissect_BackUpRelationshipObject_PDU, proto_cmip, "backedUpObject(41)");
register_ber_oid_dissector("2.9.3.2.7.42", dissect_GroupObjects_PDU, proto_cmip, "member(42)");
register_ber_oid_dissector("2.9.3.2.7.43", dissect_GroupObjects_PDU, proto_cmip, "owner(43)");
register_ber_oid_dissector("2.9.3.2.7.44", dissect_BackUpRelationshipObject_PDU, proto_cmip, "peer(44)");
register_ber_oid_dissector("2.9.3.2.7.45", dissect_PrioritisedObject_PDU, proto_cmip, "primary(45)");
register_ber_oid_dissector("2.9.3.2.7.46", dissect_PrioritisedObject_PDU, proto_cmip, "providerObject(46)");
register_ber_oid_dissector("2.9.3.2.7.47", dissect_PrioritisedObject_PDU, proto_cmip, "secondary(47)");
register_ber_oid_dissector("2.9.3.2.7.48", dissect_PrioritisedObject_PDU, proto_cmip, "userObject(48)");
register_ber_oid_dissector("2.9.3.2.7.49", dissect_ActiveDestination_PDU, proto_cmip, "activeDestination(49)");
register_ber_oid_dissector("2.9.3.2.7.50", dissect_Allomorphs_PDU, proto_cmip, "allomorphs(50)");
register_ber_oid_dissector("2.9.3.2.7.51", dissect_BackUpDestinationList_PDU, proto_cmip, "backUpDestinationList(51)");
register_ber_oid_dissector("2.9.3.2.7.52", dissect_CapacityAlarmThreshold_PDU, proto_cmip, "capacityAlarmTreshold(52)");
register_ber_oid_dissector("2.9.3.2.7.53", dissect_ConfirmedMode_PDU, proto_cmip, "confirmedMode(53)");
register_ber_oid_dissector("2.9.3.2.7.54", dissect_CurrentLogSize_PDU, proto_cmip, "currentLogSize(54)");
register_ber_oid_dissector("2.9.3.2.7.55", dissect_Destination_PDU, proto_cmip, "destination(55)");
register_ber_oid_dissector("2.9.3.2.7.56", dissect_DiscriminatorConstruct_PDU, proto_cmip, "discriminatorConstruct(56)");
register_ber_oid_dissector("2.9.3.2.7.57", dissect_IntervalsOfDay_PDU, proto_cmip, "intervalsOfDay(57)");
register_ber_oid_dissector("2.9.3.2.7.58", dissect_LogFullAction_PDU, proto_cmip, "logFullAction(58)");
register_ber_oid_dissector("2.9.3.2.7.59", dissect_LoggingTime_PDU, proto_cmip, "loggingTime(59)");
register_ber_oid_dissector("2.9.3.2.7.62", dissect_MaxLogSize_PDU, proto_cmip, "maxLogSize(62)");
register_ber_oid_dissector("2.9.3.2.7.63", dissect_NameBinding_PDU, proto_cmip, "nameBinding(63)");
register_ber_oid_dissector("2.9.3.2.7.64", dissect_NumberOfRecords_PDU, proto_cmip, "numberOfRecords(64)");
register_ber_oid_dissector("2.9.3.2.7.65", dissect_ObjectClass_PDU, proto_cmip, "objectClass(65)");
register_ber_oid_dissector("2.9.3.2.7.66", dissect_Packages_PDU, proto_cmip, "packages(66)");
register_ber_oid_dissector("2.9.3.2.7.68", dissect_StartTime_PDU, proto_cmip, "startTime(68)");
register_ber_oid_dissector("2.9.3.2.7.69", dissect_StopTime_PDU, proto_cmip, "stopTime(69)");
register_ber_oid_dissector("2.9.3.2.7.70", dissect_SupportedFeatures_PDU, proto_cmip, "supportedFeatures(70)");
register_ber_oid_dissector("2.9.3.2.7.71", dissect_WeekMask_PDU, proto_cmip, "weekMask(71)");
register_ber_oid_dissector("2.9.3.2.7.115", dissect_LifecycleState_PDU, proto_cmip, "lifecycleState(115)");
new_register_ber_oid_dissector("2.9.2.21.7.13", dissect_BaseManagedObjectId_PDU, proto_cmip, "BaseManagedObjectId(13)");
new_register_ber_oid_dissector("2.9.3.2.7.1", dissect_SimpleNameType_PDU, proto_cmip, "discriminatorId(1)");
new_register_ber_oid_dissector("2.9.3.2.7.2", dissect_SimpleNameType_PDU, proto_cmip, "logId(2)");
new_register_ber_oid_dissector("2.9.3.2.7.3", dissect_LogRecordId_PDU, proto_cmip, "logRecordId(3)");
new_register_ber_oid_dissector("2.9.3.2.7.4", dissect_SystemId_PDU, proto_cmip, "systemId(4)");
new_register_ber_oid_dissector("2.9.3.2.7.5", dissect_SystemTitle_PDU, proto_cmip, "systemTitle(5)");
new_register_ber_oid_dissector("2.9.3.2.7.6", dissect_AdditionalInformation_PDU, proto_cmip, "additionalInformation(6)");
new_register_ber_oid_dissector("2.9.3.2.7.7", dissect_AdditionalText_PDU, proto_cmip, "additionalText(7)");
new_register_ber_oid_dissector("2.9.3.2.7.8", dissect_AttributeIdentifierList_PDU, proto_cmip, "attributeIdentifierList(8)");
new_register_ber_oid_dissector("2.9.3.2.7.9", dissect_AttributeList_PDU, proto_cmip, "attributeList(9)");
new_register_ber_oid_dissector("2.9.3.2.7.10", dissect_AttributeValueChangeDefinition_PDU, proto_cmip, "attributeValueChangeDefinition(10)");
new_register_ber_oid_dissector("2.9.3.2.7.11", dissect_BackedUpStatus_PDU, proto_cmip, "backedUpStatus(11)");
new_register_ber_oid_dissector("2.9.3.2.7.12", dissect_CorrelatedNotifications_PDU, proto_cmip, "correlatedNotifications(12)");
new_register_ber_oid_dissector("2.9.3.2.7.13", dissect_EventTime_PDU, proto_cmip, "eventTime(13)");
new_register_ber_oid_dissector("2.9.3.2.7.14", dissect_EventTypeId_PDU, proto_cmip, "eventType(14)");
new_register_ber_oid_dissector("2.9.3.2.7.15", dissect_MonitoredAttributes_PDU, proto_cmip, "monitoredAttributes(15)");
new_register_ber_oid_dissector("2.9.3.2.7.16", dissect_NotificationIdentifier_PDU, proto_cmip, "notificationIdentifier(16)");
new_register_ber_oid_dissector("2.9.3.2.7.17", dissect_PerceivedSeverity_PDU, proto_cmip, "perceivedSeverity(17)");
new_register_ber_oid_dissector("2.9.3.2.7.18", dissect_ProbableCause_PDU, proto_cmip, "probableCause(18)");
new_register_ber_oid_dissector("2.9.3.2.7.19", dissect_ProposedRepairActions_PDU, proto_cmip, "proposedRepairActions(19)");
new_register_ber_oid_dissector("2.9.3.2.7.20", dissect_AttributeValueChangeDefinition_PDU, proto_cmip, "relationshipChangeDefinition(20)");
new_register_ber_oid_dissector("2.9.3.2.7.21", dissect_SecurityAlarmCause_PDU, proto_cmip, "securityAlarmCause(21)");
new_register_ber_oid_dissector("2.9.3.2.7.22", dissect_SecurityAlarmDetector_PDU, proto_cmip, "securityAlarmDetector(22)");
new_register_ber_oid_dissector("2.9.3.2.7.23", dissect_SecurityAlarmSeverity_PDU, proto_cmip, "securityAlarmSeverity(23)");
new_register_ber_oid_dissector("2.9.3.2.7.24", dissect_ServiceProvider_PDU, proto_cmip, "serviceProvider(24)");
new_register_ber_oid_dissector("2.9.3.2.7.25", dissect_ServiceUser_PDU, proto_cmip, "serviceUser(25)");
new_register_ber_oid_dissector("2.9.3.2.7.26", dissect_SourceIndicator_PDU, proto_cmip, "sourceIndicator(26)");
new_register_ber_oid_dissector("2.9.3.2.7.27", dissect_SpecificProblems_PDU, proto_cmip, "specificProblems(27)");
new_register_ber_oid_dissector("2.9.3.2.7.28", dissect_AttributeValueChangeDefinition_PDU, proto_cmip, "stateChangeDefinition(28)");
new_register_ber_oid_dissector("2.9.3.2.7.29", dissect_ThresholdInfo_PDU, proto_cmip, "thresholdInfo(29)");
new_register_ber_oid_dissector("2.9.3.2.7.30", dissect_TrendIndication_PDU, proto_cmip, "trendIndication(30)");
new_register_ber_oid_dissector("2.9.3.2.7.31", dissect_AdministrativeState_PDU, proto_cmip, "administrativeState(31)");
new_register_ber_oid_dissector("2.9.3.2.7.32", dissect_AlarmStatus_PDU, proto_cmip, "alarmStatus(32)");
new_register_ber_oid_dissector("2.9.3.2.7.33", dissect_AvailabilityStatus_PDU, proto_cmip, "availabilityStatus(33)");
new_register_ber_oid_dissector("2.9.3.2.7.34", dissect_ControlStatus_PDU, proto_cmip, "controlStatus(34)");
new_register_ber_oid_dissector("2.9.3.2.7.35", dissect_OperationalState_PDU, proto_cmip, "operationalState(35)");
new_register_ber_oid_dissector("2.9.3.2.7.36", dissect_ProceduralStatus_PDU, proto_cmip, "proceduralStatus(36)");
new_register_ber_oid_dissector("2.9.3.2.7.37", dissect_StandbyStatus_PDU, proto_cmip, "standbyStatus(37)");
new_register_ber_oid_dissector("2.9.3.2.7.38", dissect_UnknownStatus_PDU, proto_cmip, "unknownStatus(38)");
new_register_ber_oid_dissector("2.9.3.2.7.39", dissect_UsageState_PDU, proto_cmip, "usageState(39)");
new_register_ber_oid_dissector("2.9.3.2.7.40", dissect_BackUpRelationshipObject_PDU, proto_cmip, "backUpObject(40)");
new_register_ber_oid_dissector("2.9.3.2.7.41", dissect_BackUpRelationshipObject_PDU, proto_cmip, "backedUpObject(41)");
new_register_ber_oid_dissector("2.9.3.2.7.42", dissect_GroupObjects_PDU, proto_cmip, "member(42)");
new_register_ber_oid_dissector("2.9.3.2.7.43", dissect_GroupObjects_PDU, proto_cmip, "owner(43)");
new_register_ber_oid_dissector("2.9.3.2.7.44", dissect_BackUpRelationshipObject_PDU, proto_cmip, "peer(44)");
new_register_ber_oid_dissector("2.9.3.2.7.45", dissect_PrioritisedObject_PDU, proto_cmip, "primary(45)");
new_register_ber_oid_dissector("2.9.3.2.7.46", dissect_PrioritisedObject_PDU, proto_cmip, "providerObject(46)");
new_register_ber_oid_dissector("2.9.3.2.7.47", dissect_PrioritisedObject_PDU, proto_cmip, "secondary(47)");
new_register_ber_oid_dissector("2.9.3.2.7.48", dissect_PrioritisedObject_PDU, proto_cmip, "userObject(48)");
new_register_ber_oid_dissector("2.9.3.2.7.49", dissect_ActiveDestination_PDU, proto_cmip, "activeDestination(49)");
new_register_ber_oid_dissector("2.9.3.2.7.50", dissect_Allomorphs_PDU, proto_cmip, "allomorphs(50)");
new_register_ber_oid_dissector("2.9.3.2.7.51", dissect_BackUpDestinationList_PDU, proto_cmip, "backUpDestinationList(51)");
new_register_ber_oid_dissector("2.9.3.2.7.52", dissect_CapacityAlarmThreshold_PDU, proto_cmip, "capacityAlarmTreshold(52)");
new_register_ber_oid_dissector("2.9.3.2.7.53", dissect_ConfirmedMode_PDU, proto_cmip, "confirmedMode(53)");
new_register_ber_oid_dissector("2.9.3.2.7.54", dissect_CurrentLogSize_PDU, proto_cmip, "currentLogSize(54)");
new_register_ber_oid_dissector("2.9.3.2.7.55", dissect_Destination_PDU, proto_cmip, "destination(55)");
new_register_ber_oid_dissector("2.9.3.2.7.56", dissect_DiscriminatorConstruct_PDU, proto_cmip, "discriminatorConstruct(56)");
new_register_ber_oid_dissector("2.9.3.2.7.57", dissect_IntervalsOfDay_PDU, proto_cmip, "intervalsOfDay(57)");
new_register_ber_oid_dissector("2.9.3.2.7.58", dissect_LogFullAction_PDU, proto_cmip, "logFullAction(58)");
new_register_ber_oid_dissector("2.9.3.2.7.59", dissect_LoggingTime_PDU, proto_cmip, "loggingTime(59)");
new_register_ber_oid_dissector("2.9.3.2.7.62", dissect_MaxLogSize_PDU, proto_cmip, "maxLogSize(62)");
new_register_ber_oid_dissector("2.9.3.2.7.63", dissect_NameBinding_PDU, proto_cmip, "nameBinding(63)");
new_register_ber_oid_dissector("2.9.3.2.7.64", dissect_NumberOfRecords_PDU, proto_cmip, "numberOfRecords(64)");
new_register_ber_oid_dissector("2.9.3.2.7.65", dissect_ObjectClass_PDU, proto_cmip, "objectClass(65)");
new_register_ber_oid_dissector("2.9.3.2.7.66", dissect_Packages_PDU, proto_cmip, "packages(66)");
new_register_ber_oid_dissector("2.9.3.2.7.68", dissect_StartTime_PDU, proto_cmip, "startTime(68)");
new_register_ber_oid_dissector("2.9.3.2.7.69", dissect_StopTime_PDU, proto_cmip, "stopTime(69)");
new_register_ber_oid_dissector("2.9.3.2.7.70", dissect_SupportedFeatures_PDU, proto_cmip, "supportedFeatures(70)");
new_register_ber_oid_dissector("2.9.3.2.7.71", dissect_WeekMask_PDU, proto_cmip, "weekMask(71)");
new_register_ber_oid_dissector("2.9.3.2.7.115", dissect_LifecycleState_PDU, proto_cmip, "lifecycleState(115)");
/*--- End of included file: packet-cmip-dis-tab.c ---*/

128
epan/dissectors/packet-cmp.c
View File

@ -1369,85 +1369,117 @@ dissect_cmp_SuppLangTagsValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
/*--- PDUs ---*/
static void dissect_PBMParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_PBMParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_PBMParameter(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_PBMParameter_PDU);
offset = dissect_cmp_PBMParameter(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_PBMParameter_PDU);
return offset;
}
static void dissect_DHBMParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_DHBMParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_DHBMParameter(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_DHBMParameter_PDU);
offset = dissect_cmp_DHBMParameter(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_DHBMParameter_PDU);
return offset;
}
static void dissect_CAProtEncCertValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CAProtEncCertValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_CAProtEncCertValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_CAProtEncCertValue_PDU);
offset = dissect_cmp_CAProtEncCertValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_CAProtEncCertValue_PDU);
return offset;
}
static void dissect_SignKeyPairTypesValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SignKeyPairTypesValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_SignKeyPairTypesValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_SignKeyPairTypesValue_PDU);
offset = dissect_cmp_SignKeyPairTypesValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_SignKeyPairTypesValue_PDU);
return offset;
}
static void dissect_EncKeyPairTypesValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EncKeyPairTypesValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_EncKeyPairTypesValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_EncKeyPairTypesValue_PDU);
offset = dissect_cmp_EncKeyPairTypesValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_EncKeyPairTypesValue_PDU);
return offset;
}
static void dissect_PreferredSymmAlgValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_PreferredSymmAlgValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_PreferredSymmAlgValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_PreferredSymmAlgValue_PDU);
offset = dissect_cmp_PreferredSymmAlgValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_PreferredSymmAlgValue_PDU);
return offset;
}
static void dissect_CAKeyUpdateInfoValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CAKeyUpdateInfoValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_CAKeyUpdateInfoValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_CAKeyUpdateInfoValue_PDU);
offset = dissect_cmp_CAKeyUpdateInfoValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_CAKeyUpdateInfoValue_PDU);
return offset;
}
static void dissect_CurrentCRLValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CurrentCRLValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_CurrentCRLValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_CurrentCRLValue_PDU);
offset = dissect_cmp_CurrentCRLValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_CurrentCRLValue_PDU);
return offset;
}
static void dissect_UnsupportedOIDsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_UnsupportedOIDsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_UnsupportedOIDsValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_UnsupportedOIDsValue_PDU);
offset = dissect_cmp_UnsupportedOIDsValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_UnsupportedOIDsValue_PDU);
return offset;
}
static void dissect_KeyPairParamReqValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_KeyPairParamReqValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_KeyPairParamReqValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_KeyPairParamReqValue_PDU);
offset = dissect_cmp_KeyPairParamReqValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_KeyPairParamReqValue_PDU);
return offset;
}
static void dissect_KeyPairParamRepValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_KeyPairParamRepValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_KeyPairParamRepValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_KeyPairParamRepValue_PDU);
offset = dissect_cmp_KeyPairParamRepValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_KeyPairParamRepValue_PDU);
return offset;
}
static void dissect_RevPassphraseValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_RevPassphraseValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_RevPassphraseValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_RevPassphraseValue_PDU);
offset = dissect_cmp_RevPassphraseValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_RevPassphraseValue_PDU);
return offset;
}
static void dissect_ImplicitConfirmValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ImplicitConfirmValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_ImplicitConfirmValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_ImplicitConfirmValue_PDU);
offset = dissect_cmp_ImplicitConfirmValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_ImplicitConfirmValue_PDU);
return offset;
}
static void dissect_ConfirmWaitTimeValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ConfirmWaitTimeValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_ConfirmWaitTimeValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_ConfirmWaitTimeValue_PDU);
offset = dissect_cmp_ConfirmWaitTimeValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_ConfirmWaitTimeValue_PDU);
return offset;
}
static void dissect_OrigPKIMessageValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_OrigPKIMessageValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_OrigPKIMessageValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_OrigPKIMessageValue_PDU);
offset = dissect_cmp_OrigPKIMessageValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_OrigPKIMessageValue_PDU);
return offset;
}
static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cmp_SuppLangTagsValue(FALSE, tvb, 0, &asn1_ctx, tree, hf_cmp_SuppLangTagsValue_PDU);
offset = dissect_cmp_SuppLangTagsValue(FALSE, tvb, offset, &asn1_ctx, tree, hf_cmp_SuppLangTagsValue_PDU);
return offset;
}
@ -2469,22 +2501,22 @@ void proto_reg_handoff_cmp(void) {
/*--- Included file: packet-cmp-dis-tab.c ---*/
#line 1 "../../asn1/cmp/packet-cmp-dis-tab.c"
register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_cmp, "id-PasswordBasedMac");
register_ber_oid_dissector("1.2.640.113533.7.66.30", dissect_DHBMParameter_PDU, proto_cmp, "id-DHBasedMac");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.1", dissect_CAProtEncCertValue_PDU, proto_cmp, "id-it-caProtEncCert");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.2", dissect_SignKeyPairTypesValue_PDU, proto_cmp, "id-it-signKeyPairTypes");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.3", dissect_EncKeyPairTypesValue_PDU, proto_cmp, "id-it-encKeyPairTypes");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.4", dissect_PreferredSymmAlgValue_PDU, proto_cmp, "id-it-preferredSymmAlg");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.5", dissect_CAKeyUpdateInfoValue_PDU, proto_cmp, "id-it-caKeyUpdateInfo");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.6", dissect_CurrentCRLValue_PDU, proto_cmp, "id-it-currentCRL");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.7", dissect_UnsupportedOIDsValue_PDU, proto_cmp, "id-it-unsupportedOIDs");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.10", dissect_KeyPairParamReqValue_PDU, proto_cmp, "id-it-keyPairParamReq");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.11", dissect_KeyPairParamRepValue_PDU, proto_cmp, "id-it-keyPairParamRep");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.12", dissect_RevPassphraseValue_PDU, proto_cmp, "id-it-revPassphrase");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.13", dissect_ImplicitConfirmValue_PDU, proto_cmp, "id-it-implicitConfirm");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.14", dissect_ConfirmWaitTimeValue_PDU, proto_cmp, "id-it-confirmWaitTime");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.15", dissect_OrigPKIMessageValue_PDU, proto_cmp, "id-it-origPKIMessage");
register_ber_oid_dissector("1.3.6.1.5.5.7.4.16", dissect_SuppLangTagsValue_PDU, proto_cmp, "id-it-suppLangTags");
new_register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_cmp, "id-PasswordBasedMac");
new_register_ber_oid_dissector("1.2.640.113533.7.66.30", dissect_DHBMParameter_PDU, proto_cmp, "id-DHBasedMac");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.1", dissect_CAProtEncCertValue_PDU, proto_cmp, "id-it-caProtEncCert");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.2", dissect_SignKeyPairTypesValue_PDU, proto_cmp, "id-it-signKeyPairTypes");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.3", dissect_EncKeyPairTypesValue_PDU, proto_cmp, "id-it-encKeyPairTypes");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.4", dissect_PreferredSymmAlgValue_PDU, proto_cmp, "id-it-preferredSymmAlg");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.5", dissect_CAKeyUpdateInfoValue_PDU, proto_cmp, "id-it-caKeyUpdateInfo");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.6", dissect_CurrentCRLValue_PDU, proto_cmp, "id-it-currentCRL");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.7", dissect_UnsupportedOIDsValue_PDU, proto_cmp, "id-it-unsupportedOIDs");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.10", dissect_KeyPairParamReqValue_PDU, proto_cmp, "id-it-keyPairParamReq");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.11", dissect_KeyPairParamRepValue_PDU, proto_cmp, "id-it-keyPairParamRep");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.12", dissect_RevPassphraseValue_PDU, proto_cmp, "id-it-revPassphrase");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.13", dissect_ImplicitConfirmValue_PDU, proto_cmp, "id-it-implicitConfirm");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.14", dissect_ConfirmWaitTimeValue_PDU, proto_cmp, "id-it-confirmWaitTime");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.15", dissect_OrigPKIMessageValue_PDU, proto_cmp, "id-it-origPKIMessage");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.4.16", dissect_SuppLangTagsValue_PDU, proto_cmp, "id-it-suppLangTags");
/*--- End of included file: packet-cmp-dis-tab.c ---*/

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

@ -1747,80 +1747,110 @@ dissect_cms_RC2CBCParameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
/*--- PDUs ---*/
static void dissect_ContentInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ContentInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_ContentInfo(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_ContentInfo_PDU);
offset = dissect_cms_ContentInfo(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_ContentInfo_PDU);
return offset;
}
static void dissect_ContentType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ContentType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_ContentType(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_ContentType_PDU);
offset = dissect_cms_ContentType(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_ContentType_PDU);
return offset;
}
static void dissect_SignedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SignedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_SignedData(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_SignedData_PDU);
offset = dissect_cms_SignedData(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_SignedData_PDU);
return offset;
}
static void dissect_EnvelopedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EnvelopedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_EnvelopedData(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_EnvelopedData_PDU);
offset = dissect_cms_EnvelopedData(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_EnvelopedData_PDU);
return offset;
}
static void dissect_DigestedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_DigestedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_DigestedData(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_DigestedData_PDU);
offset = dissect_cms_DigestedData(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_DigestedData_PDU);
return offset;
}
static void dissect_EncryptedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EncryptedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_EncryptedData(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_EncryptedData_PDU);
offset = dissect_cms_EncryptedData(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_EncryptedData_PDU);
return offset;
}
static void dissect_AuthenticatedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_AuthenticatedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_AuthenticatedData(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_AuthenticatedData_PDU);
offset = dissect_cms_AuthenticatedData(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_AuthenticatedData_PDU);
return offset;
}
static void dissect_IssuerAndSerialNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_IssuerAndSerialNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_IssuerAndSerialNumber(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_IssuerAndSerialNumber_PDU);
offset = dissect_cms_IssuerAndSerialNumber(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_IssuerAndSerialNumber_PDU);
return offset;
}
static void dissect_MessageDigest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_MessageDigest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_MessageDigest(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_MessageDigest_PDU);
offset = dissect_cms_MessageDigest(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_MessageDigest_PDU);
return offset;
}
static void dissect_SigningTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SigningTime_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_SigningTime(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_SigningTime_PDU);
offset = dissect_cms_SigningTime(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_SigningTime_PDU);
return offset;
}
static void dissect_Countersignature_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Countersignature_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_Countersignature(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_Countersignature_PDU);
offset = dissect_cms_Countersignature(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_Countersignature_PDU);
return offset;
}
static void dissect_RC2WrapParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_RC2WrapParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_RC2WrapParameter(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_RC2WrapParameter_PDU);
offset = dissect_cms_RC2WrapParameter(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_RC2WrapParameter_PDU);
return offset;
}
static void dissect_SMIMECapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SMIMECapabilities_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_SMIMECapabilities(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_SMIMECapabilities_PDU);
offset = dissect_cms_SMIMECapabilities(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_SMIMECapabilities_PDU);
return offset;
}
static void dissect_SMIMEEncryptionKeyPreference_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_SMIMEEncryptionKeyPreference_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_SMIMEEncryptionKeyPreference(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_SMIMEEncryptionKeyPreference_PDU);
offset = dissect_cms_SMIMEEncryptionKeyPreference(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_SMIMEEncryptionKeyPreference_PDU);
return offset;
}
static void dissect_RC2CBCParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_RC2CBCParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_cms_RC2CBCParameters(FALSE, tvb, 0, &asn1_ctx, tree, hf_cms_RC2CBCParameters_PDU);
offset = dissect_cms_RC2CBCParameters(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_RC2CBCParameters_PDU);
return offset;
}
@ -2407,8 +2437,8 @@ void proto_register_cms(void) {
proto_register_field_array(proto_cms, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU);
register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU);
new_register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU);
new_register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU);
register_ber_oid_syntax(".p7s", NULL, "ContentInfo");
register_ber_oid_syntax(".p7m", NULL, "ContentInfo");
register_ber_oid_syntax(".p7c", NULL, "ContentInfo");
@ -2422,24 +2452,24 @@ void proto_reg_handoff_cms(void) {
/*--- Included file: packet-cms-dis-tab.c ---*/
#line 1 "../../asn1/cms/packet-cms-dis-tab.c"
register_ber_oid_dissector("1.2.840.113549.1.9.16.1.6", dissect_ContentInfo_PDU, proto_cms, "id-ct-contentInfo");
register_ber_oid_dissector("1.2.840.113549.1.7.2", dissect_SignedData_PDU, proto_cms, "id-signedData");
register_ber_oid_dissector("1.2.840.113549.1.7.3", dissect_EnvelopedData_PDU, proto_cms, "id-envelopedData");
register_ber_oid_dissector("1.2.840.113549.1.7.5", dissect_DigestedData_PDU, proto_cms, "id-digestedData");
register_ber_oid_dissector("1.2.840.113549.1.7.6", dissect_EncryptedData_PDU, proto_cms, "id-encryptedData");
register_ber_oid_dissector("1.2.840.113549.1.9.16.1.2", dissect_AuthenticatedData_PDU, proto_cms, "id-ct-authenticatedData");
register_ber_oid_dissector("1.2.840.113549.1.9.3", dissect_ContentType_PDU, proto_cms, "id-contentType");
register_ber_oid_dissector("1.2.840.113549.1.9.4", dissect_MessageDigest_PDU, proto_cms, "id-messageDigest");
register_ber_oid_dissector("1.2.840.113549.1.9.5", dissect_SigningTime_PDU, proto_cms, "id-signingTime");
register_ber_oid_dissector("1.2.840.113549.1.9.6", dissect_Countersignature_PDU, proto_cms, "id-counterSignature");
register_ber_oid_dissector("2.6.1.4.18", dissect_ContentInfo_PDU, proto_cms, "id-et-pkcs7");
register_ber_oid_dissector("1.3.6.1.4.1.311.16.4", dissect_IssuerAndSerialNumber_PDU, proto_cms, "ms-oe-encryption-key-preference");
register_ber_oid_dissector("1.2.840.113549.1.9.15", dissect_SMIMECapabilities_PDU, proto_cms, "id-smime-capabilities");
register_ber_oid_dissector("1.2.840.113549.1.9.16.2.11", dissect_SMIMEEncryptionKeyPreference_PDU, proto_cms, "id-encryption-key-preference");
register_ber_oid_dissector("1.2.840.113549.3.2", dissect_RC2CBCParameters_PDU, proto_cms, "id-alg-rc2-cbc");
register_ber_oid_dissector("1.2.840.113549.3.4", dissect_RC2CBCParameters_PDU, proto_cms, "id-alg-rc4");
register_ber_oid_dissector("1.2.840.113549.1.9.16.3.7", dissect_RC2WrapParameter_PDU, proto_cms, "id-alg-cmsrc2-wrap");
register_ber_oid_dissector("2.16.840.1.113730.3.1.40", dissect_SignedData_PDU, proto_cms, "userSMIMECertificate");
new_register_ber_oid_dissector("1.2.840.113549.1.9.16.1.6", dissect_ContentInfo_PDU, proto_cms, "id-ct-contentInfo");
new_register_ber_oid_dissector("1.2.840.113549.1.7.2", dissect_SignedData_PDU, proto_cms, "id-signedData");
new_register_ber_oid_dissector("1.2.840.113549.1.7.3", dissect_EnvelopedData_PDU, proto_cms, "id-envelopedData");
new_register_ber_oid_dissector("1.2.840.113549.1.7.5", dissect_DigestedData_PDU, proto_cms, "id-digestedData");
new_register_ber_oid_dissector("1.2.840.113549.1.7.6", dissect_EncryptedData_PDU, proto_cms, "id-encryptedData");
new_register_ber_oid_dissector("1.2.840.113549.1.9.16.1.2", dissect_AuthenticatedData_PDU, proto_cms, "id-ct-authenticatedData");
new_register_ber_oid_dissector("1.2.840.113549.1.9.3", dissect_ContentType_PDU, proto_cms, "id-contentType");
new_register_ber_oid_dissector("1.2.840.113549.1.9.4", dissect_MessageDigest_PDU, proto_cms, "id-messageDigest");
new_register_ber_oid_dissector("1.2.840.113549.1.9.5", dissect_SigningTime_PDU, proto_cms, "id-signingTime");
new_register_ber_oid_dissector("1.2.840.113549.1.9.6", dissect_Countersignature_PDU, proto_cms, "id-counterSignature");
new_register_ber_oid_dissector("2.6.1.4.18", dissect_ContentInfo_PDU, proto_cms, "id-et-pkcs7");
new_register_ber_oid_dissector("1.3.6.1.4.1.311.16.4", dissect_IssuerAndSerialNumber_PDU, proto_cms, "ms-oe-encryption-key-preference");
new_register_ber_oid_dissector("1.2.840.113549.1.9.15", dissect_SMIMECapabilities_PDU, proto_cms, "id-smime-capabilities");
new_register_ber_oid_dissector("1.2.840.113549.1.9.16.2.11", dissect_SMIMEEncryptionKeyPreference_PDU, proto_cms, "id-encryption-key-preference");
new_register_ber_oid_dissector("1.2.840.113549.3.2", dissect_RC2CBCParameters_PDU, proto_cms, "id-alg-rc2-cbc");
new_register_ber_oid_dissector("1.2.840.113549.3.4", dissect_RC2CBCParameters_PDU, proto_cms, "id-alg-rc4");
new_register_ber_oid_dissector("1.2.840.113549.1.9.16.3.7", dissect_RC2WrapParameter_PDU, proto_cms, "id-alg-cmsrc2-wrap");
new_register_ber_oid_dissector("2.16.840.1.113730.3.1.40", dissect_SignedData_PDU, proto_cms, "userSMIMECertificate");
/*--- End of included file: packet-cms-dis-tab.c ---*/

16
epan/dissectors/packet-credssp.c
View File

@ -323,10 +323,12 @@ dissect_credssp_TSRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
/*--- PDUs ---*/
static void dissect_TSRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_TSRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_credssp_TSRequest(FALSE, tvb, 0, &asn1_ctx, tree, hf_credssp_TSRequest_PDU);
offset = dissect_credssp_TSRequest(FALSE, tvb, offset, &asn1_ctx, tree, hf_credssp_TSRequest_PDU);
return offset;
}
@ -336,8 +338,8 @@ static void dissect_TSRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
/*
* Dissect CredSSP PDUs
*/
static void
dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
static int
dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data)
{
proto_item *item=NULL;
proto_tree *tree=NULL;
@ -350,7 +352,7 @@ dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
col_clear(pinfo->cinfo, COL_INFO);
creds_type = -1;
dissect_TSRequest_PDU(tvb, pinfo, tree);
return dissect_TSRequest_PDU(tvb, pinfo, tree, data);
}
static gboolean
@ -394,7 +396,7 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data);
}
dissect_credssp(tvb, pinfo, parent_tree);
dissect_credssp(tvb, pinfo, parent_tree, NULL);
return TRUE;
}
}
@ -536,7 +538,7 @@ void proto_register_credssp(void) {
/* Register protocol */
proto_credssp = proto_register_protocol(PNAME, PSNAME, PFNAME);
register_dissector("credssp", dissect_credssp, proto_credssp);
new_register_dissector("credssp", dissect_credssp, proto_credssp);
/* Register fields and subtrees */
proto_register_field_array(proto_credssp, hf, array_length(hf));

80
epan/dissectors/packet-crmf.c
View File

@ -831,55 +831,75 @@ dissect_crmf_EncKeyWithID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
/*--- PDUs ---*/
static void dissect_CertRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_CertRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_CertRequest(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_CertRequest_PDU);
offset = dissect_crmf_CertRequest(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_CertRequest_PDU);
return offset;
}
static void dissect_PBMParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_PBMParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_PBMParameter(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_PBMParameter_PDU);
offset = dissect_crmf_PBMParameter(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_PBMParameter_PDU);
return offset;
}
static void dissect_RegToken_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_RegToken_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_RegToken(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_RegToken_PDU);
offset = dissect_crmf_RegToken(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_RegToken_PDU);
return offset;
}
static void dissect_Authenticator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_Authenticator_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_Authenticator(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_Authenticator_PDU);
offset = dissect_crmf_Authenticator(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_Authenticator_PDU);
return offset;
}
static void dissect_PKIPublicationInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_PKIPublicationInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_PKIPublicationInfo(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_PKIPublicationInfo_PDU);
offset = dissect_crmf_PKIPublicationInfo(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_PKIPublicationInfo_PDU);
return offset;
}
static void dissect_PKIArchiveOptions_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_PKIArchiveOptions_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_PKIArchiveOptions(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_PKIArchiveOptions_PDU);
offset = dissect_crmf_PKIArchiveOptions(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_PKIArchiveOptions_PDU);
return offset;
}
static void dissect_OldCertId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_OldCertId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_OldCertId(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_OldCertId_PDU);
offset = dissect_crmf_OldCertId(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_OldCertId_PDU);
return offset;
}
static void dissect_ProtocolEncrKey_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_ProtocolEncrKey_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_ProtocolEncrKey(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_ProtocolEncrKey_PDU);
offset = dissect_crmf_ProtocolEncrKey(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_ProtocolEncrKey_PDU);
return offset;
}
static void dissect_UTF8Pairs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_UTF8Pairs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_UTF8Pairs(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_UTF8Pairs_PDU);
offset = dissect_crmf_UTF8Pairs(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_UTF8Pairs_PDU);
return offset;
}
static void dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
static int dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_crmf_EncKeyWithID(FALSE, tvb, 0, &asn1_ctx, tree, hf_crmf_EncKeyWithID_PDU);
offset = dissect_crmf_EncKeyWithID(FALSE, tvb, offset, &asn1_ctx, tree, hf_crmf_EncKeyWithID_PDU);
return offset;
}
@ -1278,16 +1298,16 @@ void proto_reg_handoff_crmf(void) {
/*--- Included file: packet-crmf-dis-tab.c ---*/
#line 1 "../../asn1/crmf/packet-crmf-dis-tab.c"
register_ber_oid_dissector("1.2.840.113549.1.9.16.1.21", dissect_EncKeyWithID_PDU, proto_crmf, "id-ct-encKeyWithID");
register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_crmf, "PasswordBasedMac");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.1", dissect_RegToken_PDU, proto_crmf, "id-regCtrl-regToken");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.2", dissect_Authenticator_PDU, proto_crmf, "id-regCtrl-authenticator");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.3", dissect_PKIPublicationInfo_PDU, proto_crmf, "id-regCtrl-pkiPublicationInfo");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.4", dissect_PKIArchiveOptions_PDU, proto_crmf, "id-regCtrl-pkiArchiveOptions");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.5", dissect_OldCertId_PDU, proto_crmf, "id-regCtrl-oldCertID");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.6", dissect_ProtocolEncrKey_PDU, proto_crmf, "id-regCtrl-protocolEncrKey");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.2.1", dissect_UTF8Pairs_PDU, proto_crmf, "id-regInfo-utf8Pairs");
register_ber_oid_dissector("1.3.6.1.5.5.7.5.2.2", dissect_CertRequest_PDU, proto_crmf, "id-regInfo-certReq");
new_register_ber_oid_dissector("1.2.840.113549.1.9.16.1.21", dissect_EncKeyWithID_PDU, proto_crmf, "id-ct-encKeyWithID");
new_register_ber_oid_dissector("1.2.840.113533.7.66.13", dissect_PBMParameter_PDU, proto_crmf, "PasswordBasedMac");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.1", dissect_RegToken_PDU, proto_crmf, "id-regCtrl-regToken");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.2", dissect_Authenticator_PDU, proto_crmf, "id-regCtrl-authenticator");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.3", dissect_PKIPublicationInfo_PDU, proto_crmf, "id-regCtrl-pkiPublicationInfo");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.4", dissect_PKIArchiveOptions_PDU, proto_crmf, "id-regCtrl-pkiArchiveOptions");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.5", dissect_OldCertId_PDU, proto_crmf, "id-regCtrl-oldCertID");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.1.6", dissect_ProtocolEncrKey_PDU, proto_crmf, "id-regCtrl-protocolEncrKey");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.2.1", dissect_UTF8Pairs_PDU, proto_crmf, "id-regInfo-utf8Pairs");
new_register_ber_oid_dissector("1.3.6.1.5.5.7.5.2.2", dissect_CertRequest_PDU, proto_crmf, "id-regInfo-certReq");
/*--- End of included file: packet-crmf-dis-tab.c ---*/

Some files were not shown because too many files have changed in this diff Show More