summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-05-15 09:49:53 +0200
committerJelmer Vernooij <jelmer@samba.org>2012-05-15 12:07:06 +0200
commita66865dd287073f21ce279d52450582ea290c7df (patch)
treee19a1da43d98843fc9fc8a6ab030f333bb775e1a
parent8588d1086142cebcf8734fcd0773f99e8825c87b (diff)
downloadsamba-a66865dd287073f21ce279d52450582ea290c7df.tar.gz
samba-a66865dd287073f21ce279d52450582ea290c7df.tar.bz2
samba-a66865dd287073f21ce279d52450582ea290c7df.zip
Use ENC_ values for proto_tree_add_item() calls.
It appears that the integral value containing the bits in a bitmap should be dissected according to the data representation, as the individual fields are fetched by dissect_ndr_XXX, which is passed the data representation and extracts the value appropriately for the data representation, so the patch replaces TRUE (which meant "always little-endian" when the last argument to proto_tree_add_item() was a byte-order Boolean) with DREP_ENC_INTEGER(drep) (which means "ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN, depending on the data representation"). For structures, I'm just using ENC_NA. Bug: https://bugzilla.samba.org/show_bug.cgi?id=8942 Signed-off-by: Jelmer Vernooij <jelmer@samba.org> Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Tue May 15 12:07:06 CEST 2012 on sn-devel-104
-rw-r--r--pidl/lib/Parse/Pidl/Wireshark/NDR.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 46c9850b56..1aa44c3458 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -215,7 +215,7 @@ sub Bitmap($$$$)
$self->pidl_code("if (parent_tree) {");
$self->indent;
- $self->pidl_code("item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, $e->{ALIGN}, TRUE);");
+ $self->pidl_code("item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, $e->{ALIGN}, DREP_ENC_INTEGER(drep));");
$self->pidl_code("tree = proto_item_add_subtree(item,ett_$ifname\_$name);");
$self->deindent;
$self->pidl_code("}\n");
@@ -648,7 +648,7 @@ sub Struct($$$$)
$self->pidl_code("");
$self->pidl_code("if (parent_tree) {");
$self->indent;
- $self->pidl_code("item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, TRUE);");
+ $self->pidl_code("item = proto_tree_add_item(parent_tree, hf_index, tvb, offset, -1, ENC_NA);");
$self->pidl_code("tree = proto_item_add_subtree(item, ett_$ifname\_$name);");
$self->deindent;
$self->pidl_code("}");