aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-rdt.c')
-rw-r--r--epan/dissectors/packet-rdt.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 93dee3bdea..516013cdfb 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -313,7 +313,7 @@ static void dissect_rdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
/* Parse all RDT packets found in the frame */
- while (offset != -1 && tvb_length_remaining(tvb, offset))
+ while (offset != -1 && tvb_captured_length_remaining(tvb, offset))
{
/* Every packet type should have at least 3 bytes */
tvb_ensure_bytes_exist(tvb, offset, 3);
@@ -461,7 +461,7 @@ guint dissect_rdt_data_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
}
else
{
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
/* More flags */
@@ -524,13 +524,13 @@ guint dissect_rdt_data_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
/* The remaining data is unparsed. */
proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA);
- offset += tvb_length_remaining(tvb, offset);
+ offset += tvb_captured_length_remaining(tvb, offset);
if (packet_length < (offset - start_offset) ||
- packet_length > tvb_length_remaining(tvb, start_offset))
+ packet_length > tvb_captured_length_remaining(tvb, start_offset))
{
proto_tree_add_text(tree, tvb, 0, 0, "Packet length invalid");
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
return start_offset + packet_length;
@@ -589,7 +589,7 @@ guint dissect_rdt_asm_action_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
}
else
{
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
/* Stream ID expansion */
@@ -608,10 +608,10 @@ guint dissect_rdt_asm_action_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA);
if (packet_length < (offset - start_offset) ||
- packet_length > tvb_length_remaining(tvb, start_offset))
+ packet_length > tvb_captured_length_remaining(tvb, start_offset))
{
proto_tree_add_text(tree, tvb, 0, 0, "Packet length invalid");
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
return start_offset + packet_length;
@@ -660,7 +660,7 @@ guint dissect_rdt_bandwidth_report_packet(tvbuff_t *tvb, packet_info *pinfo, pro
}
else
{
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
proto_tree_add_item(tree, hf_rdt_brpt_interval, tvb, offset, 2, ENC_BIG_ENDIAN);
@@ -673,10 +673,10 @@ guint dissect_rdt_bandwidth_report_packet(tvbuff_t *tvb, packet_info *pinfo, pro
col_append_str(pinfo->cinfo, COL_INFO, "BANDWIDTH-REPORT: ");
if (packet_length < (offset - start_offset) ||
- packet_length > tvb_length_remaining(tvb, start_offset))
+ packet_length > tvb_captured_length_remaining(tvb, start_offset))
{
proto_tree_add_text(tree, tvb, 0, 0, "Packet length invalid");
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
return start_offset + packet_length;
@@ -729,7 +729,7 @@ guint dissect_rdt_ack_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
}
else
{
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
/* XXX: The remaining data is unparsed. */
@@ -738,10 +738,10 @@ guint dissect_rdt_ack_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
col_append_fstr(pinfo->cinfo, COL_INFO, "ACK: lh=%u ", lost_high_flag);
if (packet_length < (offset - start_offset) ||
- packet_length > tvb_length_remaining(tvb, start_offset))
+ packet_length > tvb_captured_length_remaining(tvb, start_offset))
{
proto_tree_add_text(tree, tvb, 0, 0, "Packet length invalid");
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
return start_offset + packet_length;
@@ -872,7 +872,7 @@ guint dissect_rdt_stream_end_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
proto_tree_add_item(tree, hf_rdt_stre_reason_code, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
/* XXX: Remainder is reason_text */
- offset += tvb_length_remaining(tvb, offset);
+ offset += tvb_captured_length_remaining(tvb, offset);
}
col_append_fstr(pinfo->cinfo, COL_INFO, "STREAM-END: stream-id=%02u ", stream_id);
@@ -923,7 +923,7 @@ guint dissect_rdt_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
}
else
{
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
col_append_str(pinfo->cinfo, COL_INFO, "REPORT: ");
@@ -932,10 +932,10 @@ guint dissect_rdt_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA);
if (packet_length < (offset - start_offset) ||
- packet_length > tvb_length_remaining(tvb, start_offset))
+ packet_length > tvb_captured_length_remaining(tvb, start_offset))
{
proto_tree_add_text(tree, tvb, 0, 0, "Packet length invalid");
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
return start_offset + packet_length;
@@ -985,7 +985,7 @@ guint dissect_rdt_latency_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto
}
else
{
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
server_out_time = tvb_get_ntohl(tvb, offset);
@@ -995,10 +995,10 @@ guint dissect_rdt_latency_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto
col_append_fstr(pinfo->cinfo, COL_INFO, "LATENCY-REPORT: t=%u ", server_out_time);
if (packet_length < (offset - start_offset) ||
- packet_length > tvb_length_remaining(tvb, start_offset))
+ packet_length > tvb_captured_length_remaining(tvb, start_offset))
{
proto_tree_add_text(tree, tvb, 0, 0, "Packet length invalid");
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
return start_offset + packet_length;
@@ -1133,7 +1133,7 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin
}
/* Report what is left */
- offset += tvb_length_remaining(tvb, offset);
+ offset += tvb_captured_length_remaining(tvb, offset);
col_append_str(pinfo->cinfo, COL_INFO, "RESPONSE: ");
@@ -1183,7 +1183,7 @@ guint dissect_rdt_bw_probing_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
}
else
{
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
proto_tree_add_item(tree, hf_rdt_bwpp_seqno, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -1194,10 +1194,10 @@ guint dissect_rdt_bw_probing_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
col_append_str(pinfo->cinfo, COL_INFO, "BW-PROBING: ");
if (packet_length < (offset - start_offset) ||
- packet_length > tvb_length_remaining(tvb, start_offset))
+ packet_length > tvb_captured_length_remaining(tvb, start_offset))
{
proto_tree_add_text(tree, tvb, 0, 0, "Packet length invalid");
- packet_length = tvb_length_remaining(tvb, start_offset);
+ packet_length = tvb_captured_length_remaining(tvb, start_offset);
}
return start_offset + packet_length;
@@ -1216,7 +1216,7 @@ guint dissect_rdt_unknown_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* The remaining data is unparsed. */
proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, ENC_NA);
- offset += tvb_length_remaining(tvb, offset);
+ offset += tvb_captured_length_remaining(tvb, offset);
col_append_str(pinfo->cinfo, COL_INFO, "UNKNOWN-CTL: ");
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 16:00:56 +0000