diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-26 03:59:01 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-26 03:59:01 +0000 |
| commit | 9733aadcfe443d4f682dc4e922499fb123fd5a64 (patch) | |
| tree | 07a3dee401d42d8df404bf7cd0d8ccaebc1e8d26 | |
| parent | 7bb637f0517771daac09a14dc29ec1b110070924 (diff) | |
| download | wireshark-9733aadcfe443d4f682dc4e922499fb123fd5a64.tar.gz wireshark-9733aadcfe443d4f682dc4e922499fb123fd5a64.tar.bz2 wireshark-9733aadcfe443d4f682dc4e922499fb123fd5a64.zip | |
Re-generate asn1 dissectors after hf_register_info cleanup.
svn path=/trunk/; revision=28848
51 files changed, 2623 insertions, 1460 deletions
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index af3e2ff492..4249d99c4c 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -1137,7 +1137,7 @@ void proto_register_acp133(void) { "acp133.T_rIType", HFILL }}, { &hf_acp133_minimize, { "minimize", "acp133.minimize", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "acp133.BOOLEAN", HFILL }}, { &hf_acp133_sHD, { "sHD", "acp133.sHD", @@ -1241,11 +1241,11 @@ void proto_register_acp133(void) { "acp133.T_conversion_with_loss_prohibited", HFILL }}, { &hf_acp133_further_dl_expansion_allowed, { "further-dl-expansion-allowed", "acp133.further_dl_expansion_allowed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "acp133.BOOLEAN", HFILL }}, { &hf_acp133_originator_requested_alternate_recipient_removed, { "originator-requested-alternate-recipient-removed", "acp133.originator_requested_alternate_recipient_removed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "acp133.BOOLEAN", HFILL }}, { &hf_acp133_proof_of_delivery, { "proof-of-delivery", "acp133.proof_of_delivery", diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 84a92ffb48..72684acae6 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -7393,7 +7393,7 @@ static const ber_sequence_t IntersystemTermination_sequence[] = { { &hf_ansi_map_carrierDigits, BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CarrierDigits }, { &hf_ansi_map_electronicSerialNumber, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ElectronicSerialNumber }, { &hf_ansi_map_imsi , BER_CLASS_CON, 242, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mobileIdentificationNumber, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileIdentificationNumber }, { &hf_ansi_map_mSCIdentificationNumber, BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCIdentificationNumber }, @@ -7446,7 +7446,7 @@ static const ber_sequence_t LocalTermination_sequence[] = { { &hf_ansi_map_carrierDigits, BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CarrierDigits }, { &hf_ansi_map_destinationDigits, BER_CLASS_CON, 87, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DestinationDigits }, { &hf_ansi_map_imsi , BER_CLASS_CON, 242, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mobileIdentificationNumber, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileIdentificationNumber }, { &hf_ansi_map_oneTimeFeatureIndicator, BER_CLASS_CON, 97, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OneTimeFeatureIndicator }, @@ -7471,7 +7471,7 @@ static const ber_sequence_t PSTNTermination_sequence[] = { { &hf_ansi_map_carrierDigits, BER_CLASS_CON, 86, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CarrierDigits }, { &hf_ansi_map_electronicSerialNumber, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_ansi_map_ElectronicSerialNumber }, { &hf_ansi_map_imsi , BER_CLASS_CON, 242, BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_mobileIdentificationNumber, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileIdentificationNumber }, { &hf_ansi_map_routingDigits, BER_CLASS_CON, 150, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_RoutingDigits }, { &hf_ansi_map_terminationTriggers, BER_CLASS_CON, 122, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_TerminationTriggers }, @@ -8626,7 +8626,7 @@ static const ber_sequence_t InterSystemPage_U_set[] = { { &hf_ansi_map_extendedMSCID, BER_CLASS_CON, 53, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ExtendedMSCID }, { &hf_ansi_map_extendedSystemMyTypeCode, BER_CLASS_CON, 54, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ExtendedSystemMyTypeCode }, { &hf_ansi_map_imsi , BER_CLASS_CON, 242, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_locationAreaID, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LocationAreaID }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mobileIdentificationNumber, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileIdentificationNumber }, @@ -10023,7 +10023,7 @@ static const ber_sequence_t RedirectionRequest_U_set[] = { { &hf_ansi_map_msid , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_map_MSID }, { &hf_ansi_map_redirectionReason, BER_CLASS_CON, 19, BER_FLAGS_IMPLTAG, dissect_ansi_map_RedirectionReason }, { &hf_ansi_map_cdmaServiceOption, BER_CLASS_CON, 175, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMAServiceOption }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_mSCIdentificationNumber, BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCIdentificationNumber }, { &hf_ansi_map_tdmaServiceCode, BER_CLASS_CON, 178, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_TDMAServiceCode }, { NULL, 0, 0, 0, NULL } @@ -10510,7 +10510,7 @@ static const ber_sequence_t RoutingRequest_U_set[] = { { &hf_ansi_map_dmh_AccountCodeDigits, BER_CLASS_CON, 140, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DMH_AccountCodeDigits }, { &hf_ansi_map_dmh_AlternateBillingDigits, BER_CLASS_CON, 141, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DMH_AlternateBillingDigits }, { &hf_ansi_map_dmh_BillingDigits, BER_CLASS_CON, 142, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DMH_BillingDigits }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_locationAreaID, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LocationAreaID }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_msid , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_ansi_map_MSID }, @@ -11243,7 +11243,7 @@ static const ber_sequence_t TransferToNumberRequest_U_set[] = { { &hf_ansi_map_callingPartySubaddress, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CallingPartySubaddress }, { &hf_ansi_map_cdmaServiceOption, BER_CLASS_CON, 175, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CDMAServiceOption }, { &hf_ansi_map_groupInformation, BER_CLASS_CON, 163, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_GroupInformation }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_mscid , BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCID }, { &hf_ansi_map_mSCIdentificationNumber, BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCIdentificationNumber }, { &hf_ansi_map_pilotBillingID, BER_CLASS_CON, 169, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_PilotBillingID }, @@ -11486,7 +11486,7 @@ static const ber_sequence_t UnsolicitedResponseRes_U_set[] = { { &hf_ansi_map_dmh_BillingDigits, BER_CLASS_CON, 142, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_DMH_BillingDigits }, { &hf_ansi_map_extendedMSCID, BER_CLASS_CON, 53, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ExtendedMSCID }, { &hf_ansi_map_extendedSystemMyTypeCode, BER_CLASS_CON, 54, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ExtendedSystemMyTypeCode }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mSCIdentificationNumber, BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCIdentificationNumber }, { &hf_ansi_map_oneTimeFeatureIndicator, BER_CLASS_CON, 97, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_OneTimeFeatureIndicator }, @@ -11850,7 +11850,7 @@ static const ber_sequence_t ServiceRequest_U_set[] = { { &hf_ansi_map_extendedMSCID, BER_CLASS_CON, 53, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ExtendedMSCID }, { &hf_ansi_map_featureIndicator, BER_CLASS_CON, 306, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_FeatureIndicator }, { &hf_ansi_map_groupInformation, BER_CLASS_CON, 163, BER_FLAGS_OPTIONAL, dissect_ansi_map_GroupInformation }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_locationAreaID, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LocationAreaID }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mscid , BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCID }, @@ -12155,7 +12155,7 @@ static const ber_sequence_t FacilitySelectedAndAvailable_U_set[] = { { &hf_ansi_map_callingPartySubaddress, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CallingPartySubaddress }, { &hf_ansi_map_electronicSerialNumber, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ElectronicSerialNumber }, { &hf_ansi_map_groupInformation, BER_CLASS_CON, 163, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_GroupInformation }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_locationAreaID, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LocationAreaID }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mSCIdentificationNumber, BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCIdentificationNumber }, @@ -12700,7 +12700,7 @@ static const ber_sequence_t TBusy_U_set[] = { { &hf_ansi_map_callingPartySubaddress, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CallingPartySubaddress }, { &hf_ansi_map_electronicSerialNumber, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ElectronicSerialNumber }, { &hf_ansi_map_groupInformation, BER_CLASS_CON, 163, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_GroupInformation }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_locationAreaID, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LocationAreaID }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mSCIdentificationNumber, BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCIdentificationNumber }, @@ -12793,7 +12793,7 @@ static const ber_sequence_t TNoAnswer_U_set[] = { { &hf_ansi_map_callingPartySubaddress, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_CallingPartySubaddress }, { &hf_ansi_map_electronicSerialNumber, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_ElectronicSerialNumber }, { &hf_ansi_map_groupInformation, BER_CLASS_CON, 163, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_GroupInformation }, - { &hf_ansi_map_legInformation, BER_CLASS_CON, 288, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, + { &hf_ansi_map_legInformation, BER_CLASS_CON, 144, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LegInformation }, { &hf_ansi_map_locationAreaID, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_LocationAreaID }, { &hf_ansi_map_mobileDirectoryNumber, BER_CLASS_CON, 93, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MobileDirectoryNumber }, { &hf_ansi_map_mSCIdentificationNumber, BER_CLASS_CON, 94, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_MSCIdentificationNumber }, diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 927140f5de..e2457bb499 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -7704,7 +7704,7 @@ void proto_register_camel(void) { "camel.INTEGER_1_86400", HFILL }}, { &hf_camel_audibleIndicatorTone, { "tone", "camel.tone", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_burstList, { "burstList", "camel.burstList", @@ -7840,7 +7840,7 @@ void proto_register_camel(void) { "camel.INTEGER_1_864000", HFILL }}, { &hf_camel_releaseIfdurationExceeded, { "releaseIfdurationExceeded", "camel.releaseIfdurationExceeded", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_timeDurationCharging_tariffSwitchInterval, { "tariffSwitchInterval", "camel.tariffSwitchInterval", @@ -7868,7 +7868,7 @@ void proto_register_camel(void) { "camel.TimeInformation", HFILL }}, { &hf_camel_legActive, { "legActive", "camel.legActive", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_callLegReleasedAtTcpExpiry, { "callLegReleasedAtTcpExpiry", "camel.callLegReleasedAtTcpExpiry", @@ -8012,15 +8012,15 @@ void proto_register_camel(void) { "camel.ErrorTreatment", HFILL }}, { &hf_camel_interruptableAnnInd, { "interruptableAnnInd", "camel.interruptableAnnInd", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_voiceInformation, { "voiceInformation", "camel.voiceInformation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_voiceBack, { "voiceBack", "camel.voiceBack", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_collectedDigits, { "collectedDigits", "camel.collectedDigits", @@ -8752,15 +8752,15 @@ void proto_register_camel(void) { "inap.Integer4", HFILL }}, { &hf_camel_disconnectFromIPForbidden, { "disconnectFromIPForbidden", "camel.disconnectFromIPForbidden", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_requestAnnouncementCompleteNotification, { "requestAnnouncementCompleteNotification", "camel.requestAnnouncementCompleteNotification", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_requestAnnouncementStartedNotification, { "requestAnnouncementStartedNotification", "camel.requestAnnouncementStartedNotification", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_collectedInfo, { "collectedInfo", "camel.collectedInfo", @@ -9128,7 +9128,7 @@ void proto_register_camel(void) { "camel.ChargingResult", HFILL }}, { &hf_camel_active, { "active", "camel.active", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "camel.BOOLEAN", HFILL }}, { &hf_camel_chargingRollOver, { "chargingRollOver", "camel.chargingRollOver", diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 25ebb9ad4d..fca1b4dfa1 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -4542,7 +4542,7 @@ void proto_register_cmip(void) { "cmip.AvailabilityStatus", HFILL }}, { &hf_cmip_BackedUpStatus_PDU, { "BackedUpStatus", "cmip.BackedUpStatus", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "cmip.BackedUpStatus", HFILL }}, { &hf_cmip_BackUpDestinationList_PDU, { "BackUpDestinationList", "cmip.BackUpDestinationList", @@ -4558,7 +4558,7 @@ void proto_register_cmip(void) { "cmip.CapacityAlarmThreshold", HFILL }}, { &hf_cmip_ConfirmedMode_PDU, { "ConfirmedMode", "cmip.ConfirmedMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "cmip.ConfirmedMode", HFILL }}, { &hf_cmip_ControlStatus_PDU, { "ControlStatus", "cmip.ControlStatus", @@ -4722,7 +4722,7 @@ void proto_register_cmip(void) { "cmip.TrendIndication", HFILL }}, { &hf_cmip_UnknownStatus_PDU, { "UnknownStatus", "cmip.UnknownStatus", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "cmip.UnknownStatus", HFILL }}, { &hf_cmip_UsageState_PDU, { "UsageState", "cmip.UsageState", @@ -5242,7 +5242,7 @@ void proto_register_cmip(void) { "cmip.T_managementExtensionidentifier", HFILL }}, { &hf_cmip_significance, { "significance", "cmip.significance", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "cmip.BOOLEAN", HFILL }}, { &hf_cmip_information, { "information", "cmip.information", diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index e8ff8ef7f7..f99da8296b 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -1111,7 +1111,7 @@ void proto_register_crmf(void) { "crmf.KeyGenParameters", HFILL }}, { &hf_crmf_archiveRemGenPrivKey, { "archiveRemGenPrivKey", "crmf.archiveRemGenPrivKey", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "crmf.BOOLEAN", HFILL }}, { &hf_crmf_encryptedValue, { "encryptedValue", "crmf.encryptedValue", diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index 9a6d9552c4..284d107291 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -5041,7 +5041,7 @@ void proto_register_dap(void) { "dap.ContextSelection", HFILL }}, { &hf_dap_returnContexts, { "returnContexts", "dap.returnContexts", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_familyReturn, { "familyReturn", "dap.familyReturn", @@ -5101,7 +5101,7 @@ void proto_register_dap(void) { "dap.Name", HFILL }}, { &hf_dap_fromEntry, { "fromEntry", "dap.fromEntry", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_entry_information, { "information", "dap.information", @@ -5121,15 +5121,15 @@ void proto_register_dap(void) { "x509if.Attribute", HFILL }}, { &hf_dap_incompleteEntry, { "incompleteEntry", "dap.incompleteEntry", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_partialName, { "partialName", "dap.partialName", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_derivedEntry, { "derivedEntry", "dap.derivedEntry", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_family_class, { "family-class", "dap.family_class", @@ -5257,7 +5257,7 @@ void proto_register_dap(void) { "dap.T_matchValue", HFILL }}, { &hf_dap_dnAttributes, { "dnAttributes", "dap.dnAttributes", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_newRequest, { "newRequest", "dap.newRequest", @@ -5277,11 +5277,11 @@ void proto_register_dap(void) { "dap.SortKey", HFILL }}, { &hf_dap_reverse, { "reverse", "dap.reverse", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_unmerged, { "unmerged", "dap.unmerged", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_pagedResultsQueryReference, { "queryReference", "dap.queryReference", @@ -5501,7 +5501,7 @@ void proto_register_dap(void) { "dap.EntryInformationSelection", HFILL }}, { &hf_dap_modifyRightsRequest, { "modifyRightsRequest", "dap.modifyRightsRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_serviceControls, { "serviceControls", "dap.serviceControls", @@ -5533,11 +5533,11 @@ void proto_register_dap(void) { "dsp.ReferenceType", HFILL }}, { &hf_dap_entryOnly, { "entryOnly", "dap.entryOnly", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_nameResolveOnMaster, { "nameResolveOnMaster", "dap.nameResolveOnMaster", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_operationContexts, { "operationContexts", "dap.operationContexts", @@ -5577,7 +5577,7 @@ void proto_register_dap(void) { "x509if.DistinguishedName", HFILL }}, { &hf_dap_aliasDereferenced, { "aliasDereferenced", "dap.aliasDereferenced", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_notification, { "notification", "dap.notification", @@ -5641,7 +5641,7 @@ void proto_register_dap(void) { "dap.CompareArgumentData", HFILL }}, { &hf_dap_matched, { "matched", "dap.matched", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_matchedSubtype, { "matchedSubtype", "dap.matchedSubtype", @@ -5701,7 +5701,7 @@ void proto_register_dap(void) { "dap.PagedResultsRequest", HFILL }}, { &hf_dap_listFamily, { "listFamily", "dap.listFamily", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_unsignedListArgument, { "unsignedListArgument", "dap.unsignedListArgument", @@ -5729,7 +5729,7 @@ void proto_register_dap(void) { "dap.T_subordinates_item", HFILL }}, { &hf_dap_aliasEntry, { "aliasEntry", "dap.aliasEntry", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_partialOutcomeQualifier, { "partialOutcomeQualifier", "dap.partialOutcomeQualifier", @@ -5769,7 +5769,7 @@ void proto_register_dap(void) { "dsp.ContinuationReference", HFILL }}, { &hf_dap_unavailableCriticalExtensions, { "unavailableCriticalExtensions", "dap.unavailableCriticalExtensions", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_unknownErrors, { "unknownErrors", "dap.unknownErrors", @@ -5805,7 +5805,7 @@ void proto_register_dap(void) { "dap.INTEGER", HFILL }}, { &hf_dap_streamedResult, { "streamedResult", "dap.streamedResult", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_baseObject, { "baseObject", "dap.baseObject", @@ -5821,11 +5821,11 @@ void proto_register_dap(void) { "dap.Filter", HFILL }}, { &hf_dap_searchAliases, { "searchAliases", "dap.searchAliases", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_matchedValuesOnly, { "matchedValuesOnly", "dap.matchedValuesOnly", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_extendedFilter, { "extendedFilter", "dap.extendedFilter", @@ -5833,7 +5833,7 @@ void proto_register_dap(void) { "dap.Filter", HFILL }}, { &hf_dap_checkOverspecified, { "checkOverspecified", "dap.checkOverspecified", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_relaxation, { "relaxation", "dap.relaxation", @@ -5933,7 +5933,7 @@ void proto_register_dap(void) { "dap.EntryInformation", HFILL }}, { &hf_dap_altMatching, { "altMatching", "dap.altMatching", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_uncorrelatedSearchInfo, { "uncorrelatedSearchInfo", "dap.uncorrelatedSearchInfo", @@ -6089,7 +6089,7 @@ void proto_register_dap(void) { "x509if.RelativeDistinguishedName", HFILL }}, { &hf_dap_deleteOldRDN, { "deleteOldRDN", "dap.deleteOldRDN", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dap.BOOLEAN", HFILL }}, { &hf_dap_newSuperior, { "newSuperior", "dap.newSuperior", diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index e1bd4ddc4a..142c92bcf0 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -1683,7 +1683,7 @@ void proto_register_disp(void) { "dsp.AccessPoint", HFILL }}, { &hf_disp_secondaryShadows, { "secondaryShadows", "disp.secondaryShadows", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_area, { "area", "disp.area", @@ -1699,7 +1699,7 @@ void proto_register_disp(void) { "disp.Knowledge", HFILL }}, { &hf_disp_subordinates, { "subordinates", "disp.subordinates", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_contextSelection, { "contextSelection", "disp.contextSelection", @@ -1735,7 +1735,7 @@ void proto_register_disp(void) { "disp.T_knowledgeType", HFILL }}, { &hf_disp_extendedKnowledge, { "extendedKnowledge", "disp.extendedKnowledge", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_AttributeSelection_item, { "ClassAttributeSelection", "disp.ClassAttributeSelection", @@ -1775,7 +1775,7 @@ void proto_register_disp(void) { "disp.ConsumerUpdateMode", HFILL }}, { &hf_disp_onChange, { "onChange", "disp.onChange", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_scheduled, { "scheduled", "disp.scheduled", @@ -1787,7 +1787,7 @@ void proto_register_disp(void) { "disp.PeriodicStrategy", HFILL }}, { &hf_disp_othertimes, { "othertimes", "disp.othertimes", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_beginTime, { "beginTime", "disp.beginTime", @@ -1859,7 +1859,7 @@ void proto_register_disp(void) { "x509if.DistinguishedName", HFILL }}, { &hf_disp_aliasDereferenced, { "aliasDereferenced", "disp.aliasDereferenced", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_notification, { "notification", "disp.notification", @@ -1967,11 +1967,11 @@ void proto_register_disp(void) { "disp.SDSEType", HFILL }}, { &hf_disp_subComplete, { "subComplete", "disp.subComplete", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_attComplete, { "attComplete", "disp.attComplete", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "disp.BOOLEAN", HFILL }}, { &hf_disp_attributes, { "attributes", "disp.attributes", diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index ea5b75c0d9..fb22b9732f 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -2282,7 +2282,7 @@ void proto_register_dop(void) { "dop.OperationalBindingID", HFILL }}, { &hf_dop_supplier_is_master, { "supplier-is-master", "dop.supplier_is_master", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dop.BOOLEAN", HFILL }}, { &hf_dop_non_supplying_master, { "non-supplying-master", "dop.non_supplying_master", @@ -2414,7 +2414,7 @@ void proto_register_dop(void) { "x509if.DistinguishedName", HFILL }}, { &hf_dop_aliasDereferenced, { "aliasDereferenced", "dop.aliasDereferenced", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dop.BOOLEAN", HFILL }}, { &hf_dop_notification, { "notification", "dop.notification", @@ -2594,7 +2594,7 @@ void proto_register_dop(void) { "x509if.Attribute", HFILL }}, { &hf_dop_alias, { "alias", "dop.alias", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dop.BOOLEAN", HFILL }}, { &hf_dop_identificationTag, { "identificationTag", "dop.identificationTag", @@ -2786,7 +2786,7 @@ void proto_register_dop(void) { "dop.INTEGER", HFILL }}, { &hf_dop_signed, { "signed", "dop.signed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dop.BOOLEAN", HFILL }}, { &hf_dop_other, { "other", "dop.other", diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index a719e7c8c8..c24a6ef294 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -2241,7 +2241,7 @@ void proto_register_dsp(void) { "x509if.DistinguishedName", HFILL }}, { &hf_dsp_aliasDereferenced, { "aliasDereferenced", "dsp.aliasDereferenced", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_notification, { "notification", "dsp.notification", @@ -2285,7 +2285,7 @@ void proto_register_dsp(void) { "dsp.INTEGER", HFILL }}, { &hf_dsp_returnCrossRefs, { "returnCrossRefs", "dsp.returnCrossRefs", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_referenceType, { "referenceType", "dsp.referenceType", @@ -2301,7 +2301,7 @@ void proto_register_dsp(void) { "dsp.Time", HFILL }}, { &hf_dsp_entryOnly, { "entryOnly", "dsp.entryOnly", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_uniqueIdentifier, { "uniqueIdentifier", "dsp.uniqueIdentifier", @@ -2317,11 +2317,11 @@ void proto_register_dsp(void) { "dsp.Exclusions", HFILL }}, { &hf_dsp_excludeShadows, { "excludeShadows", "dsp.excludeShadows", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_nameResolveOnMaster, { "nameResolveOnMaster", "dsp.nameResolveOnMaster", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_operationIdentifier, { "operationIdentifier", "dsp.operationIdentifier", @@ -2405,7 +2405,7 @@ void proto_register_dsp(void) { "dsp.APCategory", HFILL }}, { &hf_dsp_chainingRequired, { "chainingRequired", "dsp.chainingRequired", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_MasterAndShadowAccessPoints_item, { "MasterOrShadowAccessPoint", "dsp.MasterOrShadowAccessPoint", @@ -2437,7 +2437,7 @@ void proto_register_dsp(void) { "dsp.AccessPointInformation", HFILL }}, { &hf_dsp_returnToDUA, { "returnToDUA", "dsp.returnToDUA", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_basicLevels, { "basicLevels", "dsp.basicLevels", @@ -2453,7 +2453,7 @@ void proto_register_dsp(void) { "dsp.INTEGER", HFILL }}, { &hf_dsp_signed, { "signed", "dsp.signed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "dsp.BOOLEAN", HFILL }}, { &hf_dsp_other, { "other", "dsp.other", diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 79b9ba9cbc..7b3860c18e 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -4876,7 +4876,7 @@ void proto_register_ftam(void) { "ftam.Implementation_Information", HFILL }}, { &hf_ftam_presentation_tontext_management, { "presentation-tontext-management", "ftam.presentation_tontext_management", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ftam.BOOLEAN", HFILL }}, { &hf_ftam_service_class, { "service-class", "ftam.service_class", @@ -5072,7 +5072,7 @@ void proto_register_ftam(void) { "ftam.Concurrency_Control", HFILL }}, { &hf_ftam_referent_indicator, { "referent-indicator", "ftam.referent_indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ftam.Referent_Indicator", HFILL }}, { &hf_ftam_override, { "override", "ftam.override", @@ -5120,7 +5120,7 @@ void proto_register_ftam(void) { "ftam.Contents_Type_Attribute", HFILL }}, { &hf_ftam_enable_fadu_locking, { "enable-fadu-locking", "ftam.enable_fadu_locking", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ftam.BOOLEAN", HFILL }}, { &hf_ftam_activity_identifier, { "activity-identifier", "ftam.activity_identifier", @@ -5164,7 +5164,7 @@ void proto_register_ftam(void) { "ftam.T_response_recovery_mode", HFILL }}, { &hf_ftam_presentation_action, { "presentation-action", "ftam.presentation_action", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ftam.BOOLEAN", HFILL }}, { &hf_ftam_threshold, { "threshold", "ftam.threshold", @@ -5804,7 +5804,7 @@ void proto_register_ftam(void) { "ftam.F_COPY_response", HFILL }}, { &hf_ftam_reset, { "reset", "ftam.reset", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ftam.BOOLEAN", HFILL }}, { &hf_ftam_destination_file_directory, { "destination-file-directory", "ftam.destination_file_directory", @@ -5844,7 +5844,7 @@ void proto_register_ftam(void) { "ftam.Error_Action", HFILL }}, { &hf_ftam_last_member_indicator, { "last-member-indicator", "ftam.last_member_indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ftam.BOOLEAN", HFILL }}, { &hf_ftam_shared_ASE_infonnation, { "shared-ASE-infonnation", "ftam.shared_ASE_infonnation", @@ -6068,7 +6068,7 @@ void proto_register_ftam(void) { "ftam.OBJECT_IDENTIFIER", HFILL }}, { &hf_ftam_boolean_value, { "boolean-value", "ftam.boolean_value", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ftam.BOOLEAN", HFILL }}, { &hf_ftam_document_type_Pattern, { "document-type-Pattern", "ftam.document_type_Pattern", diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index 0d87c0d725..6b779b48a9 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -2079,7 +2079,7 @@ void proto_register_gnm(void) { "gnm.AlarmStatus", HFILL }}, { &hf_gnm_Boolean_PDU, { "Boolean", "gnm.Boolean", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gnm.Boolean", HFILL }}, { &hf_gnm_ChannelNumber_PDU, { "ChannelNumber", "gnm.ChannelNumber", @@ -2335,7 +2335,7 @@ void proto_register_gnm(void) { "gnm.UserLabel", HFILL }}, { &hf_gnm_redline, { "redline", "gnm.redline", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gnm.Boolean", HFILL }}, { &hf_gnm_additionalInfo, { "additionalInfo", "gnm.additionalInfo", @@ -2519,7 +2519,7 @@ void proto_register_gnm(void) { "cmip.ObjectInstance", HFILL }}, { &hf_gnm_redline_01, { "redline", "gnm.redline", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gnm.BOOLEAN", HFILL }}, { &hf_gnm_name, { "name", "gnm.name", diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index c27733ba53..3a492693bf 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -870,11 +870,11 @@ void proto_register_goose(void) { "goose.INTEGER", HFILL }}, { &hf_goose_test, { "test", "goose.test", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "goose.BOOLEAN", HFILL }}, { &hf_goose_ndsCom, { "ndsCom", "goose.ndsCom", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "goose.BOOLEAN", HFILL }}, { &hf_goose_numDatSetEntries, { "numDatSetEntries", "goose.numDatSetEntries", @@ -906,7 +906,7 @@ void proto_register_goose(void) { "goose.Data", HFILL }}, { &hf_goose_boolean, { "boolean", "goose.boolean", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "goose.BOOLEAN", HFILL }}, { &hf_goose_bit_string, { "bit-string", "goose.bit_string", diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 4e8c025fce..100252679b 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -18013,7 +18013,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_old_Component_PDU, { "Component", "gsm_map.old.Component", FT_UINT32, BASE_DEC, VALS(gsm_old_Component_vals), 0, - "gsm_map.old.Component", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_getPassword, { "getPassword", "gsm_map.getPassword", FT_UINT8, BASE_DEC, VALS(gsm_old_GetPasswordArg_vals), 0, @@ -18089,7 +18089,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_forwarding_reason, { "Forwarding reason", "gsm_map.forwarding_reason", FT_UINT8, BASE_HEX, VALS(forwarding_reason_values), 0x0c, - "forwarding reason", HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_pdp_type_org, { "PDP Type Organization", "gsm_map.pdp_type_org", FT_UINT8, BASE_HEX, VALS(pdp_type_org_values), 0x0f, @@ -18134,7 +18134,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_qos_max_sdu, { "Maximum SDU size", "gsm_map.qos.max_sdu", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_gsm_map_max_brate_ulink, { "Maximum bit rate for uplink in kbit/s", "gsm_map.qos.max_brate_ulink", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -18732,7 +18732,7 @@ void proto_register_gsm_map(void) { "gsm_map.ISDN_AddressString", HFILL }}, { &hf_gsm_map_sm_sm_RP_PRI, { "sm-RP-PRI", "gsm_map.sm.sm_RP_PRI", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gsm_map_sm.BOOLEAN", HFILL }}, { &hf_gsm_map_sm_serviceCentreAddress, { "serviceCentreAddress", "gsm_map.sm.serviceCentreAddress", @@ -19486,7 +19486,7 @@ void proto_register_gsm_map(void) { "gsm_map_ms.FailureCause", HFILL }}, { &hf_gsm_map_ms_re_attempt, { "re-attempt", "gsm_map.ms.re_attempt", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gsm_map_ms.BOOLEAN", HFILL }}, { &hf_gsm_map_ms_accessType, { "accessType", "gsm_map.ms.accessType", @@ -19938,11 +19938,11 @@ void proto_register_gsm_map(void) { "gsm_map_ms.INTEGER", HFILL }}, { &hf_gsm_map_ms_pre_emption_capability, { "pre-emption-capability", "gsm_map.ms.pre_emption_capability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gsm_map_ms.BOOLEAN", HFILL }}, { &hf_gsm_map_ms_pre_emption_vulnerability, { "pre-emption-vulnerability", "gsm_map.ms.pre_emption_vulnerability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gsm_map_ms.BOOLEAN", HFILL }}, { &hf_gsm_map_ms_pdn_gw_ipv4_Address, { "pdn-gw-ipv4-Address", "gsm_map.ms.pdn_gw_ipv4_Address", @@ -21178,7 +21178,7 @@ void proto_register_gsm_map(void) { "gsm_map_ms.AccessRestrictionData", HFILL }}, { &hf_gsm_map_ms_ics_Indicator, { "ics-Indicator", "gsm_map.ms.ics_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gsm_map_ms.BOOLEAN", HFILL }}, { &hf_gsm_map_ms_eps_SubscriptionData, { "eps-SubscriptionData", "gsm_map.ms.eps_SubscriptionData", @@ -23152,7 +23152,7 @@ void proto_register_gsm_map(void) { "gsm_ss.UUS_Service", HFILL }}, { &hf_gsm_ss_uUS_Required, { "uUS-Required", "gsm_ss.uUS_Required", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "gsm_ss.BOOLEAN", HFILL }}, { &hf_gsm_ss_notificationType, { "notificationType", "gsm_ss.notificationType", diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 0900f71660..744e79187b 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -7676,7 +7676,7 @@ void proto_register_h225(void) { "h225.T_h4501SupplementaryService_item", HFILL }}, { &hf_h225_h245Tunneling, { "h245Tunneling", "h225.h245Tunneling", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.T_h245Tunneling", HFILL }}, { &hf_h225_H245Control_item, { "H245Control item", "h225.H245Control_item", @@ -7788,11 +7788,11 @@ void proto_register_h225(void) { "h225.FastStart", HFILL }}, { &hf_h225_multipleCalls, { "multipleCalls", "h225.multipleCalls", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_maintainConnection, { "maintainConnection", "h225.maintainConnection", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_alertingAddress, { "alertingAddress", "h225.alertingAddress", @@ -8004,7 +8004,7 @@ void proto_register_h225(void) { "h225.CallReferenceValue", HFILL }}, { &hf_h225_activeMC, { "activeMC", "h225.activeMC", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_conferenceGoal, { "conferenceGoal", "h225.conferenceGoal", @@ -8060,11 +8060,11 @@ void proto_register_h225(void) { "h225.FastStart_item", HFILL }}, { &hf_h225_mediaWaitForConnect, { "mediaWaitForConnect", "h225.mediaWaitForConnect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_canOverlapSend, { "canOverlapSend", "h225.canOverlapSend", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_endpointIdentifier, { "endpointIdentifier", "h225.endpointIdentifier", @@ -8436,11 +8436,11 @@ void proto_register_h225(void) { "h225.TerminalInfo", HFILL }}, { &hf_h225_mc, { "mc", "h225.mc", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_undefinedNode, { "undefinedNode", "h225.undefinedNode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_set, { "set", "h225.set", @@ -8924,7 +8924,7 @@ void proto_register_h225(void) { "h225.GatekeeperIdentifier", HFILL }}, { &hf_h225_needToRegister, { "needToRegister", "h225.needToRegister", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_alternateGatekeeper, { "alternateGatekeeper", "h225.alternateGatekeeper", @@ -8936,7 +8936,7 @@ void proto_register_h225(void) { "h225.AlternateGK", HFILL }}, { &hf_h225_altGKisPermanent, { "altGKisPermanent", "h225.altGKisPermanent", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_default, { "default", "h225.default", @@ -9032,31 +9032,31 @@ void proto_register_h225(void) { "h225.SecurityCapabilities", HFILL }}, { &hf_h225_q932Full, { "q932Full", "h225.q932Full", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_q951Full, { "q951Full", "h225.q951Full", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_q952Full, { "q952Full", "h225.q952Full", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_q953Full, { "q953Full", "h225.q953Full", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_q955Full, { "q955Full", "h225.q955Full", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_q956Full, { "q956Full", "h225.q956Full", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_q957Full, { "q957Full", "h225.q957Full", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_q954Info, { "q954Info", "h225.q954Info", @@ -9064,11 +9064,11 @@ void proto_register_h225(void) { "h225.Q954Details", HFILL }}, { &hf_h225_conferenceCalling, { "conferenceCalling", "h225.conferenceCalling", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_threePartyService, { "threePartyService", "h225.threePartyService", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_guid, { "guid", "h225.guid", @@ -9184,7 +9184,7 @@ void proto_register_h225(void) { "h225.AliasAddress", HFILL }}, { &hf_h225_canReportCallCapacity, { "canReportCallCapacity", "h225.canReportCallCapacity", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_capacityReportingSpecification_when, { "when", "h225.when", @@ -9472,11 +9472,11 @@ void proto_register_h225(void) { "h225.OCTET_STRING_SIZE_2_32", HFILL }}, { &hf_h225_sender, { "sender", "h225.sender", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_multicast, { "multicast", "h225.multicast", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_bandwidth, { "bandwidth", "h225.bandwidth", @@ -9488,11 +9488,11 @@ void proto_register_h225(void) { "h225.TransportChannelInfo", HFILL }}, { &hf_h225_canDisplayAmountString, { "canDisplayAmountString", "h225.canDisplayAmountString", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_canEnforceDurationLimit, { "canEnforceDurationLimit", "h225.canEnforceDurationLimit", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_amountString, { "amountString", "h225.amountString", @@ -9516,7 +9516,7 @@ void proto_register_h225(void) { "h225.INTEGER_1_4294967295", HFILL }}, { &hf_h225_enforceCallDurationLimit, { "enforceCallDurationLimit", "h225.enforceCallDurationLimit", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_callStartingPoint, { "callStartingPoint", "h225.callStartingPoint", @@ -9564,7 +9564,7 @@ void proto_register_h225(void) { "h225.BMPString", HFILL }}, { &hf_h225_bool, { "bool", "h225.bool", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_number8, { "number8", "h225.number8", @@ -9600,7 +9600,7 @@ void proto_register_h225(void) { "h225.GenericData", HFILL }}, { &hf_h225_replacementFeatureSet, { "replacementFeatureSet", "h225.replacementFeatureSet", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_sendAddress, { "sendAddress", "h225.sendAddress", @@ -9844,7 +9844,7 @@ void proto_register_h225(void) { "h225.NULL", HFILL }}, { &hf_h225_supportsAssignedGK, { "supportsAssignedGK", "h225.supportsAssignedGK", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_assignedGatekeeper, { "assignedGatekeeper", "h225.assignedGatekeeper", @@ -9888,7 +9888,7 @@ void proto_register_h225(void) { "h225.SecurityErrors", HFILL }}, { &hf_h225_discoveryComplete, { "discoveryComplete", "h225.discoveryComplete", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_terminalType, { "terminalType", "h225.terminalType", @@ -9912,11 +9912,11 @@ void proto_register_h225(void) { "h225.TimeToLive", HFILL }}, { &hf_h225_keepAlive, { "keepAlive", "h225.keepAlive", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_willSupplyUUIEs, { "willSupplyUUIEs", "h225.willSupplyUUIEs", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_additiveRegistration, { "additiveRegistration", "h225.additiveRegistration", @@ -9964,7 +9964,7 @@ void proto_register_h225(void) { "h225.TransportQOS", HFILL }}, { &hf_h225_willRespondToIRR, { "willRespondToIRR", "h225.willRespondToIRR", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_preGrantedARQ, { "preGrantedARQ", "h225.preGrantedARQ", @@ -9972,19 +9972,19 @@ void proto_register_h225(void) { "h225.T_preGrantedARQ", HFILL }}, { &hf_h225_makeCall, { "makeCall", "h225.makeCall", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_useGKCallSignalAddressToMakeCall, { "useGKCallSignalAddressToMakeCall", "h225.useGKCallSignalAddressToMakeCall", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_answerCall, { "answerCall", "h225.answerCall", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_useGKCallSignalAddressToAnswer, { "useGKCallSignalAddressToAnswer", "h225.useGKCallSignalAddressToAnswer", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_irrFrequencyInCall, { "irrFrequencyInCall", "h225.irrFrequencyInCall", @@ -10156,7 +10156,7 @@ void proto_register_h225(void) { "h225.CallReferenceValue", HFILL }}, { &hf_h225_canMapAlias, { "canMapAlias", "h225.canMapAlias", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_srcAlternatives, { "srcAlternatives", "h225.srcAlternatives", @@ -10184,7 +10184,7 @@ void proto_register_h225(void) { "h225.TunnelledProtocol", HFILL }}, { &hf_h225_canMapSrcAlias, { "canMapSrcAlias", "h225.canMapSrcAlias", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_pointToPoint, { "pointToPoint", "h225.pointToPoint", @@ -10260,55 +10260,55 @@ void proto_register_h225(void) { "h225.AliasAddress", HFILL }}, { &hf_h225_setup_bool, { "setup", "h225.setup", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_callProceeding_flg, { "callProceeding", "h225.callProceeding", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_connect_bool, { "connect", "h225.connect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_alerting_bool, { "alerting", "h225.alerting", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_information_bool, { "information", "h225.information", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_releaseComplete_bool, { "releaseComplete", "h225.releaseComplete", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_facility_bool, { "facility", "h225.facility", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_progress_bool, { "progress", "h225.progress", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_empty, { "empty", "h225.empty", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_status_bool, { "status", "h225.status", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_statusInquiry_bool, { "statusInquiry", "h225.statusInquiry", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_setupAcknowledge_bool, { "setupAcknowledge", "h225.setupAcknowledge", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_notify_bool, { "notify", "h225.notify", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_rejectReason, { "rejectReason", "h225.rejectReason", @@ -10368,7 +10368,7 @@ void proto_register_h225(void) { "h225.NULL", HFILL }}, { &hf_h225_answeredCall, { "answeredCall", "h225.answeredCall", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_usageInformation, { "usageInformation", "h225.usageInformation", @@ -10504,7 +10504,7 @@ void proto_register_h225(void) { "h225.T_perCallInfo_item", HFILL }}, { &hf_h225_originator, { "originator", "h225.originator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_audio, { "audio", "h225.audio", @@ -10560,11 +10560,11 @@ void proto_register_h225(void) { "h225.H323_UU_PDU", HFILL }}, { &hf_h225_sent, { "sent", "h225.sent", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_needResponse, { "needResponse", "h225.needResponse", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_irrStatus, { "irrStatus", "h225.irrStatus", @@ -10572,7 +10572,7 @@ void proto_register_h225(void) { "h225.InfoRequestResponseStatus", HFILL }}, { &hf_h225_unsolicited, { "unsolicited", "h225.unsolicited", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_complete, { "complete", "h225.complete", @@ -10612,7 +10612,7 @@ void proto_register_h225(void) { "h225.SupportedProtocols", HFILL }}, { &hf_h225_almostOutOfResources, { "almostOutOfResources", "h225.almostOutOfResources", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h225.BOOLEAN", HFILL }}, { &hf_h225_callSpecific, { "callSpecific", "h225.callSpecific", diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index c2436b835f..0f99d3804f 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -1262,7 +1262,7 @@ void proto_register_h235(void) { "h235.BMPString", HFILL }}, { &hf_h235_flag, { "flag", "h235.flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h235.BOOLEAN", HFILL }}, { &hf_h235_toBeSigned, { "toBeSigned", "h235.toBeSigned", @@ -1390,7 +1390,7 @@ void proto_register_h235(void) { "h235.SrtpSessionParameters", HFILL }}, { &hf_h235_allowMKI, { "allowMKI", "h235.allowMKI", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h235.BOOLEAN", HFILL }}, { &hf_h235_SrtpKeys_item, { "SrtpKeyParameters", "h235.SrtpKeyParameters", @@ -1434,15 +1434,15 @@ void proto_register_h235(void) { "h235.INTEGER_0_24", HFILL }}, { &hf_h235_unencryptedSrtp, { "unencryptedSrtp", "h235.unencryptedSrtp", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h235.BOOLEAN", HFILL }}, { &hf_h235_unencryptedSrtcp, { "unencryptedSrtcp", "h235.unencryptedSrtcp", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h235.BOOLEAN", HFILL }}, { &hf_h235_unauthenticatedSrtp, { "unauthenticatedSrtp", "h235.unauthenticatedSrtp", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h235.BOOLEAN", HFILL }}, { &hf_h235_fecOrder, { "fecOrder", "h235.fecOrder", diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 1f6264836e..3e416cd37d 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h245.c */ -/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn */ +/* ../../tools/asn2wrs.py -e -p h245 -c ./h245.cnf -s ./packet-h245-template -D . MULTIMEDIA-SYSTEM-CONTROL.asn */ /* Input file: packet-h245-template.c */ @@ -15067,7 +15067,7 @@ void proto_register_h245(void) { "h245.DataApplicationCapability", HFILL }}, { &hf_h245_h233EncryptionTransmitCapability, { "h233EncryptionTransmitCapability", "h245.h233EncryptionTransmitCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_h233EncryptionReceiveCapability, { "h233EncryptionReceiveCapability", "h245.h233EncryptionReceiveCapability", @@ -15191,39 +15191,39 @@ void proto_register_h245(void) { "h245.T_aal1", HFILL }}, { &hf_h245_nullClockRecovery, { "nullClockRecovery", "h245.nullClockRecovery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_srtsClockRecovery_bool, { "srtsClockRecovery", "h245.srtsClockRecovery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_adaptiveClockRecovery, { "adaptiveClockRecovery", "h245.adaptiveClockRecovery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_nullErrorCorrection, { "nullErrorCorrection", "h245.nullErrorCorrection", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_longInterleaver, { "longInterleaver", "h245.longInterleaver", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_shortInterleaver, { "shortInterleaver", "h245.shortInterleaver", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_errorCorrectionOnly, { "errorCorrectionOnly", "h245.errorCorrectionOnly", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_structuredDataTransfer, { "structuredDataTransfer", "h245.structuredDataTransfer", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_partiallyFilledCells, { "partiallyFilledCells", "h245.partiallyFilledCells", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_aal5, { "aal5", "h245.aal5", @@ -15239,11 +15239,11 @@ void proto_register_h245(void) { "h245.INTEGER_0_65535", HFILL }}, { &hf_h245_transportStream_bool, { "transportStream", "h245.transportStream", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_programStream, { "programStream", "h245.programStream", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_availableBitRates, { "availableBitRates", "h245.availableBitRates", @@ -15283,47 +15283,47 @@ void proto_register_h245(void) { "h245.Q2931Address", HFILL }}, { &hf_h245_srtsClockRecoveryflag, { "srtsClockRecovery", "h245.srtsClockRecovery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_transportWithI_frames, { "transportWithI-frames", "h245.transportWithI_frames", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoWithAL1, { "videoWithAL1", "h245.videoWithAL1", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoWithAL2, { "videoWithAL2", "h245.videoWithAL2", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoWithAL3, { "videoWithAL3", "h245.videoWithAL3", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioWithAL1, { "audioWithAL1", "h245.audioWithAL1", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioWithAL2, { "audioWithAL2", "h245.audioWithAL2", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioWithAL3, { "audioWithAL3", "h245.audioWithAL3", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dataWithAL1, { "dataWithAL1", "h245.dataWithAL1", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dataWithAL2, { "dataWithAL2", "h245.dataWithAL2", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dataWithAL3, { "dataWithAL3", "h245.dataWithAL3", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_maximumAl2SDUSize, { "maximumAl2SDUSize", "h245.maximumAl2SDUSize", @@ -15363,11 +15363,11 @@ void proto_register_h245(void) { "h245.INTEGER_2_255", HFILL }}, { &hf_h245_maxMUXPDUSizeCapability, { "maxMUXPDUSizeCapability", "h245.maxMUXPDUSizeCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_nsrpSupport, { "nsrpSupport", "h245.nsrpSupport", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_mobileOperationTransmitCapability, { "mobileOperationTransmitCapability", "h245.mobileOperationTransmitCapability", @@ -15375,23 +15375,23 @@ void proto_register_h245(void) { "h245.T_mobileOperationTransmitCapability", HFILL }}, { &hf_h245_modeChangeCapability, { "modeChangeCapability", "h245.modeChangeCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_h223AnnexA, { "h223AnnexA", "h245.h223AnnexA", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_h223AnnexADoubleFlagFlag, { "h223AnnexADoubleFlag", "h245.h223AnnexADoubleFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_h223AnnexB, { "h223AnnexB", "h245.h223AnnexB", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_h223AnnexBwithHeader, { "h223AnnexBwithHeader", "h245.h223AnnexBwithHeader", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_h223AnnexCCapability, { "h223AnnexCCapability", "h245.h223AnnexCCapability", @@ -15415,43 +15415,43 @@ void proto_register_h245(void) { "h245.INTEGER_1_65025", HFILL }}, { &hf_h245_videoWithAL1M, { "videoWithAL1M", "h245.videoWithAL1M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoWithAL2M, { "videoWithAL2M", "h245.videoWithAL2M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoWithAL3M, { "videoWithAL3M", "h245.videoWithAL3M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioWithAL1M, { "audioWithAL1M", "h245.audioWithAL1M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioWithAL2M, { "audioWithAL2M", "h245.audioWithAL2M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioWithAL3M, { "audioWithAL3M", "h245.audioWithAL3M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dataWithAL1M, { "dataWithAL1M", "h245.dataWithAL1M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dataWithAL2M, { "dataWithAL2M", "h245.dataWithAL2M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dataWithAL3M, { "dataWithAL3M", "h245.dataWithAL3M", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_alpduInterleaving, { "alpduInterleaving", "h245.alpduInterleaving", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_maximumAL1MPDUSize, { "maximumAL1MPDUSize", "h245.maximumAL1MPDUSize", @@ -15467,43 +15467,43 @@ void proto_register_h245(void) { "h245.INTEGER_0_65535", HFILL }}, { &hf_h245_rsCodeCapability, { "rsCodeCapability", "h245.rsCodeCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_suspendResumeCapabilitywAddress, { "suspendResumeCapabilitywAddress", "h245.suspendResumeCapabilitywAddress", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_suspendResumeCapabilitywoAddress, { "suspendResumeCapabilitywoAddress", "h245.suspendResumeCapabilitywoAddress", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_rejCapability, { "rejCapability", "h245.rejCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_sREJCapability, { "sREJCapability", "h245.sREJCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_mREJCapability, { "mREJCapability", "h245.mREJCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_crc8bitCapability, { "crc8bitCapability", "h245.crc8bitCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_crc16bitCapability, { "crc16bitCapability", "h245.crc16bitCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_crc32bitCapability, { "crc32bitCapability", "h245.crc32bitCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_uihCapability, { "uihCapability", "h245.uihCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_numOfDLCS, { "numOfDLCS", "h245.numOfDLCS", @@ -15511,11 +15511,11 @@ void proto_register_h245(void) { "h245.INTEGER_2_8191", HFILL }}, { &hf_h245_twoOctetAddressFieldCapability, { "twoOctetAddressFieldCapability", "h245.twoOctetAddressFieldCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_loopBackTestCapability, { "loopBackTestCapability", "h245.loopBackTestCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_n401Capability, { "n401Capability", "h245.n401Capability", @@ -15531,7 +15531,7 @@ void proto_register_h245(void) { "h245.V75Capability", HFILL }}, { &hf_h245_audioHeader, { "audioHeader", "h245.audioHeader", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_maximumAudioDelayJitter, { "maximumAudioDelayJitter", "h245.maximumAudioDelayJitter", @@ -15555,15 +15555,15 @@ void proto_register_h245(void) { "h245.T_mcCapability", HFILL }}, { &hf_h245_centralizedConferenceMC, { "centralizedConferenceMC", "h245.centralizedConferenceMC", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_decentralizedConferenceMC, { "decentralizedConferenceMC", "h245.decentralizedConferenceMC", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_rtcpVideoControlCapability, { "rtcpVideoControlCapability", "h245.rtcpVideoControlCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_mediaPacketizationCapability, { "mediaPacketizationCapability", "h245.mediaPacketizationCapability", @@ -15583,15 +15583,15 @@ void proto_register_h245(void) { "h245.RedundancyEncodingCapability", HFILL }}, { &hf_h245_logicalChannelSwitchingCapability, { "logicalChannelSwitchingCapability", "h245.logicalChannelSwitchingCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_t120DynamicPortCapability, { "t120DynamicPortCapability", "h245.t120DynamicPortCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_h261aVideoPacketization, { "h261aVideoPacketization", "h245.h261aVideoPacketization", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_rtpPayloadTypes, { "rtpPayloadType", "h245.rtpPayloadType", @@ -15639,23 +15639,23 @@ void proto_register_h245(void) { "h245.INTEGER_0_65535", HFILL }}, { &hf_h245_atmUBR, { "atmUBR", "h245.atmUBR", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_atmrtVBR, { "atmrtVBR", "h245.atmrtVBR", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_atmnrtVBR, { "atmnrtVBR", "h245.atmnrtVBR", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_atmABR, { "atmABR", "h245.atmABR", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_atmCBR, { "atmCBR", "h245.atmCBR", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_nonStandardParameter, { "nonStandardParameter", "h245.nonStandardParameter", @@ -15667,7 +15667,7 @@ void proto_register_h245(void) { "h245.INTEGER_0_255", HFILL }}, { &hf_h245_servicePrioritySignalled, { "servicePrioritySignalled", "h245.servicePrioritySignalled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_servicePriorityValue, { "servicePriorityValue", "h245.servicePriorityValue", @@ -15739,7 +15739,7 @@ void proto_register_h245(void) { "h245.ATMParameters", HFILL }}, { &hf_h245_localQoS, { "localQoS", "h245.localQoS", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_genericTransportParameters, { "genericTransportParameters", "h245.genericTransportParameters", @@ -15783,7 +15783,7 @@ void proto_register_h245(void) { "h245.T_atm_AAL5_compressed", HFILL }}, { &hf_h245_variable_delta, { "variable-delta", "h245.variable_delta", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_mediaTransport, { "mediaTransport", "h245.mediaTransport", @@ -15875,11 +15875,11 @@ void proto_register_h245(void) { "h245.INTEGER_0_255", HFILL }}, { &hf_h245_multicastCapability, { "multicastCapability", "h245.multicastCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_multiUniCastConference, { "multiUniCastConference", "h245.multiUniCastConference", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_mediaDistributionCapability, { "mediaDistributionCapability", "h245.mediaDistributionCapability", @@ -15891,27 +15891,27 @@ void proto_register_h245(void) { "h245.MediaDistributionCapability", HFILL }}, { &hf_h245_centralizedControl, { "centralizedControl", "h245.centralizedControl", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_distributedControl, { "distributedControl", "h245.distributedControl", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_centralizedAudio, { "centralizedAudio", "h245.centralizedAudio", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_distributedAudio, { "distributedAudio", "h245.distributedAudio", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_centralizedVideo, { "centralizedVideo", "h245.centralizedVideo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_distributedVideo, { "distributedVideo", "h245.distributedVideo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_centralizedData, { "centralizedData", "h245.centralizedData", @@ -15979,7 +15979,7 @@ void proto_register_h245(void) { "h245.INTEGER_1_4", HFILL }}, { &hf_h245_temporalSpatialTradeOffCapability, { "temporalSpatialTradeOffCapability", "h245.temporalSpatialTradeOffCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_maxBitRate_1_19200, { "maxBitRate", "h245.maxBitRate", @@ -15987,55 +15987,55 @@ void proto_register_h245(void) { "h245.INTEGER_1_19200", HFILL }}, { &hf_h245_stillImageTransmission, { "stillImageTransmission", "h245.stillImageTransmission", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoBadMBsCap, { "videoBadMBsCap", "h245.videoBadMBsCap", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_SPatML, { "profileAndLevel-SPatML", "h245.profileAndLevel_SPatML", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_MPatLL, { "profileAndLevel-MPatLL", "h245.profileAndLevel_MPatLL", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_MPatML, { "profileAndLevel-MPatML", "h245.profileAndLevel_MPatML", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_MPatH_14, { "profileAndLevel-MPatH-14", "h245.profileAndLevel_MPatH_14", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_MPatHL, { "profileAndLevel-MPatHL", "h245.profileAndLevel_MPatHL", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_SNRatLL, { "profileAndLevel-SNRatLL", "h245.profileAndLevel_SNRatLL", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_SNRatML, { "profileAndLevel-SNRatML", "h245.profileAndLevel_SNRatML", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_SpatialatH_14, { "profileAndLevel-SpatialatH-14", "h245.profileAndLevel_SpatialatH_14", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_HPatML, { "profileAndLevel-HPatML", "h245.profileAndLevel_HPatML", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_HPatH_14, { "profileAndLevel-HPatH-14", "h245.profileAndLevel_HPatH_14", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_profileAndLevel_HPatHL, { "profileAndLevel-HPatHL", "h245.profileAndLevel_HPatHL", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoBitRate, { "videoBitRate", "h245.videoBitRate", @@ -16087,19 +16087,19 @@ void proto_register_h245(void) { "h245.INTEGER_1_192400", HFILL }}, { &hf_h245_unrestrictedVector, { "unrestrictedVector", "h245.unrestrictedVector", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_arithmeticCoding, { "arithmeticCoding", "h245.arithmeticCoding", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_advancedPrediction, { "advancedPrediction", "h245.advancedPrediction", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_pbFrames, { "pbFrames", "h245.pbFrames", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_hrd_B, { "hrd-B", "h245.hrd_B", @@ -16131,7 +16131,7 @@ void proto_register_h245(void) { "h245.INTEGER_1_3600", HFILL }}, { &hf_h245_errorCompensation, { "errorCompensation", "h245.errorCompensation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_enhancementLayerInfo, { "enhancementLayerInfo", "h245.enhancementLayerInfo", @@ -16143,7 +16143,7 @@ void proto_register_h245(void) { "h245.H263Options", HFILL }}, { &hf_h245_baseBitRateConstrained, { "baseBitRateConstrained", "h245.baseBitRateConstrained", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_snrEnhancement, { "snrEnhancement", "h245.snrEnhancement", @@ -16179,95 +16179,95 @@ void proto_register_h245(void) { "h245.INTEGER_1_64", HFILL }}, { &hf_h245_advancedIntraCodingMode, { "advancedIntraCodingMode", "h245.advancedIntraCodingMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_deblockingFilterMode, { "deblockingFilterMode", "h245.deblockingFilterMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_improvedPBFramesMode, { "improvedPBFramesMode", "h245.improvedPBFramesMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_unlimitedMotionVectors, { "unlimitedMotionVectors", "h245.unlimitedMotionVectors", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fullPictureFreeze, { "fullPictureFreeze", "h245.fullPictureFreeze", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_partialPictureFreezeAndRelease, { "partialPictureFreezeAndRelease", "h245.partialPictureFreezeAndRelease", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_resizingPartPicFreezeAndRelease, { "resizingPartPicFreezeAndRelease", "h245.resizingPartPicFreezeAndRelease", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fullPictureSnapshot, { "fullPictureSnapshot", "h245.fullPictureSnapshot", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_partialPictureSnapshot, { "partialPictureSnapshot", "h245.partialPictureSnapshot", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoSegmentTagging, { "videoSegmentTagging", "h245.videoSegmentTagging", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_progressiveRefinement, { "progressiveRefinement", "h245.progressiveRefinement", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dynamicPictureResizingByFour, { "dynamicPictureResizingByFour", "h245.dynamicPictureResizingByFour", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dynamicPictureResizingSixteenthPel, { "dynamicPictureResizingSixteenthPel", "h245.dynamicPictureResizingSixteenthPel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dynamicWarpingHalfPel, { "dynamicWarpingHalfPel", "h245.dynamicWarpingHalfPel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dynamicWarpingSixteenthPel, { "dynamicWarpingSixteenthPel", "h245.dynamicWarpingSixteenthPel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_independentSegmentDecoding, { "independentSegmentDecoding", "h245.independentSegmentDecoding", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_slicesInOrder_NonRect, { "slicesInOrder-NonRect", "h245.slicesInOrder_NonRect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_slicesInOrder_Rect, { "slicesInOrder-Rect", "h245.slicesInOrder_Rect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_slicesNoOrder_NonRect, { "slicesNoOrder-NonRect", "h245.slicesNoOrder_NonRect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_slicesNoOrder_Rect, { "slicesNoOrder-Rect", "h245.slicesNoOrder_Rect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_alternateInterVLCMode, { "alternateInterVLCMode", "h245.alternateInterVLCMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_modifiedQuantizationMode, { "modifiedQuantizationMode", "h245.modifiedQuantizationMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_reducedResolutionUpdate, { "reducedResolutionUpdate", "h245.reducedResolutionUpdate", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_transparencyParameters, { "transparencyParameters", "h245.transparencyParameters", @@ -16275,7 +16275,7 @@ void proto_register_h245(void) { "h245.TransparencyParameters", HFILL }}, { &hf_h245_separateVideoBackChannel, { "separateVideoBackChannel", "h245.separateVideoBackChannel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_refPictureSelection, { "refPictureSelection", "h245.refPictureSelection", @@ -16359,7 +16359,7 @@ void proto_register_h245(void) { "h245.INTEGER_1_256", HFILL }}, { &hf_h245_videoMux, { "videoMux", "h245.videoMux", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoBackChannelSend, { "videoBackChannelSend", "h245.videoBackChannelSend", @@ -16475,7 +16475,7 @@ void proto_register_h245(void) { "h245.T_pixelAspectInformation", HFILL }}, { &hf_h245_anyPixelAspectRatio, { "anyPixelAspectRatio", "h245.anyPixelAspectRatio", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_pixelAspectCode, { "pixelAspectCode", "h245.pixelAspectCode", @@ -16515,47 +16515,47 @@ void proto_register_h245(void) { "h245.H263ModeComboFlags", HFILL }}, { &hf_h245_referencePicSelect, { "referencePicSelect", "h245.referencePicSelect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_enhancedReferencePicSelectBool, { "enhancedReferencePicSelect", "h245.enhancedReferencePicSelect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_dataPartitionedSlices, { "dataPartitionedSlices", "h245.dataPartitionedSlices", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fixedPointIDCT0, { "fixedPointIDCT0", "h245.fixedPointIDCT0", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_interlacedFields, { "interlacedFields", "h245.interlacedFields", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_currentPictureHeaderRepetition, { "currentPictureHeaderRepetition", "h245.currentPictureHeaderRepetition", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_previousPictureHeaderRepetition, { "previousPictureHeaderRepetition", "h245.previousPictureHeaderRepetition", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_nextPictureHeaderRepetition, { "nextPictureHeaderRepetition", "h245.nextPictureHeaderRepetition", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_pictureNumberBoolean, { "pictureNumber", "h245.pictureNumber", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_spareReferencePictures, { "spareReferencePictures", "h245.spareReferencePictures", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_constrainedBitstream, { "constrainedBitstream", "h245.constrainedBitstream", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_pictureRate, { "pictureRate", "h245.pictureRate", @@ -16599,7 +16599,7 @@ void proto_register_h245(void) { "h245.INTEGER_1_256", HFILL }}, { &hf_h245_silenceSuppression, { "silenceSuppression", "h245.silenceSuppression", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_g728, { "g728", "h245.g728", @@ -16671,31 +16671,31 @@ void proto_register_h245(void) { "h245.INTEGER_1_256", HFILL }}, { &hf_h245_annexA, { "annexA", "h245.annexA", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_annexB, { "annexB", "h245.annexB", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_annexD, { "annexD", "h245.annexD", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_annexE, { "annexE", "h245.annexE", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_annexF, { "annexF", "h245.annexF", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_annexG, { "annexG", "h245.annexG", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_annexH, { "annexH", "h245.annexH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_highRateMode0, { "highRateMode0", "h245.highRateMode0", @@ -16727,35 +16727,35 @@ void proto_register_h245(void) { "h245.G723AnnexCAudioMode", HFILL }}, { &hf_h245_audioLayer1, { "audioLayer1", "h245.audioLayer1", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioLayer2, { "audioLayer2", "h245.audioLayer2", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioLayer3, { "audioLayer3", "h245.audioLayer3", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioSampling32k, { "audioSampling32k", "h245.audioSampling32k", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioSampling44k1, { "audioSampling44k1", "h245.audioSampling44k1", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioSampling48k, { "audioSampling48k", "h245.audioSampling48k", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_singleChannel, { "singleChannel", "h245.singleChannel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_twoChannels, { "twoChannels", "h245.twoChannels", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_bitRate_1_448, { "bitRate", "h245.bitRate", @@ -16763,51 +16763,51 @@ void proto_register_h245(void) { "h245.INTEGER_1_448", HFILL }}, { &hf_h245_audioSampling16k, { "audioSampling16k", "h245.audioSampling16k", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioSampling22k05, { "audioSampling22k05", "h245.audioSampling22k05", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_audioSampling24k, { "audioSampling24k", "h245.audioSampling24k", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_threeChannels2_1, { "threeChannels2-1", "h245.threeChannels2_1", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_threeChannels3_0, { "threeChannels3-0", "h245.threeChannels3_0", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fourChannels2_0_2_0, { "fourChannels2-0-2-0", "h245.fourChannels2_0_2_0", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fourChannels2_2, { "fourChannels2-2", "h245.fourChannels2_2", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fourChannels3_1, { "fourChannels3-1", "h245.fourChannels3_1", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fiveChannels3_0_2_0, { "fiveChannels3-0-2-0", "h245.fiveChannels3_0_2_0", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fiveChannels3_2, { "fiveChannels3-2", "h245.fiveChannels3_2", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_lowFrequencyEnhancement, { "lowFrequencyEnhancement", "h245.lowFrequencyEnhancement", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_multilingual, { "multilingual", "h245.multilingual", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_bitRate2_1_1130, { "bitRate", "h245.bitRate", @@ -16819,11 +16819,11 @@ void proto_register_h245(void) { "h245.INTEGER_1_256", HFILL }}, { &hf_h245_comfortNoise, { "comfortNoise", "h245.comfortNoise", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_scrambled, { "scrambled", "h245.scrambled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_vbd_cap_type, { "type", "h245.type", @@ -16999,91 +16999,91 @@ void proto_register_h245(void) { "h245.T_t84Restricted", HFILL }}, { &hf_h245_qcif_bool, { "qcif", "h245.qcif", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_cif_bool, { "cif", "h245.cif", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_ccir601Seq, { "ccir601Seq", "h245.ccir601Seq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_ccir601Prog, { "ccir601Prog", "h245.ccir601Prog", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_hdtvSeq, { "hdtvSeq", "h245.hdtvSeq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_hdtvProg, { "hdtvProg", "h245.hdtvProg", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_g3FacsMH200x100, { "g3FacsMH200x100", "h245.g3FacsMH200x100", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_g3FacsMH200x200, { "g3FacsMH200x200", "h245.g3FacsMH200x200", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_g4FacsMMR200x100, { "g4FacsMMR200x100", "h245.g4FacsMMR200x100", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_g4FacsMMR200x200, { "g4FacsMMR200x200", "h245.g4FacsMMR200x200", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_jbig200x200Seq, { "jbig200x200Seq", "h245.jbig200x200Seq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_jbig200x200Prog, { "jbig200x200Prog", "h245.jbig200x200Prog", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_jbig300x300Seq, { "jbig300x300Seq", "h245.jbig300x300Seq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_jbig300x300Prog, { "jbig300x300Prog", "h245.jbig300x300Prog", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_digPhotoLow, { "digPhotoLow", "h245.digPhotoLow", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_digPhotoMedSeq, { "digPhotoMedSeq", "h245.digPhotoMedSeq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_digPhotoMedProg, { "digPhotoMedProg", "h245.digPhotoMedProg", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_digPhotoHighSeq, { "digPhotoHighSeq", "h245.digPhotoHighSeq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_digPhotoHighProg, { "digPhotoHighProg", "h245.digPhotoHighProg", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_fillBitRemoval, { "fillBitRemoval", "h245.fillBitRemoval", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_transcodingJBIG, { "transcodingJBIG", "h245.transcodingJBIG", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_transcodingMMR, { "transcodingMMR", "h245.transcodingMMR", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_version, { "version", "h245.version", @@ -17131,7 +17131,7 @@ void proto_register_h245(void) { "h245.NULL", HFILL }}, { &hf_h245_t38TCPBidirectionalMode, { "t38TCPBidirectionalMode", "h245.t38TCPBidirectionalMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_encryptionCapability, { "encryptionCapability", "h245.encryptionCapability", @@ -17223,15 +17223,15 @@ void proto_register_h245(void) { "h245.NonStandardParameter", HFILL }}, { &hf_h245_chairControlCapability, { "chairControlCapability", "h245.chairControlCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_videoIndicateMixingCapability, { "videoIndicateMixingCapability", "h245.videoIndicateMixingCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_multipointVisualizationCapability, { "multipointVisualizationCapability", "h245.multipointVisualizationCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_capabilityIdentifier, { "capabilityIdentifier", "h245.capabilityIdentifier", @@ -17339,7 +17339,7 @@ void proto_register_h245(void) { "h245.MultiplexFormat", HFILL }}, { &hf_h245_controlOnMuxStream, { "controlOnMuxStream", "h245.controlOnMuxStream", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_capabilityOnMuxStream, { "capabilityOnMuxStream", "h245.capabilityOnMuxStream", @@ -17371,7 +17371,7 @@ void proto_register_h245(void) { "h245.FECC_rfc2733", HFILL }}, { &hf_h245_redundancyEncodingBool, { "redundancyEncoding", "h245.redundancyEncoding", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_separateStreamBool, { "separateStream", "h245.separateStream", @@ -17379,11 +17379,11 @@ void proto_register_h245(void) { "h245.T_separateStreamBool", HFILL }}, { &hf_h245_separatePort, { "separatePort", "h245.separatePort", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_samePortBool, { "samePort", "h245.samePort", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_protectedCapability, { "protectedCapability", "h245.protectedCapability", @@ -17507,7 +17507,7 @@ void proto_register_h245(void) { "h245.TransportAddress", HFILL }}, { &hf_h245_associateConference, { "associateConference", "h245.associateConference", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_externalReference, { "externalReference", "h245.externalReference", @@ -17547,7 +17547,7 @@ void proto_register_h245(void) { "h245.OCTET_STRING_SIZE_1_20", HFILL }}, { &hf_h245_audioHeaderPresent, { "audioHeaderPresent", "h245.audioHeaderPresent", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_nullData, { "nullData", "h245.nullData", @@ -17667,7 +17667,7 @@ void proto_register_h245(void) { "h245.T_h223_al_type_al3M", HFILL }}, { &hf_h245_h223_lc_segmentableFlag, { "segmentableFlag", "h245.segmentableFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.T_h223_lc_segmentableFlag", HFILL }}, { &hf_h245_transferMode, { "transferMode", "h245.transferMode", @@ -17751,7 +17751,7 @@ void proto_register_h245(void) { "h245.ArqType", HFILL }}, { &hf_h245_alsduSplitting, { "alsduSplitting", "h245.alsduSplitting", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_rsCodeCorrection, { "rsCodeCorrection", "h245.rsCodeCorrection", @@ -17811,7 +17811,7 @@ void proto_register_h245(void) { "h245.NULL", HFILL }}, { &hf_h245_uIH, { "uIH", "h245.uIH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_v76_mode, { "mode", "h245.mode", @@ -17859,7 +17859,7 @@ void proto_register_h245(void) { "h245.INTEGER_1_4095", HFILL }}, { &hf_h245_loopbackTestProcedure, { "loopbackTestProcedure", "h245.loopbackTestProcedure", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_sessionID_0_255, { "sessionID", "h245.sessionID", @@ -17875,7 +17875,7 @@ void proto_register_h245(void) { "h245.T_mediaChannel", HFILL }}, { &hf_h245_mediaGuaranteedDelivery, { "mediaGuaranteedDelivery", "h245.mediaGuaranteedDelivery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_mediaControlChannel, { "mediaControlChannel", "h245.mediaControlChannel", @@ -17883,7 +17883,7 @@ void proto_register_h245(void) { "h245.T_mediaControlChannel", HFILL }}, { &hf_h245_mediaControlGuaranteedDelivery, { "mediaControlGuaranteedDelivery", "h245.mediaControlGuaranteedDelivery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_destination, { "destination", "h245.destination", @@ -18259,7 +18259,7 @@ void proto_register_h245(void) { "h245.Ack_mediaControlChannel", HFILL }}, { &hf_h245_flowControlToZero, { "flowControlToZero", "h245.flowControlToZero", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_cLC_source, { "source", "h245.source", @@ -18591,7 +18591,7 @@ void proto_register_h245(void) { "h245.H223AL3MParameters", HFILL }}, { &hf_h245_segmentableFlag, { "segmentableFlag", "h245.segmentableFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_redundancyEncodingMode, { "redundancyEncodingMode", "h245.redundancyEncodingMode", @@ -19383,7 +19383,7 @@ void proto_register_h245(void) { "h245.T_specificRequest", HFILL }}, { &hf_h245_multiplexCapabilityBool, { "multiplexCapability", "h245.multiplexCapability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_capabilityTableEntryNumbers, { "capabilityTableEntryNumbers", "h245.capabilityTableEntryNumbers", @@ -19691,15 +19691,15 @@ void proto_register_h245(void) { "h245.EncryptionUpdateDirection", HFILL }}, { &hf_h245_secureChannel, { "secureChannel", "h245.secureChannel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_sharedSecret, { "sharedSecret", "h245.sharedSecret", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_certProtectedKey, { "certProtectedKey", "h245.certProtectedKey", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_keyProtectionMethod, { "keyProtectionMethod", "h245.keyProtectionMethod", @@ -19751,11 +19751,11 @@ void proto_register_h245(void) { "h245.INTEGER_1_65535", HFILL }}, { &hf_h245_bitRateLockedToPCRClock, { "bitRateLockedToPCRClock", "h245.bitRateLockedToPCRClock", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_bitRateLockedToNetworkClock, { "bitRateLockedToNetworkClock", "h245.bitRateLockedToNetworkClock", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h245.BOOLEAN", HFILL }}, { &hf_h245_cmd_aal, { "aal", "h245.aal", diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h index 4376792099..386f1d0775 100644 --- a/epan/dissectors/packet-h245.h +++ b/epan/dissectors/packet-h245.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h245.h */ -/* ../../tools/asn2wrs.py -e -p h245 -c h245.cnf -s packet-h245-template MULTIMEDIA-SYSTEM-CONTROL.asn */ +/* ../../tools/asn2wrs.py -e -p h245 -c ./h245.cnf -s ./packet-h245-template -D . MULTIMEDIA-SYSTEM-CONTROL.asn */ /* Input file: packet-h245-template.h */ diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 56d3803508..fccac54d6a 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -5421,7 +5421,7 @@ void proto_register_h248(void) { "h248.INTEGER_0_15", HFILL }}, { &hf_h248_emergency, { "emergency", "h248.emergency", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_topologyReq, { "topologyReq", "h248.topologyReq", @@ -5433,7 +5433,7 @@ void proto_register_h248(void) { "h248.TopologyRequest", HFILL }}, { &hf_h248_iepscallind_BOOL, { "iepscallind", "h248.iepscallind", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.Iepscallind_BOOL", HFILL }}, { &hf_h248_contextProp, { "contextProp", "h248.contextProp", @@ -5481,11 +5481,11 @@ void proto_register_h248(void) { "h248.INTEGER_0_15", HFILL }}, { &hf_h248_selectemergency, { "selectemergency", "h248.selectemergency", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_selectiepscallind, { "selectiepscallind", "h248.selectiepscallind", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_selectLogic, { "selectLogic", "h248.selectLogic", @@ -5921,11 +5921,11 @@ void proto_register_h248(void) { "h248.Relation", HFILL }}, { &hf_h248_range, { "range", "h248.range", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_sublist, { "sublist", "h248.sublist", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_EventParamValues_item, { "EventParamValue", "h248.EventParamValue", @@ -6001,11 +6001,11 @@ void proto_register_h248(void) { "h248.StreamMode", HFILL }}, { &hf_h248_reserveValue, { "reserveValue", "h248.reserveValue", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_reserveGroup, { "reserveGroup", "h248.reserveGroup", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_propertyParms_01, { "propertyParms", "h248.propertyParms", @@ -6105,7 +6105,7 @@ void proto_register_h248(void) { "h248.NULL", HFILL }}, { &hf_h248_keepActive, { "keepActive", "h248.keepActive", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h248.BOOLEAN", HFILL }}, { &hf_h248_eventDM, { "eventDM", "h248.eventDM", diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index fc6701a639..22e6a131fe 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -4487,23 +4487,23 @@ void proto_register_h282(void) { "h282.DeviceID", HFILL }}, { &hf_h282_audioSourceFlag, { "audioSourceFlag", "h282.audioSourceFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_audioSinkFlag, { "audioSinkFlag", "h282.audioSinkFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_videoSourceFlag, { "videoSourceFlag", "h282.videoSourceFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_videoSinkFlag, { "videoSinkFlag", "h282.videoSinkFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_remoteControlFlag, { "remoteControlFlag", "h282.remoteControlFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_instanceNumber, { "instanceNumber", "h282.instanceNumber", @@ -4519,11 +4519,11 @@ void proto_register_h282(void) { "h282.StreamID", HFILL }}, { &hf_h282_videoStreamFlag, { "videoStreamFlag", "h282.videoStreamFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_sourceChangeFlag, { "sourceChangeFlag", "h282.sourceChangeFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_streamName, { "streamName", "h282.streamName", @@ -4623,7 +4623,7 @@ void proto_register_h282(void) { "h282.PresetNumber", HFILL }}, { &hf_h282_storeModeSupported, { "storeModeSupported", "h282.storeModeSupported", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_presetTextLabel, { "presetTextLabel", "h282.presetTextLabel", @@ -5247,7 +5247,7 @@ void proto_register_h282(void) { "h282.INTEGER_10_1000", HFILL }}, { &hf_h282_multiplyFactor, { "multiplyFactor", "h282.multiplyFactor", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_inputDevices, { "inputDevices", "h282.inputDevices", @@ -5407,23 +5407,23 @@ void proto_register_h282(void) { "h282.AutoSlideDisplayTime", HFILL }}, { &hf_h282_continuousRewindControl, { "continuousRewindControl", "h282.continuousRewindControl", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_continuousFastForwardControl, { "continuousFastForwardControl", "h282.continuousFastForwardControl", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_searchBackwardsControl, { "searchBackwardsControl", "h282.searchBackwardsControl", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_searchForwardsControl, { "searchForwardsControl", "h282.searchForwardsControl", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_pause_01, { "pause", "h282.pause", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_selectProgram, { "selectProgram", "h282.selectProgram", @@ -5439,7 +5439,7 @@ void proto_register_h282(void) { "h282.ProgramDuration", HFILL }}, { &hf_h282_continuousPlayBackMode, { "continuousPlayBackMode", "h282.continuousPlayBackMode", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_setPlaybackSpeed, { "setPlaybackSpeed", "h282.setPlaybackSpeed", @@ -5447,11 +5447,11 @@ void proto_register_h282(void) { "h282.PlaybackSpeed", HFILL }}, { &hf_h282_play, { "play", "h282.play", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_setAudioOutputMute, { "setAudioOutputMute", "h282.setAudioOutputMute", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_playToNormalPlayTimePoint, { "playToNormalPlayTimePoint", "h282.playToNormalPlayTimePoint", @@ -5459,7 +5459,7 @@ void proto_register_h282(void) { "h282.ProgramDuration", HFILL }}, { &hf_h282_record, { "record", "h282.record", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_recordForDuration, { "recordForDuration", "h282.recordForDuration", @@ -5699,7 +5699,7 @@ void proto_register_h282(void) { "h282.PlaybackSpeed", HFILL }}, { &hf_h282_mute, { "mute", "h282.mute", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_currentdeviceState, { "currentdeviceState", "h282.currentdeviceState", @@ -5875,11 +5875,11 @@ void proto_register_h282(void) { "h282.NonStandardIdentifier", HFILL }}, { &hf_h282_deviceLockChanged, { "deviceLockChanged", "h282.deviceLockChanged", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_deviceAvailabilityChanged, { "deviceAvailabilityChanged", "h282.deviceAvailabilityChanged", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_cameraPannedToLimit, { "cameraPannedToLimit", "h282.cameraPannedToLimit", @@ -5951,7 +5951,7 @@ void proto_register_h282(void) { "h282.NULL", HFILL }}, { &hf_h282_sourceEventNotify, { "sourceEventNotify", "h282.sourceEventNotify", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_result_01, { "result", "h282.result", @@ -5979,7 +5979,7 @@ void proto_register_h282(void) { "h282.NULL", HFILL }}, { &hf_h282_lockFlag, { "lockFlag", "h282.lockFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h282.BOOLEAN", HFILL }}, { &hf_h282_result_03, { "result", "h282.result", diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 1458980b84..6ff6422bb4 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -674,7 +674,7 @@ void proto_register_h283(void) { "h283.INTEGER_0_65535", HFILL }}, { &hf_h283_reliable, { "reliable", "h283.reliable", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h283.BOOLEAN", HFILL }}, { &hf_h283_dataType, { "dataType", "h283.dataType", diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 091155757b..9873a03b8d 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -4952,7 +4952,7 @@ void proto_register_h450(void) { "h450.SubaddressInformation", HFILL }}, { &hf_h450_oddCountIndicator, { "oddCountIndicator", "h450.oddCountIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h450.BOOLEAN", HFILL }}, { &hf_h450_extensionId, { "extensionId", "h450.extensionId", @@ -5310,7 +5310,7 @@ void proto_register_h450(void) { "h450_3.DivertingLegInformation2Arg_extension", HFILL }}, { &hf_h450_3_presentationAllowedIndicator, { "presentationAllowedIndicator", "h450.3.presentationAllowedIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h450.PresentationAllowedIndicator", HFILL }}, { &hf_h450_3_redirectionNr, { "redirectionNr", "h450.3.redirectionNr", @@ -5338,7 +5338,7 @@ void proto_register_h450(void) { "h450_3.IntResult", HFILL }}, { &hf_h450_3_remoteEnabled, { "remoteEnabled", "h450.3.remoteEnabled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h450_3.BOOLEAN", HFILL }}, { &hf_h450_3_intResult_extension, { "extension", "h450.3.extension", @@ -5730,7 +5730,7 @@ void proto_register_h450(void) { "h450_4.MixedExtension", HFILL }}, { &hf_h450_7_callbackReq, { "callbackReq", "h450.7.callbackReq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h450_7.BOOLEAN", HFILL }}, { &hf_h450_7_mWIDeactivateArg_extensionArg, { "extensionArg", "h450.7.extensionArg", @@ -5868,11 +5868,11 @@ void proto_register_h450(void) { "h450_7.BasicService", HFILL }}, { &hf_h450_9_can_retain_service, { "can-retain-service", "h450.9.can_retain_service", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h450_9.BOOLEAN", HFILL }}, { &hf_h450_9_retain_sig_connection, { "retain-sig-connection", "h450.9.retain_sig_connection", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h450_9.BOOLEAN", HFILL }}, { &hf_h450_9_ccRequestArg_extension, { "extension", "h450.9.extension", @@ -5884,7 +5884,7 @@ void proto_register_h450(void) { "h450_4.MixedExtension", HFILL }}, { &hf_h450_9_retain_service, { "retain-service", "h450.9.retain_service", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h450_9.BOOLEAN", HFILL }}, { &hf_h450_9_ccRequestRes_extension, { "extension", "h450.9.extension", diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 2d855e30cd..f78bace432 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -2759,7 +2759,7 @@ void proto_register_h460(void) { "h225.TransportAddress", HFILL }}, { &hf_h460_15_immediateResume, { "immediateResume", "h460.15.immediateResume", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h460_15.BOOLEAN", HFILL }}, { &hf_h460_15_resetH245, { "resetH245", "h460.15.resetH245", @@ -2767,7 +2767,7 @@ void proto_register_h460(void) { "h460_15.NULL", HFILL }}, { &hf_h460_15_okToSuspend, { "okToSuspend", "h460.15.okToSuspend", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h460_15.BOOLEAN", HFILL }}, { &hf_h460_15_randomNumber, { "randomNumber", "h460.15.randomNumber", diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index 96d12483e3..aea58033ec 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -3006,7 +3006,7 @@ void proto_register_h501(void) { "h501.AddressTemplate", HFILL }}, { &hf_h501_partialResponse, { "partialResponse", "h501.partialResponse", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h501.BOOLEAN", HFILL }}, { &hf_h501_supportedProtocols, { "supportedProtocols", "h501.supportedProtocols", @@ -3262,7 +3262,7 @@ void proto_register_h501(void) { "h501.NULL", HFILL }}, { &hf_h501_callSpecific, { "callSpecific", "h501.callSpecific", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h501.BOOLEAN", HFILL }}, { &hf_h501_priceInfo, { "priceInfo", "h501.priceInfo", @@ -3318,7 +3318,7 @@ void proto_register_h501(void) { "h501.SecurityMode", HFILL }}, { &hf_h501_multipleCalls, { "multipleCalls", "h501.multipleCalls", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h501.BOOLEAN", HFILL }}, { &hf_h501_currency, { "currency", "h501.currency", @@ -3414,7 +3414,7 @@ void proto_register_h501(void) { "h501.AlternatePE", HFILL }}, { &hf_h501_alternateIsPermanent, { "alternateIsPermanent", "h501.alternateIsPermanent", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "h501.BOOLEAN", HFILL }}, { &hf_h501_contactAddress, { "contactAddress", "h501.contactAddress", diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 884d2a73ca..68c3302258 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -10317,31 +10317,31 @@ void proto_register_inap(void) { "inap.ConnectedNumberTreatmentInd", HFILL }}, { &hf_inap_suppressCallDiversionNotification, { "suppressCallDiversionNotification", "inap.suppressCallDiversionNotification", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_suppressCallTransferNotification, { "suppressCallTransferNotification", "inap.suppressCallTransferNotification", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_allowCdINNoPresentationInd, { "allowCdINNoPresentationInd", "inap.allowCdINNoPresentationInd", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_userDialogueDurationInd, { "userDialogueDurationInd", "inap.userDialogueDurationInd", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_overrideLineRestrictions, { "overrideLineRestrictions", "inap.overrideLineRestrictions", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_suppressVPNAPP, { "suppressVPNAPP", "inap.suppressVPNAPP", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_calledINNumberOverriding, { "calledINNumberOverriding", "inap.calledINNumberOverriding", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_redirectServiceTreatmentInd, { "redirectServiceTreatmentInd", "inap.redirectServiceTreatmentInd", @@ -10537,7 +10537,7 @@ void proto_register_inap(void) { "inap.LegID", HFILL }}, { &hf_inap_releaseIndication, { "releaseIndication", "inap.releaseIndication", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_destinationNumberRoutingAddress, { "destinationNumberRoutingAddress", "inap.destinationNumberRoutingAddress", @@ -10577,7 +10577,7 @@ void proto_register_inap(void) { "inap.RequestedInformationList", HFILL }}, { &hf_inap_lastEventIndicator, { "lastEventIndicator", "inap.lastEventIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_requestedInformationTypeList, { "requestedInformationTypeList", "inap.requestedInformationTypeList", @@ -10781,11 +10781,11 @@ void proto_register_inap(void) { "inap.AdditionalCallingPartyNumber", HFILL }}, { &hf_inap_cCSS, { "cCSS", "inap.cCSS", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.CCSS", HFILL }}, { &hf_inap_vPNIndicator, { "vPNIndicator", "inap.vPNIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.VPNIndicator", HFILL }}, { &hf_inap_cNInfo, { "cNInfo", "inap.cNInfo", @@ -10817,7 +10817,7 @@ void proto_register_inap(void) { "inap.CallSegmentID", HFILL }}, { &hf_inap_incomingSignallingBufferCopy, { "incomingSignallingBufferCopy", "inap.incomingSignallingBufferCopy", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_actionIndicator, { "actionIndicator", "inap.actionIndicator", @@ -10933,7 +10933,7 @@ void proto_register_inap(void) { "inap.INTEGER_1_numOfCSs", HFILL }}, { &hf_inap_forcedRelease, { "forcedRelease", "inap.forcedRelease", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_allCallSegments, { "allCallSegments", "inap.allCallSegments", @@ -10997,7 +10997,7 @@ void proto_register_inap(void) { "inap.SCIBillingChargingCharacteristics", HFILL }}, { &hf_inap_nocharge, { "nocharge", "inap.nocharge", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_callProcessingOperation, { "callProcessingOperation", "inap.callProcessingOperation", @@ -11065,19 +11065,19 @@ void proto_register_inap(void) { "inap.ErrorTreatment", HFILL }}, { &hf_inap_interruptableAnnInd, { "interruptableAnnInd", "inap.interruptableAnnInd", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_voiceInformation, { "voiceInformation", "inap.voiceInformation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_voiceBack, { "voiceBack", "inap.voiceBack", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_detectModem, { "detectModem", "inap.detectModem", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_collectedDigits, { "collectedDigits", "inap.collectedDigits", @@ -11085,7 +11085,7 @@ void proto_register_inap(void) { "inap.CollectedDigits", HFILL }}, { &hf_inap_iA5Information, { "iA5Information", "inap.iA5Information", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_messageID, { "messageID", "inap.messageID", @@ -11137,11 +11137,11 @@ void proto_register_inap(void) { "inap.OCTET_STRING_SIZE_1_2", HFILL }}, { &hf_inap_restartAllowed, { "restartAllowed", "inap.restartAllowed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_replayAllowed, { "replayAllowed", "inap.replayAllowed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_inbandInfo, { "inbandInfo", "inap.inbandInfo", @@ -11229,11 +11229,11 @@ void proto_register_inap(void) { "inap.OCTET_STRING_SIZE_4", HFILL }}, { &hf_inap_disconnectFromIPForbidden, { "disconnectFromIPForbidden", "inap.disconnectFromIPForbidden", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_requestAnnouncementComplete, { "requestAnnouncementComplete", "inap.requestAnnouncementComplete", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_connectedParty, { "connectedParty", "inap.connectedParty", @@ -11253,7 +11253,7 @@ void proto_register_inap(void) { "inap.IA5String", HFILL }}, { &hf_inap_modemdetected, { "modemdetected", "inap.modemdetected", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "inap.BOOLEAN", HFILL }}, { &hf_inap_subscriberID, { "subscriberID", "inap.subscriberID", diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 7c15315f3b..850d0091cf 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -4870,7 +4870,7 @@ void proto_register_ldap(void) { "ldap.ControlType", HFILL }}, { &hf_ldap_criticality, { "criticality", "ldap.criticality", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ldap.BOOLEAN", HFILL }}, { &hf_ldap_controlValue, { "controlValue", "ldap.controlValue", @@ -4946,7 +4946,7 @@ void proto_register_ldap(void) { "ldap.INTEGER_0_maxInt", HFILL }}, { &hf_ldap_typesOnly, { "typesOnly", "ldap.typesOnly", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ldap.BOOLEAN", HFILL }}, { &hf_ldap_filter, { "filter", "ldap.filter", @@ -5034,7 +5034,7 @@ void proto_register_ldap(void) { "ldap.AssertionValue", HFILL }}, { &hf_ldap_dnAttributes, { "dnAttributes", "ldap.dnAttributes", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ldap.T_dnAttributes", HFILL }}, { &hf_ldap_objectName, { "objectName", "ldap.objectName", @@ -5090,7 +5090,7 @@ void proto_register_ldap(void) { "ldap.RelativeLDAPDN", HFILL }}, { &hf_ldap_deleteoldrdn, { "deleteoldrdn", "ldap.deleteoldrdn", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ldap.BOOLEAN", HFILL }}, { &hf_ldap_newSuperior, { "newSuperior", "ldap.newSuperior", @@ -5142,7 +5142,7 @@ void proto_register_ldap(void) { "ldap.MatchingRuleId", HFILL }}, { &hf_ldap_reverseOrder, { "reverseOrder", "ldap.reverseOrder", - FT_BOOLEAN, 8, NULL, 0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ldap.BOOLEAN", HFILL }}, { &hf_ldap_sortResult, { "sortResult", "ldap.sortResult", diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index f476c829f9..0891a04d62 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -17977,7 +17977,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_intraFrequencyReselection", HFILL }}, { &hf_lte_rrc_csg_Indication, { "csg-Indication", "lte-rrc.csg_Indication", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_csg_Identity, { "csg-Identity", "lte-rrc.csg_Identity", @@ -18165,7 +18165,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_accessBarringInformation", HFILL }}, { &hf_lte_rrc_accessBarringForEmergencyCalls, { "accessBarringForEmergencyCalls", "lte-rrc.accessBarringForEmergencyCalls", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_accessBarringForSignalling, { "accessBarringForSignalling", "lte-rrc.accessBarringForSignalling", @@ -18225,7 +18225,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.AccessClassBarringList_item", HFILL }}, { &hf_lte_rrc_accessClassBarring, { "accessClassBarring", "lte-rrc.accessClassBarring", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_MBSFN_SubframeConfiguration_item, { "MBSFN-SubframeConfiguration item", "lte-rrc.MBSFN_SubframeConfiguration_item", @@ -18281,7 +18281,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_q_HystSF_High", HFILL }}, { &hf_lte_rrc_sameRefSignalsInNeighbour, { "sameRefSignalsInNeighbour", "lte-rrc.sameRefSignalsInNeighbour", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_cellReselectionServingFreqInfo, { "cellReselectionServingFreqInfo", "lte-rrc.cellReselectionServingFreqInfo", @@ -18765,7 +18765,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_0_1023", HFILL }}, { &hf_lte_rrc_simultaneousAckNackAndCQI, { "simultaneousAckNackAndCQI", "lte-rrc.simultaneousAckNackAndCQI", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_ul_SpecificParameters, { "ul-SpecificParameters", "lte-rrc.ul_SpecificParameters", @@ -18809,7 +18809,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_retxBSR_Timer", HFILL }}, { &hf_lte_rrc_ttiBundling, { "ttiBundling", "lte-rrc.ttiBundling", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_drx_Configuration, { "drx-Configuration", "lte-rrc.drx_Configuration", @@ -18949,7 +18949,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_rlc_AM", HFILL }}, { &hf_lte_rrc_statusReportRequired, { "statusReportRequired", "lte-rrc.statusReportRequired", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_rlc_UM, { "rlc-UM", "lte-rrc.rlc_UM", @@ -18981,39 +18981,39 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_profiles", HFILL }}, { &hf_lte_rrc_profile0x0001, { "profile0x0001", "lte-rrc.profile0x0001", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0002, { "profile0x0002", "lte-rrc.profile0x0002", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0003, { "profile0x0003", "lte-rrc.profile0x0003", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0004, { "profile0x0004", "lte-rrc.profile0x0004", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0006, { "profile0x0006", "lte-rrc.profile0x0006", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0101, { "profile0x0101", "lte-rrc.profile0x0101", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0102, { "profile0x0102", "lte-rrc.profile0x0102", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0103, { "profile0x0103", "lte-rrc.profile0x0103", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_profile0x0104, { "profile0x0104", "lte-rrc.profile0x0104", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_referenceSignalPower, { "referenceSignalPower", "lte-rrc.referenceSignalPower", @@ -19097,7 +19097,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_0_63", HFILL }}, { &hf_lte_rrc_highSpeedFlag, { "highSpeedFlag", "lte-rrc.highSpeedFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_zeroCorrelationZoneConfig, { "zeroCorrelationZoneConfig", "lte-rrc.zeroCorrelationZoneConfig", @@ -19157,7 +19157,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_0_63", HFILL }}, { &hf_lte_rrc_enable64Qam, { "enable64Qam", "lte-rrc.enable64Qam", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_ul_ReferenceSignalsPUSCH, { "ul-ReferenceSignalsPUSCH", "lte-rrc.ul_ReferenceSignalsPUSCH", @@ -19465,11 +19465,11 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_srsSubframeConfiguration", HFILL }}, { &hf_lte_rrc_ackNackSrsSimultaneousTransmission, { "ackNackSrsSimultaneousTransmission", "lte-rrc.ackNackSrsSimultaneousTransmission", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_srsMaxUpPts, { "srsMaxUpPts", "lte-rrc.srsMaxUpPts", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_enable_07, { "enable", "lte-rrc.enable", @@ -19489,7 +19489,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_0_23", HFILL }}, { &hf_lte_rrc_duration, { "duration", "lte-rrc.duration", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_srs_ConfigurationIndex, { "srs-ConfigurationIndex", "lte-rrc.srs_ConfigurationIndex", @@ -19585,7 +19585,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.TPC_Index", HFILL }}, { &hf_lte_rrc_groupHoppingEnabled, { "groupHoppingEnabled", "lte-rrc.groupHoppingEnabled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_groupAssignmentPUSCH, { "groupAssignmentPUSCH", "lte-rrc.groupAssignmentPUSCH", @@ -19593,7 +19593,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_0_29", HFILL }}, { &hf_lte_rrc_sequenceHoppingEnabled, { "sequenceHoppingEnabled", "lte-rrc.sequenceHoppingEnabled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_cyclicShift_01, { "cyclicShift", "lte-rrc.cyclicShift", @@ -19629,7 +19629,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_deltaMCS_Enabled", HFILL }}, { &hf_lte_rrc_accumulationEnabled, { "accumulationEnabled", "lte-rrc.accumulationEnabled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_p0_uePUCCH, { "p0-uePUCCH", "lte-rrc.p0_uePUCCH", @@ -19669,7 +19669,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.CipheringAlgorithm", HFILL }}, { &hf_lte_rrc_keyChangeIndicator, { "keyChangeIndicator", "lte-rrc.keyChangeIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_cdma2000_CarrierInfo, { "cdma2000-CarrierInfo", "lte-rrc.cdma2000_CarrierInfo", @@ -19681,7 +19681,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.CDMA2000_CellIdentity", HFILL }}, { &hf_lte_rrc_cdma_EUTRA_Synchronisation, { "cdma-EUTRA-Synchronisation", "lte-rrc.cdma_EUTRA_Synchronisation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_cdma_SystemTime, { "cdma-SystemTime", "lte-rrc.cdma_SystemTime", @@ -19789,7 +19789,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.BIT_STRING_SIZE_128", HFILL }}, { &hf_lte_rrc_hrpd_PreRegistrationAllowed, { "hrpd-PreRegistrationAllowed", "lte-rrc.hrpd_PreRegistrationAllowed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_hrpd_PreRegistrationZoneId, { "hrpd-PreRegistrationZoneId", "lte-rrc.hrpd_PreRegistrationZoneId", @@ -19861,7 +19861,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_1_16", HFILL }}, { &hf_lte_rrc_oneXRTT_CSFB_RegistrationAllowed, { "oneXRTT-CSFB-RegistrationAllowed", "lte-rrc.oneXRTT_CSFB_RegistrationAllowed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_oneXRTT_RegistrationParameters, { "oneXRTT-RegistrationParameters", "lte-rrc.oneXRTT_RegistrationParameters", @@ -19877,27 +19877,27 @@ void proto_register_lte_rrc(void) { "lte_rrc.BIT_STRING_SIZE_16", HFILL }}, { &hf_lte_rrc_oneXRTT_MultipleSID, { "oneXRTT-MultipleSID", "lte-rrc.oneXRTT_MultipleSID", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_oneXRTT_MultipleNID, { "oneXRTT-MultipleNID", "lte-rrc.oneXRTT_MultipleNID", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_oneXRTT_HomeReg, { "oneXRTT-HomeReg", "lte-rrc.oneXRTT_HomeReg", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_oneXRTT_ForeignSIDReg, { "oneXRTT-ForeignSIDReg", "lte-rrc.oneXRTT_ForeignSIDReg", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_oneXRTT_ForeignNIDReg, { "oneXRTT-ForeignNIDReg", "lte-rrc.oneXRTT_ForeignNIDReg", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_oneXRTT_ParameterReg, { "oneXRTT-ParameterReg", "lte-rrc.oneXRTT_ParameterReg", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_oneXRTT_RegistrationPeriod, { "oneXRTT-RegistrationPeriod", "lte-rrc.oneXRTT_RegistrationPeriod", @@ -20269,7 +20269,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.BIT_STRING_SIZE_6", HFILL }}, { &hf_lte_rrc_hrpdPreRegistrationStatus, { "hrpdPreRegistrationStatus", "lte-rrc.hrpdPreRegistrationStatus", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_measResultListCDMA2000, { "measResultListCDMA2000", "lte-rrc.measResultListCDMA2000", @@ -20497,7 +20497,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_M30_30", HFILL }}, { &hf_lte_rrc_reportOnLeave, { "reportOnLeave", "lte-rrc.reportOnLeave", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_eventA4, { "eventA4", "lte-rrc.eventA4", @@ -20729,11 +20729,11 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_maxNumberROHC_ContextSessions", HFILL }}, { &hf_lte_rrc_ue_TxAntennaSelectionSupported, { "ue-TxAntennaSelectionSupported", "lte-rrc.ue_TxAntennaSelectionSupported", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_ue_SpecificRefSigsSupported, { "ue-SpecificRefSigsSupported", "lte-rrc.ue_SpecificRefSigsSupported", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_supportedEUTRA_BandList, { "supportedEUTRA-BandList", "lte-rrc.supportedEUTRA_BandList", @@ -20749,7 +20749,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.INTEGER_1_64", HFILL }}, { &hf_lte_rrc_halfDuplex, { "halfDuplex", "lte-rrc.halfDuplex", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_eutra_BandList, { "eutra-BandList", "lte-rrc.eutra_BandList", @@ -20773,7 +20773,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.InterFreqEUTRA_BandList_item", HFILL }}, { &hf_lte_rrc_interFreqNeedForGaps, { "interFreqNeedForGaps", "lte-rrc.interFreqNeedForGaps", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_InterRAT_BandList_item, { "InterRAT-BandList item", "lte-rrc.InterRAT_BandList_item", @@ -20781,7 +20781,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.InterRAT_BandList_item", HFILL }}, { &hf_lte_rrc_interRAT_NeedForGaps, { "interRAT-NeedForGaps", "lte-rrc.interRAT_NeedForGaps", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_supportedUTRA_FDD_BandList, { "supportedUTRA-FDD-BandList", "lte-rrc.supportedUTRA_FDD_BandList", @@ -20837,7 +20837,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.SupportedGERAN_BandList", HFILL }}, { &hf_lte_rrc_interRAT_PS_HO_ToGERAN, { "interRAT-PS-HO-ToGERAN", "lte-rrc.interRAT_PS_HO_ToGERAN", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "lte_rrc.BOOLEAN", HFILL }}, { &hf_lte_rrc_SupportedGERAN_BandList_item, { "SupportedGERAN-BandList item", "lte-rrc.SupportedGERAN_BandList_item", diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 0d1d37ca52..59b7c33bc0 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -7041,7 +7041,7 @@ void proto_register_mms(void) { "mms.AttachToSemaphore", HFILL }}, { &hf_mms_status, { "status", "mms.status", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.Status_Request", HFILL }}, { &hf_mms_getNameList, { "getNameList", "mms.getNameList", @@ -7981,7 +7981,7 @@ void proto_register_mms(void) { "mms.Identifier", HFILL }}, { &hf_mms_moreFollows, { "moreFollows", "mms.moreFollows", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_vendorName, { "vendorName", "mms.vendorName", @@ -8041,7 +8041,7 @@ void proto_register_mms(void) { "mms.T_listOfCapabilities_01", HFILL }}, { &hf_mms_sharable, { "sharable", "mms.sharable", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_loadData, { "loadData", "mms.loadData", @@ -8101,7 +8101,7 @@ void proto_register_mms(void) { "mms.DomainState", HFILL }}, { &hf_mms_mmsDeletable, { "mmsDeletable", "mms.mmsDeletable", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_listOfProgramInvocations, { "listOfProgramInvocations", "mms.listOfProgramInvocations", @@ -8129,11 +8129,11 @@ void proto_register_mms(void) { "mms.Identifier", HFILL }}, { &hf_mms_reusable, { "reusable", "mms.reusable", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_monitorType, { "monitorType", "mms.monitorType", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_executionArgument, { "executionArgument", "mms.executionArgument", @@ -8165,7 +8165,7 @@ void proto_register_mms(void) { "mms.Identifier", HFILL }}, { &hf_mms_monitor, { "monitor", "mms.monitor", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_startArgument, { "startArgument", "mms.startArgument", @@ -8185,7 +8185,7 @@ void proto_register_mms(void) { "mms.T_array", HFILL }}, { &hf_mms_packed, { "packed", "mms.packed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_numberOfElements, { "numberOfElements", "mms.numberOfElements", @@ -8245,7 +8245,7 @@ void proto_register_mms(void) { "mms.NULL", HFILL }}, { &hf_mms_binary_time, { "binary-time", "mms.binary_time", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_bcd, { "bcd", "mms.bcd", @@ -8297,7 +8297,7 @@ void proto_register_mms(void) { "mms.NULL", HFILL }}, { &hf_mms_specificationWithResult, { "specificationWithResult", "mms.specificationWithResult", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_variableAccessSpecificatn, { "variableAccessSpecificatn", "mms.variableAccessSpecificatn", @@ -8449,7 +8449,7 @@ void proto_register_mms(void) { "mms.Data", HFILL }}, { &hf_mms_boolean_01, { "boolean", "mms.boolean", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_bit_string_01, { "bit-string", "mms.bit_string", @@ -8541,11 +8541,11 @@ void proto_register_mms(void) { "mms.Unsigned32", HFILL }}, { &hf_mms_abortOnTimeOut, { "abortOnTimeOut", "mms.abortOnTimeOut", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_relinquishIfConnectionLost, { "relinquishIfConnectionLost", "mms.relinquishIfConnectionLost", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_applicationToPreempt, { "applicationToPreempt", "mms.applicationToPreempt", @@ -8637,7 +8637,7 @@ void proto_register_mms(void) { "mms.Identifier", HFILL }}, { &hf_mms_echo, { "echo", "mms.echo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_listOfPromptData, { "listOfPromptData", "mms.listOfPromptData", @@ -8677,7 +8677,7 @@ void proto_register_mms(void) { "mms.Unsigned8", HFILL }}, { &hf_mms_alarmSummaryReports, { "alarmSummaryReports", "mms.alarmSummaryReports", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_monitoredVariable, { "monitoredVariable", "mms.monitoredVariable", @@ -8729,7 +8729,7 @@ void proto_register_mms(void) { "mms.Unsigned32", HFILL }}, { &hf_mms_enabled, { "enabled", "mms.enabled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_timeOfLastTransitionToActive, { "timeOfLastTransitionToActive", "mms.timeOfLastTransitionToActive", @@ -8825,7 +8825,7 @@ void proto_register_mms(void) { "mms.Transitions", HFILL }}, { &hf_mms_notificationLost, { "notificationLost", "mms.notificationLost", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_alarmAcknowledgmentRule, { "alarmAcknowledgmentRule", "mms.alarmAcknowledgmentRule", @@ -8857,11 +8857,11 @@ void proto_register_mms(void) { "mms.EventTime", HFILL }}, { &hf_mms_enrollmentsOnly, { "enrollmentsOnly", "mms.enrollmentsOnly", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_activeAlarmsOnly, { "activeAlarmsOnly", "mms.activeAlarmsOnly", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mms.BOOLEAN", HFILL }}, { &hf_mms_acknowledgmentFilter, { "acknowledgmentFilter", "mms.acknowledgmentFilter", diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 1a2d58a182..a2e8d19d3f 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -607,11 +607,11 @@ proto_register_mpeg_audio(void) "mpeg_audio.INTEGER_0_3", HFILL }}, { &hf_mpeg_audio_padding, { "padding", "mpeg-audio.padding", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_audio.BOOLEAN", HFILL }}, { &hf_mpeg_audio_private, { "private", "mpeg-audio.private", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_audio.BOOLEAN", HFILL }}, { &hf_mpeg_audio_channel_mode, { "channel-mode", "mpeg-audio.channel_mode", @@ -623,11 +623,11 @@ proto_register_mpeg_audio(void) "mpeg_audio.INTEGER_0_3", HFILL }}, { &hf_mpeg_audio_copyright, { "copyright", "mpeg-audio.copyright", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_audio.BOOLEAN", HFILL }}, { &hf_mpeg_audio_original, { "original", "mpeg-audio.original", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_audio.BOOLEAN", HFILL }}, { &hf_mpeg_audio_emphasis, { "emphasis", "mpeg-audio.emphasis", diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 4521f13b13..d85f3d6ebb 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -937,11 +937,11 @@ proto_register_mpeg_pes(void) "mpeg_pes.INTEGER_0_65535", HFILL }}, { &hf_mpeg_pes_must_be_one, { "must-be-one", "mpeg-pes.must_be_one", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_must_be_zero, { "must-be-zero", "mpeg-pes.must_be_zero", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_scrambling_control, { "scrambling-control", "mpeg-pes.scrambling_control", @@ -949,51 +949,51 @@ proto_register_mpeg_pes(void) "mpeg_pes.T_scrambling_control", HFILL }}, { &hf_mpeg_pes_priority, { "priority", "mpeg-pes.priority", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_data_alignment, { "data-alignment", "mpeg-pes.data_alignment", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_copyright, { "copyright", "mpeg-pes.copyright", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_original, { "original", "mpeg-pes.original", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_pts_flag, { "pts-flag", "mpeg-pes.pts_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_dts_flag, { "dts-flag", "mpeg-pes.dts_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_escr_flag, { "escr-flag", "mpeg-pes.escr_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_es_rate_flag, { "es-rate-flag", "mpeg-pes.es_rate_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_dsm_trick_mode_flag, { "dsm-trick-mode-flag", "mpeg-pes.dsm_trick_mode_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_additional_copy_info_flag, { "additional-copy-info-flag", "mpeg-pes.additional_copy_info_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_crc_flag, { "crc-flag", "mpeg-pes.crc_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_extension_flag, { "extension-flag", "mpeg-pes.extension_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_header_data_length, { "header-data-length", "mpeg-pes.header_data_length", @@ -1025,15 +1025,15 @@ proto_register_mpeg_pes(void) "mpeg_pes.BIT_STRING_SIZE_10", HFILL }}, { &hf_mpeg_pes_constrained_parameters_flag, { "constrained-parameters-flag", "mpeg-pes.constrained_parameters_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_load_intra_quantiser_matrix, { "load-intra-quantiser-matrix", "mpeg-pes.load_intra_quantiser_matrix", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_load_non_intra_quantiser_matrix, { "load-non-intra-quantiser-matrix", "mpeg-pes.load_non_intra_quantiser_matrix", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_must_be_0001, { "must-be-0001", "mpeg-pes.must_be_0001", @@ -1045,7 +1045,7 @@ proto_register_mpeg_pes(void) "mpeg_pes.INTEGER_0_255", HFILL }}, { &hf_mpeg_pes_progressive_sequence, { "progressive-sequence", "mpeg-pes.progressive_sequence", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_chroma_format, { "chroma-format", "mpeg-pes.chroma_format", @@ -1069,7 +1069,7 @@ proto_register_mpeg_pes(void) "mpeg_pes.INTEGER_0_255", HFILL }}, { &hf_mpeg_pes_low_delay, { "low-delay", "mpeg-pes.low_delay", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_frame_rate_extension_n, { "frame-rate-extension-n", "mpeg-pes.frame_rate_extension_n", @@ -1081,7 +1081,7 @@ proto_register_mpeg_pes(void) "mpeg_pes.INTEGER_0_3", HFILL }}, { &hf_mpeg_pes_drop_frame_flag, { "drop-frame-flag", "mpeg-pes.drop_frame_flag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_hour, { "hour", "mpeg-pes.hour", @@ -1101,11 +1101,11 @@ proto_register_mpeg_pes(void) "mpeg_pes.INTEGER_0_64", HFILL }}, { &hf_mpeg_pes_closed_gop, { "closed-gop", "mpeg-pes.closed_gop", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_broken_gop, { "broken-gop", "mpeg-pes.broken_gop", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "mpeg_pes.BOOLEAN", HFILL }}, { &hf_mpeg_pes_must_be_zero_01, { "must-be-zero", "mpeg-pes.must_be_zero", diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index a23da85f34..19767960e3 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -48144,7 +48144,7 @@ void proto_register_nbap(void) { "nbap.E_DCH_TDD_CapacityConsumptionLaw", HFILL }}, { &hf_nbap_E_DCH_TTI2ms_Capability_PDU, { "E-DCH-TTI2ms-Capability", "nbap.E_DCH_TTI2ms_Capability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.E_DCH_TTI2ms_Capability", HFILL }}, { &hf_nbap_E_DCH_SF_Capability_PDU, { "E-DCH-SF-Capability", "nbap.E_DCH_SF_Capability", @@ -48228,7 +48228,7 @@ void proto_register_nbap(void) { "nbap.EDCH_RACH_Report_Value", HFILL }}, { &hf_nbap_E_DPDCH_PowerInterpolation_PDU, { "E-DPDCH-PowerInterpolation", "nbap.E_DPDCH_PowerInterpolation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.E_DPDCH_PowerInterpolation", HFILL }}, { &hf_nbap_E_DCH_MACdFlows_to_DeleteLCR_PDU, { "E-DCH-MACdFlows-to-DeleteLCR", "nbap.E_DCH_MACdFlows_to_DeleteLCR", @@ -48672,7 +48672,7 @@ void proto_register_nbap(void) { "nbap.IPMulticastIndication", HFILL }}, { &hf_nbap_IPMulticastDataBearerIndication_PDU, { "IPMulticastDataBearerIndication", "nbap.IPMulticastDataBearerIndication", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.IPMulticastDataBearerIndication", HFILL }}, { &hf_nbap_Local_Cell_ID_PDU, { "Local-Cell-ID", "nbap.Local_Cell_ID", @@ -49136,7 +49136,7 @@ void proto_register_nbap(void) { "nbap.Transmitted_Carrier_Power_Value", HFILL }}, { &hf_nbap_TransmissionDiversityApplied_PDU, { "TransmissionDiversityApplied", "nbap.TransmissionDiversityApplied", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.TransmissionDiversityApplied", HFILL }}, { &hf_nbap_TransportBearerRequestIndicator_PDU, { "TransportBearerRequestIndicator", "nbap.TransportBearerRequestIndicator", @@ -51572,7 +51572,7 @@ void proto_register_nbap(void) { "nbap.Max_TB_Size", HFILL }}, { &hf_nbap_common_E_DCH_ImplicitRelease_Indicator, { "common-E-DCH-ImplicitRelease-Indicator", "nbap.common_E_DCH_ImplicitRelease_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_cqiFeedback_CycleK, { "cqiFeedback-CycleK", "nbap.cqiFeedback_CycleK", @@ -51612,7 +51612,7 @@ void proto_register_nbap(void) { "nbap.ScramblingCodeNumber", HFILL }}, { &hf_nbap_e_AI_Indicator, { "e-AI-Indicator", "nbap.e_AI_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.E_AI_Indicator", HFILL }}, { &hf_nbap_common_E_DCH_AICH_Information, { "common-E-DCH-AICH-Information", "nbap.common_E_DCH_AICH_Information", @@ -51900,7 +51900,7 @@ void proto_register_nbap(void) { "nbap.Transport_Block_Size_Index", HFILL }}, { &hf_nbap_hSPDSCH_Second_Code_Support, { "hSPDSCH-Second-Code-Support", "nbap.hSPDSCH_Second_Code_Support", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.HSPDSCH_Second_Code_Support", HFILL }}, { &hf_nbap_hSPDSCH_First_Code_Index, { "hSPDSCH-First-Code-Index", "nbap.hSPDSCH_First_Code_Index", @@ -52540,7 +52540,7 @@ void proto_register_nbap(void) { "nbap.Inactivity_Threshold_for_UE_Grant_Monitoring", HFILL }}, { &hf_nbap_uE_DRX_Grant_Monitoring, { "uE-DRX-Grant-Monitoring", "nbap.uE_DRX_Grant_Monitoring", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.UE_DRX_Grant_Monitoring", HFILL }}, { &hf_nbap_modify, { "modify", "nbap.modify", @@ -53196,7 +53196,7 @@ void proto_register_nbap(void) { "nbap.BIT_STRING_SIZE_2", HFILL }}, { &hf_nbap_ganss_Add_Nav_Models_And_Time_Recovery, { "ganss-Add-Nav-Models-And-Time-Recovery", "nbap.ganss_Add_Nav_Models_And_Time_Recovery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_navKeplerianSet, { "navKeplerianSet", "nbap.navKeplerianSet", @@ -53216,7 +53216,7 @@ void proto_register_nbap(void) { "nbap.GANSS_NavModel_SBASecef", HFILL }}, { &hf_nbap_ganss_Add_UTC_Models, { "ganss-Add-UTC-Models", "nbap.ganss_Add_UTC_Models", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_alpha_beta_parameters, { "alpha-beta-parameters", "nbap.alpha_beta_parameters", @@ -53336,7 +53336,7 @@ void proto_register_nbap(void) { "nbap.INTEGER_M7_13", HFILL }}, { &hf_nbap_ganss_Aux_Info, { "ganss-Aux-Info", "nbap.ganss_Aux_Info", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_GANSS_Clock_Model_item, { "GANSS-SatelliteClockModelItem", "nbap.GANSS_SatelliteClockModelItem", @@ -53412,7 +53412,7 @@ void proto_register_nbap(void) { "nbap.GANSS_RX_Pos", HFILL }}, { &hf_nbap_ionospheric_Model, { "ionospheric-Model", "nbap.ionospheric_Model", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_ganssTod, { "ganssTod", "nbap.ganssTod", @@ -53500,7 +53500,7 @@ void proto_register_nbap(void) { "nbap.BIT_STRING_SIZE_19", HFILL }}, { &hf_nbap_eopReq, { "eopReq", "nbap.eopReq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_GANSS_GenericDataInfoReqList_item, { "GANSS-GenericDataInfoReqItem", "nbap.GANSS_GenericDataInfoReqItem", @@ -53512,7 +53512,7 @@ void proto_register_nbap(void) { "nbap.GANSS_ID", HFILL }}, { &hf_nbap_ganss_Navigation_Model_And_Time_Recovery, { "ganss-Navigation-Model-And-Time-Recovery", "nbap.ganss_Navigation_Model_And_Time_Recovery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_ganss_Time_Model_GNSS_GNSS, { "ganss-Time-Model-GNSS-GNSS", "nbap.ganss_Time_Model_GNSS_GNSS", @@ -53520,15 +53520,15 @@ void proto_register_nbap(void) { "nbap.BIT_STRING_SIZE_9", HFILL }}, { &hf_nbap_ganss_UTC_Model, { "ganss-UTC-Model", "nbap.ganss_UTC_Model", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_ganss_Almanac, { "ganss-Almanac", "nbap.ganss_Almanac", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_ganss_Real_Time_Integrity, { "ganss-Real-Time-Integrity", "nbap.ganss_Real_Time_Integrity", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_ganss_Data_Bit_Assistance_Req, { "ganss-Data-Bit-Assistance-Req", "nbap.ganss_Data_Bit_Assistance_Req", @@ -53604,23 +53604,23 @@ void proto_register_nbap(void) { "nbap.GANSS_IonosphereRegionalStormFlags", HFILL }}, { &hf_nbap_storm_flag_one, { "storm-flag-one", "nbap.storm_flag_one", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_storm_flag_two, { "storm-flag-two", "nbap.storm_flag_two", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_storm_flag_three, { "storm-flag-three", "nbap.storm_flag_three", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_storm_flag_four, { "storm-flag-four", "nbap.storm_flag_four", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_storm_flag_five, { "storm-flag-five", "nbap.storm_flag_five", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.BOOLEAN", HFILL }}, { &hf_nbap_iod_a, { "iod-a", "nbap.iod_a", @@ -59244,7 +59244,7 @@ void proto_register_nbap(void) { "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst", HFILL }}, { &hf_nbap_lTGI_Presence, { "lTGI-Presence", "nbap.lTGI_Presence", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "nbap.LTGI_Presence", HFILL }}, { &hf_nbap_sNPL_Reporting_Type, { "sNPL-Reporting-Type", "nbap.sNPL_Reporting_Type", diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 387d50a010..367b790e71 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-p7.c */ -/* ../../tools/asn2wrs.py -b -e -L -p p7 -c p7.cnf -s packet-p7-template MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ +/* ../../tools/asn2wrs.py -b -e -L -p p7 -c ./p7.cnf -s ./packet-p7-template -D . MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ /* Input file: packet-p7-template.c */ @@ -4427,7 +4427,7 @@ void proto_register_p7(void) { "p7.Restrictions", HFILL }}, { &hf_p7_ms_configuration_request, { "ms-configuration-request", "p7.ms_configuration_request", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_ua_registration_identifier, { "ua-registration-identifier", "p7.ua_registration_identifier", @@ -4479,7 +4479,7 @@ void proto_register_p7(void) { "p7.AttributeType", HFILL }}, { &hf_p7_alert_indication, { "alert-indication", "p7.alert_indication", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_content_types_supported, { "content-types-supported", "p7.content_types_supported", @@ -4527,7 +4527,7 @@ void proto_register_p7(void) { "p7.OBJECT_IDENTIFIER", HFILL }}, { &hf_p7_ua_registration_id_unknown, { "ua-registration-id-unknown", "p7.ua_registration_id_unknown", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_service_information, { "service-information", "p7.service_information", @@ -4683,7 +4683,7 @@ void proto_register_p7(void) { "p7.T_attribute_value", HFILL }}, { &hf_p7_child_entries, { "child-entries", "p7.child_entries", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_range, { "range", "p7.range", @@ -4743,7 +4743,7 @@ void proto_register_p7(void) { "p7.EntryClass", HFILL }}, { &hf_p7_disable_auto_modify, { "disable-auto-modify", "p7.disable_auto_modify", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_add_message_group_names, { "add-message-group-names", "p7.add_message_group_names", @@ -5071,11 +5071,11 @@ void proto_register_p7(void) { "p7.MessageGroupName", HFILL }}, { &hf_p7_immediate_descendants_only, { "immediate-descendants-only", "p7.immediate_descendants_only", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_omit_descriptors, { "omit-descriptors", "p7.omit_descriptors", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_algorithm_identifier, { "algorithm-identifier", "p7.algorithm_identifier", @@ -5159,7 +5159,7 @@ void proto_register_p7(void) { "p7.MSExtensions", HFILL }}, { &hf_p7_strict, { "strict", "p7.strict", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "p7.BOOLEAN", HFILL }}, { &hf_p7_modification, { "modification", "p7.modification", diff --git a/epan/dissectors/packet-p7.h b/epan/dissectors/packet-p7.h index 4868739c29..6859852682 100644 --- a/epan/dissectors/packet-p7.h +++ b/epan/dissectors/packet-p7.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-p7.h */ -/* ../../tools/asn2wrs.py -b -e -L -p p7 -c p7.cnf -s packet-p7-template MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ +/* ../../tools/asn2wrs.py -b -e -L -p p7 -c ./p7.cnf -s ./packet-p7-template -D . MSAbstractService.asn MSGeneralAttributeTypes.asn MSAccessProtocol.asn */ /* Input file: packet-p7-template.h */ diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 74f7892494..9cb61b142c 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -11807,23 +11807,23 @@ void proto_register_pcap(void) { "pcap.T_fdd", HFILL }}, { &hf_pcap_roundTripTimeInfoWanted, { "roundTripTimeInfoWanted", "pcap.roundTripTimeInfoWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_pathlossWanted, { "pathlossWanted", "pcap.pathlossWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_roundTripTimeInfoWithType1Wanted, { "roundTripTimeInfoWithType1Wanted", "pcap.roundTripTimeInfoWithType1Wanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_cpichRSCPWanted, { "cpichRSCPWanted", "pcap.cpichRSCPWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_cpicEcNoWanted, { "cpicEcNoWanted", "pcap.cpicEcNoWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_tdd, { "tdd", "pcap.tdd", @@ -11831,27 +11831,27 @@ void proto_register_pcap(void) { "pcap.T_tdd", HFILL }}, { &hf_pcap_rxTimingDeviationInfoWanted, { "rxTimingDeviationInfoWanted", "pcap.rxTimingDeviationInfoWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_rxTimingDeviationLCRInfoWanted, { "rxTimingDeviationLCRInfoWanted", "pcap.rxTimingDeviationLCRInfoWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_rxTimingDeviation768InfoWanted, { "rxTimingDeviation768InfoWanted", "pcap.rxTimingDeviation768InfoWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_rxTimingDeviation384extInfoWanted, { "rxTimingDeviation384extInfoWanted", "pcap.rxTimingDeviation384extInfoWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_angleOfArrivalLCRWanted, { "angleOfArrivalLCRWanted", "pcap.angleOfArrivalLCRWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_timingAdvanceLCRWanted, { "timingAdvanceLCRWanted", "pcap.timingAdvanceLCRWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_procedureCode, { "procedureCode", "pcap.procedureCode", @@ -12319,23 +12319,23 @@ void proto_register_pcap(void) { "pcap.GANSS_IonosphereRegionalStormFlags", HFILL }}, { &hf_pcap_storm_flag_one, { "storm-flag-one", "pcap.storm_flag_one", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_storm_flag_two, { "storm-flag-two", "pcap.storm_flag_two", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_storm_flag_three, { "storm-flag-three", "pcap.storm_flag_three", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_storm_flag_four, { "storm-flag-four", "pcap.storm_flag_four", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_storm_flag_five, { "storm-flag-five", "pcap.storm_flag_five", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_t_oa, { "t-oa", "pcap.t_oa", @@ -13055,11 +13055,11 @@ void proto_register_pcap(void) { "pcap.BIT_STRING_SIZE_14", HFILL }}, { &hf_pcap_antiSpoof, { "antiSpoof", "pcap.antiSpoof", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_alert, { "alert", "pcap.alert", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_tlm_Reserved, { "tlm-Reserved", "pcap.tlm_Reserved", @@ -13103,39 +13103,39 @@ void proto_register_pcap(void) { "pcap.BIT_STRING_SIZE_8", HFILL }}, { &hf_pcap_almanacRequest, { "almanacRequest", "pcap.almanacRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_utcModelRequest, { "utcModelRequest", "pcap.utcModelRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ionosphericModelRequest, { "ionosphericModelRequest", "pcap.ionosphericModelRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_navigationModelRequest, { "navigationModelRequest", "pcap.navigationModelRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_dgpsCorrectionsRequest, { "dgpsCorrectionsRequest", "pcap.dgpsCorrectionsRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_referenceLocationRequest, { "referenceLocationRequest", "pcap.referenceLocationRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_referenceTimeRequest, { "referenceTimeRequest", "pcap.referenceTimeRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_aquisitionAssistanceRequest, { "aquisitionAssistanceRequest", "pcap.aquisitionAssistanceRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_realTimeIntegrityRequest, { "realTimeIntegrityRequest", "pcap.realTimeIntegrityRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_navModelAddDataRequest, { "navModelAddDataRequest", "pcap.navModelAddDataRequest", @@ -13143,15 +13143,15 @@ void proto_register_pcap(void) { "pcap.NavModelAdditionalData", HFILL }}, { &hf_pcap_ganssReferenceTime, { "ganssReferenceTime", "pcap.ganssReferenceTime", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssreferenceLocation, { "ganssreferenceLocation", "pcap.ganssreferenceLocation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssIonosphericModel, { "ganssIonosphericModel", "pcap.ganssIonosphericModel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssRequestedGenericAssistanceDataList, { "ganssRequestedGenericAssistanceDataList", "pcap.ganssRequestedGenericAssistanceDataList", @@ -13163,7 +13163,7 @@ void proto_register_pcap(void) { "pcap.GanssReqGenericData", HFILL }}, { &hf_pcap_ganssRealTimeIntegrity, { "ganssRealTimeIntegrity", "pcap.ganssRealTimeIntegrity", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssDifferentialCorrection, { "ganssDifferentialCorrection", "pcap.ganssDifferentialCorrection", @@ -13171,11 +13171,11 @@ void proto_register_pcap(void) { "pcap.DGANSS_Sig_Id_Req", HFILL }}, { &hf_pcap_ganssAlmanac, { "ganssAlmanac", "pcap.ganssAlmanac", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssNavigationModel, { "ganssNavigationModel", "pcap.ganssNavigationModel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssTimeModels, { "ganssTimeModels", "pcap.ganssTimeModels", @@ -13183,7 +13183,7 @@ void proto_register_pcap(void) { "pcap.BIT_STRING_SIZE_9", HFILL }}, { &hf_pcap_ganssReferenceMeasurementInfo, { "ganssReferenceMeasurementInfo", "pcap.ganssReferenceMeasurementInfo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssDataBits_01, { "ganssDataBits", "pcap.ganssDataBits", @@ -13191,7 +13191,7 @@ void proto_register_pcap(void) { "pcap.GanssDataBits", HFILL }}, { &hf_pcap_ganssUTCModel, { "ganssUTCModel", "pcap.ganssUTCModel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssNavigationModelAdditionalData, { "ganssNavigationModelAdditionalData", "pcap.ganssNavigationModelAdditionalData", @@ -13207,7 +13207,7 @@ void proto_register_pcap(void) { "pcap.ReqDataBitAssistanceList_item", HFILL }}, { &hf_pcap_ganssDataBitAssistance, { "ganssDataBitAssistance", "pcap.ganssDataBitAssistance", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_type, { "type", "pcap.type", @@ -13627,11 +13627,11 @@ void proto_register_pcap(void) { "pcap.RequestTypeAccuracyCode", HFILL }}, { &hf_pcap_standAloneLocationMethodsSupported, { "standAloneLocationMethodsSupported", "pcap.standAloneLocationMethodsSupported", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ueBasedOTDOASupported, { "ueBasedOTDOASupported", "pcap.ueBasedOTDOASupported", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_networkAssistedGPSSupport, { "networkAssistedGPSSupport", "pcap.networkAssistedGPSSupport", @@ -13639,23 +13639,23 @@ void proto_register_pcap(void) { "pcap.NetworkAssistedGPSSuport", HFILL }}, { &hf_pcap_supportGPSTimingOfCellFrame, { "supportGPSTimingOfCellFrame", "pcap.supportGPSTimingOfCellFrame", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_supportForIPDL, { "supportForIPDL", "pcap.supportForIPDL", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_supportForRxTxTimeDiff, { "supportForRxTxTimeDiff", "pcap.supportForRxTxTimeDiff", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_supportForUEAGPSinCellPCH, { "supportForUEAGPSinCellPCH", "pcap.supportForUEAGPSinCellPCH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_supportForSFNSFNTimeDiff, { "supportForSFNSFNTimeDiff", "pcap.supportForSFNSFNTimeDiff", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_NetworkAssistedGANSSSupport_item, { "NetworkAssistedGANSSSupport item", "pcap.NetworkAssistedGANSSSupport_item", @@ -13671,11 +13671,11 @@ void proto_register_pcap(void) { "pcap.GANSS_SignalID", HFILL }}, { &hf_pcap_supportGANSSTimingOfCellFrame, { "supportGANSSTimingOfCellFrame", "pcap.supportGANSSTimingOfCellFrame", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_supportGANSSCarrierPhaseMeasurement, { "supportGANSSCarrierPhaseMeasurement", "pcap.supportGANSSCarrierPhaseMeasurement", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_utdoa_BitCount, { "utdoa-BitCount", "pcap.utdoa_BitCount", @@ -13699,11 +13699,11 @@ void proto_register_pcap(void) { "pcap.VerticalAccuracyCode", HFILL }}, { &hf_pcap_gpsTimingOfCellWanted, { "gpsTimingOfCellWanted", "pcap.gpsTimingOfCellWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_additionalAssistanceDataRequest, { "additionalAssistanceDataRequest", "pcap.additionalAssistanceDataRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_ganssPositioningInstructions, { "ganssPositioningInstructions", "pcap.ganssPositioningInstructions", @@ -13963,7 +13963,7 @@ void proto_register_pcap(void) { "pcap.UL_ScramblingCode", HFILL }}, { &hf_pcap_tfci_Existence, { "tfci-Existence", "pcap.tfci_Existence", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_numberOfFBI_Bits, { "numberOfFBI-Bits", "pcap.numberOfFBI_Bits", @@ -14167,7 +14167,7 @@ void proto_register_pcap(void) { "pcap.MidambleShiftAndBurstType", HFILL }}, { &hf_pcap_tFCI_Presence, { "tFCI-Presence", "pcap.tFCI_Presence", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pcap.BOOLEAN", HFILL }}, { &hf_pcap_uL_Code_InformationList, { "uL-Code-InformationList", "pcap.uL_Code_InformationList", diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 7a01494328..a498ac110d 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -870,7 +870,7 @@ void proto_register_pkix1explicit(void) { "pkix1explicit.T_extnId", HFILL }}, { &hf_pkix1explicit_critical, { "critical", "pkix1explicit.critical", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pkix1explicit.BOOLEAN", HFILL }}, { &hf_pkix1explicit_extnValue, { "extnValue", "pkix1explicit.extnValue", diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 78ce6cf27e..be52c040a7 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -450,7 +450,7 @@ void proto_register_pkixtsp(void) { "pkixtsp.INTEGER", HFILL }}, { &hf_pkixtsp_certReq, { "certReq", "pkixtsp.certReq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pkixtsp.BOOLEAN", HFILL }}, { &hf_pkixtsp_extensions, { "extensions", "pkixtsp.extensions", @@ -502,7 +502,7 @@ void proto_register_pkixtsp(void) { "pkixtsp.Accuracy", HFILL }}, { &hf_pkixtsp_ordering, { "ordering", "pkixtsp.ordering", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "pkixtsp.BOOLEAN", HFILL }}, { &hf_pkixtsp_tsa, { "tsa", "pkixtsp.tsa", diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index c4ce325a6f..4339710239 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -936,7 +936,7 @@ void proto_register_q932(void) { "q932.SubaddressInformation", HFILL }}, { &hf_q932_oddCountIndicator, { "oddCountIndicator", "q932.oddCountIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "q932.BOOLEAN", HFILL }}, { &hf_q932_sourceEntity, { "sourceEntity", "q932.sourceEntity", diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index fe85c9efad..76015c561a 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -12690,7 +12690,7 @@ void proto_register_qsig(void) { "qsig.SubaddressInformation", HFILL }}, { &hf_qsig_oddCountIndicator, { "oddCountIndicator", "qsig.oddCountIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig.BOOLEAN", HFILL }}, /* --- Module Name-Operations-asn1-97 --- --- --- */ @@ -12972,7 +12972,7 @@ void proto_register_qsig(void) { "qsig_cf.DLI2Extension", HFILL }}, { &hf_qsig_cf_presentationAllowedIndicator, { "presentationAllowedIndicator", "qsig.cf.presentationAllowedIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig.PresentationAllowedIndicator", HFILL }}, { &hf_qsig_cf_redirectionName, { "redirectionName", "qsig.cf.redirectionName", @@ -12988,7 +12988,7 @@ void proto_register_qsig(void) { "qsig_cf.IntResult", HFILL }}, { &hf_qsig_cf_remoteEnabled, { "remoteEnabled", "qsig.cf.remoteEnabled", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_cf.BOOLEAN", HFILL }}, { &hf_qsig_cf_extensionIR, { "extension", "qsig.cf.extension", @@ -13229,11 +13229,11 @@ void proto_register_qsig(void) { "qsig.PartySubaddress", HFILL }}, { &hf_qsig_cc_can_retain_service, { "can-retain-service", "qsig.cc.can_retain_service", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_cc.BOOLEAN", HFILL }}, { &hf_qsig_cc_retain_sig_connection, { "retain-sig-connection", "qsig.cc.retain_sig_connection", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_cc.BOOLEAN", HFILL }}, { &hf_qsig_cc_extension, { "extension", "qsig.cc.extension", @@ -13241,11 +13241,11 @@ void proto_register_qsig(void) { "qsig_cc.CcExtension", HFILL }}, { &hf_qsig_cc_no_path_reservation, { "no-path-reservation", "qsig.cc.no_path_reservation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_cc.BOOLEAN", HFILL }}, { &hf_qsig_cc_retain_service, { "retain-service", "qsig.cc.retain_service", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_cc.BOOLEAN", HFILL }}, { &hf_qsig_cc_fullArg, { "fullArg", "qsig.cc.fullArg", @@ -13927,7 +13927,7 @@ void proto_register_qsig(void) { "qsig_sync.ArgExtension", HFILL }}, { &hf_qsig_sync_response, { "response", "qsig.sync.response", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sync.BOOLEAN", HFILL }}, { &hf_qsig_sync_stateinfo, { "stateinfo", "qsig.sync.stateinfo", @@ -14303,7 +14303,7 @@ void proto_register_qsig(void) { "qsig_pumr.IpumUserId", HFILL }}, { &hf_qsig_pumr_homeInfoOnly, { "homeInfoOnly", "qsig.pumr.homeInfoOnly", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_pumr.BOOLEAN", HFILL }}, { &hf_qsig_pumr_userPin_02, { "userPin", "qsig.pumr.userPin", @@ -14513,7 +14513,7 @@ void proto_register_qsig(void) { "qsig.PresentedAddressScreened", HFILL }}, { &hf_qsig_ssct_awaitConnect, { "awaitConnect", "qsig.ssct.awaitConnect", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_ssct.AwaitConnect", HFILL }}, { &hf_qsig_ssct_transferredName, { "transferredName", "qsig.ssct.transferredName", @@ -15151,15 +15151,15 @@ void proto_register_qsig(void) { "qsig_sms.Status", HFILL }}, { &hf_qsig_sms_priority, { "priority", "qsig.sms.priority", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_moreMessagesToSend, { "moreMessagesToSend", "qsig.sms.moreMessagesToSend", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_statusReportQualifier, { "statusReportQualifier", "qsig.sms.statusReportQualifier", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_smsStatusReportResponseChoice, { "smsStatusReportResponseChoice", "qsig.sms.smsStatusReportResponseChoice", @@ -15179,7 +15179,7 @@ void proto_register_qsig(void) { "qsig_sms.CommandData", HFILL }}, { &hf_qsig_sms_statusReportRequest, { "statusReportRequest", "qsig.sms.statusReportRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_null, { "null", "qsig.sms.null", @@ -15191,15 +15191,15 @@ void proto_register_qsig(void) { "qsig_sms.ValidityPeriod", HFILL }}, { &hf_qsig_sms_replyPath, { "replyPath", "qsig.sms.replyPath", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_rejectDuplicates, { "rejectDuplicates", "qsig.sms.rejectDuplicates", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_statusReportIndication, { "statusReportIndication", "qsig.sms.statusReportIndication", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_resChoiceSeq, { "resChoiceSeq", "qsig.sms.resChoiceSeq", @@ -15231,7 +15231,7 @@ void proto_register_qsig(void) { "qsig_sms.ValidityPeriodEnh", HFILL }}, { &hf_qsig_sms_singleShotSM, { "singleShotSM", "qsig.sms.singleShotSM", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_enhancedVP, { "enhancedVP", "qsig.sms.enhancedVP", @@ -15255,7 +15255,7 @@ void proto_register_qsig(void) { "qsig_sms.INTEGER_0_3", HFILL }}, { &hf_qsig_sms_compressed, { "compressed", "qsig.sms.compressed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_shortMessageText, { "shortMessageText", "qsig.sms.shortMessageText", @@ -15359,7 +15359,7 @@ void proto_register_qsig(void) { "qsig_sms.FailureCause", HFILL }}, { &hf_qsig_sms_scAddressSaved, { "scAddressSaved", "qsig.sms.scAddressSaved", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_sms.BOOLEAN", HFILL }}, { &hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted, { "sRforTransactionCompleted", "qsig.sms.sRforTransactionCompleted", @@ -15414,7 +15414,7 @@ void proto_register_qsig(void) { "qsig_mcr.CallType", HFILL }}, { &hf_qsig_mcr_retainOrigCall, { "retainOrigCall", "qsig.mcr.retainOrigCall", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_mcr.BOOLEAN", HFILL }}, { &hf_qsig_mcr_destinationAddress, { "destinationAddress", "qsig.mcr.destinationAddress", @@ -15641,7 +15641,7 @@ void proto_register_qsig(void) { "qsig_mcm.UpdateInfo", HFILL }}, { &hf_qsig_mcm_moreInfoFollows, { "moreInfoFollows", "qsig.mcm.moreInfoFollows", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "qsig_mcm.BOOLEAN", HFILL }}, { &hf_qsig_mcm_argumentExtMCMUpdArg, { "argumentExt", "qsig.mcm.argumentExt", diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 67a77647a2..799284bc23 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -35961,7 +35961,7 @@ void proto_register_rnsap(void) { "rnsap.EDPCH_Information_RLReconfRequest_FDD", HFILL }}, { &hf_rnsap_E_DPDCH_PowerInterpolation_PDU, { "E-DPDCH-PowerInterpolation", "rnsap.E_DPDCH_PowerInterpolation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.E_DPDCH_PowerInterpolation", HFILL }}, { &hf_rnsap_E_Serving_Grant_Value_PDU, { "E-Serving-Grant-Value", "rnsap.E_Serving_Grant_Value", @@ -38369,7 +38369,7 @@ void proto_register_rnsap(void) { "rnsap.Transport_Block_Size_Index", HFILL }}, { &hf_rnsap_hSPDSCH_Second_Code_Support, { "hSPDSCH-Second-Code-Support", "rnsap.hSPDSCH_Second_Code_Support", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.HSPDSCH_Second_Code_Support", HFILL }}, { &hf_rnsap_hSPDSCH_First_Code_Index, { "hSPDSCH-First-Code-Index", "rnsap.hSPDSCH_First_Code_Index", @@ -38845,7 +38845,7 @@ void proto_register_rnsap(void) { "rnsap.Inactivity_Threshold_for_UE_Grant_Monitoring", HFILL }}, { &hf_rnsap_uE_DRX_Grant_Monitoring, { "uE-DRX-Grant-Monitoring", "rnsap.uE_DRX_Grant_Monitoring", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.UE_DRX_Grant_Monitoring", HFILL }}, { &hf_rnsap_modify, { "modify", "rnsap.modify", @@ -39833,7 +39833,7 @@ void proto_register_rnsap(void) { "rnsap.GANSS_RX_Pos", HFILL }}, { &hf_rnsap_ionospheric_Model, { "ionospheric-Model", "rnsap.ionospheric_Model", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_ganssTod, { "ganssTod", "rnsap.ganssTod", @@ -39893,7 +39893,7 @@ void proto_register_rnsap(void) { "rnsap.GANSS_ID", HFILL }}, { &hf_rnsap_ganss_Navigation_Model_And_Time_Recovery, { "ganss-Navigation-Model-And-Time-Recovery", "rnsap.ganss_Navigation_Model_And_Time_Recovery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_ganss_Time_Model_GNSS_GNSS, { "ganss-Time-Model-GNSS-GNSS", "rnsap.ganss_Time_Model_GNSS_GNSS", @@ -39901,15 +39901,15 @@ void proto_register_rnsap(void) { "rnsap.BIT_STRING_SIZE_9", HFILL }}, { &hf_rnsap_ganss_UTC_Model, { "ganss-UTC-Model", "rnsap.ganss_UTC_Model", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_ganss_Almanac, { "ganss-Almanac", "rnsap.ganss_Almanac", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_ganss_Real_Time_Integrity, { "ganss-Real-Time-Integrity", "rnsap.ganss_Real_Time_Integrity", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_ganss_Data_Bit_Assistance_Req, { "ganss-Data-Bit-Assistance-Req", "rnsap.ganss_Data_Bit_Assistance_Req", @@ -39973,23 +39973,23 @@ void proto_register_rnsap(void) { "rnsap.GANSS_IonosphereRegionalStormFlags", HFILL }}, { &hf_rnsap_storm_flag_one, { "storm-flag-one", "rnsap.storm_flag_one", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_storm_flag_two, { "storm-flag-two", "rnsap.storm_flag_two", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_storm_flag_three, { "storm-flag-three", "rnsap.storm_flag_three", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_storm_flag_four, { "storm-flag-four", "rnsap.storm_flag_four", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_storm_flag_five, { "storm-flag-five", "rnsap.storm_flag_five", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rnsap.BOOLEAN", HFILL }}, { &hf_rnsap_ganss_Transmission_Time, { "ganss-Transmission-Time", "rnsap.ganss_Transmission_Time", diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 4aa927ec68..cdc1f14200 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -100249,7 +100249,7 @@ void proto_register_rrc(void) { "rrc.E_TFC_Boost_Info_r7", HFILL }}, { &hf_rrc_e_DPDCH_PowerInterpolation, { "e-DPDCH-PowerInterpolation", "rrc.e_DPDCH_PowerInterpolation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.E_DPDCH_PowerInterpolation", HFILL }}, { &hf_rrc_hs_DSCH_TBSizeTable, { "hs-DSCH-TBSizeTable", "rrc.hs_DSCH_TBSizeTable", @@ -100473,11 +100473,11 @@ void proto_register_rrc(void) { "rrc.STARTList", HFILL }}, { &hf_rrc_am_RLC_ErrorIndicationRb2_3or4, { "am-RLC-ErrorIndicationRb2-3or4", "rrc.am_RLC_ErrorIndicationRb2_3or4", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_am_RLC_ErrorIndicationRb5orAbove, { "am-RLC-ErrorIndicationRb5orAbove", "rrc.am_RLC_ErrorIndicationRb5orAbove", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_cellUpdateCause, { "cellUpdateCause", "rrc.cellUpdateCause", @@ -100813,11 +100813,11 @@ void proto_register_rrc(void) { "rrc.UTRAN_DRX_CycleLengthCoefficient", HFILL }}, { &hf_rrc_rlc_Re_establishIndicatorRb2_3or4, { "rlc-Re-establishIndicatorRb2-3or4", "rrc.rlc_Re_establishIndicatorRb2_3or4", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_rlc_Re_establishIndicatorRb5orAbove, { "rlc-Re-establishIndicatorRb5orAbove", "rrc.rlc_Re_establishIndicatorRb5orAbove", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ura_Identity, { "ura-Identity", "rrc.ura_Identity", @@ -101097,7 +101097,7 @@ void proto_register_rrc(void) { "rrc.WaitTime", HFILL }}, { &hf_rrc_supportForChangeOfUE_Capability, { "supportForChangeOfUE-Capability", "rrc.supportForChangeOfUE_Capability", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_rb_InformationReconfigList_04, { "rb-InformationReconfigList", "rrc.rb_InformationReconfigList", @@ -103225,7 +103225,7 @@ void proto_register_rrc(void) { "rrc.TimeslotList", HFILL }}, { &hf_rrc_requestPCCPCHRSCP, { "requestPCCPCHRSCP", "rrc.requestPCCPCHRSCP", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_TimingAdvance_02, { "ul-TimingAdvance", "rrc.ul_TimingAdvance", @@ -104777,7 +104777,7 @@ void proto_register_rrc(void) { "rrc.UESpecificBehaviourInformation1idle", HFILL }}, { &hf_rrc_predefinedConfigStatusInfo, { "predefinedConfigStatusInfo", "rrc.predefinedConfigStatusInfo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ueCapabilityIndication, { "ueCapabilityIndication", "rrc.ueCapabilityIndication", @@ -106765,7 +106765,7 @@ void proto_register_rrc(void) { "rrc.T_nonCriticalExtensions_138", HFILL }}, { &hf_rrc_indicateChangeInSelectedServices, { "indicateChangeInSelectedServices", "rrc.indicateChangeInSelectedServices", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_mbmsMICHConfiguration, { "mbmsMICHConfiguration", "rrc.mbmsMICHConfiguration", @@ -106993,7 +106993,7 @@ void proto_register_rrc(void) { "rrc.T_spare1", HFILL }}, { &hf_rrc_dummy_23, { "dummy", "rrc.dummy", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_IMEI_item, { "IMEI-Digit", "rrc.IMEI_Digit", @@ -107045,7 +107045,7 @@ void proto_register_rrc(void) { "rrc.Digit", HFILL }}, { &hf_rrc_mibPLMN_Identity, { "mibPLMN-Identity", "rrc.mibPLMN_Identity", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_multiplePLMNs, { "multiplePLMNs", "rrc.multiplePLMNs", @@ -107373,11 +107373,11 @@ void proto_register_rrc(void) { "rrc.T_CPCH", HFILL }}, { &hf_rrc_ue_RadioCapabilityFDDUpdateRequirement, { "ue-RadioCapabilityFDDUpdateRequirement", "rrc.ue_RadioCapabilityFDDUpdateRequirement", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement, { "ue-RadioCapabilityTDDUpdateRequirement", "rrc.ue_RadioCapabilityTDDUpdateRequirement", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_systemSpecificCapUpdateReqList, { "systemSpecificCapUpdateReqList", "rrc.systemSpecificCapUpdateReqList", @@ -107385,19 +107385,19 @@ void proto_register_rrc(void) { "rrc.SystemSpecificCapUpdateReqList", HFILL }}, { &hf_rrc_ue_RadioCapabilityUpdateRequirement_TDD128, { "ue-RadioCapabilityUpdateRequirement-TDD128", "rrc.ue_RadioCapabilityUpdateRequirement_TDD128", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ue_RadioCapabilityFDDUpdateRequirement_FDD, { "ue-RadioCapabilityFDDUpdateRequirement-FDD", "rrc.ue_RadioCapabilityFDDUpdateRequirement_FDD", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement_TDD384, { "ue-RadioCapabilityTDDUpdateRequirement-TDD384", "rrc.ue_RadioCapabilityTDDUpdateRequirement_TDD384", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement_TDD128, { "ue-RadioCapabilityTDDUpdateRequirement-TDD128", "rrc.ue_RadioCapabilityTDDUpdateRequirement_TDD128", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_systemSpecificCapUpdateReqList_01, { "systemSpecificCapUpdateReqList", "rrc.systemSpecificCapUpdateReqList", @@ -107405,7 +107405,7 @@ void proto_register_rrc(void) { "rrc.SystemSpecificCapUpdateReqList_r5", HFILL }}, { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement_TDD768, { "ue-RadioCapabilityTDDUpdateRequirement-TDD768", "rrc.ue_RadioCapabilityTDDUpdateRequirement_TDD768", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_startRestart, { "startRestart", "rrc.startRestart", @@ -107453,11 +107453,11 @@ void proto_register_rrc(void) { "rrc.TMSI_DS_41", HFILL }}, { &hf_rrc_fdd_Measurements, { "fdd-Measurements", "rrc.fdd_Measurements", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd_Measurements, { "tdd-Measurements", "rrc.tdd_Measurements", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_gsm_Measurements, { "gsm-Measurements", "rrc.gsm_Measurements", @@ -107465,11 +107465,11 @@ void proto_register_rrc(void) { "rrc.GSM_Measurements", HFILL }}, { &hf_rrc_multiCarrierMeasurements, { "multiCarrierMeasurements", "rrc.multiCarrierMeasurements", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd128_Measurements, { "tdd128-Measurements", "rrc.tdd128_Measurements", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_CompressedModeMeasCapabFDDList_item, { "CompressedModeMeasCapabFDD", "rrc.CompressedModeMeasCapabFDD", @@ -107489,11 +107489,11 @@ void proto_register_rrc(void) { "rrc.RadioFrequencyBandFDD", HFILL }}, { &hf_rrc_dl_MeasurementsFDD, { "dl-MeasurementsFDD", "rrc.dl_MeasurementsFDD", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_MeasurementsFDD, { "ul-MeasurementsFDD", "rrc.ul_MeasurementsFDD", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_radioFrequencyBandFDD2, { "radioFrequencyBandFDD2", "rrc.radioFrequencyBandFDD2", @@ -107509,11 +107509,11 @@ void proto_register_rrc(void) { "rrc.RadioFrequencyBandTDD", HFILL }}, { &hf_rrc_dl_MeasurementsTDD, { "dl-MeasurementsTDD", "rrc.dl_MeasurementsTDD", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_MeasurementsTDD, { "ul-MeasurementsTDD", "rrc.ul_MeasurementsTDD", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_CompressedModeMeasCapabGSMList_item, { "CompressedModeMeasCapabGSM", "rrc.CompressedModeMeasCapabGSM", @@ -107525,19 +107525,19 @@ void proto_register_rrc(void) { "rrc.RadioFrequencyBandGSM", HFILL }}, { &hf_rrc_dl_MeasurementsGSM, { "dl-MeasurementsGSM", "rrc.dl_MeasurementsGSM", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_MeasurementsGSM, { "ul-MeasurementsGSM", "rrc.ul_MeasurementsGSM", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dl_MeasurementsMC, { "dl-MeasurementsMC", "rrc.dl_MeasurementsMC", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_MeasurementsMC, { "ul-MeasurementsMC", "rrc.ul_MeasurementsMC", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_initialPriorityDelayList, { "initialPriorityDelayList", "rrc.initialPriorityDelayList", @@ -107565,7 +107565,7 @@ void proto_register_rrc(void) { "rrc.MaxNoPhysChBitsReceived", HFILL }}, { &hf_rrc_supportForSF_512, { "supportForSF-512", "rrc.supportForSF_512", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dummy2_04, { "dummy2", "rrc.dummy2", @@ -107609,7 +107609,7 @@ void proto_register_rrc(void) { "rrc.MinimumSF_DL", HFILL }}, { &hf_rrc_supportOfPDSCH, { "supportOfPDSCH", "rrc.supportOfPDSCH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_maxPhysChPerTS, { "maxPhysChPerTS", "rrc.maxPhysChPerTS", @@ -107625,7 +107625,7 @@ void proto_register_rrc(void) { "rrc.MaxPhysChPerSubFrame_r4", HFILL }}, { &hf_rrc_supportOf8PSK, { "supportOf8PSK", "rrc.supportOf8PSK", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_multiCarrier_physical_layer_category, { "multiCarrier-physical-layer-category", "rrc.multiCarrier_physical_layer_category", @@ -107757,15 +107757,15 @@ void proto_register_rrc(void) { "rrc.U_RNTI_Group", HFILL }}, { &hf_rrc_gsm900, { "gsm900", "rrc.gsm900", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dcs1800, { "dcs1800", "rrc.dcs1800", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_gsm1900, { "gsm1900", "rrc.gsm1900", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_esn_DS_41, { "esn-DS-41", "rrc.esn_DS_41", @@ -107873,15 +107873,15 @@ void proto_register_rrc(void) { "rrc.CompressedModeMeasCapability_LCR_r4", HFILL }}, { &hf_rrc_supportOfGSM, { "supportOfGSM", "rrc.supportOfGSM", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_supportOfMulticarrier, { "supportOfMulticarrier", "rrc.supportOfMulticarrier", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_supportOfUTRAN_ToGERAN_NACC, { "supportOfUTRAN-ToGERAN-NACC", "rrc.supportOfUTRAN_ToGERAN_NACC", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_supportOfHandoverToGAN, { "supportOfHandoverToGAN", "rrc.supportOfHandoverToGAN", @@ -107909,11 +107909,11 @@ void proto_register_rrc(void) { "rrc.GANSS_Signal_Id", HFILL }}, { &hf_rrc_supportForUE_GANSS_TimingOfCellFrames, { "supportForUE-GANSS-TimingOfCellFrames", "rrc.supportForUE_GANSS_TimingOfCellFrames", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_supportForUE_GANSS_CarrierPhaseMeasurement, { "supportForUE-GANSS-CarrierPhaseMeasurement", "rrc.supportForUE_GANSS_CarrierPhaseMeasurement", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_p_TMSI, { "p-TMSI", "rrc.p_TMSI", @@ -107965,7 +107965,7 @@ void proto_register_rrc(void) { "rrc.PagingRecord2_r5", HFILL }}, { &hf_rrc_losslessSRNS_RelocationSupport, { "losslessSRNS-RelocationSupport", "rrc.losslessSRNS_RelocationSupport", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_supportForRfc2507, { "supportForRfc2507", "rrc.supportForRfc2507", @@ -107997,7 +107997,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_0_65535", HFILL }}, { &hf_rrc_supportForRfc3095ContextRelocation, { "supportForRfc3095ContextRelocation", "rrc.supportForRfc3095ContextRelocation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_maxHcContextSpace, { "maxHcContextSpace", "rrc.maxHcContextSpace", @@ -108121,7 +108121,7 @@ void proto_register_rrc(void) { "rrc.HSDSCH_physical_layer_category", HFILL }}, { &hf_rrc_dummy2_05, { "dummy2", "rrc.dummy2", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd384_hspdsch, { "tdd384-hspdsch", "rrc.tdd384_hspdsch", @@ -108181,11 +108181,11 @@ void proto_register_rrc(void) { "rrc.IdentificationOfReceivedMessage", HFILL }}, { &hf_rrc_t314_expired, { "t314-expired", "rrc.t314_expired", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_t315_expired, { "t315-expired", "rrc.t315_expired", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_interRATInfo, { "interRATInfo", "rrc.interRATInfo", @@ -108261,7 +108261,7 @@ void proto_register_rrc(void) { "rrc.TotalRLC_AM_BufferSize_r5_ext", HFILL }}, { &hf_rrc_supportOfTwoLogicalChannel, { "supportOfTwoLogicalChannel", "rrc.supportOfTwoLogicalChannel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_noRelease, { "noRelease", "rrc.noRelease", @@ -108317,7 +108317,7 @@ void proto_register_rrc(void) { "rrc.MaxNoSCCPCH_RL", HFILL }}, { &hf_rrc_simultaneousSCCPCH_DPCH_DPDCH_Reception, { "simultaneousSCCPCH-DPCH-DPDCH-Reception", "rrc.simultaneousSCCPCH_DPCH_DPDCH_Reception", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_STARTList_item, { "STARTSingle", "rrc.STARTSingle", @@ -108785,7 +108785,7 @@ void proto_register_rrc(void) { "rrc.MeasurementCapabilityExt2", HFILL }}, { &hf_rrc_rx_tx_TimeDifferenceType2Capable, { "rx-tx-TimeDifferenceType2Capable", "rrc.rx_tx_TimeDifferenceType2Capable", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_validity_CellPCH_UraPCH, { "validity-CellPCH-UraPCH", "rrc.validity_CellPCH_UraPCH", @@ -108841,7 +108841,7 @@ void proto_register_rrc(void) { "rrc.MeasurementCapability_r4_ext", HFILL }}, { &hf_rrc_totalAM_RLCMemoryExceeds10kB, { "totalAM-RLCMemoryExceeds10kB", "rrc.totalAM_RLCMemoryExceeds10kB", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_rf_CapabilityComp, { "rf-CapabilityComp", "rrc.rf_CapabilityComp", @@ -109001,7 +109001,7 @@ void proto_register_rrc(void) { "rrc.MinimumSF_UL", HFILL }}, { &hf_rrc_supportOfPUSCH, { "supportOfPUSCH", "rrc.supportOfPUSCH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd384_edch, { "tdd384-edch", "rrc.tdd384_edch", @@ -109085,11 +109085,11 @@ void proto_register_rrc(void) { "rrc.MaxNumberOfTFC_UL", HFILL }}, { &hf_rrc_standaloneLocMethodsSupported, { "standaloneLocMethodsSupported", "rrc.standaloneLocMethodsSupported", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ue_BasedOTDOA_Supported, { "ue-BasedOTDOA-Supported", "rrc.ue_BasedOTDOA_Supported", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_networkAssistedGPS_Supported, { "networkAssistedGPS-Supported", "rrc.networkAssistedGPS_Supported", @@ -109097,11 +109097,11 @@ void proto_register_rrc(void) { "rrc.NetworkAssistedGPS_Supported", HFILL }}, { &hf_rrc_supportForUE_GPS_TimingOfCellFrames, { "supportForUE-GPS-TimingOfCellFrames", "rrc.supportForUE_GPS_TimingOfCellFrames", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_supportForIPDL, { "supportForIPDL", "rrc.supportForIPDL", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_start_CS, { "start-CS", "rrc.start_CS", @@ -109141,7 +109141,7 @@ void proto_register_rrc(void) { "rrc.MAC_ehs_QueueId", HFILL }}, { &hf_rrc_inSequenceDelivery, { "inSequenceDelivery", "rrc.inSequenceDelivery", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_receivingWindowSize, { "receivingWindowSize", "rrc.receivingWindowSize", @@ -109249,7 +109249,7 @@ void proto_register_rrc(void) { "rrc.TimerEPC", HFILL }}, { &hf_rrc_missingPDU_Indicator, { "missingPDU-Indicator", "rrc.missingPDU_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_timerStatusPeriodic, { "timerStatusPeriodic", "rrc.timerStatusPeriodic", @@ -109257,7 +109257,7 @@ void proto_register_rrc(void) { "rrc.TimerStatusPeriodic", HFILL }}, { &hf_rrc_segmentationIndication, { "segmentationIndication", "rrc.segmentationIndication", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dch, { "dch", "rrc.dch", @@ -109397,11 +109397,11 @@ void proto_register_rrc(void) { "rrc.Poll_SDU", HFILL }}, { &hf_rrc_lastTransmissionPDU_Poll, { "lastTransmissionPDU-Poll", "rrc.lastTransmissionPDU_Poll", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_lastRetransmissionPDU_Poll, { "lastRetransmissionPDU-Poll", "rrc.lastRetransmissionPDU_Poll", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_pollWindow, { "pollWindow", "rrc.pollWindow", @@ -109845,11 +109845,11 @@ void proto_register_rrc(void) { "rrc.UL_LogicalChannelMappings_r8", HFILL }}, { &hf_rrc_dl_RFC3095_Context_Relocation, { "dl-RFC3095-Context-Relocation", "rrc.dl_RFC3095_Context_Relocation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_RFC3095_Context_Relocation, { "ul-RFC3095-Context-Relocation", "rrc.ul_RFC3095_Context_Relocation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_RB_PDCPContextRelocationList_item, { "RB-PDCPContextRelocation", "rrc.RB_PDCPContextRelocation", @@ -109909,7 +109909,7 @@ void proto_register_rrc(void) { "rrc.DL_RLC_Mode_r5", HFILL }}, { &hf_rrc_rlc_OneSidedReEst, { "rlc-OneSidedReEst", "rrc.rlc_OneSidedReEst", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dl_RLC_Mode_02, { "dl-RLC-Mode", "rrc.dl_RLC_Mode", @@ -110101,7 +110101,7 @@ void proto_register_rrc(void) { "rrc.RLC_PDU_SizeList", HFILL }}, { &hf_rrc_includeInSchedulingInfo, { "includeInSchedulingInfo", "rrc.includeInSchedulingInfo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_TrCH_Type_01, { "ul-TrCH-Type", "rrc.ul_TrCH_Type", @@ -110133,7 +110133,7 @@ void proto_register_rrc(void) { "rrc.RLC_PDU_SizeConstraint", HFILL }}, { &hf_rrc_rlc_LogicalChannelMappingIndicator, { "rlc-LogicalChannelMappingIndicator", "rrc.rlc_LogicalChannelMappingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_LogicalChannelMapping, { "ul-LogicalChannelMapping", "rrc.ul_LogicalChannelMapping", @@ -111217,7 +111217,7 @@ void proto_register_rrc(void) { "rrc.TFCS_IdentityPlain", HFILL }}, { &hf_rrc_sharedChannelIndicator, { "sharedChannelIndicator", "rrc.sharedChannelIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ctfc2bit, { "ctfc2bit", "rrc.ctfc2bit", @@ -111685,7 +111685,7 @@ void proto_register_rrc(void) { "rrc.ChannelisationCode256", HFILL }}, { &hf_rrc_sttd_Indicator, { "sttd-Indicator", "rrc.sttd_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_aich_TransmissionTiming, { "aich-TransmissionTiming", "rrc.aich_TransmissionTiming", @@ -112053,7 +112053,7 @@ void proto_register_rrc(void) { "rrc.T_tdd128_11", HFILL }}, { &hf_rrc_tstd_Indicator, { "tstd-Indicator", "rrc.tstd_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_modeSpecificInfo_25, { "modeSpecificInfo", "rrc.modeSpecificInfo", @@ -112209,7 +112209,7 @@ void proto_register_rrc(void) { "rrc.PositionFixedOrFlexible", HFILL }}, { &hf_rrc_tfci_Existence, { "tfci-Existence", "rrc.tfci_Existence", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd_22, { "tdd", "rrc.tdd", @@ -112617,7 +112617,7 @@ void proto_register_rrc(void) { "rrc.T_fdd_72", HFILL }}, { &hf_rrc_servingHSDSCH_RL_indicator, { "servingHSDSCH-RL-indicator", "rrc.servingHSDSCH_RL_indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dl_DPCH_InfoPerRL_02, { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL", @@ -112641,7 +112641,7 @@ void proto_register_rrc(void) { "rrc.T_fdd_74", HFILL }}, { &hf_rrc_servingEDCH_RL_indicator, { "servingEDCH-RL-indicator", "rrc.servingEDCH_RL_indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dl_dpchInfo, { "dl-dpchInfo", "rrc.dl_dpchInfo", @@ -113049,7 +113049,7 @@ void proto_register_rrc(void) { "rrc.UE_GrantMonitoring_InactivityThreshold", HFILL }}, { &hf_rrc_ue_drx_GrantMonitoring, { "ue-drx-GrantMonitoring", "rrc.ue_drx_GrantMonitoring", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_maxTFCI_Field2Value, { "maxTFCI-Field2Value", "rrc.maxTFCI_Field2Value", @@ -113221,7 +113221,7 @@ void proto_register_rrc(void) { "rrc.T_tdd384_13", HFILL }}, { &hf_rrc_long_Term_Grant_Indicator, { "long-Term-Grant-Indicator", "rrc.long_Term_Grant_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_length_of_TTRI_field, { "length-of-TTRI-field", "rrc.length_of_TTRI_field", @@ -113249,7 +113249,7 @@ void proto_register_rrc(void) { "rrc.T_tdd128_19", HFILL }}, { &hf_rrc_rdi_Indicator, { "rdi-Indicator", "rrc.rdi_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tpc_StepSize, { "tpc-StepSize", "rrc.tpc_StepSize", @@ -113497,7 +113497,7 @@ void proto_register_rrc(void) { "rrc.E_PUCH_TS_Slots", HFILL }}, { &hf_rrc_e_PUCH_CodeHopping, { "e-PUCH-CodeHopping", "rrc.e_PUCH_CodeHopping", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_e_PUCH_TPC_Step_Size, { "e-PUCH-TPC-Step-Size", "rrc.e_PUCH_TPC_Step_Size", @@ -113525,7 +113525,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_M112_M50", HFILL }}, { &hf_rrc_beaconPLEst_01, { "beaconPLEst", "rrc.beaconPLEst", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_e_PUCH_TS_ConfigurationList_01, { "e-PUCH-TS-ConfigurationList", "rrc.e_PUCH_TS_ConfigurationList", @@ -113693,7 +113693,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_0_511", HFILL }}, { &hf_rrc_ctch_Indicator, { "ctch-Indicator", "rrc.ctch_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_FACH_PCH_InformationList_item, { "FACH-PCH-Information", "rrc.FACH_PCH_Information", @@ -113945,7 +113945,7 @@ void proto_register_rrc(void) { "rrc.PowerControlGAP", HFILL }}, { &hf_rrc_pathlossCompensationSwitch, { "pathlossCompensationSwitch", "rrc.pathlossCompensationSwitch", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_hs_pdsch_CodeIndex, { "hs-pdsch-CodeIndex", "rrc.hs_pdsch_CodeIndex", @@ -113977,7 +113977,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_1_90", HFILL }}, { &hf_rrc_hs_scch_LessSecondCodeSupport, { "hs-scch-LessSecondCodeSupport", "rrc.hs_scch_LessSecondCodeSupport", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_midambleAllocationMode_05, { "midambleAllocationMode", "rrc.midambleAllocationMode", @@ -115005,7 +115005,7 @@ void proto_register_rrc(void) { "rrc.T_fdd_86", HFILL }}, { &hf_rrc_tx_DiversityIndicator, { "tx-DiversityIndicator", "rrc.tx_DiversityIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd_47, { "tdd", "rrc.tdd", @@ -115029,7 +115029,7 @@ void proto_register_rrc(void) { "rrc.TimeslotSync2", HFILL }}, { &hf_rrc_sctd_Indicator, { "sctd-Indicator", "rrc.sctd_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_fdd_90, { "fdd", "rrc.fdd", @@ -115645,7 +115645,7 @@ void proto_register_rrc(void) { "rrc.SF256_AndCodeNumber", HFILL }}, { &hf_rrc_pilotSymbolExistence, { "pilotSymbolExistence", "rrc.pilotSymbolExistence", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_timingOffset, { "timingOffset", "rrc.timingOffset", @@ -116721,7 +116721,7 @@ void proto_register_rrc(void) { "rrc.T_newParameters_07", HFILL }}, { &hf_rrc_dynamicSFusage, { "dynamicSFusage", "rrc.dynamicSFusage", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_moreTimeslots_04, { "moreTimeslots", "rrc.moreTimeslots", @@ -116993,7 +116993,7 @@ void proto_register_rrc(void) { "rrc.T_fdd_108", HFILL }}, { &hf_rrc_readSFN_Indicator, { "readSFN-Indicator", "rrc.readSFN_Indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd_65, { "tdd", "rrc.tdd", @@ -117169,11 +117169,11 @@ void proto_register_rrc(void) { "rrc.SFN_SFN_OTD_Type", HFILL }}, { &hf_rrc_cellIdentity_reportingIndicator, { "cellIdentity-reportingIndicator", "rrc.cellIdentity_reportingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_cellSynchronisationInfoReportingIndicator, { "cellSynchronisationInfoReportingIndicator", "rrc.cellSynchronisationInfoReportingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_modeSpecificInfo_77, { "modeSpecificInfo", "rrc.modeSpecificInfo", @@ -117185,15 +117185,15 @@ void proto_register_rrc(void) { "rrc.T_fdd_115", HFILL }}, { &hf_rrc_cpich_Ec_N0_reportingIndicator, { "cpich-Ec-N0-reportingIndicator", "rrc.cpich_Ec_N0_reportingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_cpich_RSCP_reportingIndicator, { "cpich-RSCP-reportingIndicator", "rrc.cpich_RSCP_reportingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_pathloss_reportingIndicator, { "pathloss-reportingIndicator", "rrc.pathloss_reportingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd_73, { "tdd", "rrc.tdd", @@ -117201,15 +117201,15 @@ void proto_register_rrc(void) { "rrc.T_tdd_66", HFILL }}, { &hf_rrc_timeslotISCP_reportingIndicator, { "timeslotISCP-reportingIndicator", "rrc.timeslotISCP_reportingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_proposedTGSN_ReportingRequired, { "proposedTGSN-ReportingRequired", "rrc.proposedTGSN_ReportingRequired", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_primaryCCPCH_RSCP_reportingIndicator, { "primaryCCPCH-RSCP-reportingIndicator", "rrc.primaryCCPCH_RSCP_reportingIndicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_q_Offset1S_N, { "q-Offset1S-N", "rrc.q_Offset1S_N", @@ -117621,7 +117621,7 @@ void proto_register_rrc(void) { "rrc.ReplacementActivationThreshold", HFILL }}, { &hf_rrc_useCIO, { "useCIO", "rrc.useCIO", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_thresholdUsedFrequency, { "thresholdUsedFrequency", "rrc.thresholdUsedFrequency", @@ -117737,11 +117737,11 @@ void proto_register_rrc(void) { "rrc.INTEGER_1_12", HFILL }}, { &hf_rrc_inter_freq_FDD_meas_ind, { "inter-freq-FDD-meas-ind", "rrc.inter_freq_FDD_meas_ind", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_inter_freq_TDD_meas_ind, { "inter-freq-TDD-meas-ind", "rrc.inter_freq_TDD_meas_ind", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_inter_RAT_meas_ind, { "inter-RAT-meas-ind", "rrc.inter_RAT_meas_ind", @@ -117753,7 +117753,7 @@ void proto_register_rrc(void) { "rrc.RAT_Type", HFILL }}, { &hf_rrc_inter_freq_TDD128_meas_ind, { "inter-freq-TDD128-meas-ind", "rrc.inter_freq_TDD128_meas_ind", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_fdd_126, { "fdd", "rrc.fdd", @@ -117909,7 +117909,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_0_127", HFILL }}, { &hf_rrc_ganssRealTimeIntegrity, { "ganssRealTimeIntegrity", "rrc.ganssRealTimeIntegrity", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssDifferentialCorrection, { "ganssDifferentialCorrection", "rrc.ganssDifferentialCorrection", @@ -117917,11 +117917,11 @@ void proto_register_rrc(void) { "rrc.DGANSS_Sig_Id_Req", HFILL }}, { &hf_rrc_ganssAlmanac, { "ganssAlmanac", "rrc.ganssAlmanac", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssNavigationModel, { "ganssNavigationModel", "rrc.ganssNavigationModel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssTimeModelGNSS_GNSS, { "ganssTimeModelGNSS-GNSS", "rrc.ganssTimeModelGNSS_GNSS", @@ -117929,7 +117929,7 @@ void proto_register_rrc(void) { "rrc.BIT_STRING_SIZE_8", HFILL }}, { &hf_rrc_ganssReferenceMeasurementInfo, { "ganssReferenceMeasurementInfo", "rrc.ganssReferenceMeasurementInfo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssDataBits, { "ganssDataBits", "rrc.ganssDataBits", @@ -117937,7 +117937,7 @@ void proto_register_rrc(void) { "rrc.GanssDataBits", HFILL }}, { &hf_rrc_ganssUTCModel, { "ganssUTCModel", "rrc.ganssUTCModel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssNavigationModelAdditionalData, { "ganssNavigationModelAdditionalData", "rrc.ganssNavigationModelAdditionalData", @@ -118053,23 +118053,23 @@ void proto_register_rrc(void) { "rrc.Ganss_Sat_Info_Nav", HFILL }}, { &hf_rrc_storm_flag_one, { "storm-flag-one", "rrc.storm_flag_one", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_storm_flag_two, { "storm-flag-two", "rrc.storm_flag_two", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_storm_flag_three, { "storm-flag-three", "rrc.storm_flag_three", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_storm_flag_four, { "storm-flag-four", "rrc.storm_flag_four", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_storm_flag_five, { "storm-flag-five", "rrc.storm_flag_five", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_satelliteID, { "satelliteID", "rrc.satelliteID", @@ -118129,11 +118129,11 @@ void proto_register_rrc(void) { "rrc.BIT_STRING_SIZE_2", HFILL }}, { &hf_rrc_alert, { "alert", "rrc.alert", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_antiSpoof, { "antiSpoof", "rrc.antiSpoof", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_GPS_TOW_AssistList_item, { "GPS-TOW-Assist", "rrc.GPS_TOW_Assist", @@ -118525,11 +118525,11 @@ void proto_register_rrc(void) { "rrc.InterFreqEventList_r6", HFILL }}, { &hf_rrc_utra_Carrier_RSSI, { "utra-Carrier-RSSI", "rrc.utra_Carrier_RSSI", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_frequencyQualityEstimate, { "frequencyQualityEstimate", "rrc.frequencyQualityEstimate", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_nonFreqRelatedQuantities, { "nonFreqRelatedQuantities", "rrc.nonFreqRelatedQuantities", @@ -118745,7 +118745,7 @@ void proto_register_rrc(void) { "rrc.InterRATEventList", HFILL }}, { &hf_rrc_utran_EstimatedQuality, { "utran-EstimatedQuality", "rrc.utran_EstimatedQuality", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ratSpecificInfo_01, { "ratSpecificInfo", "rrc.ratSpecificInfo", @@ -118757,7 +118757,7 @@ void proto_register_rrc(void) { "rrc.T_gsm_08", HFILL }}, { &hf_rrc_gsm_Carrier_RSSI, { "gsm-Carrier-RSSI", "rrc.gsm_Carrier_RSSI", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_removedIntraFreqCellList, { "removedIntraFreqCellList", "rrc.removedIntraFreqCellList", @@ -120233,7 +120233,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_1_512", HFILL }}, { &hf_rrc_dl_TransChBLER, { "dl-TransChBLER", "rrc.dl_TransChBLER", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_bler_dl_TransChIdList, { "bler-dl-TransChIdList", "rrc.bler_dl_TransChIdList", @@ -120389,7 +120389,7 @@ void proto_register_rrc(void) { "rrc.ReqDataBitAssistanceList_item", HFILL }}, { &hf_rrc_ganssDataBitAssistance, { "ganssDataBitAssistance", "rrc.ganssDataBitAssistance", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_RL_AdditionInfoList_item, { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info", @@ -120665,15 +120665,15 @@ void proto_register_rrc(void) { "rrc.TransChCriteriaList", HFILL }}, { &hf_rrc_rlc_RB_BufferPayload, { "rlc-RB-BufferPayload", "rrc.rlc_RB_BufferPayload", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_rlc_RB_BufferPayloadAverage, { "rlc-RB-BufferPayloadAverage", "rrc.rlc_RB_BufferPayloadAverage", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_rlc_RB_BufferPayloadVariance, { "rlc-RB-BufferPayloadVariance", "rrc.rlc_RB_BufferPayloadVariance", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ul_transportChannelID, { "ul-transportChannelID", "rrc.ul_transportChannelID", @@ -120853,7 +120853,7 @@ void proto_register_rrc(void) { "rrc.UE_InternalEventParamList", HFILL }}, { &hf_rrc_ue_TransmittedPower, { "ue-TransmittedPower", "rrc.ue_TransmittedPower", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_modeSpecificInfo_97, { "modeSpecificInfo", "rrc.modeSpecificInfo", @@ -120865,7 +120865,7 @@ void proto_register_rrc(void) { "rrc.T_fdd_132", HFILL }}, { &hf_rrc_ue_RX_TX_TimeDifference, { "ue-RX-TX-TimeDifference", "rrc.ue_RX_TX_TimeDifference", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_tdd_92, { "tdd", "rrc.tdd", @@ -120873,7 +120873,7 @@ void proto_register_rrc(void) { "rrc.T_tdd_84", HFILL }}, { &hf_rrc_appliedTA_02, { "appliedTA", "rrc.appliedTA", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_modeSpecificInfo_98, { "modeSpecificInfo", "rrc.modeSpecificInfo", @@ -120901,7 +120901,7 @@ void proto_register_rrc(void) { "rrc.T_tdd128_42", HFILL }}, { &hf_rrc_t_ADVinfo_02, { "t-ADVinfo", "rrc.t_ADVinfo", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ue_RX_TX_TimeDifferenceType1, { "ue-RX-TX-TimeDifferenceType1", "rrc.ue_RX_TX_TimeDifferenceType1", @@ -120957,7 +120957,7 @@ void proto_register_rrc(void) { "rrc.UE_Positioning_GANSS_AdditionalAssistanceDataRequest", HFILL }}, { &hf_rrc_reportFirstFix, { "reportFirstFix", "rrc.reportFirstFix", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_measurementInterval, { "measurementInterval", "rrc.measurementInterval", @@ -121009,15 +121009,15 @@ void proto_register_rrc(void) { "rrc.ALM_keplerianParameters", HFILL }}, { &hf_rrc_ganssReferenceTime, { "ganssReferenceTime", "rrc.ganssReferenceTime", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssreferenceLocation, { "ganssreferenceLocation", "rrc.ganssreferenceLocation", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssIonosphericModel, { "ganssIonosphericModel", "rrc.ganssIonosphericModel", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ganssRequestedGenericAssistanceDataList, { "ganssRequestedGenericAssistanceDataList", "rrc.ganssRequestedGenericAssistanceDataList", @@ -121261,39 +121261,39 @@ void proto_register_rrc(void) { "rrc.UE_Positioning_GPS_ReferenceTimeUncertainty", HFILL }}, { &hf_rrc_almanacRequest, { "almanacRequest", "rrc.almanacRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_utcModelRequest, { "utcModelRequest", "rrc.utcModelRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_ionosphericModelRequest, { "ionosphericModelRequest", "rrc.ionosphericModelRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_navigationModelRequest, { "navigationModelRequest", "rrc.navigationModelRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_dgpsCorrectionsRequest, { "dgpsCorrectionsRequest", "rrc.dgpsCorrectionsRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_referenceLocationRequest, { "referenceLocationRequest", "rrc.referenceLocationRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_referenceTimeRequest, { "referenceTimeRequest", "rrc.referenceTimeRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_aquisitionAssistanceRequest, { "aquisitionAssistanceRequest", "rrc.aquisitionAssistanceRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_realTimeIntegrityRequest, { "realTimeIntegrityRequest", "rrc.realTimeIntegrityRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_navModelAddDataRequest, { "navModelAddDataRequest", "rrc.navModelAddDataRequest", @@ -121561,7 +121561,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_0_4095", HFILL }}, { &hf_rrc_ip_PCCPCG, { "ip-PCCPCG", "rrc.ip_PCCPCG", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.IP_PCCPCH_r4", HFILL }}, { &hf_rrc_ip_Spacing_01, { "ip-Spacing", "rrc.ip_Spacing", @@ -122089,11 +122089,11 @@ void proto_register_rrc(void) { "rrc.UE_Positioning_Accuracy", HFILL }}, { &hf_rrc_gps_TimingOfCellWanted, { "gps-TimingOfCellWanted", "rrc.gps_TimingOfCellWanted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_additionalAssistanceDataRequest, { "additionalAssistanceDataRequest", "rrc.additionalAssistanceDataRequest", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_environmentCharacterisation, { "environmentCharacterisation", "rrc.environmentCharacterisation", @@ -122113,7 +122113,7 @@ void proto_register_rrc(void) { "rrc.UE_Positioning_Accuracy", HFILL }}, { &hf_rrc_additionalAssistanceDataReq, { "additionalAssistanceDataReq", "rrc.additionalAssistanceDataReq", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_velocityRequested, { "velocityRequested", "rrc.velocityRequested", @@ -122753,7 +122753,7 @@ void proto_register_rrc(void) { "rrc.T_nonCriticalExtensions_147", HFILL }}, { &hf_rrc_sib4indicator, { "sib4indicator", "rrc.sib4indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_cellSelectReselectInfo, { "cellSelectReselectInfo", "rrc.cellSelectReselectInfo", @@ -122949,7 +122949,7 @@ void proto_register_rrc(void) { "rrc.CellSelectReselectInfoPCHFACH_v5b0ext", HFILL }}, { &hf_rrc_sib6indicator, { "sib6indicator", "rrc.sib6indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_pich_PowerOffset, { "pich-PowerOffset", "rrc.pich_PowerOffset", @@ -123313,7 +123313,7 @@ void proto_register_rrc(void) { "rrc.T_nonCriticalExtensions_155", HFILL }}, { &hf_rrc_sib12indicator, { "sib12indicator", "rrc.sib12indicator", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_fach_MeasurementOccasionInfo, { "fach-MeasurementOccasionInfo", "rrc.fach_MeasurementOccasionInfo", @@ -123885,15 +123885,15 @@ void proto_register_rrc(void) { "rrc.MBMS_CommonRBInformation_r6", HFILL }}, { &hf_rrc_countingForUraPCH, { "countingForUraPCH", "rrc.countingForUraPCH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_countingForCellPCH, { "countingForCellPCH", "rrc.countingForCellPCH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_countingForCellFACH, { "countingForCellFACH", "rrc.countingForCellFACH", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_sccpchIdentity, { "sccpchIdentity", "rrc.sccpchIdentity", @@ -124193,7 +124193,7 @@ void proto_register_rrc(void) { "rrc.T_dummy_14", HFILL }}, { &hf_rrc_continueMCCHReading, { "continueMCCHReading", "rrc.continueMCCHReading", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_MBMS_ModifedServiceList_r6_item, { "MBMS-ModifedService-r6", "rrc.MBMS_ModifedService_r6", @@ -124333,7 +124333,7 @@ void proto_register_rrc(void) { "rrc.MBMS_PTM_RBInformation_C", HFILL }}, { &hf_rrc_layer1_CombiningStatus, { "layer1-CombiningStatus", "rrc.layer1_CombiningStatus", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_MBMS_PTM_RBInformation_NList_item, { "MBMS-PTM-RBInformation-N", "rrc.MBMS_PTM_RBInformation_N", @@ -124473,7 +124473,7 @@ void proto_register_rrc(void) { "rrc.MBMS_TrCHInformation_Curr", HFILL }}, { &hf_rrc_transpCh_CombiningStatus, { "transpCh-CombiningStatus", "rrc.transpCh_CombiningStatus", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_rbInformation_02, { "rbInformation", "rrc.rbInformation", @@ -125349,7 +125349,7 @@ void proto_register_rrc(void) { "rrc.CN_DomainInformation_v390ext", HFILL }}, { &hf_rrc_tdd384_Measurements, { "tdd384-Measurements", "rrc.tdd384_Measurements", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_COUNT_C_List_item, { "COUNT-CSingle", "rrc.COUNT_CSingle", @@ -125409,7 +125409,7 @@ void proto_register_rrc(void) { "rrc.INTEGER_0_4294967295", HFILL }}, { &hf_rrc_dl_dyn_changed, { "dl-dyn-changed", "rrc.dl_dyn_changed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "rrc.BOOLEAN", HFILL }}, { &hf_rrc_interRAT_UE_RadioAccessCapability, { "interRAT-UE-RadioAccessCapability", "rrc.interRAT_UE_RadioAccessCapability", diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index f7c467ce49..0987bfa962 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -624,11 +624,11 @@ void proto_register_smrse(void) { "smrse.Connect_fail", HFILL }}, { &hf_smrse_mt_priority_request, { "mt-priority-request", "smrse.mt_priority_request", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "smrse.BOOLEAN", HFILL }}, { &hf_smrse_mt_mms, { "mt-mms", "smrse.mt_mms", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "smrse.BOOLEAN", HFILL }}, { &hf_smrse_mt_message_reference, { "mt-message-reference", "smrse.mt_message_reference", @@ -684,7 +684,7 @@ void proto_register_smrse(void) { "smrse.Error_reason", HFILL }}, { &hf_smrse_msg_waiting_set, { "msg-waiting-set", "smrse.msg_waiting_set", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "smrse.BOOLEAN", HFILL }}, { &hf_smrse_alerting_MS_ISDN, { "alerting-MS-ISDN", "smrse.alerting_MS_ISDN", diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 9e7f554604..de24099005 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -1218,11 +1218,10 @@ decrypt_gssapi_krb_cfx_wrap(proto_tree *tree _U_, packet_info *pinfo _U_, tvbuff memcpy(outdata, output, tvb_length(tvb)); g_free(output); - pinfo->gssapi_decrypted_tvb=tvb_new_real_data( + pinfo->gssapi_decrypted_tvb=tvb_new_child_real_data(tvb, outdata, datalen-16, datalen-16); - tvb_set_child_real_data_tvbuff(tvb, pinfo->gssapi_decrypted_tvb); add_new_data_source(pinfo, pinfo->gssapi_decrypted_tvb, "Decrypted GSS-Krb5"); return; } @@ -1960,7 +1959,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1376 "packet-spnego-template.c" +#line 1375 "packet-spnego-template.c" }; /* List of subtrees */ @@ -1982,7 +1981,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1386 "packet-spnego-template.c" +#line 1385 "packet-spnego-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 12eb324548..c1f61a9549 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -2213,7 +2213,7 @@ void proto_register_t125(void) { "t125.OCTET_STRING", HFILL }}, { &hf_t125_upwardFlag, { "upwardFlag", "t125.upwardFlag", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "t125.BOOLEAN", HFILL }}, { &hf_t125_targetParameters, { "targetParameters", "t125.targetParameters", @@ -2273,7 +2273,7 @@ void proto_register_t125(void) { "t125.T_userId", HFILL }}, { &hf_t125_joined, { "joined", "t125.joined", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "t125.BOOLEAN", HFILL }}, { &hf_t125_userId_01, { "userId", "t125.userId", diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index 021685a0ca..b507043885 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -2339,43 +2339,43 @@ void proto_register_ulp(void) { "ulp.PosProtocol", HFILL }}, { &hf_ulp_agpsSETassisted, { "agpsSETassisted", "ulp.agpsSETassisted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_agpsSETBased, { "agpsSETBased", "ulp.agpsSETBased", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_autonomousGPS, { "autonomousGPS", "ulp.autonomousGPS", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_aFLT, { "aFLT", "ulp.aFLT", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_eCID, { "eCID", "ulp.eCID", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_eOTD, { "eOTD", "ulp.eOTD", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_oTDOA, { "oTDOA", "ulp.oTDOA", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_tia801, { "tia801", "ulp.tia801", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_rrlp, { "rrlp", "ulp.rrlp", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_rrc, { "rrc", "ulp.rrc", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_sETAuthKey, { "sETAuthKey", "ulp.sETAuthKey", @@ -2411,39 +2411,39 @@ void proto_register_ulp(void) { "ulp.Ver", HFILL }}, { &hf_ulp_almanacRequested, { "almanacRequested", "ulp.almanacRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_utcModelRequested, { "utcModelRequested", "ulp.utcModelRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_ionosphericModelRequested, { "ionosphericModelRequested", "ulp.ionosphericModelRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_dgpsCorrectionsRequested, { "dgpsCorrectionsRequested", "ulp.dgpsCorrectionsRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_referenceLocationRequested, { "referenceLocationRequested", "ulp.referenceLocationRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_referenceTimeRequested, { "referenceTimeRequested", "ulp.referenceTimeRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_acquisitionAssistanceRequested, { "acquisitionAssistanceRequested", "ulp.acquisitionAssistanceRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_realTimeIntegrityRequested, { "realTimeIntegrityRequested", "ulp.realTimeIntegrityRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_navigationModelRequested, { "navigationModelRequested", "ulp.navigationModelRequested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "ulp.BOOLEAN", HFILL }}, { &hf_ulp_navigationModelData, { "navigationModelData", "ulp.navigationModelData", diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index 2602591a59..e4a80919b9 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -67,10 +67,9 @@ #define maxPrivateIEs 65535 #define maxProtocolExtensions 65535 #define maxProtocolIEs 65535 -#define maxEARFCN 32767 +#define maxEARFCN 65535 #define maxInterfaces 16 #define maxCellineNB 256 -#define maxnoofCells 16 #define maxnoofBearers 256 #define maxNrOfErrors 256 #define maxnoofPDCP_SN 16 @@ -79,8 +78,10 @@ #define maxnoofForbLACs 4096 #define maxnoofForbTACs 4096 #define maxnoofBPLMNs 6 +#define maxnoofNeighbours 512 #define maxnoofPRBs 110 #define maxPools 16 +#define maxnoofCells 16 /* enumerated values for ProcedureCode */ #define X2AP_ID_HANDOVERPREPARATION 0 @@ -92,19 +93,19 @@ #define X2AP_ID_X2SETUP 6 #define X2AP_ID_RESET 7 #define X2AP_ID_ENBCONFIGURATIONUPDATE 8 -#define X2AP_ID_RESOURCESTATUSUPDATEINITIATION 9 +#define X2AP_ID_RESOURCESTATUSREPORTINGINITIATION 9 #define X2AP_ID_RESOURCESTATUSREPORTING 10 +#define X2AP_ID_PRIVATEMESSAGE 11 typedef enum _ProtocolIE_ID_enum { - id_Bearers_Admitted_Item = 0, - id_Bearers_Admitted_List = 1, - id_Bearers_NotAdmitted_Item = 2, - id_Bearers_NotAdmitted_List = 3, - id_Bearers_ToBeSetup_Item = 4, + id_E_RABs_Admitted_Item = 0, + id_E_RABs_Admitted_List = 1, + id_E_RAB_Item = 2, + id_E_RABs_NotAdmitted_List = 3, + id_E_RABs_ToBeSetup_Item = 4, id_Cause = 5, id_CellInformation = 6, id_CellInformation_Item = 7, - id_InterfacesToTrace_Item = 8, id_New_eNB_UE_X2AP_ID = 9, id_Old_eNB_UE_X2AP_ID = 10, id_TargetCell_ID = 11, @@ -114,8 +115,8 @@ typedef enum _ProtocolIE_ID_enum { id_UE_HistoryInformation = 15, id_UE_X2AP_ID = 16, id_CriticalityDiagnostics = 17, - id_Bearers_SubjectToStatusTransfer_List = 18, - id_Bearers_SubjectToStatusTransfer_Item = 19, + id_E_RABs_SubjectToStatusTransfer_List = 18, + id_E_RABs_SubjectToStatusTransfer_Item = 19, id_ServedCells = 20, id_GlobalENB_ID = 21, id_TimeToWait = 22, @@ -130,8 +131,14 @@ typedef enum _ProtocolIE_ID_enum { id_CellToReport_Item = 31, id_CellMeasurementResult = 32, id_CellMeasurementResult_Item = 33, - id_GUGroupIDListToAdd = 34, - id_GUGroupIDListToDelete = 35 + id_GUGroupIDToAddList = 34, + id_GUGroupIDToDeleteList = 35, + id_SRVCCOperationPossible = 36, + id_Measurement_ID = 37, + id_ReportCharacteristics = 38, + id_ENB1_Measurement_ID = 39, + id_ENB2_Measurement_ID = 40, + id_Number_of_Antennaports = 41 } ProtocolIE_ID_enum; /*--- End of included file: packet-x2ap-val.h ---*/ @@ -146,12 +153,17 @@ static int proto_x2ap = -1; static int hf_x2ap_Cause_PDU = -1; /* Cause */ static int hf_x2ap_CriticalityDiagnostics_PDU = -1; /* CriticalityDiagnostics */ static int hf_x2ap_ECGI_PDU = -1; /* ECGI */ +static int hf_x2ap_E_RAB_List_PDU = -1; /* E_RAB_List */ +static int hf_x2ap_E_RAB_Item_PDU = -1; /* E_RAB_Item */ static int hf_x2ap_GlobalENB_ID_PDU = -1; /* GlobalENB_ID */ static int hf_x2ap_GUGroupIDList_PDU = -1; /* GUGroupIDList */ static int hf_x2ap_GUMMEI_PDU = -1; /* GUMMEI */ -static int hf_x2ap_InterfacesToTrace_Item_PDU = -1; /* InterfacesToTrace_Item */ +static int hf_x2ap_Measurement_ID_PDU = -1; /* Measurement_ID */ +static int hf_x2ap_Number_of_Antennaports_PDU = -1; /* Number_of_Antennaports */ static int hf_x2ap_Registration_Request_PDU = -1; /* Registration_Request */ +static int hf_x2ap_ReportCharacteristics_PDU = -1; /* ReportCharacteristics */ static int hf_x2ap_ServedCells_PDU = -1; /* ServedCells */ +static int hf_x2ap_SRVCCOperationPossible_PDU = -1; /* SRVCCOperationPossible */ static int hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU = -1; /* TargeteNBtoSource_eNBTransparentContainer */ static int hf_x2ap_TimeToWait_PDU = -1; /* TimeToWait */ static int hf_x2ap_TraceActivation_PDU = -1; /* TraceActivation */ @@ -159,16 +171,14 @@ static int hf_x2ap_UE_HistoryInformation_PDU = -1; /* UE_HistoryInformation */ static int hf_x2ap_UE_X2AP_ID_PDU = -1; /* UE_X2AP_ID */ static int hf_x2ap_HandoverRequest_PDU = -1; /* HandoverRequest */ static int hf_x2ap_UE_ContextInformation_PDU = -1; /* UE_ContextInformation */ -static int hf_x2ap_Bearers_ToBeSetup_Item_PDU = -1; /* Bearers_ToBeSetup_Item */ +static int hf_x2ap_E_RABs_ToBeSetup_Item_PDU = -1; /* E_RABs_ToBeSetup_Item */ static int hf_x2ap_HandoverRequestAcknowledge_PDU = -1; /* HandoverRequestAcknowledge */ -static int hf_x2ap_Bearers_Admitted_List_PDU = -1; /* Bearers_Admitted_List */ -static int hf_x2ap_Bearers_Admitted_Item_PDU = -1; /* Bearers_Admitted_Item */ -static int hf_x2ap_Bearers_NotAdmitted_List_PDU = -1; /* Bearers_NotAdmitted_List */ -static int hf_x2ap_Bearers_NotAdmitted_Item_PDU = -1; /* Bearers_NotAdmitted_Item */ +static int hf_x2ap_E_RABs_Admitted_List_PDU = -1; /* E_RABs_Admitted_List */ +static int hf_x2ap_E_RABs_Admitted_Item_PDU = -1; /* E_RABs_Admitted_Item */ static int hf_x2ap_HandoverPreparationFailure_PDU = -1; /* HandoverPreparationFailure */ static int hf_x2ap_SNStatusTransfer_PDU = -1; /* SNStatusTransfer */ -static int hf_x2ap_Bearers_SubjectToStatusTransfer_List_PDU = -1; /* Bearers_SubjectToStatusTransfer_List */ -static int hf_x2ap_Bearers_SubjectToStatusTransfer_Item_PDU = -1; /* Bearers_SubjectToStatusTransfer_Item */ +static int hf_x2ap_E_RABs_SubjectToStatusTransfer_List_PDU = -1; /* E_RABs_SubjectToStatusTransfer_List */ +static int hf_x2ap_E_RABs_SubjectToStatusTransfer_Item_PDU = -1; /* E_RABs_SubjectToStatusTransfer_Item */ static int hf_x2ap_UEContextRelease_PDU = -1; /* UEContextRelease */ static int hf_x2ap_HandoverCancel_PDU = -1; /* HandoverCancel */ static int hf_x2ap_ErrorIndication_PDU = -1; /* ErrorIndication */ @@ -188,13 +198,16 @@ static int hf_x2ap_ENBConfigurationUpdateFailure_PDU = -1; /* ENBConfigurationU static int hf_x2ap_ResourceStatusRequest_PDU = -1; /* ResourceStatusRequest */ static int hf_x2ap_CellToReport_List_PDU = -1; /* CellToReport_List */ static int hf_x2ap_CellToReport_Item_PDU = -1; /* CellToReport_Item */ -static int hf_x2ap_ReportingPeriod_PDU = -1; /* ReportingPeriod */ +static int hf_x2ap_ReportingPeriodicity_PDU = -1; /* ReportingPeriodicity */ static int hf_x2ap_ResourceStatusResponse_PDU = -1; /* ResourceStatusResponse */ static int hf_x2ap_ResourceStatusFailure_PDU = -1; /* ResourceStatusFailure */ static int hf_x2ap_ResourceStatusUpdate_PDU = -1; /* ResourceStatusUpdate */ static int hf_x2ap_CellMeasurementResult_List_PDU = -1; /* CellMeasurementResult_List */ static int hf_x2ap_CellMeasurementResult_Item_PDU = -1; /* CellMeasurementResult_Item */ +static int hf_x2ap_PrivateMessage_PDU = -1; /* PrivateMessage */ static int hf_x2ap_X2AP_PDU_PDU = -1; /* X2AP_PDU */ +static int hf_x2ap_local = -1; /* INTEGER_0_maxPrivateIEs */ +static int hf_x2ap_global = -1; /* OBJECT_IDENTIFIER */ static int hf_x2ap_ProtocolIE_Container_item = -1; /* ProtocolIE_Field */ static int hf_x2ap_id = -1; /* ProtocolIE_ID */ static int hf_x2ap_criticality = -1; /* Criticality */ @@ -202,14 +215,23 @@ static int hf_x2ap_protocolIE_Field_value = -1; /* ProtocolIE_Field_value */ static int hf_x2ap_ProtocolExtensionContainer_item = -1; /* ProtocolExtensionField */ static int hf_x2ap_extension_id = -1; /* ProtocolIE_ID */ static int hf_x2ap_extensionValue = -1; /* T_extensionValue */ +static int hf_x2ap_PrivateIE_Container_item = -1; /* PrivateIE_Field */ +static int hf_x2ap_private_id = -1; /* PrivateIE_ID */ +static int hf_x2ap_privateIE_Field_value = -1; /* PrivateIE_Field_value */ +static int hf_x2ap_key_eNodeB_star = -1; /* Key_eNodeB_Star */ +static int hf_x2ap_nextHopChainingCount = -1; /* NextHopChainingCount */ +static int hf_x2ap_iE_Extensions = -1; /* ProtocolExtensionContainer */ +static int hf_x2ap_priorityLevel = -1; /* PriorityLevel */ +static int hf_x2ap_pre_emptionCapability = -1; /* Pre_emptionCapability */ +static int hf_x2ap_pre_emptionVulnerability = -1; /* Pre_emptionVulnerability */ static int hf_x2ap_BroadcastPLMNs_Item_item = -1; /* PLMN_Identity */ static int hf_x2ap_radioNetwork = -1; /* CauseRadioNetwork */ static int hf_x2ap_transport = -1; /* CauseTransport */ static int hf_x2ap_protocol = -1; /* CauseProtocol */ static int hf_x2ap_misc = -1; /* CauseMisc */ +static int hf_x2ap_cell_Size = -1; /* Cell_Size */ static int hf_x2ap_pDCP_SN = -1; /* PDCP_SN */ static int hf_x2ap_hFN = -1; /* HFN */ -static int hf_x2ap_iE_Extensions = -1; /* ProtocolExtensionContainer */ static int hf_x2ap_procedureCode = -1; /* ProcedureCode */ static int hf_x2ap_triggeringMessage = -1; /* TriggeringMessage */ static int hf_x2ap_procedureCriticality = -1; /* Criticality */ @@ -218,21 +240,37 @@ static int hf_x2ap_CriticalityDiagnostics_IE_List_item = -1; /* CriticalityDiag static int hf_x2ap_iECriticality = -1; /* Criticality */ static int hf_x2ap_iE_ID = -1; /* ProtocolIE_ID */ static int hf_x2ap_typeOfError = -1; /* TypeOfError */ +static int hf_x2ap_uL_EARFCN = -1; /* EARFCN */ +static int hf_x2ap_dL_EARFCN = -1; /* EARFCN */ +static int hf_x2ap_uL_Transmission_Bandwidth = -1; /* Transmission_Bandwidth */ +static int hf_x2ap_dL_Transmission_Bandwidth = -1; /* Transmission_Bandwidth */ +static int hf_x2ap_eARFCN = -1; /* EARFCN */ +static int hf_x2ap_transmission_Bandwidth = -1; /* Transmission_Bandwidth */ +static int hf_x2ap_subframeAssignment = -1; /* SubframeAssignment */ +static int hf_x2ap_specialSubframe_Info = -1; /* SpecialSubframe_Info */ +static int hf_x2ap_fDD = -1; /* FDD_Info */ +static int hf_x2ap_tDD = -1; /* TDD_Info */ static int hf_x2ap_pLMN_Identity = -1; /* PLMN_Identity */ static int hf_x2ap_eUTRANcellIdentifier = -1; /* EUTRANCellIdentifier */ static int hf_x2ap_macro_eNB_ID = -1; /* BIT_STRING_SIZE_20 */ static int hf_x2ap_home_eNB_ID = -1; /* BIT_STRING_SIZE_28 */ static int hf_x2ap_EPLMNs_item = -1; /* PLMN_Identity */ +static int hf_x2ap_qCI = -1; /* QCI */ +static int hf_x2ap_allocationAndRetentionPriority = -1; /* AllocationAndRetentionPriority */ +static int hf_x2ap_gbrQosInformation = -1; /* GBR_QosInformation */ +static int hf_x2ap_E_RAB_List_item = -1; /* ProtocolIE_Single_Container */ +static int hf_x2ap_e_RAB_ID = -1; /* E_RAB_ID */ +static int hf_x2ap_cause = -1; /* Cause */ static int hf_x2ap_ForbiddenTAs_item = -1; /* ForbiddenTAs_Item */ static int hf_x2ap_forbiddenTACs = -1; /* ForbiddenTACs */ static int hf_x2ap_ForbiddenTACs_item = -1; /* TAC */ static int hf_x2ap_ForbiddenLAs_item = -1; /* ForbiddenLAs_Item */ static int hf_x2ap_forbiddenLACs = -1; /* ForbiddenLACs */ static int hf_x2ap_ForbiddenLACs_item = -1; /* LAC */ -static int hf_x2ap_sAE_Bearer_MaximumBitrateDL = -1; /* BitRate */ -static int hf_x2ap_sAE_Bearer_MaximumBitrateUL = -1; /* BitRate */ -static int hf_x2ap_sAE_Bearer_GuaranteedBitrateDL = -1; /* BitRate */ -static int hf_x2ap_sAE_Bearer_GuaranteedBitrateUL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_MaximumBitrateDL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_MaximumBitrateUL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_GuaranteedBitrateDL = -1; /* BitRate */ +static int hf_x2ap_e_RAB_GuaranteedBitrateUL = -1; /* BitRate */ static int hf_x2ap_eNB_ID = -1; /* ENB_ID */ static int hf_x2ap_transportLayerAddress = -1; /* TransportLayerAddress */ static int hf_x2ap_gTP_TEID = -1; /* GTP_TEI */ @@ -245,59 +283,74 @@ static int hf_x2ap_equivalentPLMNs = -1; /* EPLMNs */ static int hf_x2ap_forbiddenTAs = -1; /* ForbiddenTAs */ static int hf_x2ap_forbiddenLAs = -1; /* ForbiddenLAs */ static int hf_x2ap_forbiddenInterRATs = -1; /* ForbiddenInterRATs */ -static int hf_x2ap_InterfacesToTrace_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_traceInterface = -1; /* TraceInterface */ -static int hf_x2ap_traceDepth = -1; /* TraceDepth */ +static int hf_x2ap_dLHWLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_uLHWLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_e_UTRAN_Cell = -1; /* LastVisitedEUTRANCellInformation */ +static int hf_x2ap_uTRAN_Cell = -1; /* LastVisitedUTRANCellInformation */ +static int hf_x2ap_gERAN_Cell = -1; /* LastVisitedGERANCellInformation */ static int hf_x2ap_global_Cell_ID = -1; /* ECGI */ static int hf_x2ap_cellType = -1; /* CellType */ static int hf_x2ap_time_UE_StayedInCell = -1; /* Time_UE_StayedInCell */ +static int hf_x2ap_undefined = -1; /* NULL */ static int hf_x2ap_eventType = -1; /* EventType */ static int hf_x2ap_reportArea = -1; /* ReportArea */ +static int hf_x2ap_Neighbour_Information_item = -1; /* Neighbour_Information_item */ +static int hf_x2ap_eCGI = -1; /* ECGI */ +static int hf_x2ap_pCI = -1; /* PCI */ static int hf_x2ap_rNTP_PerPRB = -1; /* BIT_STRING_SIZE_6_110_ */ static int hf_x2ap_rNTP_Threshold = -1; /* RNTP_Threshold */ static int hf_x2ap_numberOfCellSpecificAntennaPorts = -1; /* T_numberOfCellSpecificAntennaPorts */ static int hf_x2ap_p_B = -1; /* INTEGER_0_3_ */ static int hf_x2ap_pDCCH_InterferenceImpact = -1; /* INTEGER_0_4_ */ -static int hf_x2ap_qCI = -1; /* QCI */ -static int hf_x2ap_allocationAndRetentionPriority = -1; /* AllocationAndRetentionPriority */ -static int hf_x2ap_gbrQosInformation = -1; /* GBR_QosInformation */ -static int hf_x2ap_ServedCells_item = -1; /* ServedCell_Information */ -static int hf_x2ap_phyCID = -1; /* PhyCID */ +static int hf_x2ap_dL_GBR_PRB_usage = -1; /* DL_GBR_PRB_usage */ +static int hf_x2ap_uL_GBR_PRB_usage = -1; /* UL_GBR_PRB_usage */ +static int hf_x2ap_dL_non_GBR_PRB_usage = -1; /* DL_non_GBR_PRB_usage */ +static int hf_x2ap_uL_non_GBR_PRB_usage = -1; /* UL_non_GBR_PRB_usage */ +static int hf_x2ap_dL_Total_PRB_usage = -1; /* DL_Total_PRB_usage */ +static int hf_x2ap_uL_Total_PRB_usage = -1; /* UL_Total_PRB_usage */ +static int hf_x2ap_dLS1TNLLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_uLS1TNLLoadIndicator = -1; /* LoadIndicator */ +static int hf_x2ap_ServedCells_item = -1; /* ServedCells_item */ +static int hf_x2ap_servedCellInfo = -1; /* ServedCell_Information */ +static int hf_x2ap_neighbour_Info = -1; /* Neighbour_Information */ static int hf_x2ap_cellId = -1; /* ECGI */ static int hf_x2ap_tAC = -1; /* TAC */ static int hf_x2ap_broadcastPLMNs = -1; /* BroadcastPLMNs_Item */ -static int hf_x2ap_uL_EARFCN = -1; /* EARFCN */ -static int hf_x2ap_dL_EARFCN = -1; /* EARFCN */ -static int hf_x2ap_cell_Transmission_Bandwidth = -1; /* Cell_Transmission_Bandwidth */ -static int hf_x2ap_traceReference = -1; /* TraceReference */ +static int hf_x2ap_eUTRA_Mode_Info = -1; /* EUTRA_Mode_Info */ +static int hf_x2ap_specialSubframePatterns = -1; /* SpecialSubframePatterns */ +static int hf_x2ap_cyclicPrefixDL = -1; /* CyclicPrefixDL */ +static int hf_x2ap_cyclicPrefixUL = -1; /* CyclicPrefixUL */ +static int hf_x2ap_eUTRANTraceID = -1; /* EUTRANTraceID */ static int hf_x2ap_interfacesToTrace = -1; /* InterfacesToTrace */ +static int hf_x2ap_traceDepth = -1; /* TraceDepth */ +static int hf_x2ap_traceCollectionEntityIPAddress = -1; /* TraceCollectionEntityIPAddress */ static int hf_x2ap_UE_HistoryInformation_item = -1; /* LastVisitedCell_Item */ static int hf_x2ap_uEaggregateMaximumBitRateDownlink = -1; /* BitRate */ static int hf_x2ap_uEaggregateMaximumBitRateUplink = -1; /* BitRate */ +static int hf_x2ap_encryptionAlgorithms = -1; /* EncryptionAlgorithms */ +static int hf_x2ap_integrityProtectionAlgorithms = -1; /* IntegrityProtectionAlgorithms */ static int hf_x2ap_UL_InterferenceOverloadIndication_item = -1; /* UL_InterferenceOverloadIndication_Item */ static int hf_x2ap_UL_HighInterferenceIndicationInfo_item = -1; /* UL_HighInterferenceIndicationInfo_Item */ -static int hf_x2ap_ul_interferenceindication = -1; /* UL_HighInterferenceIndication */ static int hf_x2ap_target_Cell_ID = -1; /* ECGI */ +static int hf_x2ap_ul_interferenceindication = -1; /* UL_HighInterferenceIndication */ static int hf_x2ap_protocolIEs = -1; /* ProtocolIE_Container */ static int hf_x2ap_mME_UE_S1AP_ID = -1; /* UE_S1AP_ID */ +static int hf_x2ap_uESecurityCapabilities = -1; /* UESecurityCapabilities */ +static int hf_x2ap_aS_SecurityInformation = -1; /* AS_SecurityInformation */ static int hf_x2ap_uEaggregateMaximumBitRate = -1; /* UEAggregateMaximumBitRate */ static int hf_x2ap_subscriberProfileIDforRFP = -1; /* SubscriberProfileIDforRFP */ -static int hf_x2ap_bearers_ToBeSetup_List = -1; /* Bearers_ToBeSetup_List */ +static int hf_x2ap_e_RABs_ToBeSetup_List = -1; /* E_RABs_ToBeSetup_List */ static int hf_x2ap_rRC_Context = -1; /* RRC_Context */ static int hf_x2ap_handoverRestrictionList = -1; /* HandoverRestrictionList */ static int hf_x2ap_locationReportingInformation = -1; /* LocationReportingInformation */ -static int hf_x2ap_Bearers_ToBeSetup_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_sAE_Bearer_ID = -1; /* Bearer_ID */ -static int hf_x2ap_sAE_BearerLevel_QoS_Parameters = -1; /* SAE_BearerLevel_QoS_Parameters */ +static int hf_x2ap_E_RABs_ToBeSetup_List_item = -1; /* ProtocolIE_Single_Container */ +static int hf_x2ap_e_RAB_Level_QoS_Parameters = -1; /* E_RAB_Level_QoS_Parameters */ static int hf_x2ap_dL_Forwarding = -1; /* DL_Forwarding */ static int hf_x2ap_uL_GTPtunnelEndpoint = -1; /* GTPtunnelEndpoint */ -static int hf_x2ap_Bearers_Admitted_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_bearer_ID = -1; /* Bearer_ID */ +static int hf_x2ap_E_RABs_Admitted_List_item = -1; /* ProtocolIE_Single_Container */ static int hf_x2ap_uL_GTP_TunnelEndpoint = -1; /* GTPtunnelEndpoint */ static int hf_x2ap_dL_GTP_TunnelEndpoint = -1; /* GTPtunnelEndpoint */ -static int hf_x2ap_Bearers_NotAdmitted_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_cause = -1; /* Cause */ -static int hf_x2ap_Bearers_SubjectToStatusTransfer_List_item = -1; /* ProtocolIE_Single_Container */ +static int hf_x2ap_E_RABs_SubjectToStatusTransfer_List_item = -1; /* ProtocolIE_Single_Container */ static int hf_x2ap_receiveStatusofULPDCPSDUs = -1; /* ReceiveStatusofULPDCPSDUs */ static int hf_x2ap_uL_COUNTvalue = -1; /* COUNTvalue */ static int hf_x2ap_dL_COUNTvalue = -1; /* COUNTvalue */ @@ -308,11 +361,13 @@ static int hf_x2ap_ul_HighInterferenceIndicationInfo = -1; /* UL_HighInterferen static int hf_x2ap_relativeNarrowbandTxPower = -1; /* RelativeNarrowbandTxPower */ static int hf_x2ap_ServedCellsToModify_item = -1; /* ServedCellsToModify_Item */ static int hf_x2ap_old_ecgi = -1; /* ECGI */ -static int hf_x2ap_served_cells = -1; /* ServedCell_Information */ static int hf_x2ap_Old_ECGIs_item = -1; /* ECGI */ static int hf_x2ap_CellToReport_List_item = -1; /* ProtocolIE_Single_Container */ static int hf_x2ap_CellMeasurementResult_List_item = -1; /* ProtocolIE_Single_Container */ -static int hf_x2ap_resoureStatus = -1; /* ResourceStatus */ +static int hf_x2ap_hWOverLoadIndicator = -1; /* HWLoadIndicator */ +static int hf_x2ap_s1TNLOverLoadIndicator = -1; /* S1TNLLoadIndicator */ +static int hf_x2ap_radioresourceStatus = -1; /* RadioResourceStatus */ +static int hf_x2ap_privateIEs = -1; /* PrivateIE_Container */ static int hf_x2ap_initiatingMessage = -1; /* InitiatingMessage */ static int hf_x2ap_successfulOutcome = -1; /* SuccessfulOutcome */ static int hf_x2ap_unsuccessfulOutcome = -1; /* UnsuccessfulOutcome */ @@ -329,19 +384,31 @@ static int ett_x2ap = -1; /*--- Included file: packet-x2ap-ett.c ---*/ #line 1 "packet-x2ap-ett.c" +static gint ett_x2ap_PrivateIE_ID = -1; static gint ett_x2ap_ProtocolIE_Container = -1; static gint ett_x2ap_ProtocolIE_Field = -1; static gint ett_x2ap_ProtocolExtensionContainer = -1; static gint ett_x2ap_ProtocolExtensionField = -1; +static gint ett_x2ap_PrivateIE_Container = -1; +static gint ett_x2ap_PrivateIE_Field = -1; +static gint ett_x2ap_AS_SecurityInformation = -1; +static gint ett_x2ap_AllocationAndRetentionPriority = -1; static gint ett_x2ap_BroadcastPLMNs_Item = -1; static gint ett_x2ap_Cause = -1; +static gint ett_x2ap_CellType = -1; static gint ett_x2ap_COUNTvalue = -1; static gint ett_x2ap_CriticalityDiagnostics = -1; static gint ett_x2ap_CriticalityDiagnostics_IE_List = -1; static gint ett_x2ap_CriticalityDiagnostics_IE_List_item = -1; +static gint ett_x2ap_FDD_Info = -1; +static gint ett_x2ap_TDD_Info = -1; +static gint ett_x2ap_EUTRA_Mode_Info = -1; static gint ett_x2ap_ECGI = -1; static gint ett_x2ap_ENB_ID = -1; static gint ett_x2ap_EPLMNs = -1; +static gint ett_x2ap_E_RAB_Level_QoS_Parameters = -1; +static gint ett_x2ap_E_RAB_List = -1; +static gint ett_x2ap_E_RAB_Item = -1; static gint ett_x2ap_ForbiddenTAs = -1; static gint ett_x2ap_ForbiddenTAs_Item = -1; static gint ett_x2ap_ForbiddenTACs = -1; @@ -355,33 +422,38 @@ static gint ett_x2ap_GUGroupIDList = -1; static gint ett_x2ap_GU_Group_ID = -1; static gint ett_x2ap_GUMMEI = -1; static gint ett_x2ap_HandoverRestrictionList = -1; -static gint ett_x2ap_InterfacesToTrace = -1; -static gint ett_x2ap_InterfacesToTrace_Item = -1; +static gint ett_x2ap_HWLoadIndicator = -1; static gint ett_x2ap_LastVisitedCell_Item = -1; +static gint ett_x2ap_LastVisitedEUTRANCellInformation = -1; +static gint ett_x2ap_LastVisitedGERANCellInformation = -1; static gint ett_x2ap_LocationReportingInformation = -1; +static gint ett_x2ap_Neighbour_Information = -1; +static gint ett_x2ap_Neighbour_Information_item = -1; static gint ett_x2ap_RelativeNarrowbandTxPower = -1; -static gint ett_x2ap_SAE_BearerLevel_QoS_Parameters = -1; +static gint ett_x2ap_RadioResourceStatus = -1; +static gint ett_x2ap_S1TNLLoadIndicator = -1; static gint ett_x2ap_ServedCells = -1; +static gint ett_x2ap_ServedCells_item = -1; static gint ett_x2ap_ServedCell_Information = -1; +static gint ett_x2ap_SpecialSubframe_Info = -1; static gint ett_x2ap_TraceActivation = -1; static gint ett_x2ap_UE_HistoryInformation = -1; static gint ett_x2ap_UEAggregateMaximumBitRate = -1; +static gint ett_x2ap_UESecurityCapabilities = -1; static gint ett_x2ap_UL_InterferenceOverloadIndication = -1; static gint ett_x2ap_UL_HighInterferenceIndicationInfo = -1; static gint ett_x2ap_UL_HighInterferenceIndicationInfo_Item = -1; static gint ett_x2ap_HandoverRequest = -1; static gint ett_x2ap_UE_ContextInformation = -1; -static gint ett_x2ap_Bearers_ToBeSetup_List = -1; -static gint ett_x2ap_Bearers_ToBeSetup_Item = -1; +static gint ett_x2ap_E_RABs_ToBeSetup_List = -1; +static gint ett_x2ap_E_RABs_ToBeSetup_Item = -1; static gint ett_x2ap_HandoverRequestAcknowledge = -1; -static gint ett_x2ap_Bearers_Admitted_List = -1; -static gint ett_x2ap_Bearers_Admitted_Item = -1; -static gint ett_x2ap_Bearers_NotAdmitted_List = -1; -static gint ett_x2ap_Bearers_NotAdmitted_Item = -1; +static gint ett_x2ap_E_RABs_Admitted_List = -1; +static gint ett_x2ap_E_RABs_Admitted_Item = -1; static gint ett_x2ap_HandoverPreparationFailure = -1; static gint ett_x2ap_SNStatusTransfer = -1; -static gint ett_x2ap_Bearers_SubjectToStatusTransfer_List = -1; -static gint ett_x2ap_Bearers_SubjectToStatusTransfer_Item = -1; +static gint ett_x2ap_E_RABs_SubjectToStatusTransfer_List = -1; +static gint ett_x2ap_E_RABs_SubjectToStatusTransfer_Item = -1; static gint ett_x2ap_UEContextRelease = -1; static gint ett_x2ap_HandoverCancel = -1; static gint ett_x2ap_ErrorIndication = -1; @@ -407,6 +479,7 @@ static gint ett_x2ap_ResourceStatusFailure = -1; static gint ett_x2ap_ResourceStatusUpdate = -1; static gint ett_x2ap_CellMeasurementResult_List = -1; static gint ett_x2ap_CellMeasurementResult_Item = -1; +static gint ett_x2ap_PrivateMessage = -1; static gint ett_x2ap_X2AP_PDU = -1; static gint ett_x2ap_InitiatingMessage = -1; static gint ett_x2ap_SuccessfulOutcome = -1; @@ -454,6 +527,47 @@ dissect_x2ap_Criticality(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } + +static int +dissect_x2ap_INTEGER_0_maxPrivateIEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, maxPrivateIEs, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_OBJECT_IDENTIFIER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_object_identifier(tvb, offset, actx, tree, hf_index, NULL); + + return offset; +} + + +static const value_string x2ap_PrivateIE_ID_vals[] = { + { 0, "local" }, + { 1, "global" }, + { 0, NULL } +}; + +static const per_choice_t PrivateIE_ID_choice[] = { + { 0, &hf_x2ap_local , ASN1_NO_EXTENSIONS , dissect_x2ap_INTEGER_0_maxPrivateIEs }, + { 1, &hf_x2ap_global , ASN1_NO_EXTENSIONS , dissect_x2ap_OBJECT_IDENTIFIER }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_x2ap_PrivateIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateIE_ID, PrivateIE_ID_choice, + NULL); + + return offset; +} + + static const value_string x2ap_ProcedureCode_vals[] = { { X2AP_ID_HANDOVERPREPARATION, "id-handoverPreparation" }, { X2AP_ID_HANDOVERCANCEL, "id-handoverCancel" }, @@ -464,21 +578,22 @@ static const value_string x2ap_ProcedureCode_vals[] = { { X2AP_ID_X2SETUP, "id-x2Setup" }, { X2AP_ID_RESET, "id-reset" }, { X2AP_ID_ENBCONFIGURATIONUPDATE, "id-eNBConfigurationUpdate" }, - { X2AP_ID_RESOURCESTATUSUPDATEINITIATION, "id-resourceStatusUpdateInitiation" }, + { X2AP_ID_RESOURCESTATUSREPORTINGINITIATION, "id-resourceStatusReportingInitiation" }, { X2AP_ID_RESOURCESTATUSREPORTING, "id-resourceStatusReporting" }, + { X2AP_ID_PRIVATEMESSAGE, "id-privateMessage" }, { 0, NULL } }; static int dissect_x2ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 69 "x2ap.cnf" +#line 65 "x2ap.cnf" ProcedureCode = 0xFFFF; offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 62 "x2ap.cnf" +#line 58 "x2ap.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(ProcedureCode, x2ap_ProcedureCode_vals, @@ -489,15 +604,14 @@ dissect_x2ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const value_string x2ap_ProtocolIE_ID_vals[] = { - { id_Bearers_Admitted_Item, "id-Bearers-Admitted-Item" }, - { id_Bearers_Admitted_List, "id-Bearers-Admitted-List" }, - { id_Bearers_NotAdmitted_Item, "id-Bearers-NotAdmitted-Item" }, - { id_Bearers_NotAdmitted_List, "id-Bearers-NotAdmitted-List" }, - { id_Bearers_ToBeSetup_Item, "id-Bearers-ToBeSetup-Item" }, + { id_E_RABs_Admitted_Item, "id-E-RABs-Admitted-Item" }, + { id_E_RABs_Admitted_List, "id-E-RABs-Admitted-List" }, + { id_E_RAB_Item, "id-E-RAB-Item" }, + { id_E_RABs_NotAdmitted_List, "id-E-RABs-NotAdmitted-List" }, + { id_E_RABs_ToBeSetup_Item, "id-E-RABs-ToBeSetup-Item" }, { id_Cause, "id-Cause" }, { id_CellInformation, "id-CellInformation" }, { id_CellInformation_Item, "id-CellInformation-Item" }, - { id_InterfacesToTrace_Item, "id-InterfacesToTrace-Item" }, { id_New_eNB_UE_X2AP_ID, "id-New-eNB-UE-X2AP-ID" }, { id_Old_eNB_UE_X2AP_ID, "id-Old-eNB-UE-X2AP-ID" }, { id_TargetCell_ID, "id-TargetCell-ID" }, @@ -507,8 +621,8 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = { { id_UE_HistoryInformation, "id-UE-HistoryInformation" }, { id_UE_X2AP_ID, "id-UE-X2AP-ID" }, { id_CriticalityDiagnostics, "id-CriticalityDiagnostics" }, - { id_Bearers_SubjectToStatusTransfer_List, "id-Bearers-SubjectToStatusTransfer-List" }, - { id_Bearers_SubjectToStatusTransfer_Item, "id-Bearers-SubjectToStatusTransfer-Item" }, + { id_E_RABs_SubjectToStatusTransfer_List, "id-E-RABs-SubjectToStatusTransfer-List" }, + { id_E_RABs_SubjectToStatusTransfer_Item, "id-E-RABs-SubjectToStatusTransfer-Item" }, { id_ServedCells, "id-ServedCells" }, { id_GlobalENB_ID, "id-GlobalENB-ID" }, { id_TimeToWait, "id-TimeToWait" }, @@ -523,8 +637,14 @@ static const value_string x2ap_ProtocolIE_ID_vals[] = { { id_CellToReport_Item, "id-CellToReport-Item" }, { id_CellMeasurementResult, "id-CellMeasurementResult" }, { id_CellMeasurementResult_Item, "id-CellMeasurementResult-Item" }, - { id_GUGroupIDListToAdd, "id-GUGroupIDListToAdd" }, - { id_GUGroupIDListToDelete, "id-GUGroupIDListToDelete" }, + { id_GUGroupIDToAddList, "id-GUGroupIDToAddList" }, + { id_GUGroupIDToDeleteList, "id-GUGroupIDToDeleteList" }, + { id_SRVCCOperationPossible, "id-SRVCCOperationPossible" }, + { id_Measurement_ID, "id-Measurement-ID" }, + { id_ReportCharacteristics, "id-ReportCharacteristics" }, + { id_ENB1_Measurement_ID, "id-ENB1-Measurement-ID" }, + { id_ENB2_Measurement_ID, "id-ENB2-Measurement-ID" }, + { id_Number_of_Antennaports, "id-Number-of-Antennaports" }, { 0, NULL } }; @@ -644,19 +764,141 @@ dissect_x2ap_ProtocolExtensionContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ static int -dissect_x2ap_AllocationAndRetentionPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_PrivateIE_Field_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, NULL); + + return offset; +} + + +static const per_sequence_t PrivateIE_Field_sequence[] = { + { &hf_x2ap_private_id , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_ID }, + { &hf_x2ap_criticality , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_Criticality }, + { &hf_x2ap_privateIE_Field_value, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Field_value }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_PrivateIE_Field(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateIE_Field, PrivateIE_Field_sequence); + + return offset; +} + + +static const per_sequence_t PrivateIE_Container_sequence_of[1] = { + { &hf_x2ap_PrivateIE_Container_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Field }, +}; + +static int +dissect_x2ap_PrivateIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateIE_Container, PrivateIE_Container_sequence_of, + 1, maxPrivateIEs, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_Key_eNodeB_Star(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 256, 256, FALSE, NULL); + + return offset; +} + + + +static int +dissect_x2ap_NextHopChainingCount(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 15U, NULL, FALSE); + 0U, 7U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t AS_SecurityInformation_sequence[] = { + { &hf_x2ap_key_eNodeB_star, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Key_eNodeB_Star }, + { &hf_x2ap_nextHopChainingCount, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_NextHopChainingCount }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_AS_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_AS_SecurityInformation, AS_SecurityInformation_sequence); return offset; } +static const value_string x2ap_PriorityLevel_vals[] = { + { 0, "spare" }, + { 1, "highest" }, + { 14, "lowest" }, + { 15, "no-priority" }, + { 0, NULL } +}; + static int -dissect_x2ap_Bearer_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_PriorityLevel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, 15U, NULL, TRUE); + 0U, 15U, NULL, FALSE); + + return offset; +} + + +static const value_string x2ap_Pre_emptionCapability_vals[] = { + { 0, "shall-not-trigger-pre-emption" }, + { 1, "may-trigger-pre-emption" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Pre_emptionCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const value_string x2ap_Pre_emptionVulnerability_vals[] = { + { 0, "not-pre-emptable" }, + { 1, "pre-emptable" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Pre_emptionVulnerability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, FALSE, 0, NULL); + + return offset; +} + + +static const per_sequence_t AllocationAndRetentionPriority_sequence[] = { + { &hf_x2ap_priorityLevel , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PriorityLevel }, + { &hf_x2ap_pre_emptionCapability, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Pre_emptionCapability }, + { &hf_x2ap_pre_emptionVulnerability, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Pre_emptionVulnerability }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_AllocationAndRetentionPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_AllocationAndRetentionPriority, AllocationAndRetentionPriority_sequence); return offset; } @@ -712,7 +954,13 @@ static const value_string x2ap_CauseRadioNetwork_vals[] = { { 12, "no-radio-resources-available-in-target-cell" }, { 13, "invalid-MME-GroupID" }, { 14, "unknown-MME-Code" }, - { 15, "unspecified" }, + { 15, "encryption-and-or-integrity-protection-algorithms-not-supported" }, + { 16, "reportCharacteristicsEmpty" }, + { 17, "noReportPeriodicity" }, + { 18, "existingMeasurementID" }, + { 19, "unknown-eNB-Measurement-ID" }, + { 20, "measurement-temporarily-not-available" }, + { 21, "unspecified" }, { 0, NULL } }; @@ -720,7 +968,7 @@ static const value_string x2ap_CauseRadioNetwork_vals[] = { static int dissect_x2ap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 16, NULL, TRUE, 0, NULL); + 22, NULL, TRUE, 0, NULL); return offset; } @@ -808,17 +1056,17 @@ dissect_x2ap_Cause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot } -static const value_string x2ap_CellType_vals[] = { - { 0, "macro" }, - { 1, "micro" }, - { 2, "pico" }, - { 3, "femto" }, +static const value_string x2ap_Cell_Size_vals[] = { + { 0, "verysmall" }, + { 1, "small" }, + { 2, "medium" }, + { 3, "large" }, { 0, NULL } }; static int -dissect_x2ap_CellType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_Cell_Size(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, NULL, TRUE, 0, NULL); @@ -826,21 +1074,16 @@ dissect_x2ap_CellType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p } -static const value_string x2ap_Cell_Transmission_Bandwidth_vals[] = { - { 0, "bw6" }, - { 1, "bw15" }, - { 2, "bw25" }, - { 3, "bw50" }, - { 4, "bw75" }, - { 5, "bw100" }, - { 0, NULL } +static const per_sequence_t CellType_sequence[] = { + { &hf_x2ap_cell_Size , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cell_Size }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } }; - static int -dissect_x2ap_Cell_Transmission_Bandwidth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 6, NULL, TRUE, 0, NULL); +dissect_x2ap_CellType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_CellType, CellType_sequence); return offset; } @@ -947,6 +1190,38 @@ dissect_x2ap_CriticalityDiagnostics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } +static const value_string x2ap_CyclicPrefixDL_vals[] = { + { 0, "normal" }, + { 1, "extended" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_CyclicPrefixDL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const value_string x2ap_CyclicPrefixUL_vals[] = { + { 0, "normal" }, + { 1, "extended" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_CyclicPrefixUL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 2, NULL, TRUE, 0, NULL); + + return offset; +} + + static const value_string x2ap_DL_Forwarding_vals[] = { { 0, "dL-forwardingProposed" }, { 0, NULL } @@ -972,6 +1247,145 @@ dissect_x2ap_EARFCN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } +static const value_string x2ap_Transmission_Bandwidth_vals[] = { + { 0, "bw6" }, + { 1, "bw15" }, + { 2, "bw25" }, + { 3, "bw50" }, + { 4, "bw75" }, + { 5, "bw100" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Transmission_Bandwidth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 6, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const per_sequence_t FDD_Info_sequence[] = { + { &hf_x2ap_uL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_dL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_uL_Transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Transmission_Bandwidth }, + { &hf_x2ap_dL_Transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Transmission_Bandwidth }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_FDD_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_FDD_Info, FDD_Info_sequence); + + return offset; +} + + +static const value_string x2ap_SubframeAssignment_vals[] = { + { 0, "sa0" }, + { 1, "sa1" }, + { 2, "sa2" }, + { 3, "sa3" }, + { 4, "sa4" }, + { 5, "sa5" }, + { 6, "sa6" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_SubframeAssignment(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 7, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const value_string x2ap_SpecialSubframePatterns_vals[] = { + { 0, "ssp0" }, + { 1, "ssp1" }, + { 2, "ssp2" }, + { 3, "ssp3" }, + { 4, "ssp4" }, + { 5, "ssp5" }, + { 6, "ssp6" }, + { 7, "ssp7" }, + { 8, "ssp8" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_SpecialSubframePatterns(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 9, NULL, TRUE, 0, NULL); + + return offset; +} + + +static const per_sequence_t SpecialSubframe_Info_sequence[] = { + { &hf_x2ap_specialSubframePatterns, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SpecialSubframePatterns }, + { &hf_x2ap_cyclicPrefixDL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CyclicPrefixDL }, + { &hf_x2ap_cyclicPrefixUL , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CyclicPrefixUL }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_SpecialSubframe_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_SpecialSubframe_Info, SpecialSubframe_Info_sequence); + + return offset; +} + + +static const per_sequence_t TDD_Info_sequence[] = { + { &hf_x2ap_eARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Transmission_Bandwidth }, + { &hf_x2ap_subframeAssignment, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SubframeAssignment }, + { &hf_x2ap_specialSubframe_Info, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SpecialSubframe_Info }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_TDD_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_TDD_Info, TDD_Info_sequence); + + return offset; +} + + +static const value_string x2ap_EUTRA_Mode_Info_vals[] = { + { 0, "fDD" }, + { 1, "tDD" }, + { 0, NULL } +}; + +static const per_choice_t EUTRA_Mode_Info_choice[] = { + { 0, &hf_x2ap_fDD , ASN1_EXTENSION_ROOT , dissect_x2ap_FDD_Info }, + { 1, &hf_x2ap_tDD , ASN1_EXTENSION_ROOT , dissect_x2ap_TDD_Info }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_x2ap_EUTRA_Mode_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_EUTRA_Mode_Info, EUTRA_Mode_Info_choice, + NULL); + + return offset; +} + + static int dissect_x2ap_EUTRANCellIdentifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1040,6 +1454,16 @@ dissect_x2ap_ENB_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } + +static int +dissect_x2ap_EncryptionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 16, 16, TRUE, NULL); + + return offset; +} + + static const per_sequence_t EPLMNs_sequence_of[1] = { { &hf_x2ap_EPLMNs_item , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, }; @@ -1054,6 +1478,101 @@ dissect_x2ap_EPLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro } + +static int +dissect_x2ap_E_RAB_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 15U, NULL, TRUE); + + return offset; +} + + + +static int +dissect_x2ap_QCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 255U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t GBR_QosInformation_sequence[] = { + { &hf_x2ap_e_RAB_MaximumBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_e_RAB_MaximumBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_e_RAB_GuaranteedBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_e_RAB_GuaranteedBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_GBR_QosInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_GBR_QosInformation, GBR_QosInformation_sequence); + + return offset; +} + + +static const per_sequence_t E_RAB_Level_QoS_Parameters_sequence[] = { + { &hf_x2ap_qCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_QCI }, + { &hf_x2ap_allocationAndRetentionPriority, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AllocationAndRetentionPriority }, + { &hf_x2ap_gbrQosInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GBR_QosInformation }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_E_RAB_Level_QoS_Parameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_E_RAB_Level_QoS_Parameters, E_RAB_Level_QoS_Parameters_sequence); + + return offset; +} + + +static const per_sequence_t E_RAB_List_sequence_of[1] = { + { &hf_x2ap_E_RAB_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +}; + +static int +dissect_x2ap_E_RAB_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_x2ap_E_RAB_List, E_RAB_List_sequence_of, + 1, maxnoofBearers, FALSE); + + return offset; +} + + +static const per_sequence_t E_RAB_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, + { &hf_x2ap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cause }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_E_RAB_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_E_RAB_Item, E_RAB_Item_sequence); + + return offset; +} + + + +static int +dissect_x2ap_EUTRANTraceID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + 8, 8, FALSE, NULL); + + return offset; +} + + static const value_string x2ap_EventType_vals[] = { { 0, "change-of-serving-cell" }, { 0, NULL } @@ -1073,6 +1592,7 @@ static const value_string x2ap_ForbiddenInterRATs_vals[] = { { 0, "all" }, { 1, "geran" }, { 2, "utran" }, + { 3, "cdma2000" }, { 0, NULL } }; @@ -1080,7 +1600,7 @@ static const value_string x2ap_ForbiddenInterRATs_vals[] = { static int dissect_x2ap_ForbiddenInterRATs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 3, NULL, TRUE, 0, NULL); + 4, NULL, TRUE, 0, NULL); return offset; } @@ -1090,7 +1610,7 @@ dissect_x2ap_ForbiddenInterRATs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static int dissect_x2ap_TAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + 2, 2, FALSE, NULL); return offset; } @@ -1111,8 +1631,9 @@ dissect_x2ap_ForbiddenTACs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const per_sequence_t ForbiddenTAs_Item_sequence[] = { - { &hf_x2ap_pLMN_Identity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, - { &hf_x2ap_forbiddenTACs , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenTACs }, + { &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, + { &hf_x2ap_forbiddenTACs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenTACs }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1164,8 +1685,9 @@ dissect_x2ap_ForbiddenLACs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const per_sequence_t ForbiddenLAs_Item_sequence[] = { - { &hf_x2ap_pLMN_Identity , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, - { &hf_x2ap_forbiddenLACs , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenLACs }, + { &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, + { &hf_x2ap_forbiddenLACs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ForbiddenLACs }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1192,24 +1714,6 @@ dissect_x2ap_ForbiddenLAs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const per_sequence_t GBR_QosInformation_sequence[] = { - { &hf_x2ap_sAE_Bearer_MaximumBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_sAE_Bearer_MaximumBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateDL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateUL, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BitRate }, - { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_x2ap_GBR_QosInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_GBR_QosInformation, GBR_QosInformation_sequence); - - return offset; -} - - static const per_sequence_t GlobalENB_ID_sequence[] = { { &hf_x2ap_pLMN_Identity , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PLMN_Identity }, { &hf_x2ap_eNB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ENB_ID }, @@ -1347,68 +1851,82 @@ dissect_x2ap_HandoverRestrictionList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx } -static const per_sequence_t InterfacesToTrace_sequence_of[1] = { - { &hf_x2ap_InterfacesToTrace_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const value_string x2ap_LoadIndicator_vals[] = { + { 0, "lowLoad" }, + { 1, "mediumLoad" }, + { 2, "highLoad" }, + { 3, "overLoad" }, + { 0, NULL } }; + static int -dissect_x2ap_InterfacesToTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_InterfacesToTrace, InterfacesToTrace_sequence_of, - 1, maxInterfaces, FALSE); +dissect_x2ap_LoadIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 4, NULL, TRUE, 0, NULL); return offset; } -static const value_string x2ap_TraceInterface_vals[] = { - { 0, "s1" }, - { 1, "x2" }, - { 2, "uu" }, - { 0, NULL } +static const per_sequence_t HWLoadIndicator_sequence[] = { + { &hf_x2ap_dLHWLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, + { &hf_x2ap_uLHWLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } }; +static int +dissect_x2ap_HWLoadIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_HWLoadIndicator, HWLoadIndicator_sequence); + + return offset; +} + + static int -dissect_x2ap_TraceInterface(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 3, NULL, TRUE, 0, NULL); +dissect_x2ap_IntegrityProtectionAlgorithms(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 16, 16, TRUE, NULL); return offset; } -static const value_string x2ap_TraceDepth_vals[] = { - { 0, "minimum" }, - { 1, "medium" }, - { 2, "maximum" }, - { 3, "vendorMinimum" }, - { 4, "vendorMedium" }, - { 5, "vendorMaximum" }, - { 0, NULL } -}; + +static int +dissect_x2ap_InterfacesToTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 8, 8, FALSE, NULL); + + return offset; +} + static int -dissect_x2ap_TraceDepth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 6, NULL, TRUE, 0, NULL); +dissect_x2ap_Time_UE_StayedInCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 4095U, NULL, FALSE); return offset; } -static const per_sequence_t InterfacesToTrace_Item_sequence[] = { - { &hf_x2ap_traceInterface , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceInterface }, - { &hf_x2ap_traceDepth , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceDepth }, +static const per_sequence_t LastVisitedEUTRANCellInformation_sequence[] = { + { &hf_x2ap_global_Cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, + { &hf_x2ap_cellType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CellType }, + { &hf_x2ap_time_UE_StayedInCell, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Time_UE_StayedInCell }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; static int -dissect_x2ap_InterfacesToTrace_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_LastVisitedEUTRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_InterfacesToTrace_Item, InterfacesToTrace_Item_sequence); + ett_x2ap_LastVisitedEUTRANCellInformation, LastVisitedEUTRANCellInformation_sequence); return offset; } @@ -1416,25 +1934,62 @@ dissect_x2ap_InterfacesToTrace_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int -dissect_x2ap_Time_UE_StayedInCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL); +dissect_x2ap_LastVisitedUTRANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, + NO_BOUND, NO_BOUND, FALSE, NULL); return offset; } -static const per_sequence_t LastVisitedCell_Item_sequence[] = { - { &hf_x2ap_global_Cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, - { &hf_x2ap_cellType , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_CellType }, - { &hf_x2ap_time_UE_StayedInCell, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_Time_UE_StayedInCell }, - { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } + +static int +dissect_x2ap_NULL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_null(tvb, offset, actx, tree, hf_index); + + return offset; +} + + +static const value_string x2ap_LastVisitedGERANCellInformation_vals[] = { + { 0, "undefined" }, + { 0, NULL } +}; + +static const per_choice_t LastVisitedGERANCellInformation_choice[] = { + { 0, &hf_x2ap_undefined , ASN1_EXTENSION_ROOT , dissect_x2ap_NULL }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_x2ap_LastVisitedGERANCellInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_LastVisitedGERANCellInformation, LastVisitedGERANCellInformation_choice, + NULL); + + return offset; +} + + +static const value_string x2ap_LastVisitedCell_Item_vals[] = { + { 0, "e-UTRAN-Cell" }, + { 1, "uTRAN-Cell" }, + { 2, "gERAN-Cell" }, + { 0, NULL } +}; + +static const per_choice_t LastVisitedCell_Item_choice[] = { + { 0, &hf_x2ap_e_UTRAN_Cell , ASN1_EXTENSION_ROOT , dissect_x2ap_LastVisitedEUTRANCellInformation }, + { 1, &hf_x2ap_uTRAN_Cell , ASN1_EXTENSION_ROOT , dissect_x2ap_LastVisitedUTRANCellInformation }, + { 2, &hf_x2ap_gERAN_Cell , ASN1_EXTENSION_ROOT , dissect_x2ap_LastVisitedGERANCellInformation }, + { 0, NULL, 0, NULL } }; static int dissect_x2ap_LastVisitedCell_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_LastVisitedCell_Item, LastVisitedCell_Item_sequence); + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_x2ap_LastVisitedCell_Item, LastVisitedCell_Item_choice, + NULL); return offset; } @@ -1473,9 +2028,9 @@ dissect_x2ap_LocationReportingInformation(tvbuff_t *tvb _U_, int offset _U_, asn static int -dissect_x2ap_PhyCID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_Measurement_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 504U, NULL, TRUE); + 1U, 4095U, NULL, TRUE); return offset; } @@ -1483,9 +2038,57 @@ dissect_x2ap_PhyCID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro static int -dissect_x2ap_QCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_PCI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 256U, NULL, FALSE); + 0U, 503U, NULL, TRUE); + + return offset; +} + + +static const per_sequence_t Neighbour_Information_item_sequence[] = { + { &hf_x2ap_eCGI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, + { &hf_x2ap_pCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PCI }, + { &hf_x2ap_eARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_Neighbour_Information_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_Neighbour_Information_item, Neighbour_Information_item_sequence); + + return offset; +} + + +static const per_sequence_t Neighbour_Information_sequence_of[1] = { + { &hf_x2ap_Neighbour_Information_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_Neighbour_Information_item }, +}; + +static int +dissect_x2ap_Neighbour_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_x2ap_Neighbour_Information, Neighbour_Information_sequence_of, + 0, maxnoofNeighbours, FALSE); + + return offset; +} + + +static const value_string x2ap_Number_of_Antennaports_vals[] = { + { 0, "an1" }, + { 1, "an2" }, + { 2, "an4" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_Number_of_Antennaports(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 3, NULL, TRUE, 0, NULL); return offset; } @@ -1615,6 +2218,16 @@ dissect_x2ap_RelativeNarrowbandTxPower(tvbuff_t *tvb _U_, int offset _U_, asn1_c static int +dissect_x2ap_ReportCharacteristics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 32, 32, FALSE, NULL); + + return offset; +} + + + +static int dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, NULL); @@ -1625,38 +2238,106 @@ dissect_x2ap_RRC_Context(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int -dissect_x2ap_ResourceStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, NULL); +dissect_x2ap_DL_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); return offset; } -static const per_sequence_t SAE_BearerLevel_QoS_Parameters_sequence[] = { - { &hf_x2ap_qCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_QCI }, - { &hf_x2ap_allocationAndRetentionPriority, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AllocationAndRetentionPriority }, - { &hf_x2ap_gbrQosInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GBR_QosInformation }, + +static int +dissect_x2ap_UL_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_DL_non_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_UL_non_GBR_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_DL_Total_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + + +static int +dissect_x2ap_UL_Total_PRB_usage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, + 0U, 100U, NULL, FALSE); + + return offset; +} + + +static const per_sequence_t RadioResourceStatus_sequence[] = { + { &hf_x2ap_dL_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DL_GBR_PRB_usage }, + { &hf_x2ap_uL_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_GBR_PRB_usage }, + { &hf_x2ap_dL_non_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DL_non_GBR_PRB_usage }, + { &hf_x2ap_uL_non_GBR_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_non_GBR_PRB_usage }, + { &hf_x2ap_dL_Total_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_DL_Total_PRB_usage }, + { &hf_x2ap_uL_Total_PRB_usage, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_Total_PRB_usage }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_RadioResourceStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_RadioResourceStatus, RadioResourceStatus_sequence); + + return offset; +} + + +static const per_sequence_t S1TNLLoadIndicator_sequence[] = { + { &hf_x2ap_dLS1TNLLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, + { &hf_x2ap_uLS1TNLLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_LoadIndicator }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; static int -dissect_x2ap_SAE_BearerLevel_QoS_Parameters(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_S1TNLLoadIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_SAE_BearerLevel_QoS_Parameters, SAE_BearerLevel_QoS_Parameters_sequence); + ett_x2ap_S1TNLLoadIndicator, S1TNLLoadIndicator_sequence); return offset; } static const per_sequence_t ServedCell_Information_sequence[] = { - { &hf_x2ap_phyCID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PhyCID }, + { &hf_x2ap_pCI , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PCI }, { &hf_x2ap_cellId , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, { &hf_x2ap_tAC , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TAC }, { &hf_x2ap_broadcastPLMNs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_BroadcastPLMNs_Item }, - { &hf_x2ap_uL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, - { &hf_x2ap_dL_EARFCN , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EARFCN }, - { &hf_x2ap_cell_Transmission_Bandwidth, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cell_Transmission_Bandwidth }, + { &hf_x2ap_eUTRA_Mode_Info, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EUTRA_Mode_Info }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1670,8 +2351,24 @@ dissect_x2ap_ServedCell_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } +static const per_sequence_t ServedCells_item_sequence[] = { + { &hf_x2ap_servedCellInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_neighbour_Info , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_Neighbour_Information }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_ServedCells_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_ServedCells_item, ServedCells_item_sequence); + + return offset; +} + + static const per_sequence_t ServedCells_sequence_of[1] = { - { &hf_x2ap_ServedCells_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_ServedCells_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCells_item }, }; static int @@ -1684,6 +2381,21 @@ dissect_x2ap_ServedCells(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ } +static const value_string x2ap_SRVCCOperationPossible_vals[] = { + { 0, "possible" }, + { 0, NULL } +}; + + +static int +dissect_x2ap_SRVCCOperationPossible(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 1, NULL, TRUE, 0, NULL); + + return offset; +} + + static int dissect_x2ap_SubscriberProfileIDforRFP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -1704,29 +2416,61 @@ dissect_x2ap_TargeteNBtoSource_eNBTransparentContainer(tvbuff_t *tvb _U_, int of } +static const value_string x2ap_TimeToWait_vals[] = { + { 0, "v1s" }, + { 1, "v2s" }, + { 2, "v5s" }, + { 3, "v10s" }, + { 4, "v20s" }, + { 5, "v60s" }, + { 0, NULL } +}; + static int dissect_x2ap_TimeToWait(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - NO_BOUND, NO_BOUND, FALSE, NULL); + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 6, NULL, TRUE, 0, NULL); return offset; } +static const value_string x2ap_TraceDepth_vals[] = { + { 0, "minimum" }, + { 1, "medium" }, + { 2, "maximum" }, + { 3, "minimumWithoutVendorSpecificExtension" }, + { 4, "mediumWithoutVendorSpecificExtension" }, + { 5, "maximumWithoutVendorSpecificExtension" }, + { 0, NULL } +}; + static int -dissect_x2ap_TraceReference(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 8, 8, FALSE, NULL); +dissect_x2ap_TraceDepth(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 6, NULL, TRUE, 0, NULL); + + return offset; +} + + + +static int +dissect_x2ap_TraceCollectionEntityIPAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, + 1, 160, TRUE, NULL); return offset; } static const per_sequence_t TraceActivation_sequence[] = { - { &hf_x2ap_traceReference , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceReference }, + { &hf_x2ap_eUTRANTraceID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EUTRANTraceID }, { &hf_x2ap_interfacesToTrace, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_InterfacesToTrace }, + { &hf_x2ap_traceDepth , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceDepth }, + { &hf_x2ap_traceCollectionEntityIPAddress, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_TraceCollectionEntityIPAddress }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1790,6 +2534,22 @@ dissect_x2ap_UEAggregateMaximumBitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_c } +static const per_sequence_t UESecurityCapabilities_sequence[] = { + { &hf_x2ap_encryptionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_EncryptionAlgorithms }, + { &hf_x2ap_integrityProtectionAlgorithms, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_IntegrityProtectionAlgorithms }, + { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_UESecurityCapabilities(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_UESecurityCapabilities, UESecurityCapabilities_sequence); + + return offset; +} + + static const value_string x2ap_UL_InterferenceOverloadIndication_Item_vals[] = { { 0, "high-interference" }, { 1, "medium-interference" }, @@ -1832,8 +2592,8 @@ dissect_x2ap_UL_HighInterferenceIndication(tvbuff_t *tvb _U_, int offset _U_, as static const per_sequence_t UL_HighInterferenceIndicationInfo_Item_sequence[] = { - { &hf_x2ap_ul_interferenceindication, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_HighInterferenceIndication }, { &hf_x2ap_target_Cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, + { &hf_x2ap_ul_interferenceindication, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UL_HighInterferenceIndication }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -1875,14 +2635,14 @@ dissect_x2ap_HandoverRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx } -static const per_sequence_t Bearers_ToBeSetup_List_sequence_of[1] = { - { &hf_x2ap_Bearers_ToBeSetup_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const per_sequence_t E_RABs_ToBeSetup_List_sequence_of[1] = { + { &hf_x2ap_E_RABs_ToBeSetup_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, }; static int -dissect_x2ap_Bearers_ToBeSetup_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_ToBeSetup_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_ToBeSetup_List, Bearers_ToBeSetup_List_sequence_of, + ett_x2ap_E_RABs_ToBeSetup_List, E_RABs_ToBeSetup_List_sequence_of, 1, maxnoofBearers, FALSE); return offset; @@ -1891,9 +2651,11 @@ dissect_x2ap_Bearers_ToBeSetup_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t UE_ContextInformation_sequence[] = { { &hf_x2ap_mME_UE_S1AP_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UE_S1AP_ID }, + { &hf_x2ap_uESecurityCapabilities, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UESecurityCapabilities }, + { &hf_x2ap_aS_SecurityInformation, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_AS_SecurityInformation }, { &hf_x2ap_uEaggregateMaximumBitRate, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_UEAggregateMaximumBitRate }, { &hf_x2ap_subscriberProfileIDforRFP, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_SubscriberProfileIDforRFP }, - { &hf_x2ap_bearers_ToBeSetup_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearers_ToBeSetup_List }, + { &hf_x2ap_e_RABs_ToBeSetup_List, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RABs_ToBeSetup_List }, { &hf_x2ap_rRC_Context , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_RRC_Context }, { &hf_x2ap_handoverRestrictionList, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_HandoverRestrictionList }, { &hf_x2ap_locationReportingInformation, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_LocationReportingInformation }, @@ -1910,9 +2672,9 @@ dissect_x2ap_UE_ContextInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } -static const per_sequence_t Bearers_ToBeSetup_Item_sequence[] = { - { &hf_x2ap_sAE_Bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, - { &hf_x2ap_sAE_BearerLevel_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_SAE_BearerLevel_QoS_Parameters }, +static const per_sequence_t E_RABs_ToBeSetup_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, + { &hf_x2ap_e_RAB_Level_QoS_Parameters, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_Level_QoS_Parameters }, { &hf_x2ap_dL_Forwarding , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_DL_Forwarding }, { &hf_x2ap_uL_GTPtunnelEndpoint, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_GTPtunnelEndpoint }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, @@ -1920,9 +2682,9 @@ static const per_sequence_t Bearers_ToBeSetup_Item_sequence[] = { }; static int -dissect_x2ap_Bearers_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_ToBeSetup_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_ToBeSetup_Item, Bearers_ToBeSetup_Item_sequence); + ett_x2ap_E_RABs_ToBeSetup_Item, E_RABs_ToBeSetup_Item_sequence); return offset; } @@ -1942,22 +2704,22 @@ dissect_x2ap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ } -static const per_sequence_t Bearers_Admitted_List_sequence_of[1] = { - { &hf_x2ap_Bearers_Admitted_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const per_sequence_t E_RABs_Admitted_List_sequence_of[1] = { + { &hf_x2ap_E_RABs_Admitted_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, }; static int -dissect_x2ap_Bearers_Admitted_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_Admitted_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_Admitted_List, Bearers_Admitted_List_sequence_of, + ett_x2ap_E_RABs_Admitted_List, E_RABs_Admitted_List_sequence_of, 1, maxnoofBearers, FALSE); return offset; } -static const per_sequence_t Bearers_Admitted_Item_sequence[] = { - { &hf_x2ap_bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, +static const per_sequence_t E_RABs_Admitted_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, { &hf_x2ap_uL_GTP_TunnelEndpoint, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint }, { &hf_x2ap_dL_GTP_TunnelEndpoint, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_GTPtunnelEndpoint }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, @@ -1965,39 +2727,9 @@ static const per_sequence_t Bearers_Admitted_Item_sequence[] = { }; static int -dissect_x2ap_Bearers_Admitted_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_Admitted_Item, Bearers_Admitted_Item_sequence); - - return offset; -} - - -static const per_sequence_t Bearers_NotAdmitted_List_sequence_of[1] = { - { &hf_x2ap_Bearers_NotAdmitted_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, -}; - -static int -dissect_x2ap_Bearers_NotAdmitted_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_NotAdmitted_List, Bearers_NotAdmitted_List_sequence_of, - 1, maxnoofBearers, FALSE); - - return offset; -} - - -static const per_sequence_t Bearers_NotAdmitted_Item_sequence[] = { - { &hf_x2ap_bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, - { &hf_x2ap_cause , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Cause }, - { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, - { NULL, 0, 0, NULL } -}; - -static int -dissect_x2ap_Bearers_NotAdmitted_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_Admitted_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_NotAdmitted_Item, Bearers_NotAdmitted_Item_sequence); + ett_x2ap_E_RABs_Admitted_Item, E_RABs_Admitted_Item_sequence); return offset; } @@ -2031,22 +2763,22 @@ dissect_x2ap_SNStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act } -static const per_sequence_t Bearers_SubjectToStatusTransfer_List_sequence_of[1] = { - { &hf_x2ap_Bearers_SubjectToStatusTransfer_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, +static const per_sequence_t E_RABs_SubjectToStatusTransfer_List_sequence_of[1] = { + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_ProtocolIE_Single_Container }, }; static int -dissect_x2ap_Bearers_SubjectToStatusTransfer_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_SubjectToStatusTransfer_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_SubjectToStatusTransfer_List, Bearers_SubjectToStatusTransfer_List_sequence_of, + ett_x2ap_E_RABs_SubjectToStatusTransfer_List, E_RABs_SubjectToStatusTransfer_List_sequence_of, 1, maxnoofBearers, FALSE); return offset; } -static const per_sequence_t Bearers_SubjectToStatusTransfer_Item_sequence[] = { - { &hf_x2ap_bearer_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_Bearer_ID }, +static const per_sequence_t E_RABs_SubjectToStatusTransfer_Item_sequence[] = { + { &hf_x2ap_e_RAB_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_E_RAB_ID }, { &hf_x2ap_receiveStatusofULPDCPSDUs, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ReceiveStatusofULPDCPSDUs }, { &hf_x2ap_uL_COUNTvalue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_COUNTvalue }, { &hf_x2ap_dL_COUNTvalue , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_COUNTvalue }, @@ -2055,9 +2787,9 @@ static const per_sequence_t Bearers_SubjectToStatusTransfer_Item_sequence[] = { }; static int -dissect_x2ap_Bearers_SubjectToStatusTransfer_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_E_RABs_SubjectToStatusTransfer_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, - ett_x2ap_Bearers_SubjectToStatusTransfer_Item, Bearers_SubjectToStatusTransfer_Item_sequence); + ett_x2ap_E_RABs_SubjectToStatusTransfer_Item, E_RABs_SubjectToStatusTransfer_Item_sequence); return offset; } @@ -2237,7 +2969,8 @@ dissect_x2ap_ENBConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static const per_sequence_t ServedCellsToModify_Item_sequence[] = { { &hf_x2ap_old_ecgi , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, - { &hf_x2ap_served_cells , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_servedCellInfo , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ServedCell_Information }, + { &hf_x2ap_neighbour_Info , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_Neighbour_Information }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -2350,16 +3083,19 @@ dissect_x2ap_CellToReport_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac } -static const value_string x2ap_ReportingPeriod_vals[] = { - { 0, "ffs" }, +static const value_string x2ap_ReportingPeriodicity_vals[] = { + { 0, "one-thousand-ms" }, + { 1, "two-thousand-ms" }, + { 2, "five-thousand-ms" }, + { 3, "ten-thousand-ms" }, { 0, NULL } }; static int -dissect_x2ap_ReportingPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x2ap_ReportingPeriodicity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, - 1, NULL, TRUE, 0, NULL); + 4, NULL, TRUE, 0, NULL); return offset; } @@ -2423,7 +3159,9 @@ dissect_x2ap_CellMeasurementResult_List(tvbuff_t *tvb _U_, int offset _U_, asn1_ static const per_sequence_t CellMeasurementResult_Item_sequence[] = { { &hf_x2ap_cell_ID , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_ECGI }, - { &hf_x2ap_resoureStatus , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ResourceStatus }, + { &hf_x2ap_hWOverLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_HWLoadIndicator }, + { &hf_x2ap_s1TNLOverLoadIndicator, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_S1TNLLoadIndicator }, + { &hf_x2ap_radioresourceStatus, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_RadioResourceStatus }, { &hf_x2ap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x2ap_ProtocolExtensionContainer }, { NULL, 0, 0, NULL } }; @@ -2437,6 +3175,20 @@ dissect_x2ap_CellMeasurementResult_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ } +static const per_sequence_t PrivateMessage_sequence[] = { + { &hf_x2ap_privateIEs , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Container }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_x2ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_x2ap_PrivateMessage, PrivateMessage_sequence); + + return offset; +} + + static int dissect_x2ap_InitiatingMessage_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -2561,6 +3313,22 @@ static int dissect_ECGI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre offset += 7; offset >>= 3; return offset; } +static int dissect_E_RAB_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_E_RAB_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RAB_List_PDU); + offset += 7; offset >>= 3; + return offset; +} +static int dissect_E_RAB_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_E_RAB_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RAB_Item_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_GlobalENB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -2585,11 +3353,19 @@ static int dissect_GUMMEI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t offset += 7; offset >>= 3; return offset; } -static int dissect_InterfacesToTrace_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_Measurement_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_InterfacesToTrace_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_InterfacesToTrace_Item_PDU); + offset = dissect_x2ap_Measurement_ID(tvb, offset, &asn1_ctx, tree, hf_x2ap_Measurement_ID_PDU); + offset += 7; offset >>= 3; + return offset; +} +static int dissect_Number_of_Antennaports_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_Number_of_Antennaports(tvb, offset, &asn1_ctx, tree, hf_x2ap_Number_of_Antennaports_PDU); offset += 7; offset >>= 3; return offset; } @@ -2601,6 +3377,14 @@ static int dissect_Registration_Request_PDU(tvbuff_t *tvb _U_, packet_info *pinf offset += 7; offset >>= 3; return offset; } +static int dissect_ReportCharacteristics_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_ReportCharacteristics(tvb, offset, &asn1_ctx, tree, hf_x2ap_ReportCharacteristics_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_ServedCells_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -2609,6 +3393,14 @@ static int dissect_ServedCells_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr offset += 7; offset >>= 3; return offset; } +static int dissect_SRVCCOperationPossible_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_SRVCCOperationPossible(tvb, offset, &asn1_ctx, tree, hf_x2ap_SRVCCOperationPossible_PDU); + offset += 7; offset >>= 3; + return offset; +} static int dissect_TargeteNBtoSource_eNBTransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -2665,11 +3457,11 @@ static int dissect_UE_ContextInformation_PDU(tvbuff_t *tvb _U_, packet_info *pin offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_ToBeSetup_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_ToBeSetup_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_ToBeSetup_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_ToBeSetup_Item_PDU); + offset = dissect_x2ap_E_RABs_ToBeSetup_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_ToBeSetup_Item_PDU); offset += 7; offset >>= 3; return offset; } @@ -2681,35 +3473,19 @@ static int dissect_HandoverRequestAcknowledge_PDU(tvbuff_t *tvb _U_, packet_info offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_Admitted_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { - int offset = 0; - asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_Admitted_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_Admitted_List_PDU); - offset += 7; offset >>= 3; - return offset; -} -static int dissect_Bearers_Admitted_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_Admitted_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_Admitted_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_Admitted_Item_PDU); + offset = dissect_x2ap_E_RABs_Admitted_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_Admitted_List_PDU); offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_NotAdmitted_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_Admitted_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_NotAdmitted_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_NotAdmitted_List_PDU); - offset += 7; offset >>= 3; - return offset; -} -static int dissect_Bearers_NotAdmitted_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { - int offset = 0; - asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_NotAdmitted_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_NotAdmitted_Item_PDU); + offset = dissect_x2ap_E_RABs_Admitted_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_Admitted_Item_PDU); offset += 7; offset >>= 3; return offset; } @@ -2729,19 +3505,19 @@ static int dissect_SNStatusTransfer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_SubjectToStatusTransfer_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_SubjectToStatusTransfer_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_SubjectToStatusTransfer_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_SubjectToStatusTransfer_List_PDU); + offset = dissect_x2ap_E_RABs_SubjectToStatusTransfer_List(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_SubjectToStatusTransfer_List_PDU); offset += 7; offset >>= 3; return offset; } -static int dissect_Bearers_SubjectToStatusTransfer_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_E_RABs_SubjectToStatusTransfer_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_Bearers_SubjectToStatusTransfer_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_Bearers_SubjectToStatusTransfer_Item_PDU); + offset = dissect_x2ap_E_RABs_SubjectToStatusTransfer_Item(tvb, offset, &asn1_ctx, tree, hf_x2ap_E_RABs_SubjectToStatusTransfer_Item_PDU); offset += 7; offset >>= 3; return offset; } @@ -2897,11 +3673,11 @@ static int dissect_CellToReport_Item_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ offset += 7; offset >>= 3; return offset; } -static int dissect_ReportingPeriod_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +static int dissect_ReportingPeriodicity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); - offset = dissect_x2ap_ReportingPeriod(tvb, offset, &asn1_ctx, tree, hf_x2ap_ReportingPeriod_PDU); + offset = dissect_x2ap_ReportingPeriodicity(tvb, offset, &asn1_ctx, tree, hf_x2ap_ReportingPeriodicity_PDU); offset += 7; offset >>= 3; return offset; } @@ -2945,6 +3721,14 @@ static int dissect_CellMeasurementResult_Item_PDU(tvbuff_t *tvb _U_, packet_info offset += 7; offset >>= 3; return offset; } +static int dissect_PrivateMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); + offset = dissect_x2ap_PrivateMessage(tvb, offset, &asn1_ctx, tree, hf_x2ap_PrivateMessage_PDU); + offset += 7; offset >>= 3; + return offset; +} static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); @@ -3021,6 +3805,14 @@ void proto_register_x2ap(void) { { "ECGI", "x2ap.ECGI", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, + { &hf_x2ap_E_RAB_List_PDU, + { "E-RAB-List", "x2ap.E_RAB_List", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.E_RAB_List", HFILL }}, + { &hf_x2ap_E_RAB_Item_PDU, + { "E-RAB-Item", "x2ap.E_RAB_Item", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.E_RAB_Item", HFILL }}, { &hf_x2ap_GlobalENB_ID_PDU, { "GlobalENB-ID", "x2ap.GlobalENB_ID", FT_NONE, BASE_NONE, NULL, 0, @@ -3033,25 +3825,37 @@ void proto_register_x2ap(void) { { "GUMMEI", "x2ap.GUMMEI", FT_NONE, BASE_NONE, NULL, 0, "x2ap.GUMMEI", HFILL }}, - { &hf_x2ap_InterfacesToTrace_Item_PDU, - { "InterfacesToTrace-Item", "x2ap.InterfacesToTrace_Item", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.InterfacesToTrace_Item", HFILL }}, + { &hf_x2ap_Measurement_ID_PDU, + { "Measurement-ID", "x2ap.Measurement_ID", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.Measurement_ID", HFILL }}, + { &hf_x2ap_Number_of_Antennaports_PDU, + { "Number-of-Antennaports", "x2ap.Number_of_Antennaports", + FT_UINT32, BASE_DEC, VALS(x2ap_Number_of_Antennaports_vals), 0, + "x2ap.Number_of_Antennaports", HFILL }}, { &hf_x2ap_Registration_Request_PDU, { "Registration-Request", "x2ap.Registration_Request", FT_UINT32, BASE_DEC, VALS(x2ap_Registration_Request_vals), 0, "x2ap.Registration_Request", HFILL }}, + { &hf_x2ap_ReportCharacteristics_PDU, + { "ReportCharacteristics", "x2ap.ReportCharacteristics", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.ReportCharacteristics", HFILL }}, { &hf_x2ap_ServedCells_PDU, { "ServedCells", "x2ap.ServedCells", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.ServedCells", HFILL }}, + { &hf_x2ap_SRVCCOperationPossible_PDU, + { "SRVCCOperationPossible", "x2ap.SRVCCOperationPossible", + FT_UINT32, BASE_DEC, VALS(x2ap_SRVCCOperationPossible_vals), 0, + "x2ap.SRVCCOperationPossible", HFILL }}, { &hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU, { "TargeteNBtoSource-eNBTransparentContainer", "x2ap.TargeteNBtoSource_eNBTransparentContainer", FT_BYTES, BASE_NONE, NULL, 0, "x2ap.TargeteNBtoSource_eNBTransparentContainer", HFILL }}, { &hf_x2ap_TimeToWait_PDU, { "TimeToWait", "x2ap.TimeToWait", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, VALS(x2ap_TimeToWait_vals), 0, "x2ap.TimeToWait", HFILL }}, { &hf_x2ap_TraceActivation_PDU, { "TraceActivation", "x2ap.TraceActivation", @@ -3073,30 +3877,22 @@ void proto_register_x2ap(void) { { "UE-ContextInformation", "x2ap.UE_ContextInformation", FT_NONE, BASE_NONE, NULL, 0, "x2ap.UE_ContextInformation", HFILL }}, - { &hf_x2ap_Bearers_ToBeSetup_Item_PDU, - { "Bearers-ToBeSetup-Item", "x2ap.Bearers_ToBeSetup_Item", + { &hf_x2ap_E_RABs_ToBeSetup_Item_PDU, + { "E-RABs-ToBeSetup-Item", "x2ap.E_RABs_ToBeSetup_Item", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_ToBeSetup_Item", HFILL }}, + "x2ap.E_RABs_ToBeSetup_Item", HFILL }}, { &hf_x2ap_HandoverRequestAcknowledge_PDU, { "HandoverRequestAcknowledge", "x2ap.HandoverRequestAcknowledge", FT_NONE, BASE_NONE, NULL, 0, "x2ap.HandoverRequestAcknowledge", HFILL }}, - { &hf_x2ap_Bearers_Admitted_List_PDU, - { "Bearers-Admitted-List", "x2ap.Bearers_Admitted_List", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_Admitted_List", HFILL }}, - { &hf_x2ap_Bearers_Admitted_Item_PDU, - { "Bearers-Admitted-Item", "x2ap.Bearers_Admitted_Item", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_Admitted_Item", HFILL }}, - { &hf_x2ap_Bearers_NotAdmitted_List_PDU, - { "Bearers-NotAdmitted-List", "x2ap.Bearers_NotAdmitted_List", + { &hf_x2ap_E_RABs_Admitted_List_PDU, + { "E-RABs-Admitted-List", "x2ap.E_RABs_Admitted_List", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_NotAdmitted_List", HFILL }}, - { &hf_x2ap_Bearers_NotAdmitted_Item_PDU, - { "Bearers-NotAdmitted-Item", "x2ap.Bearers_NotAdmitted_Item", + "x2ap.E_RABs_Admitted_List", HFILL }}, + { &hf_x2ap_E_RABs_Admitted_Item_PDU, + { "E-RABs-Admitted-Item", "x2ap.E_RABs_Admitted_Item", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_NotAdmitted_Item", HFILL }}, + "x2ap.E_RABs_Admitted_Item", HFILL }}, { &hf_x2ap_HandoverPreparationFailure_PDU, { "HandoverPreparationFailure", "x2ap.HandoverPreparationFailure", FT_NONE, BASE_NONE, NULL, 0, @@ -3105,14 +3901,14 @@ void proto_register_x2ap(void) { { "SNStatusTransfer", "x2ap.SNStatusTransfer", FT_NONE, BASE_NONE, NULL, 0, "x2ap.SNStatusTransfer", HFILL }}, - { &hf_x2ap_Bearers_SubjectToStatusTransfer_List_PDU, - { "Bearers-SubjectToStatusTransfer-List", "x2ap.Bearers_SubjectToStatusTransfer_List", + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_PDU, + { "E-RABs-SubjectToStatusTransfer-List", "x2ap.E_RABs_SubjectToStatusTransfer_List", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_SubjectToStatusTransfer_List", HFILL }}, - { &hf_x2ap_Bearers_SubjectToStatusTransfer_Item_PDU, - { "Bearers-SubjectToStatusTransfer-Item", "x2ap.Bearers_SubjectToStatusTransfer_Item", + "x2ap.E_RABs_SubjectToStatusTransfer_List", HFILL }}, + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_Item_PDU, + { "E-RABs-SubjectToStatusTransfer-Item", "x2ap.E_RABs_SubjectToStatusTransfer_Item", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.Bearers_SubjectToStatusTransfer_Item", HFILL }}, + "x2ap.E_RABs_SubjectToStatusTransfer_Item", HFILL }}, { &hf_x2ap_UEContextRelease_PDU, { "UEContextRelease", "x2ap.UEContextRelease", FT_NONE, BASE_NONE, NULL, 0, @@ -3189,10 +3985,10 @@ void proto_register_x2ap(void) { { "CellToReport-Item", "x2ap.CellToReport_Item", FT_NONE, BASE_NONE, NULL, 0, "x2ap.CellToReport_Item", HFILL }}, - { &hf_x2ap_ReportingPeriod_PDU, - { "ReportingPeriod", "x2ap.ReportingPeriod", - FT_UINT32, BASE_DEC, VALS(x2ap_ReportingPeriod_vals), 0, - "x2ap.ReportingPeriod", HFILL }}, + { &hf_x2ap_ReportingPeriodicity_PDU, + { "ReportingPeriodicity", "x2ap.ReportingPeriodicity", + FT_UINT32, BASE_DEC, VALS(x2ap_ReportingPeriodicity_vals), 0, + "x2ap.ReportingPeriodicity", HFILL }}, { &hf_x2ap_ResourceStatusResponse_PDU, { "ResourceStatusResponse", "x2ap.ResourceStatusResponse", FT_NONE, BASE_NONE, NULL, 0, @@ -3213,10 +4009,22 @@ void proto_register_x2ap(void) { { "CellMeasurementResult-Item", "x2ap.CellMeasurementResult_Item", FT_NONE, BASE_NONE, NULL, 0, "x2ap.CellMeasurementResult_Item", HFILL }}, + { &hf_x2ap_PrivateMessage_PDU, + { "PrivateMessage", "x2ap.PrivateMessage", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.PrivateMessage", HFILL }}, { &hf_x2ap_X2AP_PDU_PDU, { "X2AP-PDU", "x2ap.X2AP_PDU", FT_UINT32, BASE_DEC, VALS(x2ap_X2AP_PDU_vals), 0, "x2ap.X2AP_PDU", HFILL }}, + { &hf_x2ap_local, + { "local", "x2ap.local", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.INTEGER_0_maxPrivateIEs", HFILL }}, + { &hf_x2ap_global, + { "global", "x2ap.global", + FT_OID, BASE_NONE, NULL, 0, + "x2ap.OBJECT_IDENTIFIER", HFILL }}, { &hf_x2ap_ProtocolIE_Container_item, { "ProtocolIE-Field", "x2ap.ProtocolIE_Field", FT_NONE, BASE_NONE, NULL, 0, @@ -3245,6 +4053,42 @@ void proto_register_x2ap(void) { { "extensionValue", "x2ap.extensionValue", FT_NONE, BASE_NONE, NULL, 0, "x2ap.T_extensionValue", HFILL }}, + { &hf_x2ap_PrivateIE_Container_item, + { "PrivateIE-Field", "x2ap.PrivateIE_Field", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.PrivateIE_Field", HFILL }}, + { &hf_x2ap_private_id, + { "id", "x2ap.id", + FT_UINT32, BASE_DEC, VALS(x2ap_PrivateIE_ID_vals), 0, + "x2ap.PrivateIE_ID", HFILL }}, + { &hf_x2ap_privateIE_Field_value, + { "value", "x2ap.value", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.PrivateIE_Field_value", HFILL }}, + { &hf_x2ap_key_eNodeB_star, + { "key-eNodeB-star", "x2ap.key_eNodeB_star", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.Key_eNodeB_Star", HFILL }}, + { &hf_x2ap_nextHopChainingCount, + { "nextHopChainingCount", "x2ap.nextHopChainingCount", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.NextHopChainingCount", HFILL }}, + { &hf_x2ap_iE_Extensions, + { "iE-Extensions", "x2ap.iE_Extensions", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.ProtocolExtensionContainer", HFILL }}, + { &hf_x2ap_priorityLevel, + { "priorityLevel", "x2ap.priorityLevel", + FT_UINT32, BASE_DEC, VALS(x2ap_PriorityLevel_vals), 0, + "x2ap.PriorityLevel", HFILL }}, + { &hf_x2ap_pre_emptionCapability, + { "pre-emptionCapability", "x2ap.pre_emptionCapability", + FT_UINT32, BASE_DEC, VALS(x2ap_Pre_emptionCapability_vals), 0, + "x2ap.Pre_emptionCapability", HFILL }}, + { &hf_x2ap_pre_emptionVulnerability, + { "pre-emptionVulnerability", "x2ap.pre_emptionVulnerability", + FT_UINT32, BASE_DEC, VALS(x2ap_Pre_emptionVulnerability_vals), 0, + "x2ap.Pre_emptionVulnerability", HFILL }}, { &hf_x2ap_BroadcastPLMNs_Item_item, { "PLMN-Identity", "x2ap.PLMN_Identity", FT_BYTES, BASE_NONE, NULL, 0, @@ -3265,6 +4109,10 @@ void proto_register_x2ap(void) { { "misc", "x2ap.misc", FT_UINT32, BASE_DEC, VALS(x2ap_CauseMisc_vals), 0, "x2ap.CauseMisc", HFILL }}, + { &hf_x2ap_cell_Size, + { "cell-Size", "x2ap.cell_Size", + FT_UINT32, BASE_DEC, VALS(x2ap_Cell_Size_vals), 0, + "x2ap.Cell_Size", HFILL }}, { &hf_x2ap_pDCP_SN, { "pDCP-SN", "x2ap.pDCP_SN", FT_UINT32, BASE_DEC, NULL, 0, @@ -3273,10 +4121,6 @@ void proto_register_x2ap(void) { { "hFN", "x2ap.hFN", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.HFN", HFILL }}, - { &hf_x2ap_iE_Extensions, - { "iE-Extensions", "x2ap.iE_Extensions", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.ProtocolExtensionContainer", HFILL }}, { &hf_x2ap_procedureCode, { "procedureCode", "x2ap.procedureCode", FT_UINT32, BASE_DEC, VALS(x2ap_ProcedureCode_vals), 0, @@ -3309,6 +4153,46 @@ void proto_register_x2ap(void) { { "typeOfError", "x2ap.typeOfError", FT_UINT32, BASE_DEC, VALS(x2ap_TypeOfError_vals), 0, "x2ap.TypeOfError", HFILL }}, + { &hf_x2ap_uL_EARFCN, + { "uL-EARFCN", "x2ap.uL_EARFCN", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.EARFCN", HFILL }}, + { &hf_x2ap_dL_EARFCN, + { "dL-EARFCN", "x2ap.dL_EARFCN", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.EARFCN", HFILL }}, + { &hf_x2ap_uL_Transmission_Bandwidth, + { "uL-Transmission-Bandwidth", "x2ap.uL_Transmission_Bandwidth", + FT_UINT32, BASE_DEC, VALS(x2ap_Transmission_Bandwidth_vals), 0, + "x2ap.Transmission_Bandwidth", HFILL }}, + { &hf_x2ap_dL_Transmission_Bandwidth, + { "dL-Transmission-Bandwidth", "x2ap.dL_Transmission_Bandwidth", + FT_UINT32, BASE_DEC, VALS(x2ap_Transmission_Bandwidth_vals), 0, + "x2ap.Transmission_Bandwidth", HFILL }}, + { &hf_x2ap_eARFCN, + { "eARFCN", "x2ap.eARFCN", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.EARFCN", HFILL }}, + { &hf_x2ap_transmission_Bandwidth, + { "transmission-Bandwidth", "x2ap.transmission_Bandwidth", + FT_UINT32, BASE_DEC, VALS(x2ap_Transmission_Bandwidth_vals), 0, + "x2ap.Transmission_Bandwidth", HFILL }}, + { &hf_x2ap_subframeAssignment, + { "subframeAssignment", "x2ap.subframeAssignment", + FT_UINT32, BASE_DEC, VALS(x2ap_SubframeAssignment_vals), 0, + "x2ap.SubframeAssignment", HFILL }}, + { &hf_x2ap_specialSubframe_Info, + { "specialSubframe-Info", "x2ap.specialSubframe_Info", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.SpecialSubframe_Info", HFILL }}, + { &hf_x2ap_fDD, + { "fDD", "x2ap.fDD", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.FDD_Info", HFILL }}, + { &hf_x2ap_tDD, + { "tDD", "x2ap.tDD", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.TDD_Info", HFILL }}, { &hf_x2ap_pLMN_Identity, { "pLMN-Identity", "x2ap.pLMN_Identity", FT_BYTES, BASE_NONE, NULL, 0, @@ -3329,6 +4213,30 @@ void proto_register_x2ap(void) { { "PLMN-Identity", "x2ap.PLMN_Identity", FT_BYTES, BASE_NONE, NULL, 0, "x2ap.PLMN_Identity", HFILL }}, + { &hf_x2ap_qCI, + { "qCI", "x2ap.qCI", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.QCI", HFILL }}, + { &hf_x2ap_allocationAndRetentionPriority, + { "allocationAndRetentionPriority", "x2ap.allocationAndRetentionPriority", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.AllocationAndRetentionPriority", HFILL }}, + { &hf_x2ap_gbrQosInformation, + { "gbrQosInformation", "x2ap.gbrQosInformation", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.GBR_QosInformation", HFILL }}, + { &hf_x2ap_E_RAB_List_item, + { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.ProtocolIE_Single_Container", HFILL }}, + { &hf_x2ap_e_RAB_ID, + { "e-RAB-ID", "x2ap.e_RAB_ID", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.E_RAB_ID", HFILL }}, + { &hf_x2ap_cause, + { "cause", "x2ap.cause", + FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0, + "x2ap.Cause", HFILL }}, { &hf_x2ap_ForbiddenTAs_item, { "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item", FT_NONE, BASE_NONE, NULL, 0, @@ -3353,20 +4261,20 @@ void proto_register_x2ap(void) { { "LAC", "x2ap.LAC", FT_BYTES, BASE_NONE, NULL, 0, "x2ap.LAC", HFILL }}, - { &hf_x2ap_sAE_Bearer_MaximumBitrateDL, - { "sAE-Bearer-MaximumBitrateDL", "x2ap.sAE_Bearer_MaximumBitrateDL", + { &hf_x2ap_e_RAB_MaximumBitrateDL, + { "e-RAB-MaximumBitrateDL", "x2ap.e_RAB_MaximumBitrateDL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, - { &hf_x2ap_sAE_Bearer_MaximumBitrateUL, - { "sAE-Bearer-MaximumBitrateUL", "x2ap.sAE_Bearer_MaximumBitrateUL", + { &hf_x2ap_e_RAB_MaximumBitrateUL, + { "e-RAB-MaximumBitrateUL", "x2ap.e_RAB_MaximumBitrateUL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateDL, - { "sAE-Bearer-GuaranteedBitrateDL", "x2ap.sAE_Bearer_GuaranteedBitrateDL", + { &hf_x2ap_e_RAB_GuaranteedBitrateDL, + { "e-RAB-GuaranteedBitrateDL", "x2ap.e_RAB_GuaranteedBitrateDL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, - { &hf_x2ap_sAE_Bearer_GuaranteedBitrateUL, - { "sAE-Bearer-GuaranteedBitrateUL", "x2ap.sAE_Bearer_GuaranteedBitrateUL", + { &hf_x2ap_e_RAB_GuaranteedBitrateUL, + { "e-RAB-GuaranteedBitrateUL", "x2ap.e_RAB_GuaranteedBitrateUL", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, { &hf_x2ap_eNB_ID, @@ -3417,30 +4325,42 @@ void proto_register_x2ap(void) { { "forbiddenInterRATs", "x2ap.forbiddenInterRATs", FT_UINT32, BASE_DEC, VALS(x2ap_ForbiddenInterRATs_vals), 0, "x2ap.ForbiddenInterRATs", HFILL }}, - { &hf_x2ap_InterfacesToTrace_item, - { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", + { &hf_x2ap_dLHWLoadIndicator, + { "dLHWLoadIndicator", "x2ap.dLHWLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, + { &hf_x2ap_uLHWLoadIndicator, + { "uLHWLoadIndicator", "x2ap.uLHWLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, + { &hf_x2ap_e_UTRAN_Cell, + { "e-UTRAN-Cell", "x2ap.e_UTRAN_Cell", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_traceInterface, - { "traceInterface", "x2ap.traceInterface", - FT_UINT32, BASE_DEC, VALS(x2ap_TraceInterface_vals), 0, - "x2ap.TraceInterface", HFILL }}, - { &hf_x2ap_traceDepth, - { "traceDepth", "x2ap.traceDepth", - FT_UINT32, BASE_DEC, VALS(x2ap_TraceDepth_vals), 0, - "x2ap.TraceDepth", HFILL }}, + "x2ap.LastVisitedEUTRANCellInformation", HFILL }}, + { &hf_x2ap_uTRAN_Cell, + { "uTRAN-Cell", "x2ap.uTRAN_Cell", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.LastVisitedUTRANCellInformation", HFILL }}, + { &hf_x2ap_gERAN_Cell, + { "gERAN-Cell", "x2ap.gERAN_Cell", + FT_UINT32, BASE_DEC, VALS(x2ap_LastVisitedGERANCellInformation_vals), 0, + "x2ap.LastVisitedGERANCellInformation", HFILL }}, { &hf_x2ap_global_Cell_ID, { "global-Cell-ID", "x2ap.global_Cell_ID", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, { &hf_x2ap_cellType, { "cellType", "x2ap.cellType", - FT_UINT32, BASE_DEC, VALS(x2ap_CellType_vals), 0, + FT_NONE, BASE_NONE, NULL, 0, "x2ap.CellType", HFILL }}, { &hf_x2ap_time_UE_StayedInCell, { "time-UE-StayedInCell", "x2ap.time_UE_StayedInCell", - FT_INT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "x2ap.Time_UE_StayedInCell", HFILL }}, + { &hf_x2ap_undefined, + { "undefined", "x2ap.undefined", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.NULL", HFILL }}, { &hf_x2ap_eventType, { "eventType", "x2ap.eventType", FT_UINT32, BASE_DEC, VALS(x2ap_EventType_vals), 0, @@ -3449,6 +4369,18 @@ void proto_register_x2ap(void) { { "reportArea", "x2ap.reportArea", FT_UINT32, BASE_DEC, VALS(x2ap_ReportArea_vals), 0, "x2ap.ReportArea", HFILL }}, + { &hf_x2ap_Neighbour_Information_item, + { "Neighbour-Information item", "x2ap.Neighbour_Information_item", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.Neighbour_Information_item", HFILL }}, + { &hf_x2ap_eCGI, + { "eCGI", "x2ap.eCGI", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.ECGI", HFILL }}, + { &hf_x2ap_pCI, + { "pCI", "x2ap.pCI", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.PCI", HFILL }}, { &hf_x2ap_rNTP_PerPRB, { "rNTP-PerPRB", "x2ap.rNTP_PerPRB", FT_BYTES, BASE_NONE, NULL, 0, @@ -3469,26 +4401,50 @@ void proto_register_x2ap(void) { { "pDCCH-InterferenceImpact", "x2ap.pDCCH_InterferenceImpact", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.INTEGER_0_4_", HFILL }}, - { &hf_x2ap_qCI, - { "qCI", "x2ap.qCI", + { &hf_x2ap_dL_GBR_PRB_usage, + { "dL-GBR-PRB-usage", "x2ap.dL_GBR_PRB_usage", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.QCI", HFILL }}, - { &hf_x2ap_allocationAndRetentionPriority, - { "allocationAndRetentionPriority", "x2ap.allocationAndRetentionPriority", + "x2ap.DL_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_uL_GBR_PRB_usage, + { "uL-GBR-PRB-usage", "x2ap.uL_GBR_PRB_usage", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.AllocationAndRetentionPriority", HFILL }}, - { &hf_x2ap_gbrQosInformation, - { "gbrQosInformation", "x2ap.gbrQosInformation", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.GBR_QosInformation", HFILL }}, + "x2ap.UL_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_dL_non_GBR_PRB_usage, + { "dL-non-GBR-PRB-usage", "x2ap.dL_non_GBR_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.DL_non_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_uL_non_GBR_PRB_usage, + { "uL-non-GBR-PRB-usage", "x2ap.uL_non_GBR_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.UL_non_GBR_PRB_usage", HFILL }}, + { &hf_x2ap_dL_Total_PRB_usage, + { "dL-Total-PRB-usage", "x2ap.dL_Total_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.DL_Total_PRB_usage", HFILL }}, + { &hf_x2ap_uL_Total_PRB_usage, + { "uL-Total-PRB-usage", "x2ap.uL_Total_PRB_usage", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.UL_Total_PRB_usage", HFILL }}, + { &hf_x2ap_dLS1TNLLoadIndicator, + { "dLS1TNLLoadIndicator", "x2ap.dLS1TNLLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, + { &hf_x2ap_uLS1TNLLoadIndicator, + { "uLS1TNLLoadIndicator", "x2ap.uLS1TNLLoadIndicator", + FT_UINT32, BASE_DEC, VALS(x2ap_LoadIndicator_vals), 0, + "x2ap.LoadIndicator", HFILL }}, { &hf_x2ap_ServedCells_item, - { "ServedCell-Information", "x2ap.ServedCell_Information", + { "ServedCells item", "x2ap.ServedCells_item", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.ServedCells_item", HFILL }}, + { &hf_x2ap_servedCellInfo, + { "servedCellInfo", "x2ap.servedCellInfo", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ServedCell_Information", HFILL }}, - { &hf_x2ap_phyCID, - { "phyCID", "x2ap.phyCID", + { &hf_x2ap_neighbour_Info, + { "neighbour-Info", "x2ap.neighbour_Info", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.PhyCID", HFILL }}, + "x2ap.Neighbour_Information", HFILL }}, { &hf_x2ap_cellId, { "cellId", "x2ap.cellId", FT_NONE, BASE_NONE, NULL, 0, @@ -3501,29 +4457,41 @@ void proto_register_x2ap(void) { { "broadcastPLMNs", "x2ap.broadcastPLMNs", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BroadcastPLMNs_Item", HFILL }}, - { &hf_x2ap_uL_EARFCN, - { "uL-EARFCN", "x2ap.uL_EARFCN", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.EARFCN", HFILL }}, - { &hf_x2ap_dL_EARFCN, - { "dL-EARFCN", "x2ap.dL_EARFCN", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.EARFCN", HFILL }}, - { &hf_x2ap_cell_Transmission_Bandwidth, - { "cell-Transmission-Bandwidth", "x2ap.cell_Transmission_Bandwidth", - FT_UINT32, BASE_DEC, VALS(x2ap_Cell_Transmission_Bandwidth_vals), 0, - "x2ap.Cell_Transmission_Bandwidth", HFILL }}, - { &hf_x2ap_traceReference, - { "traceReference", "x2ap.traceReference", + { &hf_x2ap_eUTRA_Mode_Info, + { "eUTRA-Mode-Info", "x2ap.eUTRA_Mode_Info", + FT_UINT32, BASE_DEC, VALS(x2ap_EUTRA_Mode_Info_vals), 0, + "x2ap.EUTRA_Mode_Info", HFILL }}, + { &hf_x2ap_specialSubframePatterns, + { "specialSubframePatterns", "x2ap.specialSubframePatterns", + FT_UINT32, BASE_DEC, VALS(x2ap_SpecialSubframePatterns_vals), 0, + "x2ap.SpecialSubframePatterns", HFILL }}, + { &hf_x2ap_cyclicPrefixDL, + { "cyclicPrefixDL", "x2ap.cyclicPrefixDL", + FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixDL_vals), 0, + "x2ap.CyclicPrefixDL", HFILL }}, + { &hf_x2ap_cyclicPrefixUL, + { "cyclicPrefixUL", "x2ap.cyclicPrefixUL", + FT_UINT32, BASE_DEC, VALS(x2ap_CyclicPrefixUL_vals), 0, + "x2ap.CyclicPrefixUL", HFILL }}, + { &hf_x2ap_eUTRANTraceID, + { "eUTRANTraceID", "x2ap.eUTRANTraceID", FT_BYTES, BASE_NONE, NULL, 0, - "x2ap.TraceReference", HFILL }}, + "x2ap.EUTRANTraceID", HFILL }}, { &hf_x2ap_interfacesToTrace, { "interfacesToTrace", "x2ap.interfacesToTrace", - FT_UINT32, BASE_DEC, NULL, 0, + FT_BYTES, BASE_NONE, NULL, 0, "x2ap.InterfacesToTrace", HFILL }}, + { &hf_x2ap_traceDepth, + { "traceDepth", "x2ap.traceDepth", + FT_UINT32, BASE_DEC, VALS(x2ap_TraceDepth_vals), 0, + "x2ap.TraceDepth", HFILL }}, + { &hf_x2ap_traceCollectionEntityIPAddress, + { "traceCollectionEntityIPAddress", "x2ap.traceCollectionEntityIPAddress", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.TraceCollectionEntityIPAddress", HFILL }}, { &hf_x2ap_UE_HistoryInformation_item, { "LastVisitedCell-Item", "x2ap.LastVisitedCell_Item", - FT_NONE, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, VALS(x2ap_LastVisitedCell_Item_vals), 0, "x2ap.LastVisitedCell_Item", HFILL }}, { &hf_x2ap_uEaggregateMaximumBitRateDownlink, { "uEaggregateMaximumBitRateDownlink", "x2ap.uEaggregateMaximumBitRateDownlink", @@ -3533,6 +4501,14 @@ void proto_register_x2ap(void) { { "uEaggregateMaximumBitRateUplink", "x2ap.uEaggregateMaximumBitRateUplink", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.BitRate", HFILL }}, + { &hf_x2ap_encryptionAlgorithms, + { "encryptionAlgorithms", "x2ap.encryptionAlgorithms", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.EncryptionAlgorithms", HFILL }}, + { &hf_x2ap_integrityProtectionAlgorithms, + { "integrityProtectionAlgorithms", "x2ap.integrityProtectionAlgorithms", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.IntegrityProtectionAlgorithms", HFILL }}, { &hf_x2ap_UL_InterferenceOverloadIndication_item, { "UL-InterferenceOverloadIndication-Item", "x2ap.UL_InterferenceOverloadIndication_Item", FT_UINT32, BASE_DEC, VALS(x2ap_UL_InterferenceOverloadIndication_Item_vals), 0, @@ -3541,14 +4517,14 @@ void proto_register_x2ap(void) { { "UL-HighInterferenceIndicationInfo-Item", "x2ap.UL_HighInterferenceIndicationInfo_Item", FT_NONE, BASE_NONE, NULL, 0, "x2ap.UL_HighInterferenceIndicationInfo_Item", HFILL }}, - { &hf_x2ap_ul_interferenceindication, - { "ul-interferenceindication", "x2ap.ul_interferenceindication", - FT_BYTES, BASE_NONE, NULL, 0, - "x2ap.UL_HighInterferenceIndication", HFILL }}, { &hf_x2ap_target_Cell_ID, { "target-Cell-ID", "x2ap.target_Cell_ID", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, + { &hf_x2ap_ul_interferenceindication, + { "ul-interferenceindication", "x2ap.ul_interferenceindication", + FT_BYTES, BASE_NONE, NULL, 0, + "x2ap.UL_HighInterferenceIndication", HFILL }}, { &hf_x2ap_protocolIEs, { "protocolIEs", "x2ap.protocolIEs", FT_UINT32, BASE_DEC, NULL, 0, @@ -3557,6 +4533,14 @@ void proto_register_x2ap(void) { { "mME-UE-S1AP-ID", "x2ap.mME_UE_S1AP_ID", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.UE_S1AP_ID", HFILL }}, + { &hf_x2ap_uESecurityCapabilities, + { "uESecurityCapabilities", "x2ap.uESecurityCapabilities", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.UESecurityCapabilities", HFILL }}, + { &hf_x2ap_aS_SecurityInformation, + { "aS-SecurityInformation", "x2ap.aS_SecurityInformation", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.AS_SecurityInformation", HFILL }}, { &hf_x2ap_uEaggregateMaximumBitRate, { "uEaggregateMaximumBitRate", "x2ap.uEaggregateMaximumBitRate", FT_NONE, BASE_NONE, NULL, 0, @@ -3565,10 +4549,10 @@ void proto_register_x2ap(void) { { "subscriberProfileIDforRFP", "x2ap.subscriberProfileIDforRFP", FT_UINT32, BASE_DEC, NULL, 0, "x2ap.SubscriberProfileIDforRFP", HFILL }}, - { &hf_x2ap_bearers_ToBeSetup_List, - { "bearers-ToBeSetup-List", "x2ap.bearers_ToBeSetup_List", + { &hf_x2ap_e_RABs_ToBeSetup_List, + { "e-RABs-ToBeSetup-List", "x2ap.e_RABs_ToBeSetup_List", FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearers_ToBeSetup_List", HFILL }}, + "x2ap.E_RABs_ToBeSetup_List", HFILL }}, { &hf_x2ap_rRC_Context, { "rRC-Context", "x2ap.rRC_Context", FT_BYTES, BASE_NONE, NULL, 0, @@ -3581,18 +4565,14 @@ void proto_register_x2ap(void) { { "locationReportingInformation", "x2ap.locationReportingInformation", FT_NONE, BASE_NONE, NULL, 0, "x2ap.LocationReportingInformation", HFILL }}, - { &hf_x2ap_Bearers_ToBeSetup_List_item, + { &hf_x2ap_E_RABs_ToBeSetup_List_item, { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_sAE_Bearer_ID, - { "sAE-Bearer-ID", "x2ap.sAE_Bearer_ID", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearer_ID", HFILL }}, - { &hf_x2ap_sAE_BearerLevel_QoS_Parameters, - { "sAE-BearerLevel-QoS-Parameters", "x2ap.sAE_BearerLevel_QoS_Parameters", + { &hf_x2ap_e_RAB_Level_QoS_Parameters, + { "e-RAB-Level-QoS-Parameters", "x2ap.e_RAB_Level_QoS_Parameters", FT_NONE, BASE_NONE, NULL, 0, - "x2ap.SAE_BearerLevel_QoS_Parameters", HFILL }}, + "x2ap.E_RAB_Level_QoS_Parameters", HFILL }}, { &hf_x2ap_dL_Forwarding, { "dL-Forwarding", "x2ap.dL_Forwarding", FT_UINT32, BASE_DEC, VALS(x2ap_DL_Forwarding_vals), 0, @@ -3601,14 +4581,10 @@ void proto_register_x2ap(void) { { "uL-GTPtunnelEndpoint", "x2ap.uL_GTPtunnelEndpoint", FT_NONE, BASE_NONE, NULL, 0, "x2ap.GTPtunnelEndpoint", HFILL }}, - { &hf_x2ap_Bearers_Admitted_List_item, + { &hf_x2ap_E_RABs_Admitted_List_item, { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_bearer_ID, - { "bearer-ID", "x2ap.bearer_ID", - FT_UINT32, BASE_DEC, NULL, 0, - "x2ap.Bearer_ID", HFILL }}, { &hf_x2ap_uL_GTP_TunnelEndpoint, { "uL-GTP-TunnelEndpoint", "x2ap.uL_GTP_TunnelEndpoint", FT_NONE, BASE_NONE, NULL, 0, @@ -3617,15 +4593,7 @@ void proto_register_x2ap(void) { { "dL-GTP-TunnelEndpoint", "x2ap.dL_GTP_TunnelEndpoint", FT_NONE, BASE_NONE, NULL, 0, "x2ap.GTPtunnelEndpoint", HFILL }}, - { &hf_x2ap_Bearers_NotAdmitted_List_item, - { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_cause, - { "cause", "x2ap.cause", - FT_UINT32, BASE_DEC, VALS(x2ap_Cause_vals), 0, - "x2ap.Cause", HFILL }}, - { &hf_x2ap_Bearers_SubjectToStatusTransfer_List_item, + { &hf_x2ap_E_RABs_SubjectToStatusTransfer_List_item, { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, @@ -3669,10 +4637,6 @@ void proto_register_x2ap(void) { { "old-ecgi", "x2ap.old_ecgi", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ECGI", HFILL }}, - { &hf_x2ap_served_cells, - { "served-cells", "x2ap.served_cells", - FT_NONE, BASE_NONE, NULL, 0, - "x2ap.ServedCell_Information", HFILL }}, { &hf_x2ap_Old_ECGIs_item, { "ECGI", "x2ap.ECGI", FT_NONE, BASE_NONE, NULL, 0, @@ -3685,10 +4649,22 @@ void proto_register_x2ap(void) { { "ProtocolIE-Single-Container", "x2ap.ProtocolIE_Single_Container", FT_NONE, BASE_NONE, NULL, 0, "x2ap.ProtocolIE_Single_Container", HFILL }}, - { &hf_x2ap_resoureStatus, - { "resoureStatus", "x2ap.resoureStatus", - FT_INT32, BASE_DEC, NULL, 0, - "x2ap.ResourceStatus", HFILL }}, + { &hf_x2ap_hWOverLoadIndicator, + { "hWOverLoadIndicator", "x2ap.hWOverLoadIndicator", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.HWLoadIndicator", HFILL }}, + { &hf_x2ap_s1TNLOverLoadIndicator, + { "s1TNLOverLoadIndicator", "x2ap.s1TNLOverLoadIndicator", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.S1TNLLoadIndicator", HFILL }}, + { &hf_x2ap_radioresourceStatus, + { "radioresourceStatus", "x2ap.radioresourceStatus", + FT_NONE, BASE_NONE, NULL, 0, + "x2ap.RadioResourceStatus", HFILL }}, + { &hf_x2ap_privateIEs, + { "privateIEs", "x2ap.privateIEs", + FT_UINT32, BASE_DEC, NULL, 0, + "x2ap.PrivateIE_Container", HFILL }}, { &hf_x2ap_initiatingMessage, { "initiatingMessage", "x2ap.initiatingMessage", FT_NONE, BASE_NONE, NULL, 0, @@ -3724,19 +4700,31 @@ void proto_register_x2ap(void) { /*--- Included file: packet-x2ap-ettarr.c ---*/ #line 1 "packet-x2ap-ettarr.c" + &ett_x2ap_PrivateIE_ID, &ett_x2ap_ProtocolIE_Container, &ett_x2ap_ProtocolIE_Field, &ett_x2ap_ProtocolExtensionContainer, &ett_x2ap_ProtocolExtensionField, + &ett_x2ap_PrivateIE_Container, + &ett_x2ap_PrivateIE_Field, + &ett_x2ap_AS_SecurityInformation, + &ett_x2ap_AllocationAndRetentionPriority, &ett_x2ap_BroadcastPLMNs_Item, &ett_x2ap_Cause, + &ett_x2ap_CellType, &ett_x2ap_COUNTvalue, &ett_x2ap_CriticalityDiagnostics, &ett_x2ap_CriticalityDiagnostics_IE_List, &ett_x2ap_CriticalityDiagnostics_IE_List_item, + &ett_x2ap_FDD_Info, + &ett_x2ap_TDD_Info, + &ett_x2ap_EUTRA_Mode_Info, &ett_x2ap_ECGI, &ett_x2ap_ENB_ID, &ett_x2ap_EPLMNs, + &ett_x2ap_E_RAB_Level_QoS_Parameters, + &ett_x2ap_E_RAB_List, + &ett_x2ap_E_RAB_Item, &ett_x2ap_ForbiddenTAs, &ett_x2ap_ForbiddenTAs_Item, &ett_x2ap_ForbiddenTACs, @@ -3750,33 +4738,38 @@ void proto_register_x2ap(void) { &ett_x2ap_GU_Group_ID, &ett_x2ap_GUMMEI, &ett_x2ap_HandoverRestrictionList, - &ett_x2ap_InterfacesToTrace, - &ett_x2ap_InterfacesToTrace_Item, + &ett_x2ap_HWLoadIndicator, &ett_x2ap_LastVisitedCell_Item, + &ett_x2ap_LastVisitedEUTRANCellInformation, + &ett_x2ap_LastVisitedGERANCellInformation, &ett_x2ap_LocationReportingInformation, + &ett_x2ap_Neighbour_Information, + &ett_x2ap_Neighbour_Information_item, &ett_x2ap_RelativeNarrowbandTxPower, - &ett_x2ap_SAE_BearerLevel_QoS_Parameters, + &ett_x2ap_RadioResourceStatus, + &ett_x2ap_S1TNLLoadIndicator, &ett_x2ap_ServedCells, + &ett_x2ap_ServedCells_item, &ett_x2ap_ServedCell_Information, + &ett_x2ap_SpecialSubframe_Info, &ett_x2ap_TraceActivation, &ett_x2ap_UE_HistoryInformation, &ett_x2ap_UEAggregateMaximumBitRate, + &ett_x2ap_UESecurityCapabilities, &ett_x2ap_UL_InterferenceOverloadIndication, &ett_x2ap_UL_HighInterferenceIndicationInfo, &ett_x2ap_UL_HighInterferenceIndicationInfo_Item, &ett_x2ap_HandoverRequest, &ett_x2ap_UE_ContextInformation, - &ett_x2ap_Bearers_ToBeSetup_List, - &ett_x2ap_Bearers_ToBeSetup_Item, + &ett_x2ap_E_RABs_ToBeSetup_List, + &ett_x2ap_E_RABs_ToBeSetup_Item, &ett_x2ap_HandoverRequestAcknowledge, - &ett_x2ap_Bearers_Admitted_List, - &ett_x2ap_Bearers_Admitted_Item, - &ett_x2ap_Bearers_NotAdmitted_List, - &ett_x2ap_Bearers_NotAdmitted_Item, + &ett_x2ap_E_RABs_Admitted_List, + &ett_x2ap_E_RABs_Admitted_Item, &ett_x2ap_HandoverPreparationFailure, &ett_x2ap_SNStatusTransfer, - &ett_x2ap_Bearers_SubjectToStatusTransfer_List, - &ett_x2ap_Bearers_SubjectToStatusTransfer_Item, + &ett_x2ap_E_RABs_SubjectToStatusTransfer_List, + &ett_x2ap_E_RABs_SubjectToStatusTransfer_Item, &ett_x2ap_UEContextRelease, &ett_x2ap_HandoverCancel, &ett_x2ap_ErrorIndication, @@ -3802,6 +4795,7 @@ void proto_register_x2ap(void) { &ett_x2ap_ResourceStatusUpdate, &ett_x2ap_CellMeasurementResult_List, &ett_x2ap_CellMeasurementResult_Item, + &ett_x2ap_PrivateMessage, &ett_x2ap_X2AP_PDU, &ett_x2ap_InitiatingMessage, &ett_x2ap_SuccessfulOutcome, @@ -3843,15 +4837,14 @@ proto_reg_handoff_x2ap(void) /*--- Included file: packet-x2ap-dis-tab.c ---*/ #line 1 "packet-x2ap-dis-tab.c" - dissector_add("x2ap.ies", id_Bearers_Admitted_Item, new_create_dissector_handle(dissect_Bearers_Admitted_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_Admitted_List, new_create_dissector_handle(dissect_Bearers_Admitted_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_NotAdmitted_Item, new_create_dissector_handle(dissect_Bearers_NotAdmitted_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_NotAdmitted_List, new_create_dissector_handle(dissect_Bearers_NotAdmitted_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_ToBeSetup_Item, new_create_dissector_handle(dissect_Bearers_ToBeSetup_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_Admitted_Item, new_create_dissector_handle(dissect_E_RABs_Admitted_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_Admitted_List, new_create_dissector_handle(dissect_E_RABs_Admitted_List_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RAB_Item, new_create_dissector_handle(dissect_E_RAB_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_NotAdmitted_List, new_create_dissector_handle(dissect_E_RAB_List_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_ToBeSetup_Item, new_create_dissector_handle(dissect_E_RABs_ToBeSetup_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_Cause, new_create_dissector_handle(dissect_Cause_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellInformation, new_create_dissector_handle(dissect_CellInformation_List_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellInformation_Item, new_create_dissector_handle(dissect_CellInformation_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_InterfacesToTrace_Item, new_create_dissector_handle(dissect_InterfacesToTrace_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_New_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_Old_eNB_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_TargetCell_ID, new_create_dissector_handle(dissect_ECGI_PDU, proto_x2ap)); @@ -3861,8 +4854,8 @@ proto_reg_handoff_x2ap(void) dissector_add("x2ap.ies", id_UE_HistoryInformation, new_create_dissector_handle(dissect_UE_HistoryInformation_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_UE_X2AP_ID, new_create_dissector_handle(dissect_UE_X2AP_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CriticalityDiagnostics, new_create_dissector_handle(dissect_CriticalityDiagnostics_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_SubjectToStatusTransfer_List, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_Bearers_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_Item_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_List, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_List_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_E_RABs_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_E_RABs_SubjectToStatusTransfer_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_ServedCells, new_create_dissector_handle(dissect_ServedCells_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_GlobalENB_ID, new_create_dissector_handle(dissect_GlobalENB_ID_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_TimeToWait, new_create_dissector_handle(dissect_TimeToWait_PDU, proto_x2ap)); @@ -3873,12 +4866,17 @@ proto_reg_handoff_x2ap(void) dissector_add("x2ap.ies", id_ServedCellsToDelete, new_create_dissector_handle(dissect_Old_ECGIs_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_Registration_Request, new_create_dissector_handle(dissect_Registration_Request_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellToReport, new_create_dissector_handle(dissect_CellToReport_List_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_ReportingPeriodicity, new_create_dissector_handle(dissect_ReportingPeriod_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ReportingPeriodicity, new_create_dissector_handle(dissect_ReportingPeriodicity_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellToReport_Item, new_create_dissector_handle(dissect_CellToReport_Item_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellMeasurementResult, new_create_dissector_handle(dissect_CellMeasurementResult_List_PDU, proto_x2ap)); dissector_add("x2ap.ies", id_CellMeasurementResult_Item, new_create_dissector_handle(dissect_CellMeasurementResult_Item_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_GUGroupIDListToAdd, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); - dissector_add("x2ap.ies", id_GUGroupIDListToDelete, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_GUGroupIDToAddList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_GUGroupIDToDeleteList, new_create_dissector_handle(dissect_GUGroupIDList_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_SRVCCOperationPossible, new_create_dissector_handle(dissect_SRVCCOperationPossible_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ReportCharacteristics, new_create_dissector_handle(dissect_ReportCharacteristics_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ENB1_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap)); + dissector_add("x2ap.ies", id_ENB2_Measurement_ID, new_create_dissector_handle(dissect_Measurement_ID_PDU, proto_x2ap)); + dissector_add("x2ap.extension", id_Number_of_Antennaports, new_create_dissector_handle(dissect_Number_of_Antennaports_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.imsg", "id-handoverPreparation", new_create_dissector_handle(dissect_HandoverRequest_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.sout", "id-handoverPreparation", new_create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.uout", "id-handoverPreparation", new_create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_x2ap)); @@ -3895,10 +4893,11 @@ proto_reg_handoff_x2ap(void) dissector_add_string("x2ap.proc.imsg", "id-eNBConfigurationUpdate", new_create_dissector_handle(dissect_ENBConfigurationUpdate_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.sout", "id-eNBConfigurationUpdate", new_create_dissector_handle(dissect_ENBConfigurationUpdateAcknowledge_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.uout", "id-eNBConfigurationUpdate", new_create_dissector_handle(dissect_ENBConfigurationUpdateFailure_PDU, proto_x2ap)); - dissector_add_string("x2ap.proc.imsg", "id-resourceStatusUpdateInitiation", new_create_dissector_handle(dissect_ResourceStatusRequest_PDU, proto_x2ap)); - dissector_add_string("x2ap.proc.sout", "id-resourceStatusUpdateInitiation", new_create_dissector_handle(dissect_ResourceStatusResponse_PDU, proto_x2ap)); - dissector_add_string("x2ap.proc.uout", "id-resourceStatusUpdateInitiation", new_create_dissector_handle(dissect_ResourceStatusFailure_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.imsg", "id-resourceStatusReportingInitiation", new_create_dissector_handle(dissect_ResourceStatusRequest_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.sout", "id-resourceStatusReportingInitiation", new_create_dissector_handle(dissect_ResourceStatusResponse_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.uout", "id-resourceStatusReportingInitiation", new_create_dissector_handle(dissect_ResourceStatusFailure_PDU, proto_x2ap)); dissector_add_string("x2ap.proc.imsg", "id-resourceStatusReporting", new_create_dissector_handle(dissect_ResourceStatusUpdate_PDU, proto_x2ap)); + dissector_add_string("x2ap.proc.imsg", "id-privateMessage", new_create_dissector_handle(dissect_PrivateMessage_PDU, proto_x2ap)); /*--- End of included file: packet-x2ap-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 1d780ff1f8..37d08942fd 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x411.c */ -/* ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn */ +/* ../../tools/asn2wrs.py -b -e -p x411 -c ./x411.cnf -s ./packet-x411-template -D . MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn */ /* Input file: packet-x411-template.c */ @@ -253,46 +253,40 @@ static int hf_x411_authenticated_result = -1; /* AuthenticatedResult */ static int hf_x411_authenticated_responder_name = -1; /* MTAName */ static int hf_x411_responder_credentials = -1; /* ResponderCredentials */ static int hf_x411_message = -1; /* Message */ -static int hf_x411_report = -1; /* Report */ static int hf_x411_probe = -1; /* Probe */ +static int hf_x411_report = -1; /* Report */ static int hf_x411_message_envelope = -1; /* MessageTransferEnvelope */ static int hf_x411_content = -1; /* Content */ static int hf_x411_report_envelope = -1; /* ReportTransferEnvelope */ static int hf_x411_report_content = -1; /* ReportTransferContent */ static int hf_x411_message_identifier = -1; /* MessageIdentifier */ -static int hf_x411_mta_originator_name = -1; /* MTAOriginatorName */ +static int hf_x411_originator_name = -1; /* MTAOriginatorName */ static int hf_x411_original_encoded_information_types = -1; /* OriginalEncodedInformationTypes */ static int hf_x411_content_type = -1; /* ContentType */ static int hf_x411_content_identifier = -1; /* ContentIdentifier */ static int hf_x411_priority = -1; /* Priority */ static int hf_x411_per_message_indicators = -1; /* PerMessageIndicators */ static int hf_x411_deferred_delivery_time = -1; /* DeferredDeliveryTime */ -static int hf_x411_per_domain_bilateral_information = -1; /* SEQUENCE_OF_PerDomainBilateralInformation */ +static int hf_x411_per_domain_bilateral_information = -1; /* SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation */ static int hf_x411_per_domain_bilateral_information_item = -1; /* PerDomainBilateralInformation */ static int hf_x411_trace_information = -1; /* TraceInformation */ static int hf_x411_extensions = -1; /* SET_OF_ExtensionField */ static int hf_x411_extensions_item = -1; /* ExtensionField */ -static int hf_x411_per_recipient_message_fields = -1; /* SEQUENCE_OF_PerRecipientMessageTransferFields */ -static int hf_x411_per_recipient_message_fields_item = -1; /* PerRecipientMessageTransferFields */ static int hf_x411_recipient_name = -1; /* MTARecipientName */ static int hf_x411_originally_specified_recipient_number = -1; /* OriginallySpecifiedRecipientNumber */ static int hf_x411_per_recipient_indicators = -1; /* PerRecipientIndicators */ static int hf_x411_explicit_conversion = -1; /* ExplicitConversion */ static int hf_x411_probe_identifier = -1; /* ProbeIdentifier */ static int hf_x411_content_length = -1; /* ContentLength */ -static int hf_x411_per_recipient_probe_transfer_fields = -1; /* SEQUENCE_OF_PerRecipientProbeTransferFields */ -static int hf_x411_per_recipient_probe_transfer_fields_item = -1; /* PerRecipientProbeTransferFields */ static int hf_x411_report_identifier = -1; /* ReportIdentifier */ static int hf_x411_report_destination_name = -1; /* ReportDestinationName */ static int hf_x411_subject_identifier = -1; /* SubjectIdentifier */ static int hf_x411_subject_intermediate_trace_information = -1; /* SubjectIntermediateTraceInformation */ static int hf_x411_returned_content = -1; /* Content */ static int hf_x411_additional_information = -1; /* AdditionalInformation */ -static int hf_x411_per_recipient_report_fields = -1; /* SEQUENCE_OF_PerRecipientReportTransferFields */ -static int hf_x411_per_recipient_report_fields_item = -1; /* PerRecipientReportTransferFields */ static int hf_x411_mta_actual_recipient_name = -1; /* MTAActualRecipientName */ static int hf_x411_last_trace_information = -1; /* LastTraceInformation */ -static int hf_x411_report_originally_intended_recipient_name = -1; /* MTAOriginallyIntendedRecipientName */ +static int hf_x411_report_originally_intended_recipient_name = -1; /* OriginallyIntendedRecipientName */ static int hf_x411_supplementary_information = -1; /* SupplementaryInformation */ static int hf_x411_country_name = -1; /* CountryName */ static int hf_x411_bilateral_domain = -1; /* T_bilateral_domain */ @@ -300,6 +294,8 @@ static int hf_x411_administration_domain_name = -1; /* AdministrationDomainName static int hf_x411_private_domain = -1; /* T_private_domain */ static int hf_x411_private_domain_identifier = -1; /* PrivateDomainIdentifier */ static int hf_x411_bilateral_information = -1; /* T_bilateral_information */ +static int hf_x411_domain = -1; /* T_domain */ +static int hf_x411_private_domain_01 = -1; /* T_private_domain_01 */ static int hf_x411_arrival_time = -1; /* ArrivalTime */ static int hf_x411_converted_encoded_information_types = -1; /* ConvertedEncodedInformationTypes */ static int hf_x411_trace_report_type = -1; /* ReportType */ @@ -307,15 +303,10 @@ static int hf_x411_InternalTraceInformation_item = -1; /* InternalTraceInformat static int hf_x411_global_domain_identifier = -1; /* GlobalDomainIdentifier */ static int hf_x411_mta_name = -1; /* MTAName */ static int hf_x411_mta_supplied_information = -1; /* MTASuppliedInformation */ -static int hf_x411_routing_action = -1; /* RoutingAction */ -static int hf_x411_attempted = -1; /* T_attempted */ -static int hf_x411_mta = -1; /* MTAName */ -static int hf_x411_domain = -1; /* GlobalDomainIdentifier */ -static int hf_x411_deferred_time = -1; /* DeferredTime */ -static int hf_x411_other_actions = -1; /* OtherActions */ static int hf_x411__untag_item = -1; /* TraceInformationElement */ static int hf_x411_domain_supplied_information = -1; /* DomainSuppliedInformation */ -static int hf_x411_attempted_domain = -1; /* GlobalDomainIdentifier */ +static int hf_x411_deferred_time = -1; /* DeferredTime */ +static int hf_x411_other_actions = -1; /* OtherActions */ static int hf_x411_initiator_name = -1; /* ObjectName */ static int hf_x411_messages_waiting = -1; /* MessagesWaiting */ static int hf_x411_responder_name = -1; /* ObjectName */ @@ -411,7 +402,7 @@ static int hf_x411_pattern_match = -1; /* ORName */ static int hf_x411_standard_parameters = -1; /* T_standard_parameters */ static int hf_x411_type_extensions = -1; /* T_type_extensions */ static int hf_x411_type_extensions_item = -1; /* T_type_extensions_item */ -static int hf_x411_originator_name = -1; /* OriginatorName */ +static int hf_x411_originator_name_01 = -1; /* OriginatorName */ static int hf_x411_submission_recipient_name = -1; /* RecipientName */ static int hf_x411_originator_report_request = -1; /* OriginatorReportRequest */ static int hf_x411_probe_recipient_name = -1; /* RecipientName */ @@ -458,6 +449,7 @@ static int hf_x411_origination_or_expansion_time = -1; /* Time */ static int hf_x411_report_type = -1; /* T_report_type */ static int hf_x411_report_type_delivery = -1; /* PerRecipientDeliveryReportFields */ static int hf_x411_non_delivery_report = -1; /* PerRecipientNonDeliveryReportFields */ +static int hf_x411_domain_01 = -1; /* GlobalDomainIdentifier */ static int hf_x411_mta_directory_name = -1; /* Name */ static int hf_x411_ExtendedCertificates_item = -1; /* ExtendedCertificate */ static int hf_x411_directory_entry = -1; /* Name */ @@ -510,7 +502,7 @@ static int hf_x411_UniversalOrganizationalUnitNames_item = -1; /* UniversalOrga static int hf_x411_character_encoding = -1; /* T_character_encoding */ static int hf_x411_two_octets = -1; /* BMPString_SIZE_1_ub_string_length */ static int hf_x411_four_octets = -1; /* UniversalString_SIZE_1_ub_string_length */ -static int hf_x411_iso_639_language_code = -1; /* PrintableString_SIZE_CONSTR411846860 */ +static int hf_x411_iso_639_language_code = -1; /* PrintableString_SIZE_CONSTR5416640 */ static int hf_x411_numeric_code = -1; /* AddrNumericString */ static int hf_x411_printable_code = -1; /* PrintableString_SIZE_1_ub_postal_code_length */ static int hf_x411_printable_address = -1; /* T_printable_address */ @@ -573,6 +565,17 @@ static int hf_x411_rtab_apdu = -1; /* RTABapdu */ static int hf_x411_abortReason = -1; /* AbortReason */ static int hf_x411_reflectedParameter = -1; /* BIT_STRING */ static int hf_x411_userdataAB = -1; /* OBJECT_IDENTIFIER */ +static int hf_x411_mta_originator_name = -1; /* MTAOriginatorName */ +static int hf_x411_per_recipient_message_fields = -1; /* SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields */ +static int hf_x411_per_recipient_message_fields_item = -1; /* PerRecipientMessageTransferFields */ +static int hf_x411_per_recipient_probe_transfer_fields = -1; /* SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields */ +static int hf_x411_per_recipient_probe_transfer_fields_item = -1; /* PerRecipientProbeTransferFields */ +static int hf_x411_per_recipient_report_fields = -1; /* SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields */ +static int hf_x411_per_recipient_report_fields_item = -1; /* PerRecipientReportTransferFields */ +static int hf_x411_routing_action = -1; /* RoutingAction */ +static int hf_x411_attempted = -1; /* T_attempted */ +static int hf_x411_mta = -1; /* MTAName */ +static int hf_x411_attempted_domain = -1; /* GlobalDomainIdentifier */ static int hf_x411_per_recipient_report_delivery_fields = -1; /* SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportDeliveryFields */ static int hf_x411_per_recipient_report_delivery_fields_item = -1; /* PerRecipientReportDeliveryFields */ static int hf_x411_mts_originator_name = -1; /* OriginatorName */ @@ -687,29 +690,32 @@ static gint ett_x411_MTS_APDU = -1; static gint ett_x411_Message = -1; static gint ett_x411_Report = -1; static gint ett_x411_MessageTransferEnvelope = -1; -static gint ett_x411_SEQUENCE_OF_PerDomainBilateralInformation = -1; +static gint ett_x411_PerMessageTransferFields = -1; +static gint ett_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation = -1; static gint ett_x411_SET_OF_ExtensionField = -1; -static gint ett_x411_SEQUENCE_OF_PerRecipientMessageTransferFields = -1; static gint ett_x411_PerRecipientMessageTransferFields = -1; static gint ett_x411_ProbeTransferEnvelope = -1; -static gint ett_x411_SEQUENCE_OF_PerRecipientProbeTransferFields = -1; +static gint ett_x411_PerProbeTransferFields = -1; static gint ett_x411_PerRecipientProbeTransferFields = -1; static gint ett_x411_ReportTransferEnvelope = -1; static gint ett_x411_ReportTransferContent = -1; -static gint ett_x411_SEQUENCE_OF_PerRecipientReportTransferFields = -1; +static gint ett_x411_PerReportTransferFields = -1; static gint ett_x411_PerRecipientReportTransferFields = -1; static gint ett_x411_PerDomainBilateralInformation = -1; static gint ett_x411_T_bilateral_domain = -1; static gint ett_x411_T_private_domain = -1; +static gint ett_x411_BilateralDomain = -1; +static gint ett_x411_T_domain = -1; +static gint ett_x411_T_private_domain_01 = -1; static gint ett_x411_PerRecipientIndicators = -1; static gint ett_x411_LastTraceInformation = -1; static gint ett_x411_InternalTraceInformation = -1; static gint ett_x411_InternalTraceInformationElement = -1; static gint ett_x411_MTASuppliedInformation = -1; -static gint ett_x411_T_attempted = -1; -static gint ett_x411_SEQUENCE_OF_TraceInformationElement = -1; +static gint ett_x411_SEQUENCE_SIZE_1_ub_transfers_OF_TraceInformationElement = -1; static gint ett_x411_TraceInformationElement = -1; static gint ett_x411_DomainSuppliedInformation = -1; +static gint ett_x411_AdditionalActions = -1; static gint ett_x411_OtherActions = -1; static gint ett_x411_MTSBindArgument = -1; static gint ett_x411_MTSBindResult = -1; @@ -855,6 +861,10 @@ static gint ett_x411_SecurityCategories = -1; static gint ett_x411_SecurityCategory = -1; static gint ett_x411_RTSE_apdus = -1; static gint ett_x411_RTABapdu = -1; +static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields = -1; +static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields = -1; +static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields = -1; +static gint ett_x411_T_attempted = -1; static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportDeliveryFields = -1; static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmissionFields = -1; static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields = -1; @@ -2706,14 +2716,14 @@ dissect_x411_PerDomainBilateralInformation(gboolean implicit_tag _U_, tvbuff_t * } -static const ber_sequence_t SEQUENCE_OF_PerDomainBilateralInformation_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation_sequence_of[1] = { { &hf_x411_per_domain_bilateral_information_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x411_PerDomainBilateralInformation }, }; static int -dissect_x411_SEQUENCE_OF_PerDomainBilateralInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_PerDomainBilateralInformation_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerDomainBilateralInformation); + SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation_sequence_of, hf_index, ett_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation); return offset; } @@ -2839,14 +2849,14 @@ dissect_x411_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U } -static const ber_sequence_t SEQUENCE_OF_TraceInformationElement_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_ub_transfers_OF_TraceInformationElement_sequence_of[1] = { { &hf_x411__untag_item , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x411_TraceInformationElement }, }; static int -dissect_x411_SEQUENCE_OF_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_SEQUENCE_SIZE_1_ub_transfers_OF_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_TraceInformationElement_sequence_of, hf_index, ett_x411_SEQUENCE_OF_TraceInformationElement); + SEQUENCE_SIZE_1_ub_transfers_OF_TraceInformationElement_sequence_of, hf_index, ett_x411_SEQUENCE_SIZE_1_ub_transfers_OF_TraceInformationElement); return offset; } @@ -2856,7 +2866,7 @@ dissect_x411_SEQUENCE_OF_TraceInformationElement(gboolean implicit_tag _U_, tvbu static int dissect_x411_TraceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, - hf_index, BER_CLASS_APP, 9, TRUE, dissect_x411_SEQUENCE_OF_TraceInformationElement); + hf_index, BER_CLASS_APP, 9, TRUE, dissect_x411_SEQUENCE_SIZE_1_ub_transfers_OF_TraceInformationElement); return offset; } @@ -3120,14 +3130,14 @@ dissect_x411_PerRecipientMessageTransferFields(gboolean implicit_tag _U_, tvbuff } -static const ber_sequence_t SEQUENCE_OF_PerRecipientMessageTransferFields_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields_sequence_of[1] = { { &hf_x411_per_recipient_message_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_PerRecipientMessageTransferFields }, }; static int -dissect_x411_SEQUENCE_OF_PerRecipientMessageTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_PerRecipientMessageTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientMessageTransferFields); + SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields); return offset; } @@ -3142,10 +3152,10 @@ static const ber_sequence_t MessageTransferEnvelope_set[] = { { &hf_x411_priority , BER_CLASS_APP, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_Priority }, { &hf_x411_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PerMessageIndicators }, { &hf_x411_deferred_delivery_time, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_DeferredDeliveryTime }, - { &hf_x411_per_domain_bilateral_information, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_OF_PerDomainBilateralInformation }, + { &hf_x411_per_domain_bilateral_information, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation }, { &hf_x411_trace_information, BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_x411_TraceInformation }, { &hf_x411_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, - { &hf_x411_per_recipient_message_fields, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_OF_PerRecipientMessageTransferFields }, + { &hf_x411_per_recipient_message_fields, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields }, { NULL, 0, 0, 0, NULL } }; @@ -3206,6 +3216,89 @@ dissect_x411_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int +dissect_x411_ProbeIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_x411_MTSIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index); + + return offset; +} + + + +int +dissect_x411_ContentLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t PerRecipientProbeTransferFields_set[] = { + { &hf_x411_recipient_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_MTARecipientName }, + { &hf_x411_originally_specified_recipient_number, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_OriginallySpecifiedRecipientNumber }, + { &hf_x411_per_recipient_indicators, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x411_PerRecipientIndicators }, + { &hf_x411_explicit_conversion, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_ExplicitConversion }, + { &hf_x411_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_x411_PerRecipientProbeTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, + PerRecipientProbeTransferFields_set, hf_index, ett_x411_PerRecipientProbeTransferFields); + + return offset; +} + + +static const ber_sequence_t SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields_sequence_of[1] = { + { &hf_x411_per_recipient_probe_transfer_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_PerRecipientProbeTransferFields }, +}; + +static int +dissect_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields); + + return offset; +} + + +static const ber_sequence_t ProbeTransferEnvelope_set[] = { + { &hf_x411_probe_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_ProbeIdentifier }, + { &hf_x411_mta_originator_name, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_MTAOriginatorName }, + { &hf_x411_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes }, + { &hf_x411_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_ContentType }, + { &hf_x411_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier }, + { &hf_x411_content_length , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_ContentLength }, + { &hf_x411_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PerMessageIndicators }, + { &hf_x411_per_domain_bilateral_information, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation }, + { &hf_x411_trace_information, BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_x411_TraceInformation }, + { &hf_x411_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, + { &hf_x411_per_recipient_probe_transfer_fields, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_x411_ProbeTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, + ProbeTransferEnvelope_set, hf_index, ett_x411_ProbeTransferEnvelope); + + return offset; +} + + + +static int +dissect_x411_Probe(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_x411_ProbeTransferEnvelope(implicit_tag, tvb, offset, actx, tree, hf_index); + + return offset; +} + + + +static int dissect_x411_ReportIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_x411_MTSIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -3527,7 +3620,7 @@ dissect_x411_LastTraceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int -dissect_x411_MTAOriginallyIntendedRecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_OriginallyIntendedRecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_x411_ORAddressAndOptionalDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index); return offset; @@ -3550,7 +3643,7 @@ static const ber_sequence_t PerRecipientReportTransferFields_set[] = { { &hf_x411_originally_specified_recipient_number, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x411_OriginallySpecifiedRecipientNumber }, { &hf_x411_per_recipient_indicators, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x411_PerRecipientIndicators }, { &hf_x411_last_trace_information, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_x411_LastTraceInformation }, - { &hf_x411_report_originally_intended_recipient_name, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_MTAOriginallyIntendedRecipientName }, + { &hf_x411_report_originally_intended_recipient_name, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_OriginallyIntendedRecipientName }, { &hf_x411_supplementary_information, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SupplementaryInformation }, { &hf_x411_extensions , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, { NULL, 0, 0, 0, NULL } @@ -3565,14 +3658,14 @@ dissect_x411_PerRecipientReportTransferFields(gboolean implicit_tag _U_, tvbuff_ } -static const ber_sequence_t SEQUENCE_OF_PerRecipientReportTransferFields_sequence_of[1] = { +static const ber_sequence_t SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields_sequence_of[1] = { { &hf_x411_per_recipient_report_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_PerRecipientReportTransferFields }, }; static int -dissect_x411_SEQUENCE_OF_PerRecipientReportTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_PerRecipientReportTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientReportTransferFields); + SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields); return offset; } @@ -3587,7 +3680,7 @@ static const ber_sequence_t ReportTransferContent_set[] = { { &hf_x411_returned_content, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_Content }, { &hf_x411_additional_information, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_AdditionalInformation }, { &hf_x411_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, - { &hf_x411_per_recipient_report_fields, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_OF_PerRecipientReportTransferFields }, + { &hf_x411_per_recipient_report_fields, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields }, { NULL, 0, 0, 0, NULL } }; @@ -3615,120 +3708,157 @@ dissect_x411_Report(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_ } +static const value_string x411_MTS_APDU_vals[] = { + { 0, "message" }, + { 2, "probe" }, + { 1, "report" }, + { 0, NULL } +}; + +static const ber_choice_t MTS_APDU_choice[] = { + { 0, &hf_x411_message , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_Message }, + { 2, &hf_x411_probe , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x411_Probe }, + { 1, &hf_x411_report , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x411_Report }, + { 0, NULL, 0, 0, 0, NULL } +}; static int -dissect_x411_ProbeIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_x411_MTSIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index); +dissect_x411_MTS_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1049 "x411.cnf" + gint apdu = -1; - return offset; -} + offset = dissect_ber_choice(actx, tree, tvb, offset, + MTS_APDU_choice, hf_index, ett_x411_MTS_APDU, + &apdu); + + if( (apdu!=-1) && x411_MTS_APDU_vals[apdu].strptr ){ + if(check_col(actx->pinfo->cinfo, COL_INFO) && (apdu != 0)) { /* we don't show "message" - sub-dissectors have better idea */ + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", x411_MTS_APDU_vals[apdu].strptr); + } + } -int -dissect_x411_ContentLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); return offset; } -static const ber_sequence_t PerRecipientProbeTransferFields_set[] = { - { &hf_x411_recipient_name , BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_MTARecipientName }, - { &hf_x411_originally_specified_recipient_number, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_OriginallySpecifiedRecipientNumber }, - { &hf_x411_per_recipient_indicators, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x411_PerRecipientIndicators }, - { &hf_x411_explicit_conversion, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_ExplicitConversion }, +static const ber_sequence_t PerMessageTransferFields_set[] = { + { &hf_x411_message_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_MessageIdentifier }, + { &hf_x411_originator_name, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_MTAOriginatorName }, + { &hf_x411_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes }, + { &hf_x411_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_ContentType }, + { &hf_x411_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier }, + { &hf_x411_priority , BER_CLASS_APP, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_Priority }, + { &hf_x411_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PerMessageIndicators }, + { &hf_x411_deferred_delivery_time, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_DeferredDeliveryTime }, + { &hf_x411_per_domain_bilateral_information, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation }, + { &hf_x411_trace_information, BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_x411_TraceInformation }, { &hf_x411_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, { NULL, 0, 0, 0, NULL } }; static int -dissect_x411_PerRecipientProbeTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_PerMessageTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, - PerRecipientProbeTransferFields_set, hf_index, ett_x411_PerRecipientProbeTransferFields); + PerMessageTransferFields_set, hf_index, ett_x411_PerMessageTransferFields); return offset; } -static const ber_sequence_t SEQUENCE_OF_PerRecipientProbeTransferFields_sequence_of[1] = { - { &hf_x411_per_recipient_probe_transfer_fields_item, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_x411_PerRecipientProbeTransferFields }, +static const ber_sequence_t PerProbeTransferFields_set[] = { + { &hf_x411_probe_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_ProbeIdentifier }, + { &hf_x411_originator_name, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_MTAOriginatorName }, + { &hf_x411_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes }, + { &hf_x411_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_ContentType }, + { &hf_x411_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier }, + { &hf_x411_content_length , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_ContentLength }, + { &hf_x411_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PerMessageIndicators }, + { &hf_x411_per_domain_bilateral_information, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation }, + { &hf_x411_trace_information, BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_x411_TraceInformation }, + { &hf_x411_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, + { NULL, 0, 0, 0, NULL } }; static int -dissect_x411_SEQUENCE_OF_PerRecipientProbeTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - SEQUENCE_OF_PerRecipientProbeTransferFields_sequence_of, hf_index, ett_x411_SEQUENCE_OF_PerRecipientProbeTransferFields); +dissect_x411_PerProbeTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, + PerProbeTransferFields_set, hf_index, ett_x411_PerProbeTransferFields); return offset; } -static const ber_sequence_t ProbeTransferEnvelope_set[] = { - { &hf_x411_probe_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_ProbeIdentifier }, - { &hf_x411_mta_originator_name, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_MTAOriginatorName }, +static const ber_sequence_t PerReportTransferFields_set[] = { + { &hf_x411_subject_identifier, BER_CLASS_APP, 4, BER_FLAGS_NOOWNTAG, dissect_x411_SubjectIdentifier }, + { &hf_x411_subject_intermediate_trace_information, BER_CLASS_APP, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_SubjectIntermediateTraceInformation }, { &hf_x411_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes }, - { &hf_x411_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_ContentType }, + { &hf_x411_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_ContentType }, { &hf_x411_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier }, - { &hf_x411_content_length , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_ContentLength }, - { &hf_x411_per_message_indicators, BER_CLASS_APP, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PerMessageIndicators }, - { &hf_x411_per_domain_bilateral_information, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_OF_PerDomainBilateralInformation }, - { &hf_x411_trace_information, BER_CLASS_APP, 9, BER_FLAGS_NOOWNTAG, dissect_x411_TraceInformation }, + { &hf_x411_returned_content, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_Content }, + { &hf_x411_additional_information, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_AdditionalInformation }, { &hf_x411_extensions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_SET_OF_ExtensionField }, - { &hf_x411_per_recipient_probe_transfer_fields, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x411_SEQUENCE_OF_PerRecipientProbeTransferFields }, { NULL, 0, 0, 0, NULL } }; static int -dissect_x411_ProbeTransferEnvelope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_PerReportTransferFields(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, - ProbeTransferEnvelope_set, hf_index, ett_x411_ProbeTransferEnvelope); + PerReportTransferFields_set, hf_index, ett_x411_PerReportTransferFields); return offset; } +static const ber_sequence_t T_private_domain_01_sequence[] = { + { &hf_x411_administration_domain_name, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_AdministrationDomainName }, + { &hf_x411_private_domain_identifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_PrivateDomainIdentifier }, + { NULL, 0, 0, 0, NULL } +}; static int -dissect_x411_Probe(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_x411_ProbeTransferEnvelope(implicit_tag, tvb, offset, actx, tree, hf_index); +dissect_x411_T_private_domain_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + T_private_domain_01_sequence, hf_index, ett_x411_T_private_domain_01); return offset; } -static const value_string x411_MTS_APDU_vals[] = { - { 0, "message" }, - { 1, "report" }, - { 2, "probe" }, +static const value_string x411_T_domain_vals[] = { + { 0, "administration-domain-name" }, + { 1, "private-domain" }, { 0, NULL } }; -static const ber_choice_t MTS_APDU_choice[] = { - { 0, &hf_x411_message , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x411_Message }, - { 1, &hf_x411_report , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x411_Report }, - { 2, &hf_x411_probe , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_x411_Probe }, +static const ber_choice_t T_domain_choice[] = { + { 0, &hf_x411_administration_domain_name, BER_CLASS_APP, 2, BER_FLAGS_NOOWNTAG, dissect_x411_AdministrationDomainName }, + { 1, &hf_x411_private_domain_01, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x411_T_private_domain_01 }, { 0, NULL, 0, 0, 0, NULL } }; static int -dissect_x411_MTS_APDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1049 "x411.cnf" - gint apdu = -1; +dissect_x411_T_domain(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_choice(actx, tree, tvb, offset, + T_domain_choice, hf_index, ett_x411_T_domain, + NULL); - offset = dissect_ber_choice(actx, tree, tvb, offset, - MTS_APDU_choice, hf_index, ett_x411_MTS_APDU, - &apdu); + return offset; +} - - if( (apdu!=-1) && x411_MTS_APDU_vals[apdu].strptr ){ - if(check_col(actx->pinfo->cinfo, COL_INFO) && (apdu != 0)) { /* we don't show "message" - sub-dissectors have better idea */ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", x411_MTS_APDU_vals[apdu].strptr); - } - } +static const ber_sequence_t BilateralDomain_sequence[] = { + { &hf_x411_country_name , BER_CLASS_APP, 1, BER_FLAGS_NOOWNTAG, dissect_x411_CountryName }, + { &hf_x411_domain , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_T_domain }, + { NULL, 0, 0, 0, NULL } +}; +static int +dissect_x411_BilateralDomain(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + BilateralDomain_sequence, hf_index, ett_x411_BilateralDomain); return offset; } @@ -3742,7 +3872,7 @@ static const value_string x411_T_attempted_vals[] = { static const ber_choice_t T_attempted_choice[] = { { 0, &hf_x411_mta , BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_x411_MTAName }, - { 1, &hf_x411_domain , BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_x411_GlobalDomainIdentifier }, + { 1, &hf_x411_domain_01 , BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_x411_GlobalDomainIdentifier }, { 0, NULL, 0, 0, 0, NULL } }; @@ -3823,6 +3953,31 @@ dissect_x411_InternalTraceInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _ } +static const ber_sequence_t AdditionalActions_set[] = { + { &hf_x411_deferred_time , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_DeferredTime }, + { &hf_x411_converted_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ConvertedEncodedInformationTypes }, + { &hf_x411_other_actions , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x411_OtherActions }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_x411_AdditionalActions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_set(implicit_tag, actx, tree, tvb, offset, + AdditionalActions_set, hf_index, ett_x411_AdditionalActions); + + return offset; +} + + + +static int +dissect_x411_InternalAdditionalActions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_x411_AdditionalActions(implicit_tag, tvb, offset, actx, tree, hf_index); + + return offset; +} + + static const value_string x411_ObjectName_vals[] = { { 0, "user-agent" }, { 1, "mTA" }, @@ -4588,15 +4743,6 @@ dissect_x411_ThisRecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int } - -static int -dissect_x411_OriginallyIntendedRecipientName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_x411_ORAddressAndOptionalDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index); - - return offset; -} - - static const ber_sequence_t OtherMessageDeliveryFields_set[] = { { &hf_x411_delivered_content_type, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_DeliveredContentType }, { &hf_x411_delivered_originator_name, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_DeliveredOriginatorName }, @@ -5389,7 +5535,7 @@ dissect_x411_PAR_old_credentials_incorrectly_specified(gboolean implicit_tag _U_ static const ber_sequence_t PerMessageSubmissionFields_set[] = { - { &hf_x411_originator_name, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_OriginatorName }, + { &hf_x411_originator_name_01, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_OriginatorName }, { &hf_x411_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes }, { &hf_x411_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_ContentType }, { &hf_x411_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier }, @@ -5410,7 +5556,7 @@ dissect_x411_PerMessageSubmissionFields(gboolean implicit_tag _U_, tvbuff_t *tvb static const ber_sequence_t PerProbeSubmissionFields_set[] = { - { &hf_x411_originator_name, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_OriginatorName }, + { &hf_x411_originator_name_01, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_x411_OriginatorName }, { &hf_x411_original_encoded_information_types, BER_CLASS_APP, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_OriginalEncodedInformationTypes }, { &hf_x411_content_type , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_ContentType }, { &hf_x411_content_identifier, BER_CLASS_APP, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_ContentIdentifier }, @@ -6113,7 +6259,7 @@ dissect_x411_ProofOfSubmissionAlgorithmIdentifier(gboolean implicit_tag _U_, tvb static const ber_sequence_t ReportingMTAName_sequence[] = { - { &hf_x411_domain , BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_x411_GlobalDomainIdentifier }, + { &hf_x411_domain_01 , BER_CLASS_APP, 3, BER_FLAGS_NOOWNTAG, dissect_x411_GlobalDomainIdentifier }, { &hf_x411_mta_name , BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_x411_MTAName }, { &hf_x411_mta_directory_name, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_x509if_Name }, { NULL, 0, 0, 0, NULL } @@ -6273,7 +6419,7 @@ dissect_x411_T_character_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int -dissect_x411_PrintableString_SIZE_CONSTR411846860(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_PrintableString_SIZE_CONSTR5416640(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, actx, tree, tvb, offset, hf_index, NULL); @@ -6284,7 +6430,7 @@ dissect_x411_PrintableString_SIZE_CONSTR411846860(gboolean implicit_tag _U_, tvb static const ber_sequence_t UniversalOrBMPString_set[] = { { &hf_x411_character_encoding, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_T_character_encoding }, - { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR411846860 }, + { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR5416640 }, { NULL, 0, 0, 0, NULL } }; @@ -8984,14 +9130,14 @@ void proto_register_x411(void) { { "message", "x411.message", FT_NONE, BASE_NONE, NULL, 0, "x411.Message", HFILL }}, - { &hf_x411_report, - { "report", "x411.report", - FT_NONE, BASE_NONE, NULL, 0, - "x411.Report", HFILL }}, { &hf_x411_probe, { "probe", "x411.probe", FT_NONE, BASE_NONE, NULL, 0, "x411.Probe", HFILL }}, + { &hf_x411_report, + { "report", "x411.report", + FT_NONE, BASE_NONE, NULL, 0, + "x411.Report", HFILL }}, { &hf_x411_message_envelope, { "envelope", "x411.envelope", FT_NONE, BASE_NONE, NULL, 0, @@ -9012,7 +9158,7 @@ void proto_register_x411(void) { { "message-identifier", "x411.message_identifier", FT_NONE, BASE_NONE, NULL, 0, "x411.MessageIdentifier", HFILL }}, - { &hf_x411_mta_originator_name, + { &hf_x411_originator_name, { "originator-name", "x411.originator_name", FT_NONE, BASE_NONE, NULL, 0, "x411.MTAOriginatorName", HFILL }}, @@ -9043,7 +9189,7 @@ void proto_register_x411(void) { { &hf_x411_per_domain_bilateral_information, { "per-domain-bilateral-information", "x411.per_domain_bilateral_information", FT_UINT32, BASE_DEC, NULL, 0, - "x411.SEQUENCE_OF_PerDomainBilateralInformation", HFILL }}, + "x411.SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation", HFILL }}, { &hf_x411_per_domain_bilateral_information_item, { "PerDomainBilateralInformation", "x411.PerDomainBilateralInformation", FT_NONE, BASE_NONE, NULL, 0, @@ -9060,21 +9206,13 @@ void proto_register_x411(void) { { "ExtensionField", "x411.ExtensionField", FT_NONE, BASE_NONE, NULL, 0, "x411.ExtensionField", HFILL }}, - { &hf_x411_per_recipient_message_fields, - { "per-recipient-fields", "x411.per_recipient_fields", - FT_UINT32, BASE_DEC, NULL, 0, - "x411.SEQUENCE_OF_PerRecipientMessageTransferFields", HFILL }}, - { &hf_x411_per_recipient_message_fields_item, - { "PerRecipientMessageTransferFields", "x411.PerRecipientMessageTransferFields", - FT_NONE, BASE_NONE, NULL, 0, - "x411.PerRecipientMessageTransferFields", HFILL }}, { &hf_x411_recipient_name, { "recipient-name", "x411.recipient_name", FT_NONE, BASE_NONE, NULL, 0, "x411.MTARecipientName", HFILL }}, { &hf_x411_originally_specified_recipient_number, { "originally-specified-recipient-number", "x411.originally_specified_recipient_number", - FT_INT32, BASE_DEC, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, "x411.OriginallySpecifiedRecipientNumber", HFILL }}, { &hf_x411_per_recipient_indicators, { "per-recipient-indicators", "x411.per_recipient_indicators", @@ -9092,14 +9230,6 @@ void proto_register_x411(void) { { "content-length", "x411.content_length", FT_UINT32, BASE_DEC, NULL, 0, "x411.ContentLength", HFILL }}, - { &hf_x411_per_recipient_probe_transfer_fields, - { "per-recipient-fields", "x411.per_recipient_fields", - FT_UINT32, BASE_DEC, NULL, 0, - "x411.SEQUENCE_OF_PerRecipientProbeTransferFields", HFILL }}, - { &hf_x411_per_recipient_probe_transfer_fields_item, - { "PerRecipientProbeTransferFields", "x411.PerRecipientProbeTransferFields", - FT_NONE, BASE_NONE, NULL, 0, - "x411.PerRecipientProbeTransferFields", HFILL }}, { &hf_x411_report_identifier, { "report-identifier", "x411.report_identifier", FT_NONE, BASE_NONE, NULL, 0, @@ -9124,14 +9254,6 @@ void proto_register_x411(void) { { "additional-information", "x411.additional_information", FT_NONE, BASE_NONE, NULL, 0, "x411.AdditionalInformation", HFILL }}, - { &hf_x411_per_recipient_report_fields, - { "per-recipient-fields", "x411.per_recipient_fields", - FT_UINT32, BASE_DEC, NULL, 0, - "x411.SEQUENCE_OF_PerRecipientReportTransferFields", HFILL }}, - { &hf_x411_per_recipient_report_fields_item, - { "PerRecipientReportTransferFields", "x411.PerRecipientReportTransferFields", - FT_NONE, BASE_NONE, NULL, 0, - "x411.PerRecipientReportTransferFields", HFILL }}, { &hf_x411_mta_actual_recipient_name, { "actual-recipient-name", "x411.actual_recipient_name", FT_NONE, BASE_NONE, NULL, 0, @@ -9143,7 +9265,7 @@ void proto_register_x411(void) { { &hf_x411_report_originally_intended_recipient_name, { "originally-intended-recipient-name", "x411.originally_intended_recipient_name", FT_NONE, BASE_NONE, NULL, 0, - "x411.MTAOriginallyIntendedRecipientName", HFILL }}, + "x411.OriginallyIntendedRecipientName", HFILL }}, { &hf_x411_supplementary_information, { "supplementary-information", "x411.supplementary_information", FT_STRING, BASE_NONE, NULL, 0, @@ -9172,6 +9294,14 @@ void proto_register_x411(void) { { "bilateral-information", "x411.bilateral_information", FT_NONE, BASE_NONE, NULL, 0, "x411.T_bilateral_information", HFILL }}, + { &hf_x411_domain, + { "domain", "x411.domain", + FT_UINT32, BASE_DEC, VALS(x411_T_domain_vals), 0, + "x411.T_domain", HFILL }}, + { &hf_x411_private_domain_01, + { "private-domain", "x411.private_domain", + FT_NONE, BASE_NONE, NULL, 0, + "x411.T_private_domain_01", HFILL }}, { &hf_x411_arrival_time, { "arrival-time", "x411.arrival_time", FT_STRING, BASE_NONE, NULL, 0, @@ -9200,22 +9330,14 @@ void proto_register_x411(void) { { "mta-supplied-information", "x411.mta_supplied_information", FT_NONE, BASE_NONE, NULL, 0, "x411.MTASuppliedInformation", HFILL }}, - { &hf_x411_routing_action, - { "routing-action", "x411.routing_action", - FT_UINT32, BASE_DEC, VALS(x411_RoutingAction_vals), 0, - "x411.RoutingAction", HFILL }}, - { &hf_x411_attempted, - { "attempted", "x411.attempted", - FT_UINT32, BASE_DEC, VALS(x411_T_attempted_vals), 0, - "x411.T_attempted", HFILL }}, - { &hf_x411_mta, - { "mta", "x411.mta", - FT_STRING, BASE_NONE, NULL, 0, - "x411.MTAName", HFILL }}, - { &hf_x411_domain, - { "domain", "x411.domain", + { &hf_x411__untag_item, + { "TraceInformationElement", "x411.TraceInformationElement", FT_NONE, BASE_NONE, NULL, 0, - "x411.GlobalDomainIdentifier", HFILL }}, + "x411.TraceInformationElement", HFILL }}, + { &hf_x411_domain_supplied_information, + { "domain-supplied-information", "x411.domain_supplied_information", + FT_NONE, BASE_NONE, NULL, 0, + "x411.DomainSuppliedInformation", HFILL }}, { &hf_x411_deferred_time, { "deferred-time", "x411.deferred_time", FT_STRING, BASE_NONE, NULL, 0, @@ -9224,18 +9346,6 @@ void proto_register_x411(void) { { "other-actions", "x411.other_actions", FT_BYTES, BASE_NONE, NULL, 0, "x411.OtherActions", HFILL }}, - { &hf_x411__untag_item, - { "TraceInformationElement", "x411.TraceInformationElement", - FT_NONE, BASE_NONE, NULL, 0, - "x411.TraceInformationElement", HFILL }}, - { &hf_x411_domain_supplied_information, - { "domain-supplied-information", "x411.domain_supplied_information", - FT_NONE, BASE_NONE, NULL, 0, - "x411.DomainSuppliedInformation", HFILL }}, - { &hf_x411_attempted_domain, - { "attempted-domain", "x411.attempted_domain", - FT_NONE, BASE_NONE, NULL, 0, - "x411.GlobalDomainIdentifier", HFILL }}, { &hf_x411_initiator_name, { "initiator-name", "x411.initiator_name", FT_UINT32, BASE_DEC, VALS(x411_ObjectName_vals), 0, @@ -9410,7 +9520,7 @@ void proto_register_x411(void) { "x411.ExtensionField", HFILL }}, { &hf_x411_restrict, { "restrict", "x411.restrict", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x411.BOOLEAN", HFILL }}, { &hf_x411_permissible_operations, { "permissible-operations", "x411.permissible_operations", @@ -9586,7 +9696,7 @@ void proto_register_x411(void) { "x411.Restriction", HFILL }}, { &hf_x411_permitted, { "permitted", "x411.permitted", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x411.BOOLEAN", HFILL }}, { &hf_x411_source_type, { "source-type", "x411.source_type", @@ -9616,7 +9726,7 @@ void proto_register_x411(void) { { "extensions item", "x411.extensions_item", FT_UINT32, BASE_DEC, VALS(x411_ExtensionType_vals), 0, "x411.T_type_extensions_item", HFILL }}, - { &hf_x411_originator_name, + { &hf_x411_originator_name_01, { "originator-name", "x411.originator_name", FT_NONE, BASE_NONE, NULL, 0, "x411.OriginatorName", HFILL }}, @@ -9804,6 +9914,10 @@ void proto_register_x411(void) { { "non-delivery", "x411.non_delivery", FT_NONE, BASE_NONE, NULL, 0, "x411.PerRecipientNonDeliveryReportFields", HFILL }}, + { &hf_x411_domain_01, + { "domain", "x411.domain", + FT_NONE, BASE_NONE, NULL, 0, + "x411.GlobalDomainIdentifier", HFILL }}, { &hf_x411_mta_directory_name, { "mta-directory-name", "x411.mta_directory_name", FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0, @@ -10015,7 +10129,7 @@ void proto_register_x411(void) { { &hf_x411_iso_639_language_code, { "iso-639-language-code", "x411.iso_639_language_code", FT_STRING, BASE_NONE, NULL, 0, - "x411.PrintableString_SIZE_CONSTR411846860", HFILL }}, + "x411.PrintableString_SIZE_CONSTR5416640", HFILL }}, { &hf_x411_numeric_code, { "numeric-code", "x411.numeric_code", FT_STRING, BASE_NONE, NULL, 0, @@ -10264,6 +10378,50 @@ void proto_register_x411(void) { { "userdataAB", "x411.userdataAB", FT_OID, BASE_NONE, NULL, 0, "x411.OBJECT_IDENTIFIER", HFILL }}, + { &hf_x411_mta_originator_name, + { "originator-name", "x411.originator_name", + FT_NONE, BASE_NONE, NULL, 0, + "x411.MTAOriginatorName", HFILL }}, + { &hf_x411_per_recipient_message_fields, + { "per-recipient-fields", "x411.per_recipient_fields", + FT_UINT32, BASE_DEC, NULL, 0, + "x411.SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields", HFILL }}, + { &hf_x411_per_recipient_message_fields_item, + { "PerRecipientMessageTransferFields", "x411.PerRecipientMessageTransferFields", + FT_NONE, BASE_NONE, NULL, 0, + "x411.PerRecipientMessageTransferFields", HFILL }}, + { &hf_x411_per_recipient_probe_transfer_fields, + { "per-recipient-fields", "x411.per_recipient_fields", + FT_UINT32, BASE_DEC, NULL, 0, + "x411.SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields", HFILL }}, + { &hf_x411_per_recipient_probe_transfer_fields_item, + { "PerRecipientProbeTransferFields", "x411.PerRecipientProbeTransferFields", + FT_NONE, BASE_NONE, NULL, 0, + "x411.PerRecipientProbeTransferFields", HFILL }}, + { &hf_x411_per_recipient_report_fields, + { "per-recipient-fields", "x411.per_recipient_fields", + FT_UINT32, BASE_DEC, NULL, 0, + "x411.SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields", HFILL }}, + { &hf_x411_per_recipient_report_fields_item, + { "PerRecipientReportTransferFields", "x411.PerRecipientReportTransferFields", + FT_NONE, BASE_NONE, NULL, 0, + "x411.PerRecipientReportTransferFields", HFILL }}, + { &hf_x411_routing_action, + { "routing-action", "x411.routing_action", + FT_UINT32, BASE_DEC, VALS(x411_RoutingAction_vals), 0, + "x411.RoutingAction", HFILL }}, + { &hf_x411_attempted, + { "attempted", "x411.attempted", + FT_UINT32, BASE_DEC, VALS(x411_T_attempted_vals), 0, + "x411.T_attempted", HFILL }}, + { &hf_x411_mta, + { "mta", "x411.mta", + FT_STRING, BASE_NONE, NULL, 0, + "x411.MTAName", HFILL }}, + { &hf_x411_attempted_domain, + { "attempted-domain", "x411.attempted_domain", + FT_NONE, BASE_NONE, NULL, 0, + "x411.GlobalDomainIdentifier", HFILL }}, { &hf_x411_per_recipient_report_delivery_fields, { "per-recipient-fields", "x411.per_recipient_fields", FT_UINT32, BASE_DEC, NULL, 0, @@ -10646,29 +10804,32 @@ void proto_register_x411(void) { &ett_x411_Message, &ett_x411_Report, &ett_x411_MessageTransferEnvelope, - &ett_x411_SEQUENCE_OF_PerDomainBilateralInformation, + &ett_x411_PerMessageTransferFields, + &ett_x411_SEQUENCE_SIZE_1_ub_transfers_OF_PerDomainBilateralInformation, &ett_x411_SET_OF_ExtensionField, - &ett_x411_SEQUENCE_OF_PerRecipientMessageTransferFields, &ett_x411_PerRecipientMessageTransferFields, &ett_x411_ProbeTransferEnvelope, - &ett_x411_SEQUENCE_OF_PerRecipientProbeTransferFields, + &ett_x411_PerProbeTransferFields, &ett_x411_PerRecipientProbeTransferFields, &ett_x411_ReportTransferEnvelope, &ett_x411_ReportTransferContent, - &ett_x411_SEQUENCE_OF_PerRecipientReportTransferFields, + &ett_x411_PerReportTransferFields, &ett_x411_PerRecipientReportTransferFields, &ett_x411_PerDomainBilateralInformation, &ett_x411_T_bilateral_domain, &ett_x411_T_private_domain, + &ett_x411_BilateralDomain, + &ett_x411_T_domain, + &ett_x411_T_private_domain_01, &ett_x411_PerRecipientIndicators, &ett_x411_LastTraceInformation, &ett_x411_InternalTraceInformation, &ett_x411_InternalTraceInformationElement, &ett_x411_MTASuppliedInformation, - &ett_x411_T_attempted, - &ett_x411_SEQUENCE_OF_TraceInformationElement, + &ett_x411_SEQUENCE_SIZE_1_ub_transfers_OF_TraceInformationElement, &ett_x411_TraceInformationElement, &ett_x411_DomainSuppliedInformation, + &ett_x411_AdditionalActions, &ett_x411_OtherActions, &ett_x411_MTSBindArgument, &ett_x411_MTSBindResult, @@ -10814,6 +10975,10 @@ void proto_register_x411(void) { &ett_x411_SecurityCategory, &ett_x411_RTSE_apdus, &ett_x411_RTABapdu, + &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageTransferFields, + &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeTransferFields, + &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportTransferFields, + &ett_x411_T_attempted, &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientReportDeliveryFields, &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmissionFields, &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h index 9118f6e1ed..4e1d7dac75 100644 --- a/epan/dissectors/packet-x411.h +++ b/epan/dissectors/packet-x411.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x411.h */ -/* ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn */ +/* ../../tools/asn2wrs.py -b -e -p x411 -c ./x411.cnf -s ./packet-x411-template -D . MTAAbstractService.asn MTSAbstractService.asn MTSAccessProtocol.asn MHSProtocolObjectIdentifiers.asn */ /* Input file: packet-x411-template.h */ diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 570576e764..820c8accd0 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -4390,7 +4390,7 @@ void proto_register_x420(void) { "x420.SensitivityField", HFILL }}, { &hf_x420_AutoForwardedField_PDU, { "AutoForwardedField", "x420.AutoForwardedField", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x420.AutoForwardedField", HFILL }}, { &hf_x420_Body_PDU, { "Body", "x420.Body", @@ -4734,7 +4734,7 @@ void proto_register_x420(void) { "x420.SensitivityField", HFILL }}, { &hf_x420_auto_forwarded, { "auto-forwarded", "x420.auto_forwarded", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x420.AutoForwardedField", HFILL }}, { &hf_x420_extensions, { "extensions", "x420.extensions", @@ -4758,7 +4758,7 @@ void proto_register_x420(void) { "x420.NotificationRequests", HFILL }}, { &hf_x420_reply_requested, { "reply-requested", "x420.reply_requested", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x420.BOOLEAN", HFILL }}, { &hf_x420_recipient_extensions, { "recipient-extensions", "x420.recipient_extensions", @@ -4922,7 +4922,7 @@ void proto_register_x420(void) { "x420.TeletexData", HFILL }}, { &hf_x420_telex_compatible, { "telex-compatible", "x420.telex_compatible", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x420.BOOLEAN", HFILL }}, { &hf_x420_teletex_non_basic_parameters, { "non-basic-parameters", "x420.non_basic_parameters", @@ -5358,7 +5358,7 @@ void proto_register_x420(void) { "x420.T_compression_algorithm_param", HFILL }}, { &hf_x420_permitted_actions, { "permitted-actions", "x420.permitted_actions", - FT_BYTES, BASE_NONE, NULL, 0, + FT_BYTES, BASE_HEX, NULL, 0, "ftam.Permitted_Actions_Attribute", HFILL }}, { &hf_x420_storage_account, { "storage-account", "x420.storage_account", @@ -5598,7 +5598,7 @@ void proto_register_x420(void) { "x420.INTEGER", HFILL }}, { &hf_x420_processed, { "processed", "x420.processed", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x420.BOOLEAN", HFILL }}, { &hf_x420_data, { "data", "x420.data", diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 2598416158..4027cd6589 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -1059,7 +1059,7 @@ void proto_register_x509af(void) { "x509af.T_extnId", HFILL }}, { &hf_x509af_critical, { "critical", "x509af.critical", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509af.BOOLEAN", HFILL }}, { &hf_x509af_extnValue, { "extnValue", "x509af.extnValue", diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index f7ad693eaa..ee0bf90e33 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -2130,7 +2130,7 @@ void proto_register_x509ce(void) { "x509if.Attribute", HFILL }}, { &hf_x509ce_cA, { "cA", "x509ce.cA", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_pathLenConstraint, { "pathLenConstraint", "x509ce.pathLenConstraint", @@ -2294,15 +2294,15 @@ void proto_register_x509ce(void) { "x509if.RelativeDistinguishedName", HFILL }}, { &hf_x509ce_onlyContainsUserPublicKeyCerts, { "onlyContainsUserPublicKeyCerts", "x509ce.onlyContainsUserPublicKeyCerts", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_onlyContainsCACerts, { "onlyContainsCACerts", "x509ce.onlyContainsCACerts", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_indirectCRL, { "indirectCRL", "x509ce.indirectCRL", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_ToBeRevokedSyntax_item, { "ToBeRevokedGroup", "x509ce.ToBeRevokedGroup", @@ -2362,15 +2362,15 @@ void proto_register_x509ce(void) { "x509ce.RevokedCertificateGroup", HFILL }}, { &hf_x509ce_containsUserAttributeCerts, { "containsUserAttributeCerts", "x509ce.containsUserAttributeCerts", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_containsAACerts, { "containsAACerts", "x509ce.containsAACerts", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_containsSOAPublicKeyCerts, { "containsSOAPublicKeyCerts", "x509ce.containsSOAPublicKeyCerts", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509ce.BOOLEAN", HFILL }}, { &hf_x509ce_serialNumber, { "serialNumber", "x509ce.serialNumber", diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 7894f9a24b..644cf2ce86 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -2145,7 +2145,7 @@ void proto_register_x509if(void) { "x509if.HierarchyLevel", HFILL }}, { &hf_x509if_HierarchyBelow_PDU, { "HierarchyBelow", "x509if.HierarchyBelow", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509if.HierarchyBelow", HFILL }}, { &hf_x509if_type, { "type", "x509if.type", @@ -2193,7 +2193,7 @@ void proto_register_x509if(void) { "x509if.T_contextValues_item", HFILL }}, { &hf_x509if_fallback, { "fallback", "x509if.fallback", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509if.BOOLEAN", HFILL }}, { &hf_x509if_type_01, { "type", "x509if.type", @@ -2265,7 +2265,7 @@ void proto_register_x509if(void) { "x509if.T_atadv_value", HFILL }}, { &hf_x509if_primaryDistinguished, { "primaryDistinguished", "x509if.primaryDistinguished", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509if.BOOLEAN", HFILL }}, { &hf_x509if_valueswithContext, { "valuesWithContext", "x509if.valuesWithContext", @@ -2413,7 +2413,7 @@ void proto_register_x509if(void) { "x509if.T_attributeType", HFILL }}, { &hf_x509if_includeSubtypes, { "includeSubtypes", "x509if.includeSubtypes", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509if.BOOLEAN", HFILL }}, { &hf_x509if_ra_selectedValues, { "selectedValues", "x509if.selectedValues", diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index c40edd9c9e..d93ba18480 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509sat.c */ -/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ +/* ../../tools/asn2wrs.py -b -e -p x509sat -c ./x509sat.cnf -s ./packet-x509sat-template -D . SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.c */ @@ -1826,7 +1826,7 @@ void proto_register_x509sat(void) { "x509sat.Integer", HFILL }}, { &hf_x509sat_Boolean_PDU, { "Boolean", "x509sat.Boolean", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509sat.Boolean", HFILL }}, { &hf_x509sat_SyntaxGeneralizedTime_PDU, { "SyntaxGeneralizedTime", "x509sat.SyntaxGeneralizedTime", @@ -2090,7 +2090,7 @@ void proto_register_x509sat(void) { "x509sat.Period", HFILL }}, { &hf_x509sat_notThisTime, { "notThisTime", "x509sat.notThisTime", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509sat.BOOLEAN", HFILL }}, { &hf_x509sat_timeZone, { "timeZone", "x509sat.timeZone", @@ -2234,7 +2234,7 @@ void proto_register_x509sat(void) { "x509sat.T_between", HFILL }}, { &hf_x509sat_entirely, { "entirely", "x509sat.entirely", - FT_BOOLEAN, BASE_NONE, NULL, 0x0, + FT_BOOLEAN, BASE_NONE, NULL, 0, "x509sat.BOOLEAN", HFILL }}, { &hf_x509sat_localeID1, { "localeID1", "x509sat.localeID1", |