Fix duplicated filters

6 files changed, 70 insertions, 7 deletions

diff --git a/epan/dissectors/asn1/ilp/ilp.cnf b/epan/dissectors/asn1/ilp/ilp.cnf
index 46b041bbf3..062e7c0c71 100644
--- a/epan/dissectors/asn1/ilp/ilp.cnf
+++ b/epan/dissectors/asn1/ilp/ilp.cnf
@@ -21,6 +21,19 @@ FrequencyInfo/modeSpecificInfo  modeSpecificFrequencyInfo
 FrequencyInfo/modeSpecificInfo/fdd  fdd_fr
 FrequencyInfo/modeSpecificInfo/tdd  tdd_fr
 SETId/min  minsi
+LocationDataLCI/latitude LocationDataLCI_latitude
+LocationDataLCI/longitude LocationDataLCI_longitude
+LocationDataLCI/altitude LocationDataLCI_altitude
+CellGlobalIdEUTRA/cellIdentity eutra_cellIdentity
+
+#.FIELD_ATTR
+SETId/min  ABBREV=minsi
+LocationDataLCI/latitude ABBREV=locationdatalci.latitude
+LocationDataLCI/latitude ABBREV=locationdatalci.longitude
+LocationDataLCI/altitude ABBREV=locationdatalci.altitude
+CellGlobalIdEUTRA/cellIdentity ABBREV=cellglobalideutra.cellIdentity
+
+
 #.END
 
 #.FN_HDR ILP-PDU
diff --git a/epan/dissectors/asn1/inap/inap.cnf b/epan/dissectors/asn1/inap/inap.cnf
index 70ad1ac479..c53bf11f21 100644
--- a/epan/dissectors/asn1/inap/inap.cnf
+++ b/epan/dissectors/asn1/inap/inap.cnf
@@ -27,14 +27,31 @@ RejectProblem
 #.END
 
 #.TYPE_RENAME
-ReturnResult/result/result		ResultArgument
+ReturnResult/result/result          ResultArgument
 
 #.FIELD_RENAME
-Invoke/linkedId/present			linkedIdPresent
-Reject/problem/invoke			invokeProblem
-Reject/problem/returnError		returnErrorProblem
-ReturnResult/result/result		resultArgument
-Reject/problem/returnResult		problemReturnResult
+Invoke/linkedId/present             inkedIdPresent
+Reject/problem/invoke               invokeProblem
+Reject/problem/returnError          returnErrorProblem
+ReturnResult/result/result          resultArgument
+Reject/problem/returnResult         problemReturnResult
+Trigger/tDPIdentifier               trigger_tDPIdentifier
+InbandInfo/duration                 inbandInfo_duration
+Tone/duration                       tone_duration
+FilteringCharacteristics/interval   filteringCharacteristics_interval
+InbandInfo/interval                 inbandInfo_interval
+ScfTaskRefusedParameter/reason      scfTaskRefusedParameter_reason
+Code/local                          code_local
+
+#.FIELD_ATTR
+Trigger/tDPIdentifier               ABBREV=trigger.tdpidentifier
+InbandInfo/duration                 ABBREV=inbandInfo.duration
+Tone/duration                       ABBREV=tone.duration
+FilteringCharacteristics/interval   ABBREV=filteringCharacteristics.interval
+InbandInfo/interval                 ABBREV=inbandInfo.interval
+ScfTaskRefusedParameter/reason      ABBREV=scfTaskRefusedParameter.reason
+Code/local                          ABBREV=code.local
+
 
 #.OMIT_ASSIGNMENT Remote-Operations-Information-Objects
 Bind
diff --git a/epan/dissectors/asn1/its/its.cnf b/epan/dissectors/asn1/its/its.cnf
index 23bf3d55ba..f5da3b200e 100644
--- a/epan/dissectors/asn1/its/its.cnf
+++ b/epan/dissectors/asn1/its/its.cnf
@@ -283,6 +283,13 @@ Node-XY-26b/y                     n26bY
 Node-XY-28b/y                     n28bY
 Node-XY-32b/y                     n32bY
 
+#.FIELD_ATTR
+IntersectionState/status          ABBREV=intersectionState.status
+SignalStatusPackage/status        ABBREV=signalStatusPackage.status
+SignalStatusMessage/status        ABBREV=signalStatusMessage.status
+FullPositionVector/elevation      ABBREV=fullPositionVector.elevation
+PositionConfidenceSet/elevation   ABBREV=positionConfidenceSet.elevation
+Position3D/elevation              ABBREV=position3D.elevation
 
 #.END
 
diff --git a/epan/dissectors/asn1/kerberos/kerberos.cnf b/epan/dissectors/asn1/kerberos/kerberos.cnf
index c9564adb82..74236e69f1 100644
--- a/epan/dissectors/asn1/kerberos/kerberos.cnf
+++ b/epan/dissectors/asn1/kerberos/kerberos.cnf
@@ -37,6 +37,11 @@ AP-REQ/_untag/authenticator authenticator_enc_part
 PA-FX-FAST-REQUEST/armored-data armored_data_request
 PA-FX-FAST-REPLY/armored-data armored_data_reply
 
+#.FIELD_ATTR
+KDC-REQ-BODY/etype      ABBREV=kdc-req-body.etype
+ETYPE-INFO-ENTRY/salt   ABBREV=info_salt
+ETYPE-INFO2-ENTRY/salt  ABBREV=info2_salt
+
 #.OMIT_ASSIGNMENT
 AD-AND-OR
 AD-KDCIssued
diff --git a/epan/dissectors/asn1/lpp/lpp.cnf b/epan/dissectors/asn1/lpp/lpp.cnf
index 9e7b20b3d4..0e190a6ef1 100644
--- a/epan/dissectors/asn1/lpp/lpp.cnf
+++ b/epan/dissectors/asn1/lpp/lpp.cnf
@@ -107,7 +107,16 @@ Sensor-MeasurementInformation-r13
 Sensor-MotionInformation-r15
 TBS-AssistanceDataList-r14
 Velocity
-#.END
+
+#.FIELD_RENAME
+CellGlobalIdGERAN/cellIdentity cellGlobalIdGERAN_cellIdentity
+LocationCoordinates/polygon locationCoordinates_polygon
+UTC-ModelSet4/utcDN UTC-ModelSet4_utcDN
+
+#.FIELD_ATTR
+CellGlobalIdGERAN/cellIdentity  ABBREV=cellGlobalIdGERAN.cellIdentity
+LocationCoordinates/polygon     ABBREV=locationCoordinates.polygon
+UTC-ModelSet4/utcDN             ABBREV=uTC-ModelSet4.utcDN
 
 #.MAKE_ENUM
 GNSS-ID/gnss-id TYPE_PREFIX UPPER_CASE
diff --git a/epan/dissectors/asn1/lppe/lppe.cnf b/epan/dissectors/asn1/lppe/lppe.cnf
index 44f5ca5380..157794541c 100644
--- a/epan/dissectors/asn1/lppe/lppe.cnf
+++ b/epan/dissectors/asn1/lppe/lppe.cnf
@@ -15,6 +15,18 @@ OMA-LPPe-MessageExtension
 
 #.OMIT_ASSIGNMENT
 
+#.FIELD_RENAME
+OMA-LPPe-MapDataReferenceElement/mapDataUrl mapDataUrl_choice
+OMA-LPPe-WLAN-LocationDataLCI/latitude oma-LPPe-WLAN-LocationDataLCI_latitude
+OMA-LPPe-WLAN-LocationDataLCI/longitude oma-LPPe-WLAN-LocationDataLCI_longitude
+OMA-LPPe-WLAN-LocationDataLCI/altitude oma-LPPe-WLAN-LocationDataLCI_altitude
+
+#.FIELD_ATTR
+OMA-LPPe-MapDataReferenceElement/mapDataUrl     ABBREV=mapDataUrl_choice
+OMA-LPPe-WLAN-LocationDataLCI/latitude          ABBREV=oMA-LPPe-WLAN-LocationDataLCI.latitude
+OMA-LPPe-WLAN-LocationDataLCI/longitude         ABBREV=oMA-LPPe-WLAN-LocationDataLCI.longitude
+OMA-LPPe-WLAN-LocationDataLCI/altitude          ABBREV=oMA-LPPe-WLAN-LocationDataLCI.altitude
+
 #.FN_HDR OMA-LPPe-MessageExtension
 
   proto_tree_add_item(tree, proto_lppe, tvb, 0, -1, ENC_NA);