[SCM] Samba Shared Repository - branch master updated
Matthieu Patou
mat at samba.org
Fri Aug 5 16:51:02 MDT 2011
The branch, master has been updated
via 593c932 idl: We don't need a context for FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2 and avoid colision on bop attribute
via 987b25d pidl: for wireshark use only the major of the version
via 403f064 pidl: For wireshark check also LIBNDR_FLAG_NOALIGN for not aligning
via 0912979 pidl: handle union when the switch variable is outside of the union for wireshark dissector
via da02b56 pidl: add subcontext handling for wireshark
via aea446b pidl: If STR_NULLTERM we concider it's a string as well
via 5a5f684 pidl: handle hyper attribute for wireshark
via dc829a4 pidl: handle datablob for wireshark generator
via ba882bf pidl: rpc version is a 32 bit
via 5ff63e2 pidl: generate code for dissecting null terminated strings
via 7170cfa pidl: don't expect to have quote when creating import headers
via bb865b4 s4-scripting: allow to specify the number max of iteration around getNcChanges
from 56319cf s3:rpc_transport_tstream: only use tstream_cli_np_use_trans() for sync requests
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 593c9328fdddb27f92425f8eaba856c3a62e15cd
Author: Matthieu Patou <mat at matws.net>
Date: Sat Aug 6 00:55:52 2011 +0400
idl: We don't need a context for FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2 and avoid colision on bop attribute
Autobuild-User: Matthieu Patou <mat at samba.org>
Autobuild-Date: Sat Aug 6 00:50:47 CEST 2011 on sn-devel-104
commit 987b25d7e0fab19533fdbae63de22d74bdd8fbf7
Author: Matthieu Patou <mat at matws.net>
Date: Fri Aug 5 23:14:03 2011 +0400
pidl: for wireshark use only the major of the version
commit 403f064744e648edc86a6e21b174d92330ef8642
Author: Matthieu Patou <mat at matws.net>
Date: Fri Aug 5 23:13:08 2011 +0400
pidl: For wireshark check also LIBNDR_FLAG_NOALIGN for not aligning
commit 0912979341045e7d0bdf53bf8c5e855a2fcb7890
Author: Matthieu Patou <mat at matws.net>
Date: Fri Aug 5 23:11:47 2011 +0400
pidl: handle union when the switch variable is outside of the union for wireshark dissector
commit da02b56572f1d7f176e9ce9044cad99640d113a1
Author: Matthieu Patou <mat at matws.net>
Date: Fri Aug 5 23:07:57 2011 +0400
pidl: add subcontext handling for wireshark
commit aea446ba793e1cd3ad1a70efa18aab47e46d45d4
Author: Matthieu Patou <mat at matws.net>
Date: Fri Aug 5 23:03:29 2011 +0400
pidl: If STR_NULLTERM we concider it's a string as well
commit 5a5f6845db58ad1edfd90210da4b538859da43fc
Author: Matthieu Patou <mat at matws.net>
Date: Tue Aug 2 22:42:58 2011 +0400
pidl: handle hyper attribute for wireshark
commit dc829a438a8b9f5cb8cd05dbbe24470bf192f935
Author: Matthieu Patou <mat at matws.net>
Date: Tue Aug 2 22:42:44 2011 +0400
pidl: handle datablob for wireshark generator
commit ba882bfd904fc9afb0b136c104ce9b51cf4bb3b0
Author: Matthieu Patou <mat at matws.net>
Date: Tue Aug 2 11:56:51 2011 +0400
pidl: rpc version is a 32 bit
commit 5ff63e2dcffe0c1db3e0111f4eb710e2bff4f9c8
Author: Matthieu Patou <mat at matws.net>
Date: Tue Aug 2 11:56:32 2011 +0400
pidl: generate code for dissecting null terminated strings
commit 7170cfaaf3b8663ac20be0231baa8ba90e80e5af
Author: Matthieu Patou <mat at matws.net>
Date: Tue Aug 2 11:50:32 2011 +0400
pidl: don't expect to have quote when creating import headers
Currently the $_ didn't contains the quote anymore, in order to avoid
any further regression the cleanup of quote is done before so that if
$_ still have quotes we clean them in anycase.
commit bb865b4a95462ec2f1ed7436adb30dd89c91c65d
Author: Matthieu Patou <mat at matws.net>
Date: Thu Aug 4 19:59:49 2011 +0400
s4-scripting: allow to specify the number max of iteration around getNcChanges
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/frsrpc.idl | 4 +-
pidl/lib/Parse/Pidl/NDR.pm | 3 +
pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 146 ++++++++++++++++++++++++++++------
source4/scripting/devel/getncchanges | 5 +-
4 files changed, 129 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/frsrpc.idl b/librpc/idl/frsrpc.idl
index e85042c..fcc3119 100644
--- a/librpc/idl/frsrpc.idl
+++ b/librpc/idl/frsrpc.idl
@@ -299,10 +299,10 @@ interface frsrpc
frsrpc_CommPktChangeOrderCommand remote_co;
[case(FRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K)][subcontext(4)]
frsrpc_CommPktCoRecordExtensionWin2k co_ext_win2k;
- [case(FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2)][subcontext(4)]
+ [case(FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2)]
frsrpc_CommPktChangeOrderRecordExtension co_extension2;
[case(FRSRPC_COMM_PKT_CHUNK_EOP)]
- [value(0xFFFFFFFF)] uint32 bop;
+ [value(0xFFFFFFFF)] uint32 bopend;
} frsrpc_CommPktChunkData;
typedef [public,flag(NDR_NOALIGN)] struct {
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index d91c324..db776ae 100644
--- a/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
@@ -943,6 +943,9 @@ sub ContainsString($)
{
my ($e) = @_;
+ if (property_matches($e, "flag", ".*STR_NULLTERM.*")) {
+ return 1;
+ }
foreach my $l (@{$e->{LEVELS}}) {
return 1 if ($l->{TYPE} eq "ARRAY" and $l->{IS_ZERO_TERMINATED});
}
diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 64b8dcf..46c9850 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -270,11 +270,9 @@ sub Bitmap($$$$)
$self->register_type($name, "offset = $dissectorname(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);", "FT_UINT$size", "BASE_HEX", "0", "NULL", $size/8);
}
-sub ElementLevel($$$$$$$)
+sub ElementLevel($$$$$$$$)
{
- my ($self,$e,$l,$hf,$myname,$pn,$ifname) = @_;
-
- my $param = 0;
+ my ($self,$e,$l,$hf,$myname,$pn,$ifname,$param) = @_;
if (defined($self->{conformance}->{dissectorparams}->{$myname})) {
$param = $self->{conformance}->{dissectorparams}->{$myname}->{PARAM};
@@ -323,9 +321,19 @@ sub ElementLevel($$$$$$$)
$self->pidl_code("proto_item_append_text(tree, \": %s\", data);");
} elsif (property_matches($e, "flag", ".*LIBNDR_FLAG_STR_SIZE4.*")) {
$self->pidl_code("offset = dissect_ndr_vstring(tvb, offset, pinfo, tree, drep, $bs, $hf, FALSE, NULL);");
+ } elsif (property_matches($e, "flag", ".*STR_NULLTERM.*")) {
+ if ($bs == 2) {
+ $self->pidl_code("offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, $hf , 0);")
+ } else {
+ $self->pidl_code("offset = dissect_null_term_string(tvb, offset, pinfo, tree, drep, $hf , 0);")
+ }
} else {
warn("Unable to handle string with flags $e->{PROPERTIES}->{flag}");
}
+ } elsif ($l->{DATA_TYPE} eq "DATA_BLOB") {
+ my $remain = 0;
+ $remain = 1 if (property_matches($e->{ORIGINAL}, "flag", ".*LIBNDR_FLAG_REMAINING.*"));
+ $self->pidl_code("offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, $hf, $remain);");
} else {
my $call;
@@ -350,27 +358,65 @@ sub ElementLevel($$$$$$$)
$self->pidl_code($call);
}
} elsif ($_->{TYPE} eq "SUBCONTEXT") {
+ my $varswitch;
+ if (has_property($e, "switch_is")) {
+ $varswitch = $e->{PROPERTIES}->{switch_is};
+ }
my $num_bits = ($l->{HEADER_SIZE}*8);
+ my $hf2 = $self->register_hf_field($hf."_", "Subcontext length", "$ifname.$pn.$_->{NAME}subcontext", "FT_UINT$num_bits", "BASE_HEX", "NULL", 0, "");
+ $self->{hf_used}->{$hf2} = 1;
+ $self->pidl_code("dcerpc_info *di = pinfo->private_data;");
$self->pidl_code("guint$num_bits size;");
- $self->pidl_code("int start_offset = offset;");
+ $self->pidl_code("int conformant = di->conformant_run;");
$self->pidl_code("tvbuff_t *subtvb;");
- $self->pidl_code("offset = dissect_ndr_uint$num_bits(tvb, offset, pinfo, tree, drep, $hf, &size);");
- $self->pidl_code("proto_tree_add_text(tree, tvb, start_offset, offset - start_offset + size, \"Subcontext size\");");
+ $self->pidl_code("");
+ # We need to be able to dissect the length of the context in every case
+ # and conformant run skips the dissections of scalars ...
+ $self->pidl_code("if (!conformant) {");
+ $self->indent;
+ $self->pidl_code("offset = dissect_ndr_uint$num_bits(tvb, offset, pinfo, tree, drep, $hf2, &size);");
$self->pidl_code("subtvb = tvb_new_subset(tvb, offset, size, -1);");
- $self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, drep);");
+ if ($param ne 0) {
+ $self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, drep, $param);");
+ } else {
+ $self->pidl_code("$myname\_(subtvb, 0, pinfo, tree, drep);");
+ }
+ $self->pidl_code("offset += size;");
+ $self->deindent;
+ $self->pidl_code("}");
} else {
die("Unknown type `$_->{TYPE}'");
}
}
-sub Element($$$)
+sub Element($$$$$)
{
- my ($self,$e,$pn,$ifname) = @_;
+ my ($self,$e,$pn,$ifname,$isoruseswitch) = @_;
my $dissectorname = "$ifname\_dissect\_element\_".StripPrefixes($pn, $self->{conformance}->{strip_prefixes})."\_".StripPrefixes($e->{NAME}, $self->{conformance}->{strip_prefixes});
- my $call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, drep);";
+ my ($call_code, $moreparam);
+ my $param = 0;
+ if (defined $isoruseswitch) {
+ my $type = $isoruseswitch->[0];
+ my $name = $isoruseswitch->[1];
+
+ my $switch_dt = getType($type);
+ my $switch_type;
+ if ($switch_dt->{DATA}->{TYPE} eq "ENUM") {
+ $switch_type = "g".Parse::Pidl::Typelist::enum_type_fn($switch_dt->{DATA});
+ } elsif ($switch_dt->{DATA}->{TYPE} eq "SCALAR") {
+ $switch_type = "g$e->{SWITCH_TYPE}";
+ }
+ $moreparam = ", $switch_type *".$name;
+ $param = $name;
+ $call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, drep, &$name);";
+ } else {
+ $moreparam = "";
+ $call_code = "offset = $dissectorname(tvb, offset, pinfo, tree, drep);";
+ }
+
my $type = $self->find_type($e->{TYPE});
@@ -403,16 +449,24 @@ sub Element($$$)
my $add = "";
+ my $oldparam = undef;
foreach (@{$e->{LEVELS}}) {
+ if (defined $_->{SWITCH_IS}) {
+ $oldparam = $param;
+ $param = "*$param";
+ }
next if ($_->{TYPE} eq "SWITCH");
- $self->pidl_def("static int $dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);");
+ $self->pidl_def("static int $dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_$moreparam);");
$self->pidl_fn_start("$dissectorname$add");
$self->pidl_code("static int");
- $self->pidl_code("$dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)");
+ $self->pidl_code("$dissectorname$add(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_$moreparam)");
$self->pidl_code("{");
$self->indent;
- $self->ElementLevel($e,$_,$hf,$dissectorname.$add,$pn,$ifname);
+ $self->ElementLevel($e,$_,$hf,$dissectorname.$add,$pn,$ifname,$param);
+ if (defined $oldparam) {
+ $param = $oldparam;
+ }
$self->pidl_code("");
$self->pidl_code("return offset;");
@@ -433,7 +487,7 @@ sub Function($$$)
my %dissectornames;
foreach (@{$fn->{ELEMENTS}}) {
- $dissectornames{$_->{NAME}} = $self->Element($_, $fn->{NAME}, $ifname) if not defined($dissectornames{$_->{NAME}});
+ $dissectornames{$_->{NAME}} = $self->Element($_, $fn->{NAME}, $ifname, undef) if not defined($dissectornames{$_->{NAME}});
}
my $fn_name = $_->{NAME};
@@ -534,7 +588,40 @@ sub Struct($$$$)
$self->register_ett("ett_$ifname\_$name");
my $res = "";
- ($res.="\t".$self->Element($_, $name, $ifname)."\n\n") foreach (@{$e->{ELEMENTS}});
+ my $varswitchs = {};
+ # will contain the switch var declaration;
+ my $vars = [];
+ foreach (@{$e->{ELEMENTS}}) {
+ if (has_property($_, "switch_is")) {
+ $varswitchs->{$_->{PROPERTIES}->{switch_is}} = [];
+ }
+ }
+ foreach (@{$e->{ELEMENTS}}) {
+ my $switch_info = undef;
+
+ my $v = $_->{NAME};
+ if (scalar(grep {/$v/} keys(%$varswitchs)) == 1) {
+ # This element is one of the switch attribute
+ my $switch_dt = getType($_->{TYPE});
+ my $switch_type;
+ if ($switch_dt->{DATA}->{TYPE} eq "ENUM") {
+ $switch_type = "g".Parse::Pidl::Typelist::enum_type_fn($switch_dt->{DATA});
+ } elsif ($switch_dt->{DATA}->{TYPE} eq "SCALAR") {
+ $switch_type = "g$e->{SWITCH_TYPE}";
+ }
+
+ push @$vars, "$switch_type $v;";
+ $switch_info = [ $_->{TYPE}, $v ];
+ $varswitchs->{$v} = $switch_info;
+ }
+
+ if (has_property($_, "switch_is")) {
+ my $varswitch = $_->{PROPERTIES}->{switch_is};
+ $switch_info = $varswitchs->{$varswitch};
+ }
+
+ $res.="\t".$self->Element($_, $name, $ifname, $switch_info)."\n\n";
+ }
$self->pidl_hdr("int $dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_);");
@@ -543,6 +630,7 @@ sub Struct($$$$)
$self->pidl_code("$dissectorname(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)");
$self->pidl_code("{");
$self->indent;
+ $self->pidl_code($_) foreach (@$vars);
$self->pidl_code("proto_item *item = NULL;");
$self->pidl_code("proto_tree *tree = NULL;");
if ($e->{ALIGN} > 1) {
@@ -551,7 +639,7 @@ sub Struct($$$$)
$self->pidl_code("int old_offset;");
$self->pidl_code("");
- if ($e->{ALIGN} > 1) {
+ if ($e->{ALIGN} > 1 and not property_matches($e, "flag", ".*LIBNDR_FLAG_NOALIGN.*")) {
$self->pidl_code("ALIGN_TO_$e->{ALIGN}_BYTES;");
}
$self->pidl_code("");
@@ -599,7 +687,7 @@ sub Union($$$$)
foreach (@{$e->{ELEMENTS}}) {
$res.="\n\t\t$_->{CASE}:\n";
if ($_->{TYPE} ne "EMPTY") {
- $res.="\t\t\t".$self->Element($_, $name, $ifname)."\n";
+ $res.="\t\t\t".$self->Element($_, $name, $ifname, undef)."\n";
}
$res.="\t\tbreak;\n";
}
@@ -623,7 +711,11 @@ sub Union($$$$)
$self->pidl_code("proto_item *item = NULL;");
$self->pidl_code("proto_tree *tree = NULL;");
$self->pidl_code("int old_offset;");
- $self->pidl_code("$switch_type level;");
+ if (!defined $switch_type) {
+ $self->pidl_code("guint32 level = param;");
+ } else {
+ $self->pidl_code("$switch_type level;");
+ }
$self->pidl_code("");
$self->pidl_code("old_offset = offset;");
@@ -636,11 +728,13 @@ sub Union($$$$)
$self->pidl_code("");
- $self->pidl_code("offset = $switch_dissect(tvb, offset, pinfo, tree, drep, hf_index, &level);");
+ if (defined $switch_type) {
+ $self->pidl_code("offset = $switch_dissect(tvb, offset, pinfo, tree, drep, hf_index, &level);");
- if ($e->{ALIGN} > 1) {
- $self->pidl_code("ALIGN_TO_$e->{ALIGN}_BYTES;");
- $self->pidl_code("");
+ if ($e->{ALIGN} > 1) {
+ $self->pidl_code("ALIGN_TO_$e->{ALIGN}_BYTES;");
+ $self->pidl_code("");
+ }
}
@@ -770,8 +864,8 @@ sub ProcessImport
my @imports = @_;
foreach (@imports) {
next if($_ eq "security");
- s/\.idl\"$//;
s/^\"//;
+ s/\.idl"?$//;
$self->pidl_hdr("#include \"packet-dcerpc-$_\.h\"");
}
$self->pidl_hdr("");
@@ -811,7 +905,7 @@ sub ProcessInterface($$)
. ", 0x" . substr($if_uuid, 35, 2) . " }");
$self->pidl_def("};");
- my $maj = $x->{VERSION};
+ my $maj = 0x0000FFFF & $x->{VERSION};
$maj =~ s/\.(.*)$//g;
$self->pidl_def("static guint16 ver_dcerpc_$x->{NAME} = $maj;");
$self->pidl_def("");
@@ -820,7 +914,6 @@ sub ProcessInterface($$)
$return_types{$x->{NAME}} = {};
$self->Interface($x);
-
$self->pidl_code("\n".DumpFunctionTable($x));
foreach (keys %{$return_types{$x->{NAME}}}) {
@@ -879,6 +972,7 @@ sub Initialize($$)
$self->register_type("int$bits", "offset = PIDL_dissect_uint$bits(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);", "FT_INT$bits", "BASE_DEC", 0, "NULL", $bytes);
}
+ $self->register_type("hyper", "offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, \@HF\@, NULL);", "FT_UINT64", "BASE_DEC", 0, "NULL", 8);
$self->register_type("udlong", "offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, drep, \@HF\@, NULL);", "FT_UINT64", "BASE_DEC", 0, "NULL", 4);
$self->register_type("bool8", "offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_INT8", "BASE_DEC", 0, "NULL", 1);
$self->register_type("char", "offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, \@HF\@, \@PARAM\@);","FT_INT8", "BASE_DEC", 0, "NULL", 1);
diff --git a/source4/scripting/devel/getncchanges b/source4/scripting/devel/getncchanges
index e5b7f8e..736e3db 100755
--- a/source4/scripting/devel/getncchanges
+++ b/source4/scripting/devel/getncchanges
@@ -101,6 +101,7 @@ if __name__ == "__main__":
parser.add_option("", "--exop", dest="exop", help="extended operation",)
parser.add_option("", "--pas", dest="use_pas", action='store_true', default=False,
help="send partial attribute set",)
+ parser.add_option("", "--nb-iter", type='int', help="Number of getncchange iterations")
parser.add_option("", "--dest-dsa", type='str',
default='"9c637462-5b8c-4467-aef2-bdb1f57bc4ef"', help="destination DSA GUID")
parser.add_option("", "--replica-flags", type='int',
@@ -170,8 +171,10 @@ if __name__ == "__main__":
req8.mapping_ctr.num_mappings = 0
req8.mapping_ctr.mappings = None
+ nb_iter = 0
while True:
(level, ctr) = drs.DsGetNCChanges(drs_handle, 8, req8)
- if ctr.more_data == 0:
+ nb_iter += 1
+ if ctr.more_data == 0 or opts.nb_iter == nb_iter:
break
req8.highwatermark.tmp_highest_usn = ctr.new_highwatermark.tmp_highest_usn
--
Samba Shared Repository
More information about the samba-cvs
mailing list