proto_tree_add_item (packetlogger_tree, hf_type, tvb, 0, 1, ENC_BIG_ENDIAN);
proto_item_append_text (ti, " %s", val_to_str (pl_type, type_vals, "Unknown 0x%02x"));
- len = tvb_length_remaining (tvb, 1);
+ len = tvb_reported_length_remaining (tvb, 1);
next_tvb = tvb_new_subset_remaining (tvb, 1);
if (pl_type <= PKT_RECV_ACL_DATA) {
col_clear(pinfo->cinfo, COL_INFO);
dissect_pcep_msg_tree(tvb, tree, ett_pcep, pinfo);
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
static int
{
tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 4, get_pcep_message_len,
dissect_pcep_pdu, data);
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
/*Register the protocol with wireshark*/
expert_add_info(pinfo, pcp_tree, &ei_pcp_unimplemented_packet_type);
break;
}
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
static int dissect_pcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
/* pass all packets through TCP-reassembly */
tcp_dissect_pdus(tvb, pinfo, tree, TRUE, PCP_HEADER_LEN, get_pcp_message_len, dissect_pcp_message, data);
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
/* setup the dissecting */
*/
if (dissect_peekremote_new(tvb, pinfo, tree, u)) {
/* Yup, it was peekremote-ng, and it's been dissected as such. */
- return tvb_length(tvb);
+ return tvb_reported_length(tvb);
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PEEKREMOTE");
ptvcursor_current_offset(cursor), 2, pgmhdr_cksum, "not available");
} else {
reportedlen = tvb_reported_length(tvb);
- pgmlen = tvb_length(tvb);
+ pgmlen = tvb_captured_length(tvb);
if (pgm_check_checksum && pgmlen >= reportedlen) {
vec_t cksum_vec[1];
guint16 computed_cksum;
case PKTC_MTAFQDN_REP:
/* MTA FQDN */
- string_len = tvb_length_remaining(tvb, offset) - 4;
+ string_len = tvb_reported_length_remaining(tvb, offset) - 4;
if (string_len <= 0)
THROW(ReportedBoundsError);
proto_tree_add_item(tree, hf_pktc_mtafqdn_fqdn, tvb, offset, string_len, ENC_ASCII|ENC_NA);
guint32 magic;
/* check for min size */
- if (tvb_length(tvb) < 16) { /* Not a PKTGEN packet. */
- return FALSE;
+ if (tvb_reported_length(tvb) < 16) { /* Not a PKTGEN packet. */
+ return FALSE;
}
/* check for magic number */
proto_tree_add_time(pktgen_tree, hf_pktgen_timestamp, tvb, offset - 8, 8, &tstamp);
- if (tvb_length_remaining(tvb, offset)) /* random data */
+ if (tvb_reported_length_remaining(tvb, offset)) /* random data */
call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo,
pktgen_tree);
}