diff options
author | AndersBroman <anders.broman@ericsson.com> | 2015-01-14 13:47:08 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-01-14 13:37:14 +0000 |
commit | 20e2c05d9b380158bfa27dcb94dd23ba7cad3ec6 (patch) | |
tree | e509621172bdceb10291db72d92ed6cac6d75384 /asn1/m3ap | |
parent | 36aca292fb9ee3ce47203958ebc879665db3027a (diff) |
[E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
argument. While at it remove deprecated APIs
Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
Reviewed-on: https://code.wireshark.org/review/6534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1/m3ap')
-rw-r--r-- | asn1/m3ap/m3ap.cnf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf index 1e1d0a0abe..4df0271636 100644 --- a/asn1/m3ap/m3ap.cnf +++ b/asn1/m3ap/m3ap.cnf @@ -126,7 +126,7 @@ ProtocolIE-Field/value ie_field_value if (!parameter_tvb) return offset; - dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); + dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, E212_NONE, FALSE); #.END #.FN_BODY IPAddress VAL_PTR = ¶meter_tvb @@ -138,7 +138,7 @@ ProtocolIE-Field/value ie_field_value if (!parameter_tvb) return offset; - tvb_len = tvb_length(parameter_tvb); + tvb_len = tvb_reported_length(parameter_tvb); proto_tree_add_item(tree, hf_m3ap_IPAddress, parameter_tvb, 0, tvb_len, ENC_NA); #.END @@ -152,7 +152,7 @@ ProtocolIE-Field/value ie_field_value if (!parameter_tvb) return offset; - tvb_len = tvb_length(parameter_tvb); + tvb_len = tvb_reported_length(parameter_tvb); time_str = tvb_ntp_fmt_ts(parameter_tvb, 0); proto_tree_add_string(tree, hf_m3ap_Absolute_Time_ofMBMS_Data_value, parameter_tvb, 0, tvb_len, time_str); @@ -167,7 +167,7 @@ ProtocolIE-Field/value ie_field_value if (!parameter_tvb) return offset; - tvb_len = tvb_length(parameter_tvb); + tvb_len = tvb_reported_length(parameter_tvb); dissect_gtpv2_mbms_service_area(parameter_tvb, actx->pinfo, tree, actx->created_item, tvb_len, 0, 0); #.END @@ -182,7 +182,7 @@ ProtocolIE-Field/value ie_field_value if (!parameter_tvb) return offset; - tvb_len = tvb_length(parameter_tvb); + tvb_len = tvb_reported_length(parameter_tvb); proto_item_append_text(actx->created_item, " "); dissect_gtpv2_mbms_session_duration(parameter_tvb, actx->pinfo, tree, actx->created_item, tvb_len, 0, 0); @@ -197,7 +197,7 @@ ProtocolIE-Field/value ie_field_value if (!parameter_tvb) return offset; - tvb_len = tvb_length(parameter_tvb); + tvb_len = tvb_reported_length(parameter_tvb); dissect_gtpv2_mbms_time_to_data_xfer(parameter_tvb, actx->pinfo, tree, actx->created_item, tvb_len, 0, 0); #.END |