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-synphasor.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-synphasor.c')
-rw-r--r-- | epan/dissectors/packet-synphasor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 88f1abd46d..5374844350 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -443,7 +443,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v { guint8 frame_type; guint16 crc; - guint tvbsize = tvb_captured_length(tvb); + guint tvbsize = tvb_length(tvb); /* some heuristics */ if (tvbsize < 17 /* 17 bytes = header frame with only a @@ -554,7 +554,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v /*offset += 2;*/ /* CRC */ } /* if (tree) */ - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* dissect_synphasor() */ /* called for synchrophasors over UDP */ @@ -573,7 +573,7 @@ static int dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void { tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 4, get_pdu_length, dissect_common, data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } @@ -765,7 +765,7 @@ static int dissect_data_frame(tvbuff_t *tvb, reported_size += BLOCKSIZE(*block); } - if (tvb_captured_length(tvb) == reported_size) { + if (tvb_length(tvb) == reported_size) { proto_item_append_text(data_item, ", using frame number %"G_GUINT32_FORMAT" as configuration frame", conf->fnum); config_found = TRUE; @@ -818,7 +818,7 @@ static int dissect_command_frame(tvbuff_t *tvb, packet_info *pinfo) { proto_tree *command_tree = NULL; - guint tvbsize = tvb_captured_length(tvb); + guint tvbsize = tvb_length(tvb); const char *s; proto_item_set_text(command_item, "Command data"); |