[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-999-ge9f1264

[Andrew Tridgell]

The branch, master has been updated
       via  e9f126421d21a66cc695039f798d252e9f98fef9 (commit)
      from  d26016c19854142c1e5fbb5a3bfc40e7e4b1c616 (commit)

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


- Log -----------------------------------------------------------------
commit e9f126421d21a66cc695039f798d252e9f98fef9
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Sun Oct 4 16:57:57 2009 +1100

    add trailer alignment to structures

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

Summary of changes:
 pidl/lib/Parse/Pidl/Wireshark/NDR.pm |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 e13e144..b8adf2d 100644
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -545,6 +545,9 @@ sub Struct($$$$)
 	$self->indent;
 	$self->pidl_code("proto_item *item = NULL;");
 	$self->pidl_code("proto_tree *tree = NULL;");
+	if ($e->{ALIGN} > 1) {
+		$self->pidl_code("dcerpc_info *di = pinfo->private_data;");
+	}
 	$self->pidl_code("int old_offset;");
 	$self->pidl_code("");
 
@@ -565,6 +568,15 @@ sub Struct($$$$)
 	$self->pidl_code("\n$res");
 
 	$self->pidl_code("proto_item_set_len(item, offset-old_offset);\n");
+	if ($e->{ALIGN} > 1) {
+		$self->pidl_code("");
+		$self->pidl_code("if (di->call_data->flags & DCERPC_IS_NDR64) {");
+		$self->indent;
+		$self->pidl_code("ALIGN_TO_$e->{ALIGN}_BYTES;");
+		$self->deindent;
+		$self->pidl_code("}");
+	}
+	$self->pidl_code("");
 	$self->pidl_code("return offset;");
 	$self->deindent;
 	$self->pidl_code("}\n");
@@ -634,6 +646,8 @@ sub Union($$$$)
 
 	$self->pidl_code("switch(level) {$res\t}");
 	$self->pidl_code("proto_item_set_len(item, offset-old_offset);\n");
+	$self->pidl_code("");
+
 	$self->pidl_code("return offset;");
 	$self->deindent;
 	$self->pidl_code("}");


-- 
Samba Shared Repository