diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-tipc.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
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 <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tipc.c')
| -rw-r--r-- | epan/dissectors/packet-tipc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 61958e2fbf..d542823532 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1047,7 +1047,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i offset += padlen; }; if ((offset-msg_size) > 0) { - proto_tree_add_text(tipc_tree, tipc_tvb, offset, -1, "Filler for MTU discovery: %d byte%c", tvb_captured_length_remaining(tipc_tvb, offset), (padlen!=1?'s':0)); + proto_tree_add_text(tipc_tree, tipc_tvb, offset, -1, "Filler for MTU discovery: %d byte%c", tvb_length_remaining(tipc_tvb, offset), (padlen!=1?'s':0)); }; break; case TIPCv2_CONN_MANAGER: @@ -1938,7 +1938,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr pinfo, link_sel, /* ID for fragments belonging together - NEEDS IMPROVING? */ NULL, - tvb_captured_length_remaining(tvb, offset), /* fragment length - to the end */ + tvb_length_remaining(tvb, offset), /* fragment length - to the end */ TRUE); /* More fragments? */ if (msg_type == TIPC_FIRST_SEGMENT) { reassembled_msg_length = tvb_get_ntohl(tvb, offset) & 0x1ffff; @@ -2017,7 +2017,7 @@ dissect_tipc_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi { tcp_dissect_pdus(tvb, pinfo, parent_tree, tipc_tcp_desegment, 4, get_tipc_pdu_len, dissect_tipc, data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -2049,7 +2049,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ user = (dword>>25) & 0xf; msg_size = dword & 0x1ffff; - if ((guint32)tvb_captured_length_remaining(tvb, offset) < msg_size) { + if ((guint32)tvb_length_remaining(tvb, offset) < msg_size) { tipc_tvb = tvb; } else { tipc_tvb = tvb_new_subset_length(tvb, offset, msg_size); @@ -2148,7 +2148,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ tipc_tree = proto_item_add_subtree(ti, ett_tipc); if (version == TIPCv2) { dissect_tipc_v2(tipc_tvb, tipc_tree, pinfo, offset, user, msg_size, hdr_size, datatype_hdr); - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* Word 0-2 common for all messages */ @@ -2185,7 +2185,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ case TIPC_SEGMENTATION_MANAGER: case TIPC_MSG_BUNDLER: dissect_tipc_int_prot_msg(tipc_tvb, pinfo, tipc_tree, offset, user, msg_size); - return tvb_captured_length(tvb); + return tvb_length(tvb); default: break; } @@ -2263,7 +2263,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ tipc_data_tree = proto_item_add_subtree(tipc_data_item , ett_tipc_data); data_tvb = tvb_new_subset_remaining(tipc_tvb, offset); dissect_tipc_name_dist_data(data_tvb, tipc_data_tree, 0); - return tvb_captured_length(tvb); + return tvb_length(tvb); } else { /* Port name type / Connection level sequence number */ proto_tree_add_text(tipc_tree, tipc_tvb, offset, 4, "Port name type / Connection level sequence number"); @@ -2300,7 +2300,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } } /*if (hdr_size <= 5) */ - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* Register TIPC with Wireshark */ |