[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Tue May 15 04:08:04 MDT 2012


The branch, master has been updated
       via  a66865d Use ENC_ values for proto_tree_add_item() calls.
      from  8588d10 s4:ntvfs/smb2: remove misleading comment regarding security=server

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a66865dd287073f21ce279d52450582ea290c7df
Author: Guy Harris <guy at alum.mit.edu>
Date:   Tue May 15 09:49:53 2012 +0200

    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 at samba.org>
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Tue May 15 12:07:06 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 pidl/lib/Parse/Pidl/Wireshark/NDR.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 46c9850..1aa44c3 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("}");


-- 
Samba Shared Repository


More information about the samba-cvs mailing list