ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb

svn path=/trunk/; revision=18921

1 files changed, 94 insertions, 94 deletions

diff --git a/epan/dissectors/packet-gsm_ss.c b/epan/dissectors/packet-gsm_ss.c
index c4bd3cc956..42c9698f56 100644
--- a/epan/dissectors/packet-gsm_ss.c
+++ b/epan/dissectors/packet-gsm_ss.c
@@ -505,10 +505,10 @@ static const value_string gsm_ss_RDN_vals[] = {
 };
 
 static const ber_choice_t RDN_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_presentationAllowedAddress_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_presentationRestricted_impl },
-  {   2, BER_CLASS_CON, 2, 0, dissect_numberNotAvailableDueToInterworking_impl },
-  {   3, BER_CLASS_CON, 3, 0, dissect_presentationRestrictedAddress_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_presentationAllowedAddress_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_numberNotAvailableDueToInterworking_impl },
+  {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_presentationRestrictedAddress_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -587,10 +587,10 @@ static const value_string gsm_ss_Name_vals[] = {
 };
 
 static const ber_choice_t Name_choice[] = {
-  {   0, BER_CLASS_CON, 0, 0, dissect_namePresentationAllowed_impl },
-  {   1, BER_CLASS_CON, 1, 0, dissect_presentationRestricted_impl },
-  {   2, BER_CLASS_CON, 2, 0, dissect_nameUnavailable_impl },
-  {   3, BER_CLASS_CON, 3, 0, dissect_namePresentationRestricted_impl },
+  {   0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_namePresentationAllowed_impl },
+  {   1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentationRestricted_impl },
+  {   2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_nameUnavailable_impl },
+  {   3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_namePresentationRestricted_impl },
   { 0, 0, 0, 0, NULL }
 };
 
@@ -1551,347 +1551,347 @@ void proto_register_gsm_ss(void) {
     { &hf_gsm_ss_notifySS,
       { "notifySS", "gsm_ss.notifySS",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/notifySS", HFILL }},
+        "gsm_ss.NotifySS_Arg", HFILL }},
     { &hf_gsm_ss_processUnstructuredSS_Data,
       { "processUnstructuredSS-Data", "gsm_ss.processUnstructuredSS_Data",
         FT_STRING, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/processUnstructuredSS-Data", HFILL }},
+        "gsm_ss.SS_UserData", HFILL }},
     { &hf_gsm_ss_forwardCUG_Info,
       { "forwardCUG-Info", "gsm_ss.forwardCUG_Info",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/forwardCUG-Info", HFILL }},
+        "gsm_ss.ForwardCUG_InfoArg", HFILL }},
     { &hf_gsm_ss_accessRegisterCCEntry,
       { "accessRegisterCCEntry", "gsm_ss.accessRegisterCCEntry",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/accessRegisterCCEntry", HFILL }},
+        "gsm_ss.AccessRegisterCCEntryArg", HFILL }},
     { &hf_gsm_ss_forwardChargeAdvice,
       { "forwardChargeAdvice", "gsm_ss.forwardChargeAdvice",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/forwardChargeAdvice", HFILL }},
+        "gsm_ss.ForwardChargeAdviceArg", HFILL }},
     { &hf_gsm_ss_callDeflection,
       { "callDeflection", "gsm_ss.callDeflection",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/callDeflection", HFILL }},
+        "gsm_ss.CallDeflectionArg", HFILL }},
     { &hf_gsm_ss_lcs_LocationNotification,
       { "lcs-LocationNotification", "gsm_ss.lcs_LocationNotification",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/lcs-LocationNotification", HFILL }},
+        "gsm_ss.LocationNotificationArg", HFILL }},
     { &hf_gsm_ss_lcs_MOLR,
       { "lcs-MOLR", "gsm_ss.lcs_MOLR",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/lcs-MOLR", HFILL }},
+        "gsm_ss.LCS_MOLRArg", HFILL }},
     { &hf_gsm_ss_lcs_AreaEventRequest,
       { "lcs-AreaEventRequest", "gsm_ss.lcs_AreaEventRequest",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/lcs-AreaEventRequest", HFILL }},
+        "gsm_ss.LCS_AreaEventRequestArg", HFILL }},
     { &hf_gsm_ss_lcs_AreaEventReport,
       { "lcs-AreaEventReport", "gsm_ss.lcs_AreaEventReport",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/lcs-AreaEventReport", HFILL }},
+        "gsm_ss.LCS_AreaEventReportArg", HFILL }},
     { &hf_gsm_ss_lcs_AreaEventCancellation,
       { "lcs-AreaEventCancellation", "gsm_ss.lcs_AreaEventCancellation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsArg/lcs-AreaEventCancellation", HFILL }},
+        "gsm_ss.LCS_AreaEventCancellationArg", HFILL }},
     { &hf_gsm_ss_registerCC_EntryRes,
       { "registerCC-EntryRes", "gsm_ss.registerCC_EntryRes",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsRes/registerCC-EntryRes", HFILL }},
+        "gsm_ss.RegisterCC_EntryRes", HFILL }},
     { &hf_gsm_ss_lcs_LocationNotification_res,
       { "lcs-LocationNotification-res", "gsm_ss.lcs_LocationNotification_res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsRes/lcs-LocationNotification-res", HFILL }},
+        "gsm_ss.LocationNotificationRes", HFILL }},
     { &hf_gsm_ss_lcs_MOLR_res,
       { "lcs-MOLR-res", "gsm_ss.lcs_MOLR_res",
         FT_NONE, BASE_NONE, NULL, 0,
-        "DummySS-operationsRes/lcs-MOLR-res", HFILL }},
+        "gsm_ss.LCS_MOLRRes", HFILL }},
     { &hf_gsm_ss_ss_Code,
       { "ss-Code", "gsm_ss.ss_Code",
         FT_UINT8, BASE_DEC, VALS(ssCode_vals), 0,
-        "", HFILL }},
+        "gsm_map.SS_Code", HFILL }},
     { &hf_gsm_ss_ss_Status,
       { "ss-Status", "gsm_ss.ss_Status",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "NotifySS-Arg/ss-Status", HFILL }},
+        "gsm_map.SS_Status", HFILL }},
     { &hf_gsm_ss_ss_Notification,
       { "ss-Notification", "gsm_ss.ss_Notification",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "NotifySS-Arg/ss-Notification", HFILL }},
+        "gsm_ss.SS_Notification", HFILL }},
     { &hf_gsm_ss_callIsWaiting_Indicator,
       { "callIsWaiting-Indicator", "gsm_ss.callIsWaiting_Indicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NotifySS-Arg/callIsWaiting-Indicator", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_callOnHold_Indicator,
       { "callOnHold-Indicator", "gsm_ss.callOnHold_Indicator",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_CallOnHold_Indicator_vals), 0,
-        "NotifySS-Arg/callOnHold-Indicator", HFILL }},
+        "gsm_ss.CallOnHold_Indicator", HFILL }},
     { &hf_gsm_ss_mpty_Indicator,
       { "mpty-Indicator", "gsm_ss.mpty_Indicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NotifySS-Arg/mpty-Indicator", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_cug_Index,
       { "cug-Index", "gsm_ss.cug_Index",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "gsm_map.CUG_Index", HFILL }},
     { &hf_gsm_ss_clirSuppressionRejected,
       { "clirSuppressionRejected", "gsm_ss.clirSuppressionRejected",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NotifySS-Arg/clirSuppressionRejected", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_ect_Indicator,
       { "ect-Indicator", "gsm_ss.ect_Indicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NotifySS-Arg/ect-Indicator", HFILL }},
+        "gsm_ss.ECT_Indicator", HFILL }},
     { &hf_gsm_ss_nameIndicator,
       { "nameIndicator", "gsm_ss.nameIndicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NotifySS-Arg/nameIndicator", HFILL }},
+        "gsm_ss.NameIndicator", HFILL }},
     { &hf_gsm_ss_ccbs_Feature,
       { "ccbs-Feature", "gsm_ss.ccbs_Feature",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NotifySS-Arg/ccbs-Feature", HFILL }},
+        "gsm_map.CCBS_Feature", HFILL }},
     { &hf_gsm_ss_alertingPattern,
       { "alertingPattern", "gsm_ss.alertingPattern",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "NotifySS-Arg/alertingPattern", HFILL }},
+        "gsm_map.AlertingPattern", HFILL }},
     { &hf_gsm_ss_multicall_Indicator,
       { "multicall-Indicator", "gsm_ss.multicall_Indicator",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_Multicall_Indicator_vals), 0,
-        "NotifySS-Arg/multicall-Indicator", HFILL }},
+        "gsm_ss.Multicall_Indicator", HFILL }},
     { &hf_gsm_ss_chargingInformation,
       { "chargingInformation", "gsm_ss.chargingInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ForwardChargeAdviceArg/chargingInformation", HFILL }},
+        "gsm_ss.ChargingInformation", HFILL }},
     { &hf_gsm_ss_e1,
       { "e1", "gsm_ss.e1",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ChargingInformation/e1", HFILL }},
+        "gsm_ss.E1", HFILL }},
     { &hf_gsm_ss_e2,
       { "e2", "gsm_ss.e2",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ChargingInformation/e2", HFILL }},
+        "gsm_ss.E2", HFILL }},
     { &hf_gsm_ss_e3,
       { "e3", "gsm_ss.e3",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ChargingInformation/e3", HFILL }},
+        "gsm_ss.E3", HFILL }},
     { &hf_gsm_ss_e4,
       { "e4", "gsm_ss.e4",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ChargingInformation/e4", HFILL }},
+        "gsm_ss.E4", HFILL }},
     { &hf_gsm_ss_e5,
       { "e5", "gsm_ss.e5",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ChargingInformation/e5", HFILL }},
+        "gsm_ss.E5", HFILL }},
     { &hf_gsm_ss_e6,
       { "e6", "gsm_ss.e6",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ChargingInformation/e6", HFILL }},
+        "gsm_ss.E6", HFILL }},
     { &hf_gsm_ss_e7,
       { "e7", "gsm_ss.e7",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ChargingInformation/e7", HFILL }},
+        "gsm_ss.E7", HFILL }},
     { &hf_gsm_ss_suppressPrefCUG,
       { "suppressPrefCUG", "gsm_ss.suppressPrefCUG",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ForwardCUG-InfoArg/suppressPrefCUG", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_suppressOA,
       { "suppressOA", "gsm_ss.suppressOA",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ForwardCUG-InfoArg/suppressOA", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_ect_CallState,
       { "ect-CallState", "gsm_ss.ect_CallState",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_ECT_CallState_vals), 0,
-        "ECT-Indicator/ect-CallState", HFILL }},
+        "gsm_ss.ECT_CallState", HFILL }},
     { &hf_gsm_ss_rdn,
       { "rdn", "gsm_ss.rdn",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_RDN_vals), 0,
-        "ECT-Indicator/rdn", HFILL }},
+        "gsm_ss.RDN", HFILL }},
     { &hf_gsm_ss_callingName,
       { "callingName", "gsm_ss.callingName",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_Name_vals), 0,
-        "NameIndicator/callingName", HFILL }},
+        "gsm_ss.Name", HFILL }},
     { &hf_gsm_ss_namePresentationAllowed,
       { "namePresentationAllowed", "gsm_ss.namePresentationAllowed",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Name/namePresentationAllowed", HFILL }},
+        "gsm_ss.NameSet", HFILL }},
     { &hf_gsm_ss_presentationRestricted,
       { "presentationRestricted", "gsm_ss.presentationRestricted",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_nameUnavailable,
       { "nameUnavailable", "gsm_ss.nameUnavailable",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Name/nameUnavailable", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_namePresentationRestricted,
       { "namePresentationRestricted", "gsm_ss.namePresentationRestricted",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Name/namePresentationRestricted", HFILL }},
+        "gsm_ss.NameSet", HFILL }},
     { &hf_gsm_ss_dataCodingScheme,
       { "dataCodingScheme", "gsm_ss.dataCodingScheme",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "NameSet/dataCodingScheme", HFILL }},
+        "gsm_map.USSD_DataCodingScheme", HFILL }},
     { &hf_gsm_ss_lengthInCharacters,
       { "lengthInCharacters", "gsm_ss.lengthInCharacters",
         FT_INT32, BASE_DEC, NULL, 0,
-        "NameSet/lengthInCharacters", HFILL }},
+        "gsm_ss.INTEGER", HFILL }},
     { &hf_gsm_ss_nameString,
       { "nameString", "gsm_ss.nameString",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "NameSet/nameString", HFILL }},
+        "gsm_map.USSD_String", HFILL }},
     { &hf_gsm_ss_presentationAllowedAddress,
       { "presentationAllowedAddress", "gsm_ss.presentationAllowedAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RDN/presentationAllowedAddress", HFILL }},
+        "gsm_ss.RemotePartyNumber", HFILL }},
     { &hf_gsm_ss_numberNotAvailableDueToInterworking,
       { "numberNotAvailableDueToInterworking", "gsm_ss.numberNotAvailableDueToInterworking",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RDN/numberNotAvailableDueToInterworking", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_presentationRestrictedAddress,
       { "presentationRestrictedAddress", "gsm_ss.presentationRestrictedAddress",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RDN/presentationRestrictedAddress", HFILL }},
+        "gsm_ss.RemotePartyNumber", HFILL }},
     { &hf_gsm_ss_partyNumber,
       { "partyNumber", "gsm_ss.partyNumber",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "RemotePartyNumber/partyNumber", HFILL }},
+        "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_ss_partyNumberSubaddress,
       { "partyNumberSubaddress", "gsm_ss.partyNumberSubaddress",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "RemotePartyNumber/partyNumberSubaddress", HFILL }},
+        "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_ss_ccbs_Feature1,
       { "ccbs-Feature", "gsm_ss.ccbs_Feature",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RegisterCC-EntryRes/ccbs-Feature", HFILL }},
+        "gsm_ss.T_ccbs_Feature", HFILL }},
     { &hf_gsm_ss_ccbs_Index,
       { "ccbs-Index", "gsm_ss.ccbs_Index",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "RegisterCC-EntryRes/ccbs-Feature/ccbs-Index", HFILL }},
+        "gsm_ss.INTEGER_1_5", HFILL }},
     { &hf_gsm_ss_b_subscriberNumber,
       { "b-subscriberNumber", "gsm_ss.b_subscriberNumber",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "RegisterCC-EntryRes/ccbs-Feature/b-subscriberNumber", HFILL }},
+        "gsm_ss.T_b_subscriberNumber", HFILL }},
     { &hf_gsm_ss_b_subscriberSubaddress,
       { "b-subscriberSubaddress", "gsm_ss.b_subscriberSubaddress",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "RegisterCC-EntryRes/ccbs-Feature/b-subscriberSubaddress", HFILL }},
+        "gsm_ss.OCTET_STRING_SIZE_1_21", HFILL }},
     { &hf_gsm_ss_basicServiceGroup,
       { "basicServiceGroup", "gsm_ss.basicServiceGroup",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_T_basicServiceGroup_vals), 0,
-        "RegisterCC-EntryRes/ccbs-Feature/basicServiceGroup", HFILL }},
+        "gsm_ss.T_basicServiceGroup", HFILL }},
     { &hf_gsm_ss_bearerService,
       { "bearerService", "gsm_ss.bearerService",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "RegisterCC-EntryRes/ccbs-Feature/basicServiceGroup/bearerService", HFILL }},
+        "gsm_ss.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_gsm_ss_teleservice,
       { "teleservice", "gsm_ss.teleservice",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "RegisterCC-EntryRes/ccbs-Feature/basicServiceGroup/teleservice", HFILL }},
+        "gsm_ss.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_gsm_ss_deflectedToNumber,
       { "deflectedToNumber", "gsm_ss.deflectedToNumber",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "CallDeflectionArg/deflectedToNumber", HFILL }},
+        "gsm_map.AddressString", HFILL }},
     { &hf_gsm_ss_deflectedToSubaddress,
       { "deflectedToSubaddress", "gsm_ss.deflectedToSubaddress",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "CallDeflectionArg/deflectedToSubaddress", HFILL }},
+        "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_ss_uUS_Service,
       { "uUS-Service", "gsm_ss.uUS_Service",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_UUS_Service_vals), 0,
-        "UserUserServiceArg/uUS-Service", HFILL }},
+        "gsm_ss.UUS_Service", HFILL }},
     { &hf_gsm_ss_uUS_Required,
       { "uUS-Required", "gsm_ss.uUS_Required",
         FT_BOOLEAN, 8, NULL, 0,
-        "UserUserServiceArg/uUS-Required", HFILL }},
+        "gsm_ss.BOOLEAN", HFILL }},
     { &hf_gsm_ss_notificationType,
       { "notificationType", "gsm_ss.notificationType",
         FT_UINT32, BASE_DEC, VALS(gsm_map_NotificationToMSUser_vals), 0,
-        "LocationNotificationArg/notificationType", HFILL }},
+        "gsm_map.NotificationToMSUser", HFILL }},
     { &hf_gsm_ss_locationType,
       { "locationType", "gsm_ss.locationType",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "gsm_map.LocationType", HFILL }},
     { &hf_gsm_ss_lcsClientExternalID,
       { "lcsClientExternalID", "gsm_ss.lcsClientExternalID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "gsm_map.LCSClientExternalID", HFILL }},
     { &hf_gsm_ss_lcsClientName,
       { "lcsClientName", "gsm_ss.lcsClientName",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LocationNotificationArg/lcsClientName", HFILL }},
+        "gsm_map.LCSClientName", HFILL }},
     { &hf_gsm_ss_lcsRequestorID,
       { "lcsRequestorID", "gsm_ss.lcsRequestorID",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LocationNotificationArg/lcsRequestorID", HFILL }},
+        "gsm_map.LCSRequestorID", HFILL }},
     { &hf_gsm_ss_lcsCodeword,
       { "lcsCodeword", "gsm_ss.lcsCodeword",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LocationNotificationArg/lcsCodeword", HFILL }},
+        "gsm_map.LCSCodeword", HFILL }},
     { &hf_gsm_ss_lcsServiceTypeID,
       { "lcsServiceTypeID", "gsm_ss.lcsServiceTypeID",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "gsm_map.LCSServiceTypeID", HFILL }},
     { &hf_gsm_ss_verificationResponse,
       { "verificationResponse", "gsm_ss.verificationResponse",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_VerificationResponse_vals), 0,
-        "LocationNotificationRes/verificationResponse", HFILL }},
+        "gsm_ss.VerificationResponse", HFILL }},
     { &hf_gsm_ss_molr_Type,
       { "molr-Type", "gsm_ss.molr_Type",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_MOLR_Type_vals), 0,
-        "LCS-MOLRArg/molr-Type", HFILL }},
+        "gsm_ss.MOLR_Type", HFILL }},
     { &hf_gsm_ss_locationMethod,
       { "locationMethod", "gsm_ss.locationMethod",
         FT_UINT32, BASE_DEC, VALS(gsm_ss_LocationMethod_vals), 0,
-        "LCS-MOLRArg/locationMethod", HFILL }},
+        "gsm_ss.LocationMethod", HFILL }},
     { &hf_gsm_ss_lcs_QoS,
       { "lcs-QoS", "gsm_ss.lcs_QoS",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LCS-MOLRArg/lcs-QoS", HFILL }},
+        "gsm_map.LCS_QoS", HFILL }},
     { &hf_gsm_ss_mlc_Number,
       { "mlc-Number", "gsm_ss.mlc_Number",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "LCS-MOLRArg/mlc-Number", HFILL }},
+        "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_ss_gpsAssistanceData,
       { "gpsAssistanceData", "gsm_ss.gpsAssistanceData",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "LCS-MOLRArg/gpsAssistanceData", HFILL }},
+        "gsm_ss.GPSAssistanceData", HFILL }},
     { &hf_gsm_ss_supportedGADShapes,
       { "supportedGADShapes", "gsm_ss.supportedGADShapes",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "LCS-MOLRArg/supportedGADShapes", HFILL }},
+        "gsm_map.SupportedGADShapes", HFILL }},
     { &hf_gsm_ss_ageOfLocationInfo,
       { "ageOfLocationInfo", "gsm_ss.ageOfLocationInfo",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "LCS-MOLRArg/ageOfLocationInfo", HFILL }},
+        "gsm_map.AgeOfLocationInformation", HFILL }},
     { &hf_gsm_ss_pseudonymIndicator,
       { "pseudonymIndicator", "gsm_ss.pseudonymIndicator",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LCS-MOLRArg/pseudonymIndicator", HFILL }},
+        "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_locationEstimate,
       { "locationEstimate", "gsm_ss.locationEstimate",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "LCS-MOLRRes/locationEstimate", HFILL }},
+        "gsm_map.Ext_GeographicalInformation", HFILL }},
     { &hf_gsm_ss_decipheringKeys,
       { "decipheringKeys", "gsm_ss.decipheringKeys",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "LCS-MOLRRes/decipheringKeys", HFILL }},
+        "gsm_ss.DecipheringKeys", HFILL }},
     { &hf_gsm_ss_add_LocationEstimate,
       { "add-LocationEstimate", "gsm_ss.add_LocationEstimate",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "LCS-MOLRRes/add-LocationEstimate", HFILL }},
+        "gsm_map.Add_GeographicalInformation", HFILL }},
     { &hf_gsm_ss_referenceNumber,
       { "referenceNumber", "gsm_ss.referenceNumber",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "gsm_map.LCS_ReferenceNumber", HFILL }},
     { &hf_gsm_ss_h_gmlc_address,
       { "h-gmlc-address", "gsm_ss.h_gmlc_address",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "gsm_map.GSN_Address", HFILL }},
     { &hf_gsm_ss_deferredLocationEventType,
       { "deferredLocationEventType", "gsm_ss.deferredLocationEventType",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "LCS-AreaEventRequestArg/deferredLocationEventType", HFILL }},
+        "gsm_map.DeferredLocationEventType", HFILL }},
     { &hf_gsm_ss_areaEventInfo,
       { "areaEventInfo", "gsm_ss.areaEventInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LCS-AreaEventRequestArg/areaEventInfo", HFILL }},
+        "gsm_map.AreaEventInfo", HFILL }},
 
 /*--- End of included file: packet-gsm_ss-hfarr.c ---*/
 #line 389 "packet-gsm_ss-template.c"