Regenerate all asn2wrs generated dissectors.

svn path=/trunk/; revision=28379

1 files changed, 32 insertions, 32 deletions

diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index c33d18c8e0..a3f7673351 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-rrlp.c                                                              */
-/* ../../tools/asn2wrs.py -p rrlp -c rrlp.cnf -s packet-rrlp-template ../gsmmap/MAP-ExtensionDataTypes.asn ../gsmmap/MAP-LCS-DataTypes.asn RRLP-Messages.asn RRLP-Components.asn */
+/* ../../tools/asn2wrs.py -p rrlp -c ./rrlp.cnf -s ./packet-rrlp-template -D . ../gsmmap/MAP-ExtensionDataTypes.asn ../gsmmap/MAP-LCS-DataTypes.asn RRLP-Messages.asn RRLP-Components.asn */
 
 /* Input file: packet-rrlp-template.c */
 
@@ -4602,7 +4602,7 @@ void proto_register_rrlp(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.PCS_Extensions", HFILL }},
     { &hf_rrlp_PrivateExtensionList_item,
-      { "PrivateExtensionList", "rrlp.PrivateExtensionList_item",
+      { "PrivateExtension", "rrlp.PrivateExtension",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.PrivateExtension", HFILL }},
     { &hf_rrlp_extId,
@@ -4798,7 +4798,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfMsrAssistBTS", HFILL }},
     { &hf_rrlp_SeqOfMsrAssistBTS_item,
-      { "SeqOfMsrAssistBTS", "rrlp.SeqOfMsrAssistBTS_item",
+      { "MsrAssistBTS", "rrlp.MsrAssistBTS",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.MsrAssistBTS", HFILL }},
     { &hf_rrlp_multiFrameOffset,
@@ -4818,7 +4818,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfSystemInfoAssistBTS", HFILL }},
     { &hf_rrlp_SeqOfSystemInfoAssistBTS_item,
-      { "SeqOfSystemInfoAssistBTS", "rrlp.SeqOfSystemInfoAssistBTS_item",
+      { "SystemInfoAssistBTS", "rrlp.SystemInfoAssistBTS",
         FT_UINT32, BASE_DEC, VALS(rrlp_SystemInfoAssistBTS_vals), 0,
         "rrlp.SystemInfoAssistBTS", HFILL }},
     { &hf_rrlp_notPresent,
@@ -4866,7 +4866,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfReferenceIdentityType", HFILL }},
     { &hf_rrlp_SeqOfReferenceIdentityType_item,
-      { "SeqOfReferenceIdentityType", "rrlp.SeqOfReferenceIdentityType_item",
+      { "ReferenceIdentityType", "rrlp.ReferenceIdentityType",
         FT_UINT32, BASE_DEC, VALS(rrlp_ReferenceIdentityType_vals), 0,
         "rrlp.ReferenceIdentityType", HFILL }},
     { &hf_rrlp_bsicAndCarrier,
@@ -4910,7 +4910,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfOTD_MsrElementRest", HFILL }},
     { &hf_rrlp_SeqOfOTD_MsrElementRest_item,
-      { "SeqOfOTD-MsrElementRest", "rrlp.SeqOfOTD_MsrElementRest_item",
+      { "OTD-MsrElementRest", "rrlp.OTD_MsrElementRest",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.OTD_MsrElementRest", HFILL }},
     { &hf_rrlp_refFrameNumber,
@@ -4938,7 +4938,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfOTD_FirstSetMsrs", HFILL }},
     { &hf_rrlp_SeqOfOTD_FirstSetMsrs_item,
-      { "SeqOfOTD-FirstSetMsrs", "rrlp.SeqOfOTD_FirstSetMsrs_item",
+      { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.OTD_FirstSetMsrs", HFILL }},
     { &hf_rrlp_otd_MsrsOfOtherSets,
@@ -4946,7 +4946,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfOTD_MsrsOfOtherSets", HFILL }},
     { &hf_rrlp_SeqOfOTD_MsrsOfOtherSets_item,
-      { "SeqOfOTD-MsrsOfOtherSets", "rrlp.SeqOfOTD_MsrsOfOtherSets_item",
+      { "OTD-MsrsOfOtherSets", "rrlp.OTD_MsrsOfOtherSets",
         FT_UINT32, BASE_DEC, VALS(rrlp_OTD_MsrsOfOtherSets_vals), 0,
         "rrlp.OTD_MsrsOfOtherSets", HFILL }},
     { &hf_rrlp_refQuality,
@@ -5014,7 +5014,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGPS_MsrSetElement", HFILL }},
     { &hf_rrlp_SeqOfGPS_MsrSetElement_item,
-      { "SeqOfGPS-MsrSetElement", "rrlp.SeqOfGPS_MsrSetElement_item",
+      { "GPS-MsrSetElement", "rrlp.GPS_MsrSetElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GPS_MsrSetElement", HFILL }},
     { &hf_rrlp_gpsTOW_01,
@@ -5026,7 +5026,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGPS_MsrElement", HFILL }},
     { &hf_rrlp_SeqOfGPS_MsrElement_item,
-      { "SeqOfGPS-MsrElement", "rrlp.SeqOfGPS_MsrElement_item",
+      { "GPS-MsrElement", "rrlp.GPS_MsrElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GPS_MsrElement", HFILL }},
     { &hf_rrlp_satelliteID,
@@ -5134,7 +5134,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.GPSWeek", HFILL }},
     { &hf_rrlp_GPSTOWAssist_item,
-      { "GPSTOWAssist", "rrlp.GPSTOWAssist_item",
+      { "GPSTOWAssistElement", "rrlp.GPSTOWAssistElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GPSTOWAssistElement", HFILL }},
     { &hf_rrlp_tlmWord,
@@ -5182,7 +5182,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfSatElement", HFILL }},
     { &hf_rrlp_SeqOfSatElement_item,
-      { "SeqOfSatElement", "rrlp.SeqOfSatElement_item",
+      { "SatElement", "rrlp.SatElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.SatElement", HFILL }},
     { &hf_rrlp_iode,
@@ -5222,7 +5222,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfNavModelElement", HFILL }},
     { &hf_rrlp_SeqOfNavModelElement_item,
-      { "SeqOfNavModelElement", "rrlp.SeqOfNavModelElement_item",
+      { "NavModelElement", "rrlp.NavModelElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.NavModelElement", HFILL }},
     { &hf_rrlp_satStatus,
@@ -5446,7 +5446,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfAlmanacElement", HFILL }},
     { &hf_rrlp_SeqOfAlmanacElement_item,
-      { "SeqOfAlmanacElement", "rrlp.SeqOfAlmanacElement_item",
+      { "AlmanacElement", "rrlp.AlmanacElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.AlmanacElement", HFILL }},
     { &hf_rrlp_almanacE,
@@ -5502,7 +5502,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfAcquisElement", HFILL }},
     { &hf_rrlp_SeqOfAcquisElement_item,
-      { "SeqOfAcquisElement", "rrlp.SeqOfAcquisElement_item",
+      { "AcquisElement", "rrlp.AcquisElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.AcquisElement", HFILL }},
     { &hf_rrlp_gpsTOW_03,
@@ -5558,7 +5558,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.INTEGER_0_7", HFILL }},
     { &hf_rrlp_SeqOf_BadSatelliteSet_item,
-      { "SeqOf-BadSatelliteSet", "rrlp.SeqOf_BadSatelliteSet_item",
+      { "SatelliteID", "rrlp.SatelliteID",
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SatelliteID", HFILL }},
     { &hf_rrlp_rel98_Ext_ExpOTD,
@@ -5586,7 +5586,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfMsrAssistBTS_R98_ExpOTD", HFILL }},
     { &hf_rrlp_SeqOfMsrAssistBTS_R98_ExpOTD_item,
-      { "SeqOfMsrAssistBTS-R98-ExpOTD", "rrlp.SeqOfMsrAssistBTS_R98_ExpOTD_item",
+      { "MsrAssistBTS-R98-ExpOTD", "rrlp.MsrAssistBTS_R98_ExpOTD",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.MsrAssistBTS_R98_ExpOTD", HFILL }},
     { &hf_rrlp_expectedOTD,
@@ -5602,7 +5602,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfSystemInfoAssistBTS_R98_ExpOTD", HFILL }},
     { &hf_rrlp_SeqOfSystemInfoAssistBTS_R98_ExpOTD_item,
-      { "SeqOfSystemInfoAssistBTS-R98-ExpOTD", "rrlp.SeqOfSystemInfoAssistBTS_R98_ExpOTD_item",
+      { "SystemInfoAssistBTS-R98-ExpOTD", "rrlp.SystemInfoAssistBTS_R98_ExpOTD",
         FT_UINT32, BASE_DEC, VALS(rrlp_SystemInfoAssistBTS_R98_ExpOTD_vals), 0,
         "rrlp.SystemInfoAssistBTS_R98_ExpOTD", HFILL }},
     { &hf_rrlp_present_01,
@@ -5646,7 +5646,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfOTD_FirstSetMsrs_R98_Ext", HFILL }},
     { &hf_rrlp_SeqOfOTD_FirstSetMsrs_R98_Ext_item,
-      { "SeqOfOTD-FirstSetMsrs-R98-Ext", "rrlp.SeqOfOTD_FirstSetMsrs_R98_Ext_item",
+      { "OTD-FirstSetMsrs", "rrlp.OTD_FirstSetMsrs",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.OTD_FirstSetMsrs", HFILL }},
     { &hf_rrlp_extended_reference,
@@ -5718,7 +5718,7 @@ void proto_register_rrlp(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSSIonosphericModel", HFILL }},
     { &hf_rrlp_SeqOfGANSSGenericAssistDataElement_item,
-      { "SeqOfGANSSGenericAssistDataElement", "rrlp.SeqOfGANSSGenericAssistDataElement_item",
+      { "GANSSGenericAssistDataElement", "rrlp.GANSSGenericAssistDataElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSSGenericAssistDataElement", HFILL }},
     { &hf_rrlp_ganssID,
@@ -5826,7 +5826,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.INTEGER_0_1", HFILL }},
     { &hf_rrlp_SeqOfGANSSTimeModel_item,
-      { "SeqOfGANSSTimeModel", "rrlp.SeqOfGANSSTimeModel_item",
+      { "GANSSTimeModelElement", "rrlp.GANSSTimeModelElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSSTimeModelElement", HFILL }},
     { &hf_rrlp_ganssTimeModelRefTime,
@@ -5862,7 +5862,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfSgnTypeElement", HFILL }},
     { &hf_rrlp_SeqOfSgnTypeElement_item,
-      { "SeqOfSgnTypeElement", "rrlp.SeqOfSgnTypeElement_item",
+      { "SgnTypeElement", "rrlp.SgnTypeElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.SgnTypeElement", HFILL }},
     { &hf_rrlp_ganssSignalID,
@@ -5878,7 +5878,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfDGANSSSgnElement", HFILL }},
     { &hf_rrlp_SeqOfDGANSSSgnElement_item,
-      { "SeqOfDGANSSSgnElement", "rrlp.SeqOfDGANSSSgnElement_item",
+      { "DGANSSSgnElement", "rrlp.DGANSSSgnElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.DGANSSSgnElement", HFILL }},
     { &hf_rrlp_svID,
@@ -5910,7 +5910,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGANSSSatelliteElement", HFILL }},
     { &hf_rrlp_SeqOfGANSSSatelliteElement_item,
-      { "SeqOfGANSSSatelliteElement", "rrlp.SeqOfGANSSSatelliteElement_item",
+      { "GANSSSatelliteElement", "rrlp.GANSSSatelliteElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSSSatelliteElement", HFILL }},
     { &hf_rrlp_svHealth,
@@ -5998,7 +5998,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfStandardClockModelElement", HFILL }},
     { &hf_rrlp_SeqOfStandardClockModelElement_item,
-      { "SeqOfStandardClockModelElement", "rrlp.SeqOfStandardClockModelElement_item",
+      { "StandardClockModelElement", "rrlp.StandardClockModelElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.StandardClockModelElement", HFILL }},
     { &hf_rrlp_stanClockTocLSB,
@@ -6030,7 +6030,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfBadSignalElement", HFILL }},
     { &hf_rrlp_SeqOfBadSignalElement_item,
-      { "SeqOfBadSignalElement", "rrlp.SeqOfBadSignalElement_item",
+      { "BadSignalElement", "rrlp.BadSignalElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.BadSignalElement", HFILL }},
     { &hf_rrlp_badSVID,
@@ -6054,7 +6054,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOf_GANSSDataBits", HFILL }},
     { &hf_rrlp_SeqOf_GANSSDataBits_item,
-      { "SeqOf-GANSSDataBits", "rrlp.SeqOf_GANSSDataBits_item",
+      { "GANSSDataBit", "rrlp.GANSSDataBit",
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.GANSSDataBit", HFILL }},
     { &hf_rrlp_ganssSignalID_01,
@@ -6066,7 +6066,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGANSSRefMeasurementElement", HFILL }},
     { &hf_rrlp_SeqOfGANSSRefMeasurementElement_item,
-      { "SeqOfGANSSRefMeasurementElement", "rrlp.SeqOfGANSSRefMeasurementElement_item",
+      { "GANSSRefMeasurementElement", "rrlp.GANSSRefMeasurementElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSSRefMeasurementElement", HFILL }},
     { &hf_rrlp_additionalDoppler,
@@ -6110,7 +6110,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGANSSAlmanacElement", HFILL }},
     { &hf_rrlp_SeqOfGANSSAlmanacElement_item,
-      { "SeqOfGANSSAlmanacElement", "rrlp.SeqOfGANSSAlmanacElement_item",
+      { "GANSSAlmanacElement", "rrlp.GANSSAlmanacElement",
         FT_UINT32, BASE_DEC, VALS(rrlp_GANSSAlmanacElement_vals), 0,
         "rrlp.GANSSAlmanacElement", HFILL }},
     { &hf_rrlp_keplerianAlmanacSet,
@@ -6238,7 +6238,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGANSS_MsrSetElement", HFILL }},
     { &hf_rrlp_SeqOfGANSS_MsrSetElement_item,
-      { "SeqOfGANSS-MsrSetElement", "rrlp.SeqOfGANSS_MsrSetElement_item",
+      { "GANSS-MsrSetElement", "rrlp.GANSS_MsrSetElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSS_MsrSetElement", HFILL }},
     { &hf_rrlp_deltaGNASSTOD,
@@ -6250,7 +6250,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGANSS_SgnTypeElement", HFILL }},
     { &hf_rrlp_SeqOfGANSS_SgnTypeElement_item,
-      { "SeqOfGANSS-SgnTypeElement", "rrlp.SeqOfGANSS_SgnTypeElement_item",
+      { "GANSS-SgnTypeElement", "rrlp.GANSS_SgnTypeElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSS_SgnTypeElement", HFILL }},
     { &hf_rrlp_ganssSignalID_02,
@@ -6262,7 +6262,7 @@ void proto_register_rrlp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrlp.SeqOfGANSS_SgnElement", HFILL }},
     { &hf_rrlp_SeqOfGANSS_SgnElement_item,
-      { "SeqOfGANSS-SgnElement", "rrlp.SeqOfGANSS_SgnElement_item",
+      { "GANSS-SgnElement", "rrlp.GANSS_SgnElement",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrlp.GANSS_SgnElement", HFILL }},
     { &hf_rrlp_mpathDet,