aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-05-14 22:05:56 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-05-14 22:05:56 +0000
commitcb2fc4e58b0f417c2dc9bad40b40cb8a43c3e936 (patch)
treed6aff1545052e257d6574111062c522d64cd98a9
parentf404b15be5515b4370ad86a4f85a79add8c245d3 (diff)
from martin m
prettify dcerpc svn path=/trunk/; revision=14369
-rw-r--r--epan/dissectors/packet-dcerpc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 81e8ff06d3..2d6c24c307 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -1866,6 +1866,8 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
dcerpc_callback_fnct_t *callback, void *callback_args)
{
dcerpc_info *di;
+ proto_tree *tr = NULL;
+ gint start_offset = offset;
di=pinfo->private_data;
if(di->conformant_run){
@@ -1880,7 +1882,6 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
if( pointers_are_top_level
&&(type==NDR_POINTER_REF) ){
proto_item *item;
- proto_tree *tr;
/* we must find out a nice way to do the length here */
item=proto_tree_add_text(tree, tvb, offset, 0,
@@ -1898,7 +1899,6 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
int idx;
guint32 id;
proto_item *item;
- proto_tree *tr;
/* get the referent id */
offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
@@ -1935,7 +1935,6 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
&& (type==NDR_POINTER_UNIQUE) ){
guint32 id;
proto_item *item;
- proto_tree *tr;
/* get the referent id */
offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
@@ -1963,7 +1962,6 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
&& (type==NDR_POINTER_REF) ){
guint32 id;
proto_item *item;
- proto_tree *tr;
/* get the referent id */
offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
@@ -1984,7 +1982,6 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
&& (type==NDR_POINTER_UNIQUE) ){
guint32 id;
proto_item *item;
- proto_tree *tr;
/* get the referent id */
offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
@@ -2013,7 +2010,6 @@ dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
int idx;
guint32 id;
proto_item *item;
- proto_tree *tr;
/* get the referent id */
offset = dissect_ndr_uint32(tvb, offset, pinfo, NULL, drep, -1, &id);
@@ -2057,6 +2053,10 @@ after_ref_id:
pointers_are_top_level=TRUE;
}
+ /* Set the length for the new subtree */
+ if (tr){
+ proto_item_set_len(tr, offset-start_offset);
+ }
return offset;
}