From 7edadf9ce38d3c983d8911200aa46f49ade26f2e Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Thu, 4 Apr 2019 14:49:57 +0200 Subject: asn2wrs: Improve filtername of named bits. Change-Id: Ie22137e95c8752a0783e3e9ff99b45c0b79b0d4a Reviewed-on: https://code.wireshark.org/review/32714 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-rrlp.c | 152 +++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'epan/dissectors/packet-rrlp.c') diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 95abe5efd9..81d1c07290 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -847,7 +847,7 @@ static int hf_rrlp_GPSAssistance_ephemerisExtension = -1; static int hf_rrlp_GPSAssistance_ephemerisExtensionCheck = -1; static int hf_rrlp_CommonGANSSAssistance_referenceTime = -1; static int hf_rrlp_CommonGANSSAssistance_referenceLocation = -1; -static int hf_rrlp_CommonGANSSAssistance_spare_bit_2 = -1; +static int hf_rrlp_CommonGANSSAssistance_spare_bit2 = -1; static int hf_rrlp_CommonGANSSAssistance_ionosphericModel = -1; static int hf_rrlp_CommonGANSSAssistance_addIonosphericModel = -1; static int hf_rrlp_CommonGANSSAssistance_earthOrientationParam = -1; @@ -6956,7 +6956,7 @@ dissect_rrlp_GPSAssistance(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ static const int * CommonGANSSAssistance_bits[] = { &hf_rrlp_CommonGANSSAssistance_referenceTime, &hf_rrlp_CommonGANSSAssistance_referenceLocation, - &hf_rrlp_CommonGANSSAssistance_spare_bit_2, + &hf_rrlp_CommonGANSSAssistance_spare_bit2, &hf_rrlp_CommonGANSSAssistance_ionosphericModel, &hf_rrlp_CommonGANSSAssistance_addIonosphericModel, &hf_rrlp_CommonGANSSAssistance_earthOrientationParam, @@ -10209,295 +10209,295 @@ void proto_register_rrlp(void) { FT_BYTES, BASE_NONE, NULL, 0, "GANSSModelID", HFILL }}, { &hf_rrlp_GANSSPositioningMethod_gps, - { "gps", "rrlp.gps", + { "gps", "rrlp.GANSSPositioningMethod.gps", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethod_galileo, - { "galileo", "rrlp.galileo", + { "galileo", "rrlp.GANSSPositioningMethod.galileo", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethod_sbas, - { "sbas", "rrlp.sbas", + { "sbas", "rrlp.GANSSPositioningMethod.sbas", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethod_modernizedGPS, - { "modernizedGPS", "rrlp.modernizedGPS", + { "modernizedGPS", "rrlp.GANSSPositioningMethod.modernizedGPS", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethod_qzss, - { "qzss", "rrlp.qzss", + { "qzss", "rrlp.GANSSPositioningMethod.qzss", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethod_glonass, - { "glonass", "rrlp.glonass", + { "glonass", "rrlp.GANSSPositioningMethod.glonass", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_rrlp_PositionData_e_otd, - { "e-otd", "rrlp.e-otd", + { "e-otd", "rrlp.PositionData.e.otd", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_PositionData_gps, - { "gps", "rrlp.gps", + { "gps", "rrlp.PositionData.gps", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_PositionData_galileo, - { "galileo", "rrlp.galileo", + { "galileo", "rrlp.PositionData.galileo", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_PositionData_sbas, - { "sbas", "rrlp.sbas", + { "sbas", "rrlp.PositionData.sbas", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_PositionData_modernizedGPS, - { "modernizedGPS", "rrlp.modernizedGPS", + { "modernizedGPS", "rrlp.PositionData.modernizedGPS", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_PositionData_qzss, - { "qzss", "rrlp.qzss", + { "qzss", "rrlp.PositionData.qzss", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_rrlp_PositionData_glonass, - { "glonass", "rrlp.glonass", + { "glonass", "rrlp.PositionData.glonass", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_rrlp_NonGANSSPositionMethods_msAssistedEOTD, - { "msAssistedEOTD", "rrlp.msAssistedEOTD", + { "msAssistedEOTD", "rrlp.NonGANSSPositionMethods.msAssistedEOTD", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_NonGANSSPositionMethods_msBasedEOTD, - { "msBasedEOTD", "rrlp.msBasedEOTD", + { "msBasedEOTD", "rrlp.NonGANSSPositionMethods.msBasedEOTD", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_NonGANSSPositionMethods_msAssistedGPS, - { "msAssistedGPS", "rrlp.msAssistedGPS", + { "msAssistedGPS", "rrlp.NonGANSSPositionMethods.msAssistedGPS", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_NonGANSSPositionMethods_msBasedGPS, - { "msBasedGPS", "rrlp.msBasedGPS", + { "msBasedGPS", "rrlp.NonGANSSPositionMethods.msBasedGPS", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_NonGANSSPositionMethods_standaloneGPS, - { "standaloneGPS", "rrlp.standaloneGPS", + { "standaloneGPS", "rrlp.NonGANSSPositionMethods.standaloneGPS", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethodTypes_msAssisted, - { "msAssisted", "rrlp.msAssisted", + { "msAssisted", "rrlp.GANSSPositioningMethodTypes.msAssisted", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethodTypes_msBased, - { "msBased", "rrlp.msBased", + { "msBased", "rrlp.GANSSPositioningMethodTypes.msBased", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GANSSPositioningMethodTypes_standalone, - { "standalone", "rrlp.standalone", + { "standalone", "rrlp.GANSSPositioningMethodTypes.standalone", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal1, - { "signal1", "rrlp.signal1", + { "signal1", "rrlp.GANSSSignals.signal1", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal2, - { "signal2", "rrlp.signal2", + { "signal2", "rrlp.GANSSSignals.signal2", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal3, - { "signal3", "rrlp.signal3", + { "signal3", "rrlp.GANSSSignals.signal3", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal4, - { "signal4", "rrlp.signal4", + { "signal4", "rrlp.GANSSSignals.signal4", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal5, - { "signal5", "rrlp.signal5", + { "signal5", "rrlp.GANSSSignals.signal5", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal6, - { "signal6", "rrlp.signal6", + { "signal6", "rrlp.GANSSSignals.signal6", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal7, - { "signal7", "rrlp.signal7", + { "signal7", "rrlp.GANSSSignals.signal7", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_rrlp_GANSSSignals_signal8, - { "signal8", "rrlp.signal8", + { "signal8", "rrlp.GANSSSignals.signal8", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_rrlp_SBASID_waas, - { "waas", "rrlp.waas", + { "waas", "rrlp.SBASID.waas", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_SBASID_egnos, - { "egnos", "rrlp.egnos", + { "egnos", "rrlp.SBASID.egnos", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_SBASID_masas, - { "masas", "rrlp.masas", + { "masas", "rrlp.SBASID.masas", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_SBASID_gagan, - { "gagan", "rrlp.gagan", + { "gagan", "rrlp.SBASID.gagan", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_MultipleMeasurementSets_eotd, - { "eotd", "rrlp.eotd", + { "eotd", "rrlp.MultipleMeasurementSets.eotd", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_MultipleMeasurementSets_gps, - { "gps", "rrlp.gps", + { "gps", "rrlp.MultipleMeasurementSets.gps", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_MultipleMeasurementSets_ganss, - { "ganss", "rrlp.ganss", + { "ganss", "rrlp.MultipleMeasurementSets.ganss", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_almanac, - { "almanac", "rrlp.almanac", + { "almanac", "rrlp.GPSAssistance.almanac", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_uTCmodel, - { "uTCmodel", "rrlp.uTCmodel", + { "uTCmodel", "rrlp.GPSAssistance.uTCmodel", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_ionosphericModel, - { "ionosphericModel", "rrlp.ionosphericModel", + { "ionosphericModel", "rrlp.GPSAssistance.ionosphericModel", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_navigationmodel, - { "navigationmodel", "rrlp.navigationmodel", + { "navigationmodel", "rrlp.GPSAssistance.navigationmodel", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_dGPScorrections, - { "dGPScorrections", "rrlp.dGPScorrections", + { "dGPScorrections", "rrlp.GPSAssistance.dGPScorrections", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_referenceLocation, - { "referenceLocation", "rrlp.referenceLocation", + { "referenceLocation", "rrlp.GPSAssistance.referenceLocation", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_referenceTime, - { "referenceTime", "rrlp.referenceTime", + { "referenceTime", "rrlp.GPSAssistance.referenceTime", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_acquisitionAssistance, - { "acquisitionAssistance", "rrlp.acquisitionAssistance", + { "acquisitionAssistance", "rrlp.GPSAssistance.acquisitionAssistance", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_realTimeIntegrity, - { "realTimeIntegrity", "rrlp.realTimeIntegrity", + { "realTimeIntegrity", "rrlp.GPSAssistance.realTimeIntegrity", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_ephemerisExtension, - { "ephemerisExtension", "rrlp.ephemerisExtension", + { "ephemerisExtension", "rrlp.GPSAssistance.ephemerisExtension", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GPSAssistance_ephemerisExtensionCheck, - { "ephemerisExtensionCheck", "rrlp.ephemerisExtensionCheck", + { "ephemerisExtensionCheck", "rrlp.GPSAssistance.ephemerisExtensionCheck", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_CommonGANSSAssistance_referenceTime, - { "referenceTime", "rrlp.referenceTime", + { "referenceTime", "rrlp.CommonGANSSAssistance.referenceTime", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_CommonGANSSAssistance_referenceLocation, - { "referenceLocation", "rrlp.referenceLocation", + { "referenceLocation", "rrlp.CommonGANSSAssistance.referenceLocation", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - { &hf_rrlp_CommonGANSSAssistance_spare_bit_2, - { "spare_bit_2", "rrlp.spare_bit_2", + { &hf_rrlp_CommonGANSSAssistance_spare_bit2, + { "spare_bit2", "rrlp.CommonGANSSAssistance.spare.bit2", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_CommonGANSSAssistance_ionosphericModel, - { "ionosphericModel", "rrlp.ionosphericModel", + { "ionosphericModel", "rrlp.CommonGANSSAssistance.ionosphericModel", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_CommonGANSSAssistance_addIonosphericModel, - { "addIonosphericModel", "rrlp.addIonosphericModel", + { "addIonosphericModel", "rrlp.CommonGANSSAssistance.addIonosphericModel", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_CommonGANSSAssistance_earthOrientationParam, - { "earthOrientationParam", "rrlp.earthOrientationParam", + { "earthOrientationParam", "rrlp.CommonGANSSAssistance.earthOrientationParam", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_realTimeIntegrity, - { "realTimeIntegrity", "rrlp.realTimeIntegrity", + { "realTimeIntegrity", "rrlp.GANSSAssistance.realTimeIntegrity", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_differentialCorrections, - { "differentialCorrections", "rrlp.differentialCorrections", + { "differentialCorrections", "rrlp.GANSSAssistance.differentialCorrections", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_almanac, - { "almanac", "rrlp.almanac", + { "almanac", "rrlp.GANSSAssistance.almanac", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_referenceMeasurementInformation, - { "referenceMeasurementInformation", "rrlp.referenceMeasurementInformation", + { "referenceMeasurementInformation", "rrlp.GANSSAssistance.referenceMeasurementInformation", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_navigationModel, - { "navigationModel", "rrlp.navigationModel", + { "navigationModel", "rrlp.GANSSAssistance.navigationModel", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_timeModelGNSS_UTC, - { "timeModelGNSS-UTC", "rrlp.timeModelGNSS-UTC", + { "timeModelGNSS-UTC", "rrlp.GANSSAssistance.timeModelGNSS.UTC", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_timeModelGNSS_GNSS, - { "timeModelGNSS-GNSS", "rrlp.timeModelGNSS-GNSS", + { "timeModelGNSS-GNSS", "rrlp.GANSSAssistance.timeModelGNSS.GNSS", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_databitassistance, - { "databitassistance", "rrlp.databitassistance", + { "databitassistance", "rrlp.GANSSAssistance.databitassistance", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_ephemerisExtension, - { "ephemerisExtension", "rrlp.ephemerisExtension", + { "ephemerisExtension", "rrlp.GANSSAssistance.ephemerisExtension", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_ephemerisExtensionCheck, - { "ephemerisExtensionCheck", "rrlp.ephemerisExtensionCheck", + { "ephemerisExtensionCheck", "rrlp.GANSSAssistance.ephemerisExtensionCheck", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_addUTCmodel, - { "addUTCmodel", "rrlp.addUTCmodel", + { "addUTCmodel", "rrlp.GANSSAssistance.addUTCmodel", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GANSSAssistance_auxiliaryInformation, - { "auxiliaryInformation", "rrlp.auxiliaryInformation", + { "auxiliaryInformation", "rrlp.GANSSAssistance.auxiliaryInformation", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model1, - { "model1", "rrlp.model1", + { "model1", "rrlp.GANSSModelID.model1", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model2, - { "model2", "rrlp.model2", + { "model2", "rrlp.GANSSModelID.model2", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model3, - { "model3", "rrlp.model3", + { "model3", "rrlp.GANSSModelID.model3", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model4, - { "model4", "rrlp.model4", + { "model4", "rrlp.GANSSModelID.model4", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model5, - { "model5", "rrlp.model5", + { "model5", "rrlp.GANSSModelID.model5", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model6, - { "model6", "rrlp.model6", + { "model6", "rrlp.GANSSModelID.model6", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model7, - { "model7", "rrlp.model7", + { "model7", "rrlp.GANSSModelID.model7", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, { &hf_rrlp_GANSSModelID_model8, - { "model8", "rrlp.model8", + { "model8", "rrlp.GANSSModelID.model8", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, -- cgit v1.2.3