From 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 19 Jun 2014 17:18:16 +0000 Subject: Revert "Fixup: tvb_* -> tvb_captured" https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann --- epan/dissectors/packet-sccp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-sccp.c') diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index efe8ac10a4..ce912feb99 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -842,7 +842,7 @@ sccp_called_calling_looks_valid(guint32 frame_num _U_, tvbuff_t *tvb, guint8 my_ { guint8 ai, ri, gti, ssni, pci; guint8 len_needed = 1; /* need at least the Address Indicator */ - guint len = tvb_captured_length(tvb); + guint len = tvb_length(tvb); ai = tvb_get_guint8(tvb, 0); if ((my_mtp3_standard == ANSI_STANDARD) && ((ai & ANSI_NATIONAL_MASK) == 0)) @@ -908,7 +908,7 @@ looks_like_valid_sccp(guint32 frame_num _U_, tvbuff_t *tvb, guint8 my_mtp3_stand guint data_ptr = 0; guint opt_ptr = 0; guint8 pointer_length = POINTER_LENGTH; - guint len = tvb_captured_length(tvb); + guint len = tvb_length(tvb); /* Ensure we can do some basic checks without throwing an exception. * Accesses beyond this length need to check the length first because @@ -1570,7 +1570,7 @@ dissect_sccp_unknown_message(tvbuff_t *message_tvb, proto_tree *sccp_tree) { guint32 message_length; - message_length = tvb_captured_length(message_tvb); + message_length = tvb_length(message_tvb); proto_tree_add_text(sccp_tree, message_tvb, 0, message_length, "Unknown message (%u byte%s)", -- cgit v1.2.3