diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-synphasor.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 5374844350..88f1abd46d 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_length(tvb); + guint tvbsize = tvb_captured_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_length(tvb); + return tvb_captured_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_length(tvb); + return tvb_captured_length(tvb); } @@ -765,7 +765,7 @@ static int dissect_data_frame(tvbuff_t *tvb, reported_size += BLOCKSIZE(*block); } - if (tvb_length(tvb) == reported_size) { + if (tvb_captured_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_length(tvb); + guint tvbsize = tvb_captured_length(tvb); const char *s; proto_item_set_text(command_item, "Command data"); |