aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/pidl
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2015-06-23 10:55:22 -0700
committerEvan Huus <eapache@gmail.com>2015-06-23 17:56:11 +0000
commiteb321f87107c9b25a5094d749b3bd9d1a72e1560 (patch)
tree25fc90238481792b3e005b51f893dd8f0ad7fd0f /epan/dissectors/pidl
parent17ac3831d6b461e75cb0ddbaf485353891470185 (diff)
Remove deprecated tvb_length from PIDL dissectors
Also regenerate all to pick up the usage of https in some comment links. Change-Id: Ic17b6368d2118627178b0b560031450d98e5b5e5 Reviewed-on: https://code.wireshark.org/review/9060 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/pidl')
-rw-r--r--epan/dissectors/pidl/dnsserver.cnf2
-rw-r--r--epan/dissectors/pidl/eventlog.cnf4
-rw-r--r--epan/dissectors/pidl/frsrpc.cnf4
-rw-r--r--epan/dissectors/pidl/lsa.cnf4
4 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/pidl/dnsserver.cnf b/epan/dissectors/pidl/dnsserver.cnf
index 6edf6407df..eb2043900a 100644
--- a/epan/dissectors/pidl/dnsserver.cnf
+++ b/epan/dissectors/pidl/dnsserver.cnf
@@ -46,7 +46,7 @@ dnsserver_dissect_struct_DNS_RPC_NAME(tvbuff_t *tvb _U_, int offset _U_, packet_
}
offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, di, drep, hf_dnsserver_DNS_RPC_NAME_NameLength, &len);
- bc = tvb_length_remaining(tvb, offset);
+ bc = tvb_captured_length_remaining(tvb, offset);
dn = get_unicode_or_ascii_string(tvb, &offset,
TRUE, &dn_len, TRUE, TRUE, &bc);
if (dn) {
diff --git a/epan/dissectors/pidl/eventlog.cnf b/epan/dissectors/pidl/eventlog.cnf
index a6733c9f71..9645ed1782 100644
--- a/epan/dissectors/pidl/eventlog.cnf
+++ b/epan/dissectors/pidl/eventlog.cnf
@@ -67,7 +67,7 @@ eventlog_dissect_element_ReadEventLogW_data_(tvbuff_t *tvb, int offset, packet_i
* NDR encoded at all and there are byte offsets into this buffer
* encoded therein.
*/
- record_tvb=tvb_new_subset(tvb, offset, MIN((gint)len, tvb_length_remaining(tvb, offset)), len);
+ record_tvb=tvb_new_subset(tvb, offset, MIN((gint)len, tvb_captured_length_remaining(tvb, offset)), len);
eventlog_dissect_struct_Record(record_tvb, 0, pinfo, tree, di, drep, hf_eventlog_Record, 0);
offset+=len;
@@ -98,7 +98,7 @@ eventlog_dissect_element_Record_sid_offset(tvbuff_t *tvb, int offset, packet_inf
/* this blob contains an NT SID.
* tvb starts at the beginning of the record.
*/
- sid_tvb=tvb_new_subset(tvb, sid_offset, MIN((gint)sid_length, tvb_length_remaining(tvb, offset)), sid_length);
+ sid_tvb=tvb_new_subset(tvb, sid_offset, MIN((gint)sid_length, tvb_captured_length_remaining(tvb, offset)), sid_length);
dissect_nt_sid(sid_tvb, 0, tree, "SID", NULL, -1);
}
diff --git a/epan/dissectors/pidl/frsrpc.cnf b/epan/dissectors/pidl/frsrpc.cnf
index 250697897a..135f5b9c08 100644
--- a/epan/dissectors/pidl/frsrpc.cnf
+++ b/epan/dissectors/pidl/frsrpc.cnf
@@ -97,7 +97,7 @@ static int
frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep _U_, int hf_index, guint32 param _U_)
{
guint32 nb_chunk = 0;
- guint32 remaining = tvb_length_remaining(tvb, offset);
+ guint32 remaining = tvb_reported_length_remaining(tvb, offset);
int align_status = di->no_align;
if (remaining > 0) {
@@ -106,7 +106,7 @@ frsrpc_dissect_struct_frsrpc_CommPktChunkCtr(tvbuff_t *tvb, int offset, packet_i
di->no_align = 1;
for(nb_chunk = 0; remaining > 0; nb_chunk++) {
offset = frsrpc_dissect_struct_CommPktChunk(tvb, offset, pinfo, subtree, di, drep, hf_CommPktChunk, param);
- remaining = tvb_length_remaining(tvb, offset);
+ remaining = tvb_reported_length_remaining(tvb, offset);
}
di->no_align = align_status;
}
diff --git a/epan/dissectors/pidl/lsa.cnf b/epan/dissectors/pidl/lsa.cnf
index cbbb11c3c1..a55eb2bde7 100644
--- a/epan/dissectors/pidl/lsa.cnf
+++ b/epan/dissectors/pidl/lsa.cnf
@@ -359,8 +359,8 @@ lsarpc_dissect_element_lsa_DomainInfoEfs_efs_blob_(tvbuff_t *tvb _U_, int offset
hf_lsarpc_efs_blob_len, &reported_len);
len = reported_len;
- if (len > tvb_length_remaining(tvb, offset)) {
- len = tvb_length_remaining(tvb, offset);
+ if (len > tvb_captured_length_remaining(tvb, offset)) {
+ len = tvb_captured_length_remaining(tvb, offset);
}
next_tvb = tvb_new_subset(tvb, offset, len, reported_len);