From 2dd3a926b3da7dcec405c7021d9bd9e79d9ece73 Mon Sep 17 00:00:00 2001 From: morriss Date: Fri, 27 May 2011 03:06:50 +0000 Subject: Make TVBs opaque for most users. Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37422 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-dtls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-dtls.c') diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index b87df025a4..b1ac0ed488 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -560,7 +560,7 @@ decrypt_dtls_record(tvbuff_t *tvb, packet_info *pinfo, guint32 offset, } if (ret && save_plaintext) { - ssl_add_data_info(proto_dtls, pinfo, dtls_decrypted_data.data, dtls_decrypted_data_avail, TVB_RAW_OFFSET(tvb)+offset, 0); + ssl_add_data_info(proto_dtls, pinfo, dtls_decrypted_data.data, dtls_decrypted_data_avail, tvb_raw_offset(tvb)+offset, 0); } return ret; @@ -791,7 +791,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, decrypted = ssl_get_record_info(proto_dtls, pinfo, offset); if (decrypted) dissect_dtls_handshake(decrypted, pinfo, dtls_record_tree, 0, - decrypted->length, conv_version, ssl, content_type); + tvb_length(decrypted), conv_version, ssl, content_type); else dissect_dtls_handshake(tvb, pinfo, dtls_record_tree, offset, record_length, conv_version, ssl, content_type); @@ -821,7 +821,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, association?association->info:"Application Data"); /* show decrypted data info, if available */ - appl_data = ssl_get_data_info(proto_dtls, pinfo, TVB_RAW_OFFSET(tvb)+offset); + appl_data = ssl_get_data_info(proto_dtls, pinfo, tvb_raw_offset(tvb)+offset); if (appl_data && (appl_data->plain_data.data_len > 0)) { tvbuff_t *next_tvb; -- cgit v1.2.3