Skip to content

Commit

Permalink
Use ENC_ values for proto_tree_add_item() calls.
Browse files Browse the repository at this point in the history
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 <[email protected]>

Autobuild-User: Jelmer Vernooij <[email protected]>
Autobuild-Date: Tue May 15 12:07:06 CEST 2012 on sn-devel-104
  • Loading branch information
guyharris authored and jelmer committed May 15, 2012
1 parent 8588d10 commit a66865d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pidl/lib/Parse/Pidl/Wireshark/NDR.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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("}");
Expand Down

0 comments on commit a66865d

Please sign in to comment.