osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

M2AP: use unit strings 

Change-Id: Id9aa6a48faaf749a439f0f61b5ad8d2920c56ac7
Reviewed-on: https://code.wireshark.org/review/19323
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Pascal Quantin 2016-12-17 22:51:43 +01:00 committed by Michael Mann
parent 6292d14148
commit 667b700c22
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/asn1/m2ap/m2ap.cnf
View File

@ -96,8 +96,8 @@ ProtocolIE-Field/value ie_field_value
}
#.END
#.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
#.FN_HDR SessionStartRequest
col_set_str(actx->pinfo->cinfo, COL_INFO, "MBMS Session Start Request");

8
epan/dissectors/packet-m2ap.c
View File

@ -825,10 +825,6 @@ dissect_m2ap_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 100 "./asn1/m2ap/m2ap.cnf"
proto_item_append_text(actx->created_item, "bit/s");
return offset;
}
@ -3854,11 +3850,11 @@ proto_register_m2ap(void) {
"ENB_MBMS_Configuration_data_Item", HFILL }},
{ &hf_m2ap_mBMS_E_RAB_MaximumBitrateDL,
{ "mBMS-E-RAB-MaximumBitrateDL", "m2ap.mBMS_E_RAB_MaximumBitrateDL",
FT_UINT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_m2ap_mBMS_E_RAB_GuaranteedBitrateDL,
{ "mBMS-E-RAB-GuaranteedBitrateDL", "m2ap.mBMS_E_RAB_GuaranteedBitrateDL",
FT_UINT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC|BASE_UNIT_STRING, &units_bit_sec, 0,
"BitRate", HFILL }},
{ &hf_m2ap_eNB_ID,
{ "eNB-ID", "m2ap.eNB_ID",