osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Missed cahnges from last commit: 

- Replace some deprecated APIs

Change-Id: If815e7191afb445c474a59cf1e3af603fc7b0b28
Reviewed-on: https://code.wireshark.org/review/5018
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2014-10-31 10:10:38 +01:00 committed by Anders Broman
parent 155fe6c689
commit 1f0a68d61a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
epan/dissectors/packet-dcerpc.c
View File

@ -2754,7 +2754,7 @@ show_stub_data(tvbuff_t *tvb, gint offset, proto_tree *dcerpc_tree,
* bytes, the reported number of bytes, not the number of bytes
* that happen to be in the tvbuff.
*/
if (tvb_length_remaining(tvb, offset) > 0) {
if (tvb_reported_length_remaining(tvb, offset) > 0) {
auth_pad_len = auth_info?auth_info->auth_pad_len:0;
length = tvb_reported_length_remaining(tvb, offset);
@ -3154,7 +3154,7 @@ dissect_dcerpc_cn_auth(tvbuff_t *tvb, int stub_offset, packet_info *pinfo,
dcerpc_auth_subdissector_fns *auth_fns;
auth_tvb = tvb_new_subset(tvb, offset,
MIN(hdr->auth_len,tvb_length_remaining(tvb, offset)),
MIN(hdr->auth_len,tvb_reported_length_remaining(tvb, offset)),
hdr->auth_len);
if ((auth_fns = get_auth_subdissector_fns(auth_info->auth_level,
@ -3578,7 +3578,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
save_fragmented = pinfo->fragmented;
length = tvb_length_remaining(tvb, offset);
length = tvb_reported_length_remaining(tvb, offset);
reported_length = tvb_reported_length_remaining(tvb, offset);
if (reported_length < 0 ||
(guint32)reported_length < auth_info->auth_size) {
@ -3596,8 +3596,8 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
/*XXX we should really make sure we calculate auth_info->auth_data
and use that one instead of this auth_tvb hack
*/
if (tvb_length(tvb) == tvb_reported_length(tvb)) {
if (tvb_length_remaining(tvb, offset+length) > 8) {
if (tvb_reported_length(tvb) == tvb_reported_length(tvb)) {
if (tvb_reported_length_remaining(tvb, offset+length) > 8) {
auth_tvb = tvb_new_subset_remaining(tvb, offset+length+8);
}
}
@ -3637,7 +3637,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
"Encrypted stub data (%d byte%s)",
tvb_reported_length(payload_tvb),
plurality(tvb_length(payload_tvb), "", "s"));
plurality(tvb_reported_length(payload_tvb), "", "s"));
add_new_data_source(
pinfo, result, "Decrypted stub data");
@ -3667,7 +3667,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
/* debug output of essential fragment data. */
/* leave it here for future debugging sessions */
/*printf("DCE num:%u offset:%u frag_len:%u tvb_len:%u\n",
pinfo->fd->num, offset, hdr->frag_len, tvb_length(decrypted_tvb));*/
pinfo->fd->num, offset, hdr->frag_len, tvb_reported_length(decrypted_tvb));*/
/* if we are not doing reassembly and this is the first fragment
then just dissect it and exit
@ -3699,7 +3699,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
nor the first fragment then there is nothing more we can do
so we just have to exit
*/
if ( !dcerpc_reassemble || (tvb_length(tvb) != tvb_reported_length(tvb)) )
if ( !dcerpc_reassemble || (tvb_captured_length(tvb) != tvb_reported_length(tvb)) )
goto end_cn_stub;
/* if we didn't get 'frame' we don't know where the PDU started and thus
@ -3730,7 +3730,7 @@ dissect_dcerpc_cn_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
*/
fd_head = fragment_add_seq_next(&dcerpc_co_reassembly_table,
decrypted_tvb, 0, pinfo, frame, NULL,
tvb_length(decrypted_tvb),
tvb_reported_length(decrypted_tvb),
hdr->flags&PFC_LAST_FRAG ? FALSE : TRUE /* more_frags */);
end_cn_stub:
@ -4223,7 +4223,7 @@ dissect_dcerpc_cn_fault(tvbuff_t *tvb, gint offset, packet_info *pinfo,
proto_tree_add_expert(dcerpc_tree, pinfo, &ei_dcerpc_no_request_found, tvb, 0, 0);
}
length = tvb_length_remaining(tvb, offset);
length = tvb_reported_length_remaining(tvb, offset);
/* as we now create a tvb in dissect_dcerpc_cn() containing only the
* stub_data, the following calculation is no longer valid:
* stub_length = hdr->frag_len - offset - auth_info.auth_size;
@ -4756,7 +4756,7 @@ dissect_dcerpc_cn(tvbuff_t *tvb, int offset, packet_info *pinfo,
if (can_desegment && pinfo->can_desegment
&& !tvb_bytes_exist(tvb, start_offset, hdr.frag_len)) {
pinfo->desegment_offset = start_offset;
pinfo->desegment_len = hdr.frag_len - tvb_length_remaining(tvb, start_offset);
pinfo->desegment_len = hdr.frag_len - tvb_reported_length_remaining(tvb, start_offset);
*pkt_len = 0; /* desegmentation required */
return TRUE;
}
@ -4867,7 +4867,7 @@ dissect_dcerpc_cn(tvbuff_t *tvb, int offset, packet_info *pinfo,
* (and other functions might fail as well) computing the right start
* offset otherwise.
*/
subtvb_len = MIN(hdr.frag_len, tvb_length(tvb));
subtvb_len = MIN(hdr.frag_len, tvb_reported_length(tvb));
fragment_tvb = tvb_new_subset(tvb, start_offset,
subtvb_len /* length */,
hdr.frag_len /* reported_length */);
@ -5032,7 +5032,7 @@ dissect_dcerpc_cn_bs_body(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* it was just too short to tell and ask the TCP layer for more
* data. */
pinfo->desegment_offset = offset;
pinfo->desegment_len = (guint32)(sizeof(e_dce_cn_common_hdr_t) - tvb_length_remaining(tvb, offset));
pinfo->desegment_len = (guint32)(sizeof(e_dce_cn_common_hdr_t) - tvb_reported_length_remaining(tvb, offset));
} else {
/* Really not DCE-RPC */
break;
@ -5160,7 +5160,7 @@ dissect_dcerpc_dg_auth(tvbuff_t *tvb, int offset, proto_tree *dcerpc_tree,
* packet body, then dissect the auth info.
*/
offset += hdr->frag_len;
if (tvb_length_remaining(tvb, offset) > 0) {
if (tvb_reported_length_remaining(tvb, offset) > 0) {
switch (hdr->auth_proto) {
case DCE_C_RPC_AUTHN_PROTOCOL_KRB5:
@ -5319,7 +5319,7 @@ dissect_dcerpc_dg_stub(tvbuff_t *tvb, int offset, packet_info *pinfo,
col_append_fstr(pinfo->cinfo, COL_INFO, " opnum: %u len: %u",
di->call_data->opnum, hdr->frag_len );
length = tvb_length_remaining(tvb, offset);
length = tvb_reported_length_remaining(tvb, offset);
reported_length = tvb_reported_length_remaining(tvb, offset);
stub_length = hdr->frag_len;
if (length > stub_length)
@ -5615,7 +5615,7 @@ dissect_dcerpc_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
* have an 80 byte header on them. Which starts with
* version (4), pkt_type.
*/
if (tvb_length(tvb) < sizeof (hdr)) {
if (tvb_reported_length(tvb) < sizeof (hdr)) {
return FALSE;
}