diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 20:31:32 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-19 18:42:44 +0000 |
| commit | 39f6a8b669444c83dea016e59c62e7902b9711b6 (patch) | |
| tree | 0f7c4f1e54c1a0b4fc2772c60b0ec90ef8ec8ac5 /epan/dissectors/pidl | |
| parent | d0ac93756794ed29650dc91f7f8304b11504c61b (diff) | |
Revert "Update PIDL source files with the API changes done in g021e7af"
This reverts commit e09d127a9a08b587903a957145d3df655b190954.
Change-Id: Id34b9f5875b1d63aaeed96b3ffdc8ece63ab4134
Reviewed-on: https://code.wireshark.org/review/2436
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/pidl')
| -rw-r--r-- | epan/dissectors/pidl/dnsserver.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/pidl/eventlog.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/pidl/frsrpc.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/pidl/lsa.cnf | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/pidl/dnsserver.cnf b/epan/dissectors/pidl/dnsserver.cnf index 353180a575..8797217003 100644 --- a/epan/dissectors/pidl/dnsserver.cnf +++ b/epan/dissectors/pidl/dnsserver.cnf @@ -41,7 +41,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_captured_length_remaining(tvb, offset); + bc = tvb_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 45142fcf57..cc8491795f 100644 --- a/epan/dissectors/pidl/eventlog.cnf +++ b/epan/dissectors/pidl/eventlog.cnf @@ -66,7 +66,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_captured_length_remaining(tvb, offset)), len); + record_tvb=tvb_new_subset(tvb, offset, MIN((gint)len, tvb_length_remaining(tvb, offset)), len); eventlog_dissect_struct_Record(record_tvb, 0, pinfo, tree, di, drep, hf_eventlog_Record, 0); offset+=len; @@ -97,7 +97,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_captured_length_remaining(tvb, offset)), sid_length); + sid_tvb=tvb_new_subset(tvb, sid_offset, MIN((gint)sid_length, tvb_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 f685acd291..fc45c63032 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_captured_length_remaining(tvb, offset); + guint32 remaining = tvb_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_captured_length_remaining(tvb, offset); + remaining = tvb_length_remaining(tvb, offset); } di->no_align = align_status; } diff --git a/epan/dissectors/pidl/lsa.cnf b/epan/dissectors/pidl/lsa.cnf index 2b3c56601c..e030e4d8d2 100644 --- a/epan/dissectors/pidl/lsa.cnf +++ b/epan/dissectors/pidl/lsa.cnf @@ -366,8 +366,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_captured_length_remaining(tvb, offset)) { - len = tvb_captured_length_remaining(tvb, offset); + if (len > tvb_length_remaining(tvb, offset)) { + len = tvb_length_remaining(tvb, offset); } next_tvb = tvb_new_subset(tvb, offset, len, reported_len); |