osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Matthieu Patou <mat@matws.net> 

Add new helper function for DCE/RPC NDR data blobs


svn path=/trunk/; revision=38472
This commit is contained in:
Ronnie Sahlberg 2011-08-11 07:48:02 +00:00
parent c667e67fb7
commit 788dc6230a
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
epan/dissectors/packet-dcerpc-nt.c
View File

@ -50,6 +50,7 @@ static int hf_lsa_String_name_size = -1;
static gint ett_nt_unicode_string = -1;
static gint ett_lsa_String = -1;
static gint ett_nt_data_blob = -1;
@ -77,6 +78,31 @@ const value_string platform_id_vals[] = {
{ 0, NULL }
};
int
dissect_ndr_datablob(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint8 *drep, int hf_index,
int use_remaining_space)
{
proto_item *item;
guint32 len;
proto_tree *subtree = tree;
item = proto_tree_add_text(tree, tvb, offset, 0, "%s",
proto_registrar_get_name(hf_index));
subtree = proto_item_add_subtree(item, ett_nt_data_blob);
if (use_remaining_space) {
len = tvb_length_remaining (tvb, offset);
} else {
offset = dissect_ndr_uint32(tvb, offset, pinfo, subtree, drep,
hf_index, &len);
}
proto_tree_add_text(tree, tvb, offset, len, "Blob data");
offset += len;
return offset;
}
int
dissect_null_term_string(tvbuff_t *tvb, int offset,
packet_info *pinfo _U_, proto_tree *tree,
@ -1946,6 +1972,7 @@ void dcerpc_smb_init(int proto_dcerpc)
static gint *ett[] = {
&ett_nt_unicode_string,
&ett_nt_data_blob,
&ett_nt_counted_string,
&ett_nt_counted_byte_array,
&ett_nt_policy_hnd,

4
epan/dissectors/packet-dcerpc-nt.h
View File

@ -84,6 +84,10 @@ extern const value_string platform_id_vals[];
ALIGN_TO_2_BYTES; \
} \
}
int
dissect_ndr_datablob(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint8 *drep, int hf_index,
int use_remaining_space);
int
dissect_null_term_string(tvbuff_t *tvb, int offset, packet_info *pinfo,