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-cigi.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-cigi.c')
| -rw-r--r-- | epan/dissectors/packet-cigi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 4122b9a2d5..30f3c65223 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -2455,7 +2455,7 @@ packet_is_cigi(tvbuff_t *tvb) /* CIGI 3 */ guint16 byte_swap; - if (tvb_captured_length(tvb) < 3) { + if (tvb_length(tvb) < 3) { /* Not enough data available to check */ return FALSE; } @@ -2609,7 +2609,7 @@ dissect_cigi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } dissect_cigi_pdu(tvb, pinfo, tree); /* We probably ate the entire packet. */ - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* Code to actually dissect the CIGI packets */ @@ -2658,7 +2658,7 @@ dissect_cigi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { - ti = proto_tree_add_protocol_format(tree, proto_cigi, tvb, 0, tvb_captured_length(tvb), "Common Image Generator Interface (%i), %s => %s (%u bytes)", + ti = proto_tree_add_protocol_format(tree, proto_cigi, tvb, 0, tvb_length(tvb), "Common Image Generator Interface (%i), %s => %s (%u bytes)", cigi_version, src_str, dest_str, tvb_reported_length(tvb)); cigi_tree = proto_item_add_subtree(ti, ett_cigi); @@ -2707,7 +2707,7 @@ cigi_add_tree(tvbuff_t *tvb, proto_tree *cigi_tree) proto_tree* cigi_packet_tree = NULL; proto_item* tipacket; - length = tvb_captured_length(tvb); + length = tvb_length(tvb); /* Each iteration through this loop is meant to be a separate cigi packet * therefore it is okay to assume that at the top of this look we are given @@ -2798,7 +2798,7 @@ cigi2_add_tree(tvbuff_t *tvb, proto_tree *cigi_tree) proto_item* tipacket; int hf_cigi2_packet = -1; - length = tvb_captured_length(tvb); + length = tvb_length(tvb); /* Each iteration through this loop is meant to be a separate cigi packet * therefore it is okay to assume that at the top of this look we are given @@ -2995,7 +2995,7 @@ cigi3_add_tree(tvbuff_t *tvb, proto_tree *cigi_tree) proto_item* tipacket; int hf_cigi3_packet = -1; - length = tvb_captured_length(tvb); + length = tvb_length(tvb); /* Each iteration through this loop is meant to be a separate cigi packet * therefore it is okay to assume that at the top of this look we are given |