From 0fdbe0839d823cb722d8dd6a4fbccce09adfe124 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Tue, 15 Dec 2020 11:24:55 +0100 Subject: [PATCH] asn2wrs: Rename duplicated filter names --- .../asn1/HI2Operations/HI2Operations.cnf | 17 ++- epan/dissectors/asn1/acse/acse.cnf | 2 +- epan/dissectors/asn1/ain/AIN-Operations.asn | 38 +++--- epan/dissectors/asn1/ain/AIN-Parameters.asn | 6 +- epan/dissectors/asn1/ain/ain.cnf | 7 ++ epan/dissectors/packet-HI2Operations.c | 80 ++++++------ epan/dissectors/packet-acse.c | 2 +- epan/dissectors/packet-ain.c | 115 +++++++++--------- 8 files changed, 142 insertions(+), 125 deletions(-) diff --git a/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf b/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf index 91e8847da4..b37be29d7c 100644 --- a/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf +++ b/epan/dissectors/asn1/HI2Operations/HI2Operations.cnf @@ -30,6 +30,13 @@ LIMODIFYconf LISTATUSind StatusType +#.FIELD_RENAME +GSMLocation/geoCoordinates/latitude geoCoordinates_latitude +GSMLocation/geoCoordinates/longitude geoCoordinates_longitude +TetraLocation/ms-Loc/mnc ms_Loc_mnc +TetraLocation/ms-Loc/mcc ms_Loc_mcc +TetraLocation/ms-Loc/lai ms_Loc_lai + #.FN_HDR UUS1-Content /* Heuristic test to see if it's our content */ @@ -93,9 +100,11 @@ StatusType dissect_q931_bearer_capability_ie(parameter_tvb, 0, tvb_reported_length_remaining(parameter_tvb,0), tree); -#.TYPE_RENAME - -#.FIELD_RENAME - +#.FIELD_ATTR +GSMLocation/geoCoordinates/latitude ABBREV=geoCoordinates.latitude +GSMLocation/geoCoordinates/longitude ABBREV=geoCoordinates.longitude +TetraLocation/ms-Loc/mnc ABBREV=ms_loc.mnc +TetraLocation/ms-Loc/mcc ABBREV=ms_loc.mcc +TetraLocation/ms-Loc/lai ABBREV=ms_loc.lai #.END diff --git a/epan/dissectors/asn1/acse/acse.cnf b/epan/dissectors/asn1/acse/acse.cnf index c9d531c6dc..48c615dbe9 100644 --- a/epan/dissectors/asn1/acse/acse.cnf +++ b/epan/dissectors/asn1/acse/acse.cnf @@ -169,5 +169,5 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned #.FIELD_ATTR Association-data/_item NAME = "Association-data" - +P-context-result-list/_item/result ABBREV=pcontext.result #.END diff --git a/epan/dissectors/asn1/ain/AIN-Operations.asn b/epan/dissectors/asn1/ain/AIN-Operations.asn index f24c7a2f6d..ce9551d51a 100644 --- a/epan/dissectors/asn1/ain/AIN-Operations.asn +++ b/epan/dissectors/asn1/ain/AIN-Operations.asn @@ -264,7 +264,7 @@ CallInfoFromResourceArg ::= SEQUENCE { FailureOutcomeArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, ccID CcID OPTIONAL, legID LegID OPTIONAL, bCMType BCMType OPTIONAL, @@ -409,7 +409,7 @@ CallInfoFromResourceArg ::= SEQUENCE { sap Sap OPTIONAL, aMASequenceNumber AMASequenceNumber OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, prefix Prefix OPTIONAL, triggerInformation TriggerInformation OPTIONAL } @@ -427,7 +427,7 @@ CallInfoFromResourceArg ::= SEQUENCE { OAnswerArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL @@ -458,7 +458,7 @@ CallInfoFromResourceArg ::= SEQUENCE { amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL } oDisconnect OPERATION ::= { @@ -484,7 +484,7 @@ CallInfoFromResourceArg ::= SEQUENCE { ODisconnectArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, @@ -532,7 +532,7 @@ CallInfoFromResourceArg ::= SEQUENCE { collectedDigits CollectedDigits OPTIONAL, verticalServiceCode VerticalServiceCode OPTIONAL, aCGEncountered ACGEncountered OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL @@ -567,7 +567,7 @@ CallInfoFromResourceArg ::= SEQUENCE { redirectingPartyID RedirectingPartyID OPTIONAL, redirectionInformation RedirectionInformation OPTIONAL, sap Sap OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, aCGEncountered ACGEncountered OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, @@ -600,7 +600,7 @@ CallInfoFromResourceArg ::= SEQUENCE { OSuspendedArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, @@ -623,7 +623,7 @@ CallInfoFromResourceArg ::= SEQUENCE { OTermSeizedArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL @@ -659,7 +659,7 @@ CallInfoFromResourceArg ::= SEQUENCE { sap Sap OPTIONAL, aMASequenceNumber AMASequenceNumber OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, triggerInformation TriggerInformation OPTIONAL } @@ -719,7 +719,7 @@ CallInfoFromResourceArg ::= SEQUENCE { SuccessOutcomeArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, ccID CcID OPTIONAL, legID LegID OPTIONAL, bCMType BCMType OPTIONAL, @@ -742,7 +742,7 @@ CallInfoFromResourceArg ::= SEQUENCE { TAnswerArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL @@ -781,7 +781,7 @@ CallInfoFromResourceArg ::= SEQUENCE { calledPartyStationType CalledPartyStationType OPTIONAL, sap Sap OPTIONAL, genericName GenericName OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, aCGEncountered ACGEncountered OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, @@ -821,7 +821,7 @@ CallInfoFromResourceArg ::= SEQUENCE { amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, aMASequenceNumber AMASequenceNumber OPTIONAL } @@ -848,7 +848,7 @@ CallInfoFromResourceArg ::= SEQUENCE { amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL } tMidCall OPERATION ::= { @@ -890,7 +890,7 @@ CallInfoFromResourceArg ::= SEQUENCE { collectedDigits CollectedDigits OPTIONAL, verticalServiceCode VerticalServiceCode OPTIONAL, aCGEncountered ACGEncountered OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, @@ -927,7 +927,7 @@ CallInfoFromResourceArg ::= SEQUENCE { calledPartyStationType CalledPartyStationType OPTIONAL, sap Sap OPTIONAL, genericName GenericName OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, aCGEncountered ACGEncountered OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, @@ -1000,7 +1000,7 @@ CallInfoFromResourceArg ::= SEQUENCE { TermResourceAvailableArg ::= SEQUENCE{ userID UserID, bearerCapability BearerCapability, - notificationIndicator NotificationIndicator OPTIONAL, + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL, amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, @@ -1052,7 +1052,7 @@ CallInfoFromResourceArg ::= SEQUENCE { amp1 Amp1 OPTIONAL, amp2 Amp2 OPTIONAL, extensionParameter [84] IMPLICIT ExtensionParameter OPTIONAL, - notificationIndicator NotificationIndicator OPTIONAL + notificationIndicator [111] IMPLICIT NotificationIndicator OPTIONAL } analyzeRoute OPERATION ::= { diff --git a/epan/dissectors/asn1/ain/AIN-Parameters.asn b/epan/dissectors/asn1/ain/AIN-Parameters.asn index 2174d37651..5b9d833322 100644 --- a/epan/dissectors/asn1/ain/AIN-Parameters.asn +++ b/epan/dissectors/asn1/ain/AIN-Parameters.asn @@ -929,7 +929,9 @@ tNoAnswerTimer TNoAnswerTimer, editListType EditListType, aCGGlobalOverride ACGGlobalOverride, - notificationIndicator NotificationIndicator, + notificationIndicator [111] IMPLICIT NotificationIndicator, + -- TRUE = Switch Notification Message + -- FALSE = Switch Request Message aMALineNumber AMALineNumber, aMADigitsDialedWC AMADigitsDialedWC, carrierUsage CarrierUsage, @@ -1139,7 +1141,7 @@ NotificationDuration ::= [128] IMPLICIT INTEGER(1..99) - NotificationIndicator ::= [111] IMPLICIT BOOLEAN + NotificationIndicator ::= BOOLEAN -- TRUE = Switch Notification Message -- FALSE = Switch Request Message diff --git a/epan/dissectors/asn1/ain/ain.cnf b/epan/dissectors/asn1/ain/ain.cnf index a1f34e652c..1ed7ab7e75 100644 --- a/epan/dissectors/asn1/ain/ain.cnf +++ b/epan/dissectors/asn1/ain/ain.cnf @@ -17,6 +17,9 @@ RejectProblem #.TYPE_RENAME #.FIELD_RENAME +DisplayInformation/notificationIndicator displayInformation_notificationIndicator +Reject/problem/invoke invokeproblem +Action8/invoke action8_invoke #.OMIT_ASSIGNMENT Remote-Operations-Information-Objects Bind @@ -230,6 +233,10 @@ static const ain_err_t ain_err_tab[] = { proto_tree_add_item(subtree, hf_ain_amaslpid, parameter_tvb, 0, tvb_reported_length_remaining(parameter_tvb, 0), ENC_BCD_DIGITS_0_9); +#.FIELD_ATTR +DisplayInformation/notificationIndicator ABBREV=displayInformation.notificationIndicator +Reject/problem/invoke ABBREV=invokeproblem +Action8/invoke ABBREV=action8.invoke #.END # diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index d722a266a4..8ddc9577c6 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -130,14 +130,14 @@ static int hf_HI2Operations_umtsLocation = -1; /* UMTSLocation */ static int hf_HI2Operations_sAI = -1; /* OCTET_STRING_SIZE_7 */ static int hf_HI2Operations_oldRAI = -1; /* OCTET_STRING_SIZE_6 */ static int hf_HI2Operations_ms_Loc = -1; /* T_ms_Loc */ -static int hf_HI2Operations_mcc = -1; /* INTEGER_0_1023 */ -static int hf_HI2Operations_mnc = -1; /* INTEGER_0_16383 */ -static int hf_HI2Operations_lai = -1; /* INTEGER_0_65535 */ +static int hf_HI2Operations_ms_Loc_mcc = -1; /* INTEGER_0_1023 */ +static int hf_HI2Operations_ms_Loc_mnc = -1; /* INTEGER_0_16383 */ +static int hf_HI2Operations_ms_Loc_lai = -1; /* INTEGER_0_65535 */ static int hf_HI2Operations_ci = -1; /* INTEGER */ static int hf_HI2Operations_ls_Loc = -1; /* INTEGER */ static int hf_HI2Operations_geoCoordinates = -1; /* T_geoCoordinates */ -static int hf_HI2Operations_latitude = -1; /* PrintableString_SIZE_7_10 */ -static int hf_HI2Operations_longitude = -1; /* PrintableString_SIZE_8_11 */ +static int hf_HI2Operations_geoCoordinates_latitude = -1; /* PrintableString_SIZE_7_10 */ +static int hf_HI2Operations_geoCoordinates_longitude = -1; /* PrintableString_SIZE_8_11 */ static int hf_HI2Operations_mapDatum = -1; /* MapDatum */ static int hf_HI2Operations_azimuth = -1; /* INTEGER_0_359 */ static int hf_HI2Operations_utmCoordinates = -1; /* T_utmCoordinates */ @@ -150,8 +150,8 @@ static int hf_HI2Operations_point = -1; /* GA_Point */ static int hf_HI2Operations_pointWithUnCertainty = -1; /* GA_PointWithUnCertainty */ static int hf_HI2Operations_polygon = -1; /* GA_Polygon */ static int hf_HI2Operations_latitudeSign = -1; /* T_latitudeSign */ -static int hf_HI2Operations_latitude_01 = -1; /* INTEGER_0_8388607 */ -static int hf_HI2Operations_longitude_01 = -1; /* INTEGER_M8388608_8388607 */ +static int hf_HI2Operations_latitude = -1; /* INTEGER_0_8388607 */ +static int hf_HI2Operations_longitude = -1; /* INTEGER_M8388608_8388607 */ static int hf_HI2Operations_geographicalCoordinates = -1; /* GeographicalCoordinates */ static int hf_HI2Operations_uncertaintyCode = -1; /* INTEGER_0_127 */ static int hf_HI2Operations_GA_Polygon_item = -1; /* GA_Polygon_item */ @@ -359,9 +359,9 @@ static int hf_HI2Operations_e164address = -1; /* NumericString_SIZE_20 */ static int hf_HI2Operations_tEI = -1; /* TEIType */ static int hf_HI2Operations_mSLoc = -1; /* TETRACGIType */ static int hf_HI2Operations_lSLoc = -1; /* TETRAAddressType */ -static int hf_HI2Operations_mcc_01 = -1; /* MCCType */ -static int hf_HI2Operations_mnc_01 = -1; /* MNCType */ -static int hf_HI2Operations_lai_01 = -1; /* LocationAreaType */ +static int hf_HI2Operations_mcc = -1; /* MCCType */ +static int hf_HI2Operations_mnc = -1; /* MNCType */ +static int hf_HI2Operations_lai = -1; /* LocationAreaType */ static int hf_HI2Operations_cI = -1; /* CellIdType */ static int hf_HI2Operations_ssi = -1; /* SSIType */ @@ -547,7 +547,7 @@ dissect_HI2Operations_OCTET_STRING_SIZE_1_5(gboolean implicit_tag _U_, tvbuff_t static int dissect_HI2Operations_T_e164_Format(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 78 "./asn1/HI2Operations/HI2Operations.cnf" +#line 85 "./asn1/HI2Operations/HI2Operations.cnf" tvbuff_t *parameter_tvb=NULL; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -891,9 +891,9 @@ dissect_HI2Operations_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static const ber_sequence_t T_ms_Loc_sequence[] = { - { &hf_HI2Operations_mcc , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_1023 }, - { &hf_HI2Operations_mnc , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_16383 }, - { &hf_HI2Operations_lai , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_65535 }, + { &hf_HI2Operations_ms_Loc_mcc, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_1023 }, + { &hf_HI2Operations_ms_Loc_mnc, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_16383 }, + { &hf_HI2Operations_ms_Loc_lai, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_65535 }, { &hf_HI2Operations_ci , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER }, { NULL, 0, 0, 0, NULL } }; @@ -989,8 +989,8 @@ dissect_HI2Operations_INTEGER_0_359(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static const ber_sequence_t T_geoCoordinates_sequence[] = { - { &hf_HI2Operations_latitude, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_7_10 }, - { &hf_HI2Operations_longitude, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_8_11 }, + { &hf_HI2Operations_geoCoordinates_latitude, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_7_10 }, + { &hf_HI2Operations_geoCoordinates_longitude, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_8_11 }, { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MapDatum }, { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_359 }, { NULL, 0, 0, 0, NULL } @@ -1144,8 +1144,8 @@ dissect_HI2Operations_INTEGER_M8388608_8388607(gboolean implicit_tag _U_, tvbuff static const ber_sequence_t GeographicalCoordinates_sequence[] = { { &hf_HI2Operations_latitudeSign, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_latitudeSign }, - { &hf_HI2Operations_latitude_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_8388607 }, - { &hf_HI2Operations_longitude_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_M8388608_8388607 }, + { &hf_HI2Operations_latitude, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_8388607 }, + { &hf_HI2Operations_longitude, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_M8388608_8388607 }, { NULL, 0, 0, 0, NULL } }; @@ -3175,9 +3175,9 @@ dissect_HI2Operations_CellIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static const ber_sequence_t TETRACGIType_sequence[] = { - { &hf_HI2Operations_mcc_01, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType }, - { &hf_HI2Operations_mnc_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType }, - { &hf_HI2Operations_lai_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LocationAreaType }, + { &hf_HI2Operations_mcc , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType }, + { &hf_HI2Operations_mnc , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType }, + { &hf_HI2Operations_lai , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LocationAreaType }, { &hf_HI2Operations_cI , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CellIdType }, { NULL, 0, 0, 0, NULL } }; @@ -3203,8 +3203,8 @@ dissect_HI2Operations_SSIType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static const ber_sequence_t TSIType_sequence[] = { - { &hf_HI2Operations_mcc_01, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType }, - { &hf_HI2Operations_mnc_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType }, + { &hf_HI2Operations_mcc , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType }, + { &hf_HI2Operations_mnc , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType }, { &hf_HI2Operations_ssi , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SSIType }, { NULL, 0, 0, 0, NULL } }; @@ -3799,7 +3799,7 @@ dissect_HI2Operations_Direction_Indication(gboolean implicit_tag _U_, tvbuff_t * static int dissect_HI2Operations_T_bearer_capability(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 87 "./asn1/HI2Operations/HI2Operations.cnf" +#line 94 "./asn1/HI2Operations/HI2Operations.cnf" tvbuff_t *parameter_tvb; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -3857,7 +3857,7 @@ static const ber_sequence_t UUS1_Content_sequence[] = { static int dissect_HI2Operations_UUS1_Content(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 34 "./asn1/HI2Operations/HI2Operations.cnf" +#line 41 "./asn1/HI2Operations/HI2Operations.cnf" /* Heuristic test to see if it's our content */ gint8 tmp_class; @@ -4298,16 +4298,16 @@ void proto_register_HI2Operations(void) { { "ms-Loc", "HI2Operations.ms_Loc_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_HI2Operations_mcc, - { "mcc", "HI2Operations.mcc", + { &hf_HI2Operations_ms_Loc_mcc, + { "mcc", "HI2Operations.ms_loc.mcc", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_0_1023", HFILL }}, - { &hf_HI2Operations_mnc, - { "mnc", "HI2Operations.mnc", + { &hf_HI2Operations_ms_Loc_mnc, + { "mnc", "HI2Operations.ms_loc.mnc", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_0_16383", HFILL }}, - { &hf_HI2Operations_lai, - { "lai", "HI2Operations.lai", + { &hf_HI2Operations_ms_Loc_lai, + { "lai", "HI2Operations.ms_loc.lai", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_0_65535", HFILL }}, { &hf_HI2Operations_ci, @@ -4322,12 +4322,12 @@ void proto_register_HI2Operations(void) { { "geoCoordinates", "HI2Operations.geoCoordinates_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_HI2Operations_latitude, - { "latitude", "HI2Operations.latitude", + { &hf_HI2Operations_geoCoordinates_latitude, + { "latitude", "HI2Operations.geoCoordinates.latitude", FT_STRING, BASE_NONE, NULL, 0, "PrintableString_SIZE_7_10", HFILL }}, - { &hf_HI2Operations_longitude, - { "longitude", "HI2Operations.longitude", + { &hf_HI2Operations_geoCoordinates_longitude, + { "longitude", "HI2Operations.geoCoordinates.longitude", FT_STRING, BASE_NONE, NULL, 0, "PrintableString_SIZE_8_11", HFILL }}, { &hf_HI2Operations_mapDatum, @@ -4378,11 +4378,11 @@ void proto_register_HI2Operations(void) { { "latitudeSign", "HI2Operations.latitudeSign", FT_UINT32, BASE_DEC, VALS(HI2Operations_T_latitudeSign_vals), 0, NULL, HFILL }}, - { &hf_HI2Operations_latitude_01, + { &hf_HI2Operations_latitude, { "latitude", "HI2Operations.latitude", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_0_8388607", HFILL }}, - { &hf_HI2Operations_longitude_01, + { &hf_HI2Operations_longitude, { "longitude", "HI2Operations.longitude", FT_INT32, BASE_DEC, NULL, 0, "INTEGER_M8388608_8388607", HFILL }}, @@ -5214,15 +5214,15 @@ void proto_register_HI2Operations(void) { { "lSLoc", "HI2Operations.lSLoc", FT_UINT32, BASE_DEC, VALS(HI2Operations_TETRAAddressType_vals), 0, "TETRAAddressType", HFILL }}, - { &hf_HI2Operations_mcc_01, + { &hf_HI2Operations_mcc, { "mcc", "HI2Operations.mcc", FT_BYTES, BASE_NONE, NULL, 0, "MCCType", HFILL }}, - { &hf_HI2Operations_mnc_01, + { &hf_HI2Operations_mnc, { "mnc", "HI2Operations.mnc", FT_BYTES, BASE_NONE, NULL, 0, "MNCType", HFILL }}, - { &hf_HI2Operations_lai_01, + { &hf_HI2Operations_lai, { "lai", "HI2Operations.lai", FT_BYTES, BASE_NONE, NULL, 0, "LocationAreaType", HFILL }}, diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 8eb5ca9c6f..c553bc9f59 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -2121,7 +2121,7 @@ void proto_register_acse(void) { FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_acse_pcontext_result, - { "result", "acse.result", + { "result", "acse.pcontext.result", FT_INT32, BASE_DEC, VALS(acse_Result_vals), 0, NULL, HFILL }}, { &hf_acse_concrete_syntax_name, diff --git a/epan/dissectors/packet-ain.c b/epan/dissectors/packet-ain.c index ab8147d4e0..9bacf018af 100644 --- a/epan/dissectors/packet-ain.c +++ b/epan/dissectors/packet-ain.c @@ -362,7 +362,7 @@ static int hf_ain_action7 = -1; /* Action7 */ static int hf_ain_toggle = -1; /* Toggle */ static int hf_ain_service8 = -1; /* Service8 */ static int hf_ain_action8 = -1; /* Action8 */ -static int hf_ain_invoke = -1; /* Invoke8 */ +static int hf_ain_action8_invoke = -1; /* Invoke8 */ static int hf_ain_service9 = -1; /* Service9 */ static int hf_ain_action9 = -1; /* Action9 */ static int hf_ain_changeList = -1; /* ChangeList */ @@ -391,7 +391,7 @@ static int hf_ain_continuation = -1; /* OCTET_STRING_SIZE_1_20 */ static int hf_ain_calledAddress = -1; /* OCTET_STRING_SIZE_1_20 */ static int hf_ain_cause = -1; /* OCTET_STRING_SIZE_1_20 */ static int hf_ain_progressIndicator = -1; /* OCTET_STRING_SIZE_1_20 */ -static int hf_ain_notificationIndicator_01 = -1; /* OCTET_STRING_SIZE_1_20 */ +static int hf_ain_displayInformation_notificationIndicator = -1; /* OCTET_STRING_SIZE_1_20 */ static int hf_ain_prompt = -1; /* OCTET_STRING_SIZE_1_20 */ static int hf_ain_accumulatedDigits = -1; /* OCTET_STRING_SIZE_1_20 */ static int hf_ain_status = -1; /* OCTET_STRING_SIZE_1_20 */ @@ -475,7 +475,7 @@ static int hf_ain_privateFacilityGID = -1; /* PrivateFacilityGID */ static int hf_ain_aDSIcpeID = -1; /* ADSIcpeID */ static int hf_ain_local = -1; /* T_local */ static int hf_ain_global = -1; /* OBJECT_IDENTIFIER */ -static int hf_ain_invoke_01 = -1; /* Invoke */ +static int hf_ain_invoke = -1; /* Invoke */ static int hf_ain_returnResult = -1; /* ReturnResult */ static int hf_ain_returnError = -1; /* ReturnError */ static int hf_ain_reject = -1; /* Reject */ @@ -491,7 +491,7 @@ static int hf_ain_errcode = -1; /* Code */ static int hf_ain_parameter_01 = -1; /* T_parameter */ static int hf_ain_problem = -1; /* T_problem */ static int hf_ain_general = -1; /* GeneralProblem */ -static int hf_ain_invoke_02 = -1; /* InvokeProblem */ +static int hf_ain_invokeproblem = -1; /* InvokeProblem */ static int hf_ain_returnResult_01 = -1; /* ReturnResultProblem */ static int hf_ain_returnError_01 = -1; /* ReturnErrorProblem */ static int hf_ain_present_01 = -1; /* INTEGER */ @@ -943,7 +943,7 @@ dissect_ain_SpcID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_ain_AINDigits(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 185 "./asn1/ain/ain.cnf" +#line 188 "./asn1/ain/ain.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -1145,7 +1145,7 @@ dissect_ain_T_assignmentAuthority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_ain_T_parameters(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 182 "./asn1/ain/ain.cnf" +#line 185 "./asn1/ain/ain.cnf" offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); @@ -1546,7 +1546,7 @@ dissect_ain_CollectedAddressInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static int dissect_ain_CarrierFormat(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 202 "./asn1/ain/ain.cnf" +#line 205 "./asn1/ain/ain.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -1728,19 +1728,9 @@ dissect_ain_CTRClearArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset -static int -dissect_ain_BOOLEAN(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_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); - - return offset; -} - - - static int dissect_ain_NotificationIndicator(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_CON, 111, TRUE, dissect_ain_BOOLEAN); + offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); return offset; } @@ -1749,7 +1739,7 @@ dissect_ain_NotificationIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static const ber_sequence_t FailureOutcomeArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_ccID , BER_CLASS_CON, 133, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_CcID }, { &hf_ain_legID , BER_CLASS_CON, 132, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_LegID }, { &hf_ain_bCMType , BER_CLASS_CON, 134, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_BCMType }, @@ -2036,6 +2026,15 @@ dissect_ain_Sap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, as +static int +dissect_ain_BOOLEAN(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_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); + + return offset; +} + + + static int dissect_ain_STRConnection(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, @@ -2307,7 +2306,7 @@ static const ber_sequence_t NetworkBusyArg_sequence[] = { { &hf_ain_sap , BER_CLASS_CON, 81, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Sap }, { &hf_ain_aMASequenceNumber, BER_CLASS_CON, 89, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_AMASequenceNumber }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_prefix , BER_CLASS_CON, 148, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Prefix }, { &hf_ain_triggerInformation, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_TriggerInformation }, { NULL, 0, 0, 0, NULL } @@ -2325,7 +2324,7 @@ dissect_ain_NetworkBusyArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static const ber_sequence_t OAnswerArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2349,7 +2348,7 @@ static const ber_sequence_t OAbandonArg_sequence[] = { { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { NULL, 0, 0, 0, NULL } }; @@ -2390,7 +2389,7 @@ dissect_ain_DisconnectCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static const ber_sequence_t ODisconnectArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2447,7 +2446,7 @@ static const ber_sequence_t OMidCallArg_sequence[] = { { &hf_ain_collectedDigits , BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_CollectedDigits }, { &hf_ain_verticalServiceCode, BER_CLASS_CON, 54, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_VerticalServiceCode }, { &hf_ain_aCGEncountered , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_ACGEncountered }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2477,7 +2476,7 @@ static const ber_sequence_t ONoAnswerArg_sequence[] = { { &hf_ain_redirectingPartyID, BER_CLASS_CON, 43, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_RedirectingPartyID }, { &hf_ain_redirectionInformation, BER_CLASS_CON, 44, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_RedirectionInformation }, { &hf_ain_sap , BER_CLASS_CON, 81, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Sap }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_aCGEncountered , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_ACGEncountered }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, @@ -2502,7 +2501,7 @@ dissect_ain_ONoAnswerArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static const ber_sequence_t OSuspendedArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2523,7 +2522,7 @@ dissect_ain_OSuspendedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static const ber_sequence_t OTermSeizedArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2554,7 +2553,7 @@ static const ber_sequence_t OriginationAttemptArg_sequence[] = { { &hf_ain_sap , BER_CLASS_CON, 81, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Sap }, { &hf_ain_aMASequenceNumber, BER_CLASS_CON, 89, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_AMASequenceNumber }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_triggerInformation, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_TriggerInformation }, { NULL, 0, 0, 0, NULL } }; @@ -2609,7 +2608,7 @@ dissect_ain_ResourceClearArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static const ber_sequence_t SuccessOutcomeArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_ccID , BER_CLASS_CON, 133, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_CcID }, { &hf_ain_legID , BER_CLASS_CON, 132, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_LegID }, { &hf_ain_bCMType , BER_CLASS_CON, 134, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_BCMType }, @@ -2632,7 +2631,7 @@ dissect_ain_SuccessOutcomeArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static const ber_sequence_t TAnswerArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2741,7 +2740,7 @@ static const ber_sequence_t TBusyArg_sequence[] = { { &hf_ain_calledPartyStationType, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_CalledPartyStationType }, { &hf_ain_sap , BER_CLASS_CON, 81, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Sap }, { &hf_ain_genericName , BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_GenericName }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_aCGEncountered , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_ACGEncountered }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, @@ -2772,7 +2771,7 @@ static const ber_sequence_t TDisconnectArg_sequence[] = { { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_aMASequenceNumber, BER_CLASS_CON, 89, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_AMASequenceNumber }, { NULL, 0, 0, 0, NULL } }; @@ -2803,7 +2802,7 @@ static const ber_sequence_t TDTMFEnteredArg_sequence[] = { { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { NULL, 0, 0, 0, NULL } }; @@ -2835,7 +2834,7 @@ static const ber_sequence_t TMidCallArg_sequence[] = { { &hf_ain_collectedDigits , BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_CollectedDigits }, { &hf_ain_verticalServiceCode, BER_CLASS_CON, 54, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_VerticalServiceCode }, { &hf_ain_aCGEncountered , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_ACGEncountered }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2867,7 +2866,7 @@ static const ber_sequence_t TNoAnswerArg_sequence[] = { { &hf_ain_calledPartyStationType, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_CalledPartyStationType }, { &hf_ain_sap , BER_CLASS_CON, 81, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Sap }, { &hf_ain_genericName , BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_GenericName }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_aCGEncountered , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_ACGEncountered }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, @@ -2940,7 +2939,7 @@ dissect_ain_TerminationAttemptArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static const ber_sequence_t TermResourceAvailableArg_sequence[] = { { &hf_ain_userID , BER_CLASS_CON, 53, BER_FLAGS_NOOWNTAG, dissect_ain_UserID }, { &hf_ain_bearerCapability, BER_CLASS_CON, 13, BER_FLAGS_NOOWNTAG, dissect_ain_BearerCapability }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, @@ -2984,7 +2983,7 @@ static const ber_sequence_t TimeoutArg_sequence[] = { { &hf_ain_amp1 , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp1 }, { &hf_ain_amp2 , BER_CLASS_CON, 109, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_Amp2 }, { &hf_ain_extensionParameter, BER_CLASS_CON, 84, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_ExtensionParameter }, - { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { NULL, 0, 0, 0, NULL } }; @@ -3210,7 +3209,7 @@ dissect_ain_SEQUENCE_SIZE_1_2_OF_AMALineNumber(gboolean implicit_tag _U_, tvbuff static int dissect_ain_AMAslpID(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 221 "./asn1/ain/ain.cnf" +#line 224 "./asn1/ain/ain.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; @@ -3481,7 +3480,7 @@ static const ber_choice_t DisplayInformation_choice[] = { { 3, &hf_ain_calledAddress , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, { 4, &hf_ain_cause , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, { 5, &hf_ain_progressIndicator, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, - { 6, &hf_ain_notificationIndicator_01, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, + { 6, &hf_ain_displayInformation_notificationIndicator, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, { 7, &hf_ain_prompt , BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, { 8, &hf_ain_accumulatedDigits, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, { 9, &hf_ain_status , BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_ain_OCTET_STRING_SIZE_1_20 }, @@ -7257,7 +7256,7 @@ static const value_string ain_Action8_vals[] = { }; static const ber_choice_t Action8_choice[] = { - { 2, &hf_ain_invoke , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ain_Invoke8 }, + { 2, &hf_ain_action8_invoke , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ain_Invoke8 }, { 0, NULL, 0, 0, 0, NULL } }; @@ -7992,7 +7991,7 @@ static const ber_choice_t Parms_choice[] = { { 102, &hf_ain_tNoAnswerTimer , BER_CLASS_CON, 99, BER_FLAGS_NOOWNTAG, dissect_ain_TNoAnswerTimer }, { 103, &hf_ain_editListType , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ain_EditListType }, { 104, &hf_ain_aCGGlobalOverride, BER_CLASS_CON, 110, BER_FLAGS_NOOWNTAG, dissect_ain_ACGGlobalOverride }, - { 105, &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_NOOWNTAG, dissect_ain_NotificationIndicator }, + { 105, &hf_ain_notificationIndicator, BER_CLASS_CON, 111, BER_FLAGS_IMPLTAG, dissect_ain_NotificationIndicator }, { 106, &hf_ain_aMALineNumber , BER_CLASS_CON, 9, BER_FLAGS_NOOWNTAG, dissect_ain_AMALineNumber }, { 107, &hf_ain_aMADigitsDialedWC, BER_CLASS_CON, 8, BER_FLAGS_NOOWNTAG, dissect_ain_AMADigitsDialedWC }, { 108, &hf_ain_carrierUsage , BER_CLASS_CON, 79, BER_FLAGS_NOOWNTAG, dissect_ain_CarrierUsage }, @@ -8143,7 +8142,7 @@ dissect_ain_PAR_failureReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_ain_T_local(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 137 "./asn1/ain/ain.cnf" +#line 140 "./asn1/ain/ain.cnf" offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, &opcode); @@ -8252,7 +8251,7 @@ dissect_ain_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_ain_T_argument(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 166 "./asn1/ain/ain.cnf" +#line 169 "./asn1/ain/ain.cnf" offset = dissect_invokeData(tree, tvb, offset, actx); @@ -8272,7 +8271,7 @@ static const ber_sequence_t Invoke_sequence[] = { static int dissect_ain_Invoke(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 150 "./asn1/ain/ain.cnf" +#line 153 "./asn1/ain/ain.cnf" ain_opcode_type=AIN_OPCODE_INVOKE; @@ -8287,7 +8286,7 @@ dissect_ain_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_ain_T_result_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_) { -#line 170 "./asn1/ain/ain.cnf" +#line 173 "./asn1/ain/ain.cnf" offset = dissect_returnResultData(tree, tvb, offset, actx); @@ -8320,7 +8319,7 @@ static const ber_sequence_t ReturnResult_sequence[] = { static int dissect_ain_ReturnResult(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 154 "./asn1/ain/ain.cnf" +#line 157 "./asn1/ain/ain.cnf" ain_opcode_type=AIN_OPCODE_RETURN_RESULT; @@ -8335,7 +8334,7 @@ dissect_ain_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_ain_T_parameter(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 174 "./asn1/ain/ain.cnf" +#line 177 "./asn1/ain/ain.cnf" offset = dissect_returnErrorData(tree, tvb, offset, actx); @@ -8354,7 +8353,7 @@ static const ber_sequence_t ReturnError_sequence[] = { static int dissect_ain_ReturnError(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 158 "./asn1/ain/ain.cnf" +#line 161 "./asn1/ain/ain.cnf" ain_opcode_type=AIN_OPCODE_RETURN_ERROR; @@ -8451,7 +8450,7 @@ static const value_string ain_T_problem_vals[] = { static const ber_choice_t T_problem_choice[] = { { 0, &hf_ain_general , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ain_GeneralProblem }, - { 1, &hf_ain_invoke_02 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ain_InvokeProblem }, + { 1, &hf_ain_invokeproblem , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ain_InvokeProblem }, { 2, &hf_ain_returnResult_01 , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ain_ReturnResultProblem }, { 3, &hf_ain_returnError_01 , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ain_ReturnErrorProblem }, { 0, NULL, 0, 0, 0, NULL } @@ -8475,7 +8474,7 @@ static const ber_sequence_t Reject_sequence[] = { static int dissect_ain_Reject(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 162 "./asn1/ain/ain.cnf" +#line 165 "./asn1/ain/ain.cnf" ain_opcode_type=AIN_OPCODE_REJECT; @@ -8488,7 +8487,7 @@ dissect_ain_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static const ber_choice_t ROS_choice[] = { - { 1, &hf_ain_invoke_01 , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ain_Invoke }, + { 1, &hf_ain_invoke , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ain_Invoke }, { 2, &hf_ain_returnResult , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_ain_ReturnResult }, { 3, &hf_ain_returnError , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_ain_ReturnError }, { 4, &hf_ain_reject , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_ain_Reject }, @@ -10573,8 +10572,8 @@ void proto_register_ain(void) { { "action8", "ain.action8", FT_UINT32, BASE_DEC, VALS(ain_Action8_vals), 0, NULL, HFILL }}, - { &hf_ain_invoke, - { "invoke", "ain.invoke", + { &hf_ain_action8_invoke, + { "invoke", "ain.action8.invoke", FT_UINT32, BASE_DEC, VALS(ain_Invoke8_vals), 0, "Invoke8", HFILL }}, { &hf_ain_service9, @@ -10689,8 +10688,8 @@ void proto_register_ain(void) { { "progressIndicator", "ain.progressIndicator", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_1_20", HFILL }}, - { &hf_ain_notificationIndicator_01, - { "notificationIndicator", "ain.notificationIndicator", + { &hf_ain_displayInformation_notificationIndicator, + { "notificationIndicator", "ain.displayInformation.notificationIndicator", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_1_20", HFILL }}, { &hf_ain_prompt, @@ -11025,7 +11024,7 @@ void proto_register_ain(void) { { "global", "ain.global", FT_OID, BASE_NONE, NULL, 0, "OBJECT_IDENTIFIER", HFILL }}, - { &hf_ain_invoke_01, + { &hf_ain_invoke, { "invoke", "ain.invoke_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -11089,8 +11088,8 @@ void proto_register_ain(void) { { "general", "ain.general", FT_INT32, BASE_DEC, VALS(ain_GeneralProblem_vals), 0, "GeneralProblem", HFILL }}, - { &hf_ain_invoke_02, - { "invoke", "ain.invoke", + { &hf_ain_invokeproblem, + { "invoke", "ain.invokeproblem", FT_INT32, BASE_DEC, VALS(ain_InvokeProblem_vals), 0, "InvokeProblem", HFILL }}, { &hf_ain_returnResult_01,