diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 20:31:08 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 18:42:28 +0000 |
commit | d0ac93756794ed29650dc91f7f8304b11504c61b (patch) | |
tree | ca84581f86ad0d451a9600533a57b4f56e261fa0 /asn1/m3ap | |
parent | 7398779206eb53ec17bf2f4f4f7fad414b0c7391 (diff) |
Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b.
Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1/m3ap')
-rw-r--r-- | asn1/m3ap/m3ap.cnf | 10 | ||||
-rw-r--r-- | asn1/m3ap/packet-m3ap-template.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/asn1/m3ap/m3ap.cnf b/asn1/m3ap/m3ap.cnf index 954f861733..1e1d0a0abe 100644 --- a/asn1/m3ap/m3ap.cnf +++ b/asn1/m3ap/m3ap.cnf @@ -138,7 +138,7 @@ ProtocolIE-Field/value ie_field_value if (!parameter_tvb) return offset; - tvb_len = tvb_captured_length(parameter_tvb); + tvb_len = tvb_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_captured_length(parameter_tvb); + tvb_len = tvb_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_captured_length(parameter_tvb); + tvb_len = tvb_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_captured_length(parameter_tvb); + tvb_len = tvb_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_captured_length(parameter_tvb); + tvb_len = tvb_length(parameter_tvb); dissect_gtpv2_mbms_time_to_data_xfer(parameter_tvb, actx->pinfo, tree, actx->created_item, tvb_len, 0, 0); #.END diff --git a/asn1/m3ap/packet-m3ap-template.c b/asn1/m3ap/packet-m3ap-template.c index e5e42ae6eb..22a77aa5f2 100644 --- a/asn1/m3ap/packet-m3ap-template.c +++ b/asn1/m3ap/packet-m3ap-template.c @@ -93,27 +93,27 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint(m3ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint(m3ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint(m3ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint(m3ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint(m3ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint(m3ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint(m3ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - return (dissector_try_uint(m3ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; + return (dissector_try_uint(m3ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } |