The branch, master has been updated via 482c022 pidl:Samba4/NDR/Parser: fix NDR64 union alignment via fd628e7 midltests: add more union_align examples from 172a158 s3: Initialize output vars in parse_ea_blob
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 482c02284068810a57b35a509857fb1273d833b0 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Aug 16 17:35:50 2010 +0200 pidl:Samba4/NDR/Parser: fix NDR64 union alignment We need to align before the switch_type and before the union arms. Both alignments are to the boundary of the largest possible union arm. This means that adding a new union arm with a larger alignment would break compat!!! metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Sun Oct 24 17:49:23 UTC 2010 on sn-devel-104 commit fd628e7ae4653d5224c5dfcd9b2815113eaae7b8 Author: Stefan Metzmacher <me...@samba.org> Date: Sun Oct 24 18:54:46 2010 +0200 midltests: add more union_align examples This demonstrates the difference between NDR32 and NDR64 metze ----------------------------------------------------------------------- Summary of changes: pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 8 ++ .../midltests/valid/midltests_union_align_01.txt | 48 ++++---- .../midltests/valid/midltests_union_align_02.idl | 61 +++++++++ .../midltests/valid/midltests_union_align_02.txt | 37 ++++++ .../midltests/valid/midltests_union_align_03.idl | 64 ++++++++++ .../midltests/valid/midltests_union_align_03.txt | 37 ++++++ .../midltests/valid/midltests_union_align_04.idl | 64 ++++++++++ .../midltests/valid/midltests_union_align_04.txt | 37 ++++++ .../midltests/valid/midltests_union_align_05.idl | 61 +++++++++ .../midltests/valid/midltests_union_align_05.txt | 37 ++++++ .../midltests/valid/midltests_union_align_06.idl | 61 +++++++++ .../midltests/valid/midltests_union_align_06.txt | 37 ++++++ .../midltests/valid/midltests_union_align_07.idl | 61 +++++++++ .../midltests/valid/midltests_union_align_07.txt | 38 ++++++ .../midltests/valid/midltests_union_align_08.idl | 68 ++++++++++ .../midltests/valid/midltests_union_align_08.txt | 129 ++++++++++++++++++++ 16 files changed, 824 insertions(+), 24 deletions(-) create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_02.idl create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_02.txt create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_03.idl create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_03.txt create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_04.idl create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_04.txt create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_05.idl create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_05.txt create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_06.idl create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_06.txt create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_07.idl create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_07.txt create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_08.idl create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_08.txt Changeset truncated at 500 lines: diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 27e7a30..09518f7 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -1688,6 +1688,10 @@ sub ParseUnionPushPrimitives($$$$) $self->pidl("uint32_t level = ndr_push_get_switch_value($ndr, $varname);"); + if (defined($e->{ALIGN})) { + $self->pidl("NDR_CHECK(ndr_push_union_align($ndr, $e->{ALIGN}));"); + } + if (defined($e->{SWITCH_TYPE})) { $self->pidl("NDR_CHECK(ndr_push_$e->{SWITCH_TYPE}($ndr, NDR_SCALARS, level));"); } @@ -1833,6 +1837,10 @@ sub ParseUnionPullPrimitives($$$$$) my ($self,$e,$ndr,$varname,$switch_type) = @_; my $have_default = 0; + if (defined($e->{ALIGN})) { + $self->pidl("NDR_CHECK(ndr_pull_union_align($ndr, $e->{ALIGN}));"); + } + if (defined($switch_type)) { $self->pidl("NDR_CHECK(ndr_pull_$switch_type($ndr, NDR_SCALARS, &_level));"); $self->pidl("if (_level != level) {"); diff --git a/testprogs/win32/midltests/valid/midltests_union_align_01.txt b/testprogs/win32/midltests/valid/midltests_union_align_01.txt index a7f737c..cc372c8 100644 --- a/testprogs/win32/midltests/valid/midltests_union_align_01.txt +++ b/testprogs/win32/midltests/valid/midltests_union_align_01.txt @@ -1,24 +1,24 @@ -[in] Buffer[4/8] -[000] 00 00 00 00 .... -srv_midltests_fn: Start -srv_midltests_fn: End -[out] Buffer[4] -[000] 54 72 75 65 True -[in] Buffer[6/10] -[000] 02 00 02 00 FF FF ...... -srv_midltests_fn: Start -srv_midltests_fn: End -[out] Buffer[4] -[000] 54 72 75 65 True -[in] Buffer[8/12] -[000] 04 00 04 00 FF FF FF FF ........ -srv_midltests_fn: Start -srv_midltests_fn: End -[out] Buffer[4] -[000] 54 72 75 65 True -[in] Buffer[16/16] -[000] 08 00 08 00 00 00 00 00 FF FF FF FF FF FF FF FF ........ ........ -srv_midltests_fn: Start -srv_midltests_fn: End -[out] Buffer[4] -[000] 54 72 75 65 True +[in] Buffer[4/8] +[000] 00 00 00 00 .... +srv_midltests_fn: Start +srv_midltests_fn: End +[out] Buffer[4] +[000] 54 72 75 65 True +[in] Buffer[6/10] +[000] 02 00 02 00 FF FF ...... +srv_midltests_fn: Start +srv_midltests_fn: End +[out] Buffer[4] +[000] 54 72 75 65 True +[in] Buffer[8/12] +[000] 04 00 04 00 FF FF FF FF ........ +srv_midltests_fn: Start +srv_midltests_fn: End +[out] Buffer[4] +[000] 54 72 75 65 True +[in] Buffer[16/16] +[000] 08 00 08 00 00 00 00 00 FF FF FF FF FF FF FF FF ........ ........ +srv_midltests_fn: Start +srv_midltests_fn: End +[out] Buffer[4] +[000] 54 72 75 65 True diff --git a/testprogs/win32/midltests/valid/midltests_union_align_02.idl b/testprogs/win32/midltests/valid/midltests_union_align_02.idl new file mode 100644 index 0000000..dc2d84d --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_02.idl @@ -0,0 +1,61 @@ +#ifndef MIDLTESTS_C_CODE + +/* + * For midltests_tcp.exe you may want to + * redirect the traffic via rinetd + * with a /etc/rinetd.conf like this: + * + * 172.31.9.1 5032 172.31.9.8 5032 + * 172.31.9.1 5064 172.31.9.8 5064 + * + * This is useful to watch the traffic with + * a network sniffer. + */ +/* +cpp_quote("#define LISTEN_IP \"0.0.0.0\"") +cpp_quote("#define FORWARD_IP \"127.0.0.1\"") +cpp_quote("#define CONNECT_IP \"172.31.9.1\"") +*/ + +/* + * With midltests_tcp.exe NDR64 is enforced by default. + * For testing it might be needed to allow downgrades + * to NDR32. This is needed when you use 'pipe'. + */ +//cpp_quote("#define DONOT_FORCE_NDR64 1") + +[ + uuid("225b9fcb-eb3d-497b-8b0b-591f049a2507"), + pointer_default(unique) +] +interface midltests +{ + typedef [switch_type(char)] union { + [case(1)] char c; + } u; + long midltests_fn( + [in] char l, + [in,switch_is(l)] u u + ); +} + +#elif MIDLTESTS_C_CODE + +static void midltests(void) +{ + char l; + u u; + + l = 1; + u.c = 'A'; + cli_midltests_fn(l,u); +} + +long srv_midltests_fn(char l, u u) +{ + printf("srv_midltests_fn: Start\n"); + printf("srv_midltests_fn: End\n"); + return 0x65757254; +} + +#endif diff --git a/testprogs/win32/midltests/valid/midltests_union_align_02.txt b/testprogs/win32/midltests/valid/midltests_union_align_02.txt new file mode 100644 index 0000000..16186ea --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_02.txt @@ -0,0 +1,37 @@ +Wait for setup of server threads + +Test NDR32 + +ndr32: disable NDR64 + +ndr32:in => out: ptype[request] flen[27] plen[3] ahint[3] + +[000] 01 01 41 ..A + +srv_midltests_fn: Start +srv_midltests_fn: End + +ndr32:out => in: ptype[response] flen[28] plen[4] ahint[4] + +[000] 54 72 75 65 True + +NDRTcpThread[ndr32] stop + +Test NDR64 + +ndr64: got NDR64 + +ndr64:in => out: ptype[request] flen[27] plen[3] ahint[3] + +[000] 01 01 41 ..A + +srv_midltests_fn: Start +srv_midltests_fn: End + +ndr64:out => in: ptype[response] flen[28] plen[4] ahint[4] + +[000] 54 72 75 65 True + +NDRTcpThread[ndr64] stop + +Test OK diff --git a/testprogs/win32/midltests/valid/midltests_union_align_03.idl b/testprogs/win32/midltests/valid/midltests_union_align_03.idl new file mode 100644 index 0000000..699dd6c --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_03.idl @@ -0,0 +1,64 @@ +#ifndef MIDLTESTS_C_CODE + +/* + * For midltests_tcp.exe you may want to + * redirect the traffic via rinetd + * with a /etc/rinetd.conf like this: + * + * 172.31.9.1 5032 172.31.9.8 5032 + * 172.31.9.1 5064 172.31.9.8 5064 + * + * This is useful to watch the traffic with + * a network sniffer. + */ +/* +cpp_quote("#define LISTEN_IP \"0.0.0.0\"") +cpp_quote("#define FORWARD_IP \"127.0.0.1\"") +cpp_quote("#define CONNECT_IP \"172.31.9.1\"") +*/ + +/* + * With midltests_tcp.exe NDR64 is enforced by default. + * For testing it might be needed to allow downgrades + * to NDR32. This is needed when you use 'pipe'. + */ +//cpp_quote("#define DONOT_FORCE_NDR64 1") + +[ + uuid("225b9fcb-eb3d-497b-8b0b-591f049a2507"), + pointer_default(unique) +] +interface midltests +{ + typedef [switch_type(short)] union { + [case(1)] char c; + } u; + long midltests_fn( + [in] short l, + [in] char v, + [in,switch_is(l)] u u + ); +} + +#elif MIDLTESTS_C_CODE + +static void midltests(void) +{ + short l; + char v; + u u; + + l = 1; + v = 'V'; + u.c = 'C'; + cli_midltests_fn(l, v, u); +} + +long srv_midltests_fn(short l, char v, u u) +{ + printf("srv_midltests_fn: Start\n"); + printf("srv_midltests_fn: End\n"); + return 0x65757254; +} + +#endif diff --git a/testprogs/win32/midltests/valid/midltests_union_align_03.txt b/testprogs/win32/midltests/valid/midltests_union_align_03.txt new file mode 100644 index 0000000..7078dd3 --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_03.txt @@ -0,0 +1,37 @@ +Wait for setup of server threads + +Test NDR32 + +ndr32: disable NDR64 + +ndr32:in => out: ptype[request] flen[31] plen[7] ahint[7] + +[000] 01 00 56 00 01 00 43 ..V...C + +srv_midltests_fn: Start +srv_midltests_fn: End + +ndr32:out => in: ptype[response] flen[28] plen[4] ahint[4] + +[000] 54 72 75 65 True + +NDRTcpThread[ndr32] stop + +Test NDR64 + +ndr64: got NDR64 + +ndr64:in => out: ptype[request] flen[31] plen[7] ahint[7] + +[000] 01 00 56 00 01 00 43 ..V...C + +srv_midltests_fn: Start +srv_midltests_fn: End + +ndr64:out => in: ptype[response] flen[28] plen[4] ahint[4] + +[000] 54 72 75 65 True + +NDRTcpThread[ndr64] stop + +Test OK diff --git a/testprogs/win32/midltests/valid/midltests_union_align_04.idl b/testprogs/win32/midltests/valid/midltests_union_align_04.idl new file mode 100644 index 0000000..a7c6ad7 --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_04.idl @@ -0,0 +1,64 @@ +#ifndef MIDLTESTS_C_CODE + +/* + * For midltests_tcp.exe you may want to + * redirect the traffic via rinetd + * with a /etc/rinetd.conf like this: + * + * 172.31.9.1 5032 172.31.9.8 5032 + * 172.31.9.1 5064 172.31.9.8 5064 + * + * This is useful to watch the traffic with + * a network sniffer. + */ +/* +cpp_quote("#define LISTEN_IP \"0.0.0.0\"") +cpp_quote("#define FORWARD_IP \"127.0.0.1\"") +cpp_quote("#define CONNECT_IP \"172.31.9.1\"") +*/ + +/* + * With midltests_tcp.exe NDR64 is enforced by default. + * For testing it might be needed to allow downgrades + * to NDR32. This is needed when you use 'pipe'. + */ +//cpp_quote("#define DONOT_FORCE_NDR64 1") + +[ + uuid("225b9fcb-eb3d-497b-8b0b-591f049a2507"), + pointer_default(unique) +] +interface midltests +{ + typedef [switch_type(long)] union { + [case(1)] char c; + } u; + long midltests_fn( + [in] long l, + [in] char v, + [in,switch_is(l)] u u + ); +} + +#elif MIDLTESTS_C_CODE + +static void midltests(void) +{ + long l; + char v; + u u; + + l = 1; + v = 'V'; + u.c = 'C'; + cli_midltests_fn(l, v, u); +} + +long srv_midltests_fn(long l, char v, u u) +{ + printf("srv_midltests_fn: Start\n"); + printf("srv_midltests_fn: End\n"); + return 0x65757254; +} + +#endif diff --git a/testprogs/win32/midltests/valid/midltests_union_align_04.txt b/testprogs/win32/midltests/valid/midltests_union_align_04.txt new file mode 100644 index 0000000..d323860 --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_04.txt @@ -0,0 +1,37 @@ +Wait for setup of server threads + +Test NDR32 + +ndr32: disable NDR64 + +ndr32:in => out: ptype[request] flen[37] plen[13] ahint[13] + +[000] 01 00 00 00 56 00 00 00 01 00 00 00 43 ....V... ....C + +srv_midltests_fn: Start +srv_midltests_fn: End + +ndr32:out => in: ptype[response] flen[28] plen[4] ahint[4] + +[000] 54 72 75 65 True + +NDRTcpThread[ndr32] stop + +Test NDR64 + +ndr64: got NDR64 + +ndr64:in => out: ptype[request] flen[37] plen[13] ahint[13] + +[000] 01 00 00 00 56 00 00 00 01 00 00 00 43 ....V... ....C + +srv_midltests_fn: Start +srv_midltests_fn: End + +ndr64:out => in: ptype[response] flen[28] plen[4] ahint[4] + +[000] 54 72 75 65 True + +NDRTcpThread[ndr64] stop + +Test OK diff --git a/testprogs/win32/midltests/valid/midltests_union_align_05.idl b/testprogs/win32/midltests/valid/midltests_union_align_05.idl new file mode 100644 index 0000000..da46bab --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_05.idl @@ -0,0 +1,61 @@ +#ifndef MIDLTESTS_C_CODE + +/* + * For midltests_tcp.exe you may want to + * redirect the traffic via rinetd + * with a /etc/rinetd.conf like this: + * + * 172.31.9.1 5032 172.31.9.8 5032 + * 172.31.9.1 5064 172.31.9.8 5064 + * + * This is useful to watch the traffic with + * a network sniffer. + */ +/* +cpp_quote("#define LISTEN_IP \"0.0.0.0\"") +cpp_quote("#define FORWARD_IP \"127.0.0.1\"") +cpp_quote("#define CONNECT_IP \"172.31.9.1\"") +*/ + +/* + * With midltests_tcp.exe NDR64 is enforced by default. + * For testing it might be needed to allow downgrades + * to NDR32. This is needed when you use 'pipe'. + */ +//cpp_quote("#define DONOT_FORCE_NDR64 1") + +[ + uuid("225b9fcb-eb3d-497b-8b0b-591f049a2507"), + pointer_default(unique) +] +interface midltests +{ + typedef [switch_type(char)] union { + [case(1)] short c; + } u; + long midltests_fn( + [in] char l, + [in,switch_is(l)] u u + ); +} + +#elif MIDLTESTS_C_CODE + +static void midltests(void) +{ + char l; + u u; + + l = 1; + u.c = 'C'; + cli_midltests_fn(l, u); +} + +long srv_midltests_fn(hyper l, u u) +{ + printf("srv_midltests_fn: Start\n"); + printf("srv_midltests_fn: End\n"); + return 0x65757254; +} + +#endif diff --git a/testprogs/win32/midltests/valid/midltests_union_align_05.txt b/testprogs/win32/midltests/valid/midltests_union_align_05.txt new file mode 100644 index 0000000..1938b0a --- /dev/null +++ b/testprogs/win32/midltests/valid/midltests_union_align_05.txt @@ -0,0 +1,37 @@ +Wait for setup of server threads + +Test NDR32 + +ndr32: disable NDR64 + +ndr32:in => out: ptype[request] flen[28] plen[4] ahint[4] + +[000] 01 01 43 00 ..C. + +srv_midltests_fn: Start +srv_midltests_fn: End -- Samba Shared Repository