aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/asn1/x2ap/x2ap.cnf16
-rw-r--r--epan/dissectors/packet-x2ap.c34
2 files changed, 17 insertions, 33 deletions
diff --git a/epan/dissectors/asn1/x2ap/x2ap.cnf b/epan/dissectors/asn1/x2ap/x2ap.cnf
index a35393e671..2fefa4136f 100644
--- a/epan/dissectors/asn1/x2ap/x2ap.cnf
+++ b/epan/dissectors/asn1/x2ap/x2ap.cnf
@@ -309,8 +309,8 @@ LAC TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX
subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_PLMN_Identity);
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, FALSE);
-#.FN_FTR BitRate
- proto_item_append_text(actx->created_item, "bit/s");
+#.TYPE_ATTR
+BitRate DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_sec
#.TYPE_ATTR
MME-Code TYPE = FT_UINT8 DISPLAY = BASE_DEC_HEX
@@ -360,8 +360,8 @@ MME-Group-ID TYPE = FT_UINT16 DISPLAY = BASE_DEC_HEX
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 2, fields, ENC_BIG_ENDIAN);
}
-#.FN_FTR Time-UE-StayedInCell
- proto_item_append_text(actx->created_item, "s");
+#.TYPE_ATTR
+Time-UE-StayedInCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
Time-UE-StayedInCell-EnhancedGranularity DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_Time_UE_StayedInCell_EnhancedGranularity_fmt)
@@ -414,11 +414,11 @@ Threshold-RSRQ DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_Threshold_RSRQ_fmt)
proto_tree_add_bitmask_list(subtree, parameter_tvb, 0, 1, fields, ENC_BIG_ENDIAN);
}
-#.FN_FTR ExpectedActivityPeriod
-proto_item_append_text(actx->created_item, "s");
+#.TYPE_ATTR
+ExpectedActivityPeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
-#.FN_FTR ExpectedIdlePeriod
-proto_item_append_text(actx->created_item, "s");
+#.TYPE_ATTR
+ExpectedIdlePeriod DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
#.TYPE_ATTR
RSRPMeasurementResult/_item/rSRPMeasured DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(x2ap_Threshold_RSRP_fmt)
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index 0776691573..da6d5d5d44 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -2387,10 +2387,6 @@ dissect_x2ap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index,
0U, G_GUINT64_CONSTANT(10000000000), NULL, FALSE);
-#line 313 "./asn1/x2ap/x2ap.cnf"
- proto_item_append_text(actx->created_item, "bit/s");
-
-
return offset;
}
@@ -4029,10 +4025,6 @@ dissect_x2ap_ExpectedActivityPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
1U, 181U, NULL, FALSE);
-#line 418 "./asn1/x2ap/x2ap.cnf"
-proto_item_append_text(actx->created_item, "s");
-
-
return offset;
}
@@ -4043,10 +4035,6 @@ dissect_x2ap_ExpectedIdlePeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
1U, 181U, NULL, FALSE);
-#line 421 "./asn1/x2ap/x2ap.cnf"
-proto_item_append_text(actx->created_item, "s");
-
-
return offset;
}
@@ -4643,10 +4631,6 @@ dissect_x2ap_Time_UE_StayedInCell(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 4095U, NULL, FALSE);
-#line 364 "./asn1/x2ap/x2ap.cnf"
- proto_item_append_text(actx->created_item, "s");
-
-
return offset;
}
@@ -12063,11 +12047,11 @@ void proto_register_x2ap(void) {
NULL, HFILL }},
{ &hf_x2ap_expectedActivityPeriod,
{ "expectedActivityPeriod", "x2ap.expectedActivityPeriod",
- FT_UINT32, BASE_DEC, NULL, 0,
+ FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0,
NULL, HFILL }},
{ &hf_x2ap_expectedIdlePeriod,
{ "expectedIdlePeriod", "x2ap.expectedIdlePeriod",
- FT_UINT32, BASE_DEC, NULL, 0,
+ FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0,
NULL, HFILL }},
{ &hf_x2ap_sourceofUEActivityBehaviourInformation,
{ "sourceofUEActivityBehaviourInformation", "x2ap.sourceofUEActivityBehaviourInformation",
@@ -12123,19 +12107,19 @@ void proto_register_x2ap(void) {
NULL, HFILL }},
{ &hf_x2ap_e_RAB_MaximumBitrateDL,
{ "e-RAB-MaximumBitrateDL", "x2ap.e_RAB_MaximumBitrateDL",
- FT_UINT64, BASE_DEC, NULL, 0,
+ FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_x2ap_e_RAB_MaximumBitrateUL,
{ "e-RAB-MaximumBitrateUL", "x2ap.e_RAB_MaximumBitrateUL",
- FT_UINT64, BASE_DEC, NULL, 0,
+ FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_x2ap_e_RAB_GuaranteedBitrateDL,
{ "e-RAB-GuaranteedBitrateDL", "x2ap.e_RAB_GuaranteedBitrateDL",
- FT_UINT64, BASE_DEC, NULL, 0,
+ FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_x2ap_e_RAB_GuaranteedBitrateUL,
{ "e-RAB-GuaranteedBitrateUL", "x2ap.e_RAB_GuaranteedBitrateUL",
- FT_UINT64, BASE_DEC, NULL, 0,
+ FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_x2ap_eNB_ID,
{ "eNB-ID", "x2ap.eNB_ID",
@@ -12215,7 +12199,7 @@ void proto_register_x2ap(void) {
NULL, HFILL }},
{ &hf_x2ap_time_UE_StayedInCell,
{ "time-UE-StayedInCell", "x2ap.time_UE_StayedInCell",
- FT_UINT32, BASE_DEC, NULL, 0,
+ FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0,
NULL, HFILL }},
{ &hf_x2ap_undefined,
{ "undefined", "x2ap.undefined_element",
@@ -12607,11 +12591,11 @@ void proto_register_x2ap(void) {
"Port_Number", HFILL }},
{ &hf_x2ap_uEaggregateMaximumBitRateDownlink,
{ "uEaggregateMaximumBitRateDownlink", "x2ap.uEaggregateMaximumBitRateDownlink",
- FT_UINT64, BASE_DEC, NULL, 0,
+ FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_x2ap_uEaggregateMaximumBitRateUplink,
{ "uEaggregateMaximumBitRateUplink", "x2ap.uEaggregateMaximumBitRateUplink",
- FT_UINT64, BASE_DEC, NULL, 0,
+ FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_x2ap_UE_HistoryInformation_item,
{ "LastVisitedCell-Item", "x2ap.LastVisitedCell_Item",
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 07:02:42 +0000