use strict;
use needed;
+use typelist;
# list of known types
-my %typedefs;
my %typefamily;
-sub get_typedef($)
+sub get_typefamily($)
{
my $n = shift;
- return $typedefs{$n};
+ return $typefamily{$n};
}
-sub RegisterPrimitives()
-{
- my %type_alignments =
- (
+my %scalar_alignments =
+(
"char" => 1,
"int8" => 1,
"uint8" => 1,
"ipv4address" => 4,
"hyper" => 8,
"NTTIME_hyper" => 8
- );
-
- foreach my $k (keys %type_alignments) {
- $typedefs{$k} = {
- NAME => $k,
- TYPE => "TYPEDEF",
- DATA => {
- TYPE => "SCALAR",
- ALIGN => $type_alignments{$k}
- }
- };
+);
+
+$typefamily{SCALAR} = {
+ ALIGN => sub {
+ my $t = shift;
+ return $scalar_alignments{$t->{NAME}};
}
-}
+};
sub is_scalar_type($)
{
my $type = shift;
- if (my $dt = $typedefs{$type}->{DATA}->{TYPE}) {
+ return 0 unless typelist::hasType($type);
+
+ if (my $dt = typelist::getType($type)->{DATA}->{TYPE}) {
return 1 if ($dt eq "SCALAR" or $dt eq "ENUM" or $dt eq "BITMAP");
}
return undef;
}
+# return 1 if this is a fixed array
+sub is_fixed_array($)
+{
+ my $e = shift;
+ my $len = $e->{"ARRAY_LEN"};
+ return 1 if (defined $len && util::is_constant($len));
+ return 0;
+}
+
+# return 1 if this is a conformant array
+sub is_conformant_array($)
+{
+ my $e = shift;
+ return 1 if (util::has_property($e, "size_is"));
+ return 0;
+}
+
+# return 1 if this is a inline array
+sub is_inline_array($)
+{
+ my $e = shift;
+ my $len = $e->{"ARRAY_LEN"};
+ if (is_fixed_array($e) ||
+ defined $len && $len ne "*") {
+ return 1;
+ }
+ return 0;
+}
+
+# return 1 if this is a varying array
+sub is_varying_array($)
+{
+ my $e = shift;
+ return util::has_property($e, "length_is");
+}
+
+# return 1 if this is a surrounding array (sometimes
+# referred to as an embedded array). Can only occur as
+# the last element in a struct and can not contain any pointers.
+sub is_surrounding_array($)
+{
+ my $e = shift;
+
+ return ($e->{POINTERS} == 0
+ and defined $e->{ARRAY_LEN}
+ and $e->{ARRAY_LEN} eq "*"
+ and $e == $e->{PARENT}->{ELEMENTS}[-1]
+ and $e->{PARENT}->{TYPE} ne "FUNCTION");
+}
+
+sub array_type($)
+{
+ my $e = shift;
+
+ return "conformant-varying" if (is_varying_array($e) and is_conformant_array($e));
+ return "conformant" if (is_varying_array($e));
+ return "varying" if (is_varying_array($e));
+ return "inline" if (is_inline_array($e));
+ return "fixed" if (is_fixed_array($e));
+
+ return undef;
+}
+
# determine if an element needs a reference pointer on the wire
# in its NDR representation
sub need_wire_pointer($)
{
my $e = shift;
- my $pt;
-
- return 0 unless ($pt = pointer_type($e));
- if ($pt ne "ref") {
- return 1;
- } else {
- return 0;
+ my $n = $e->{POINTERS};
+ my $pt = pointer_type($e);
+
+ # Top level "ref" pointers do not have a referrent identifier
+ if ( defined($pt)
+ and $pt eq "ref"
+ and $e->{PARENT}->{TYPE} eq "FUNCTION")
+ {
+ $n--;
}
+
+ return $n;
}
-# determine if an element is a pure scalar. pure scalars do not
-# have a "buffers" section in NDR
-sub is_pure_scalar($)
+# determine if an element needs a "buffers" section in NDR
+sub need_buffers_section($)
{
my $e = shift;
- if (util::has_property($e, "ref")) {
- return 1;
- }
- if (is_scalar_type($e->{TYPE}) &&
- !$e->{POINTERS} &&
+ if (!can_contain_deferred($e) &&
!util::array_size($e)) {
- return 1;
+ return 0;
}
- return 0;
+ return 1;
}
# see if a variable needs to be allocated by the NDR subsystem on pull
{
my $e = shift;
- if (util::has_property($e, "ref")) {
- return 0;
- }
-
- if ($e->{POINTERS} || util::array_size($e)) {
- return 1;
- }
-
+ return 0 if (util::has_property($e, "ref") && $e->{PARENT}->{TYPE} eq "FUNCTION");
+ return 1 if ($e->{POINTERS} || util::array_size($e));
return 0;
}
+# Prefix to get the actual value of a variable
+sub c_ptr_prefix($)
+{
+ my $e = shift;
+ my $pointers = "";
+ foreach my $i (need_wire_pointer($e)..$e->{POINTERS}-1) { $pointers.="*"; }
+ return $pointers;
+}
# determine the C prefix used to refer to a variable when passing to a push
# function. This will be '*' for pointers to scalar types, '' for scalar
{
my $e = shift;
- if ($e->{TYPE} =~ "string") {
- return "";
- }
+ my $ret = "";
- if (is_scalar_type($e->{TYPE}) &&
- $e->{POINTERS}) {
- return "*";
- }
- if (!is_scalar_type($e->{TYPE}) &&
+ if ($e->{TYPE} =~ "string") {
+ $ret = "";
+ } elsif (is_scalar_type($e->{TYPE}) and $e->{POINTERS} and
+ !util::array_size($e)) {
+ $ret .="*";
+ } elsif (!is_scalar_type($e->{TYPE}) &&
!$e->{POINTERS} &&
!util::array_size($e)) {
return "&";
}
- return "";
-}
+ foreach my $i (2..$e->{POINTERS}) { $ret.="*"; }
+
+ return $ret;
+}
# determine the C prefix used to refer to a variable when passing to a pull
# return '&' or ''
return "&";
}
- return "";
+ my $ret = "";
+ foreach my $i (2..$e->{POINTERS}) { $ret.="*"; }
+ return $ret;
}
my $res = "";
my $tabs = "";
$res .="\n";
}
-sub indent
+sub indent()
{
$tabs .= "\t";
}
-sub deindent
+sub deindent()
{
$tabs = substr($tabs, 0, -1);
}
-###################################
-# find a sibling var in a structure
-sub find_sibling($$)
-{
- my($e) = shift;
- my($name) = shift;
- my($fn) = $e->{PARENT};
-
- if ($name =~ /\*(.*)/) {
- $name = $1;
- }
-
- for my $e2 (@{$fn->{ELEMENTS}}) {
- return $e2 if ($e2->{NAME} eq $name);
- }
-
- die "invalid sibling '$name'";
-}
-
####################################################################
# work out the name of a size_is() variable
sub ParseExpr($$$)
return $prefix . "r->$size";
}
- my $e2 = find_sibling($e, $size);
+ my $e2 = util::find_sibling($e, $size);
+
+ die("Invalid sibling '$size'") unless defined($e2);
if (util::has_property($e2, "in") && util::has_property($e2, "out")) {
return $prefix . "$var_prefix$size";
sub fn_prefix($)
{
my $fn = shift;
- if ($fn->{TYPE} eq "TYPEDEF") {
- if (util::has_property($fn, "public")) {
- return "";
- }
- }
- if ($fn->{TYPE} eq "FUNCTION") {
- if (util::has_property($fn, "public")) {
- return "";
- }
+ if ($fn->{TYPE} eq "TYPEDEF" or
+ $fn->{TYPE} eq "FUNCTION") {
+ return "" if (util::has_property($fn, "public"));
}
+
return "static ";
}
{
my $e = shift;
- unless (defined($typedefs{$e}) && defined($typedefs{$e}->{DATA}->{TYPE})) {
+ unless (typelist::hasType($e)) {
# it must be an external type - all we can do is guess
# print "Warning: assuming alignment of unknown type '$e' is 4\n";
return 4;
}
- my $dt = $typedefs{$e}->{DATA};
+ my $dt = typelist::getType($e)->{DATA};
+
+ my $tmp = $typefamily{$dt->{TYPE}}->{ALIGN}->($dt);
+ return $tmp;
+}
+
+#####################################################################
+# see if a type contains any deferred data
+sub can_contain_deferred
+{
+ my $e = shift;
+
+ return 1 if ($e->{POINTERS});
+ return 0 if (is_scalar_type($e->{TYPE}));
+ return 0 if (util::has_property($e, "subcontext"));
+ return 1 unless (typelist::hasType($e->{TYPE})); # assume the worst
- return $dt->{ALIGN} if ($dt->{ALIGN});
- return $typefamily{$dt->{TYPE}}->{ALIGN}->($dt);
+ my $type = typelist::getType($e->{TYPE});
+
+ foreach my $x (@{$type->{DATA}->{ELEMENTS}}) {
+ return 1 if (can_contain_deferred ($x));
+ }
+
+ return 0;
}
#####################################################################
-# parse an array - push side
-sub ParseArrayPush($$$)
+# parse array preceding data - push side
+sub ParseArrayPushPreceding($$$)
{
my $e = shift;
my $var_prefix = shift;
my $size = ParseExpr($e, util::array_size($e), $var_prefix);
- if (defined $e->{CONFORMANT_SIZE}) {
- # the conformant size has already been pushed
- } elsif (!util::is_inline_array($e)) {
+ if (!is_inline_array($e)) {
# we need to emit the array size
pidl "NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, $size));";
}
+}
- if (my $length = util::has_property($e, "length_is")) {
+#####################################################################
+# parse the data of an array - push side
+sub ParseArrayPush($$$$)
+{
+ my $e = shift;
+ my $ndr = shift;
+ my $var_prefix = shift;
+ my $ndr_flags = shift;
+ my $cprefix = c_push_prefix($e);
+
+ my $size = ParseExpr($e, util::array_size($e), $var_prefix);
+
+ # See whether the array size has been pushed yet
+ if (!is_surrounding_array($e)) {
+ ParseArrayPushPreceding($e, $var_prefix, $ndr_flags);
+ }
+
+ if (is_varying_array($e)) {
+ my $length = util::has_property($e, "length_is");
$length = ParseExpr($e, $length, $var_prefix);
- pidl "NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));";
- pidl "NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, $length));";
+ pidl "NDR_CHECK(ndr_push_uint32($ndr, NDR_SCALARS, 0));";
+ pidl "NDR_CHECK(ndr_push_uint32($ndr, NDR_SCALARS, $length));";
$size = $length;
}
if (is_scalar_type($e->{TYPE})) {
- pidl "NDR_CHECK(ndr_push_array_$e->{TYPE}(ndr, $ndr_flags, $var_prefix$e->{NAME}, $size));";
+ pidl "NDR_CHECK(ndr_push_array_$e->{TYPE}($ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}, $size));";
} else {
- pidl "NDR_CHECK(ndr_push_array(ndr, $ndr_flags, $var_prefix$e->{NAME}, sizeof($var_prefix$e->{NAME}\[0]), $size, (ndr_push_flags_fn_t)ndr_push_$e->{TYPE}));";
+ pidl "NDR_CHECK(ndr_push_array($ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}, sizeof($cprefix$var_prefix$e->{NAME}\[0]), $size, (ndr_push_flags_fn_t)ndr_push_$e->{TYPE}));";
}
}
my $e = shift;
my $var_prefix = shift;
my $size = ParseExpr($e, util::array_size($e), $var_prefix);
- my $length = util::has_property($e, "length_is");
+ my $cprefix = c_push_prefix($e);
- if (defined $length) {
- $size = ParseExpr($e, $length, $var_prefix);
+ if (is_varying_array($e)) {
+ $size = ParseExpr($e, util::has_property($e, "length_is"), $var_prefix);
}
if (is_scalar_type($e->{TYPE})) {
- pidl "ndr_print_array_$e->{TYPE}(ndr, \"$e->{NAME}\", $var_prefix$e->{NAME}, $size);";
+ pidl "ndr_print_array_$e->{TYPE}(ndr, \"$e->{NAME}\", $cprefix$var_prefix$e->{NAME}, $size);";
} else {
- pidl "ndr_print_array(ndr, \"$e->{NAME}\", $var_prefix$e->{NAME}, sizeof($var_prefix$e->{NAME}\[0]), $size, (ndr_print_fn_t)ndr_print_$e->{TYPE});";
+ pidl "ndr_print_array(ndr, \"$e->{NAME}\", $cprefix$var_prefix$e->{NAME}, sizeof($cprefix$var_prefix$e->{NAME}\[0]), $size, (ndr_print_fn_t)ndr_print_$e->{TYPE});";
}
}
my $e = shift;
my $var_prefix = shift;
- if (!defined $e->{CONFORMANT_SIZE} &&
- util::has_property($e, "size_is")) {
+ if (is_conformant_array($e)) {
my $size = ParseExpr($e, util::array_size($e), $var_prefix);
pidl "if ($var_prefix$e->{NAME}) {";
indent;
pidl "}";
}
- if (my $length = util::has_property($e, "length_is")) {
+ if (is_varying_array($e)) {
+ my $length = util::has_property($e, "length_is");
$length = ParseExpr($e, $length, $var_prefix);
pidl "if ($var_prefix$e->{NAME}) {";
indent;
check_null_pointer($length);
pidl "NDR_CHECK(ndr_check_array_length(ndr, (void*)&$var_prefix$e->{NAME}, $length));";
deindent;
- pidl "}";
+ pidl "}"
+ }
+}
+
+sub ParseArrayPullPreceding($$$)
+{
+ my $e = shift;
+ my $var_prefix = shift;
+ my $ndr_flags = shift;
+
+ if (!is_inline_array($e)) {
+ # non fixed arrays encode the size just before the array
+ pidl "NDR_CHECK(ndr_pull_array_size(ndr, &$var_prefix$e->{NAME}));";
}
}
#####################################################################
# parse an array - pull side
-sub ParseArrayPull($$$)
+sub ParseArrayPull($$$$)
{
my $e = shift;
+ my $ndr = shift;
my $var_prefix = shift;
my $ndr_flags = shift;
- my $size = ParseExpr($e, util::array_size($e), $var_prefix);
- my $alloc_size = $size;
+ my $cprefix = c_pull_prefix($e);
+ my $length = ParseExpr($e, util::array_size($e), $var_prefix);
+ my $size = $length;
+
+ if (is_conformant_array($e)) {
+ $length = $size = "ndr_get_array_size($ndr, &$var_prefix$e->{NAME})";
+ }
# if this is a conformant array then we use that size to allocate, and make sure
# we allocate enough to pull the elements
- if (defined $e->{CONFORMANT_SIZE}) {
- $alloc_size = $e->{CONFORMANT_SIZE};
- check_null_pointer($size);
- pidl "if ($size > $alloc_size) {";
+ if (!is_inline_array($e) and not is_surrounding_array($e)) {
+ if ($var_prefix =~ /^r->out/ && $length =~ /^\*r->in/) {
+ my $length2 = substr($length, 1);
+ pidl "if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_ALLOC($ndr, $length2); }";
+ }
+
+ ParseArrayPullPreceding($e, $var_prefix, $ndr_flags);
+ }
+
+ if (is_varying_array($e)) {
+ pidl "NDR_CHECK(ndr_pull_array_length($ndr, &$var_prefix$e->{NAME}));";
+ $length = "ndr_get_array_length($ndr, &$var_prefix$e->{NAME})";
+ }
+
+ check_null_pointer($length);
+
+ if ($length ne $size) {
+ pidl "if ($length > $size) {";
indent;
- pidl "return ndr_pull_error(ndr, NDR_ERR_CONFORMANT_SIZE, \"Bad conformant size %u should be %u\", $alloc_size, $size);";
+ pidl "return ndr_pull_error($ndr, NDR_ERR_CONFORMANT_SIZE, \"Bad conformant size %u should be %u\", $size, $length);";
deindent;
pidl "}";
- } elsif (!util::is_inline_array($e)) {
- if ($var_prefix =~ /^r->out/ && $size =~ /^\*r->in/) {
- my $size2 = substr($size, 1);
- pidl "if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_ALLOC(ndr, $size2); }";
- }
-
- # non fixed arrays encode the size just before the array
- pidl "NDR_CHECK(ndr_pull_array_size(ndr, &$var_prefix$e->{NAME}));";
- $alloc_size = "ndr_get_array_size(ndr, &$var_prefix$e->{NAME})";
}
- if ((need_alloc($e) && !util::is_fixed_array($e)) ||
+ if ((need_alloc($e) && !is_fixed_array($e)) ||
($var_prefix eq "r->in." && util::has_property($e, "ref"))) {
- if (!util::is_inline_array($e) || $ndr_flags eq "NDR_SCALARS") {
- pidl "NDR_ALLOC_N(ndr, $var_prefix$e->{NAME}, $alloc_size);";
+ if (!is_inline_array($e) || $ndr_flags eq "NDR_SCALARS") {
+ pidl "NDR_ALLOC_N($ndr, $var_prefix$e->{NAME}, $size);";
}
}
if (($var_prefix eq "r->out." && util::has_property($e, "ref"))) {
- if (!util::is_inline_array($e) || $ndr_flags eq "NDR_SCALARS") {
- pidl "if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {";
- indent;
- pidl "NDR_ALLOC_N(ndr, $var_prefix$e->{NAME}, $alloc_size);";
- deindent;
+ if (!is_inline_array($e) || $ndr_flags eq "NDR_SCALARS") {
+ pidl "if ($ndr->flags & LIBNDR_FLAG_REF_ALLOC) {";
+ pidl "\tNDR_ALLOC_N($ndr, $var_prefix$e->{NAME}, $size);";
pidl "}";
}
}
- if (my $length = util::has_property($e, "length_is")) {
- pidl "NDR_CHECK(ndr_pull_array_length(ndr, &$var_prefix$e->{NAME}));";
- $size = "ndr_get_array_length(ndr, &$var_prefix$e->{NAME})";
+ if (is_scalar_type($e->{TYPE})) {
+ pidl "NDR_CHECK(ndr_pull_array_$e->{TYPE}($ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}, $length));";
+ } else {
+ pidl "NDR_CHECK(ndr_pull_array($ndr, $ndr_flags, (void **)$cprefix$var_prefix$e->{NAME}, sizeof($cprefix$var_prefix$e->{NAME}\[0]), $length, (ndr_pull_flags_fn_t)ndr_pull_$e->{TYPE}));";
}
+}
- check_null_pointer($size);
- if (is_scalar_type($e->{TYPE})) {
- pidl "NDR_CHECK(ndr_pull_array_$e->{TYPE}(ndr, $ndr_flags, $var_prefix$e->{NAME}, $size));";
+sub ParseSubcontextPushStart($)
+{
+ my $e = shift;
+ my $sub_size = util::has_property($e, "subcontext");
+
+ pidl "{";
+ indent;
+ pidl "struct ndr_push *_ndr_$e->{NAME};";
+ pidl "";
+ pidl "_ndr_$e->{NAME} = ndr_push_init_ctx(ndr);";
+ pidl "if (!_ndr_$e->{NAME}) return NT_STATUS_NO_MEMORY;";
+ pidl "_ndr_$e->{NAME}->flags = ndr->flags;";
+ pidl "";
+
+ return "_ndr_$e->{NAME}";
+}
+
+sub ParseSubcontextPushEnd($)
+{
+ my $e = shift;
+ my $sub_size = util::has_property($e, "subcontext");
+ pidl "NDR_CHECK(ndr_push_subcontext_header(ndr, $sub_size, _ndr_$e->{NAME}));";
+ pidl "NDR_CHECK(ndr_push_bytes(ndr, _ndr_$e->{NAME}->data, _ndr_$e->{NAME}->offset));";
+ deindent;
+ pidl "}";
+}
+
+sub ParseSubcontextPullStart($)
+{
+ my $e = shift;
+ my $sub_size = util::has_property($e, "subcontext");
+
+ pidl "{";
+ indent;
+ pidl "struct ndr_pull *_ndr_$e->{NAME};";
+ pidl "NDR_ALLOC(ndr, _ndr_$e->{NAME});";
+ pidl "NDR_CHECK(ndr_pull_subcontext_header(ndr, $sub_size, _ndr_$e->{NAME}));";
+
+ return "_ndr_$e->{NAME}";
+}
+
+sub ParseSubcontextPullEnd($)
+{
+ my $e = shift;
+ my $sub_size = util::has_property($e, "subcontext");
+
+ my $advance;
+ if ($sub_size) {
+ $advance = "_ndr_$e->{NAME}->data_size";
} else {
- pidl "NDR_CHECK(ndr_pull_array(ndr, $ndr_flags, (void **)$var_prefix$e->{NAME}, sizeof($var_prefix$e->{NAME}\[0]), $size, (ndr_pull_flags_fn_t)ndr_pull_$e->{TYPE}));";
+ $advance = "_ndr_$e->{NAME}->offset";
}
+ pidl "NDR_CHECK(ndr_pull_advance(ndr, $advance));";
+ deindent;
+ pidl "}";
}
#####################################################################
my($var_prefix) = shift;
my($ndr_flags) = shift;
my $cprefix = c_push_prefix($e);
+ my $ptr_prefix = c_ptr_prefix($e);
my $sub_size = util::has_property($e, "subcontext");
+ my $ndr = "ndr";
start_flags($e);
pidl "$cprefix$var_prefix$e->{NAME} = $value;";
}
- if (util::has_property($e, "relative")) {
- pidl "NDR_CHECK(ndr_push_relative_ptr1(ndr, $var_prefix$e->{NAME}));";
- } elsif (util::is_inline_array($e)) {
- ParseArrayPush($e, "r->", "NDR_SCALARS");
- } elsif (need_wire_pointer($e)) {
- ParseElementPushPtr($e, $var_prefix, $ndr_flags);
+ if (defined $sub_size and $e->{POINTERS} == 0) {
+ $ndr = ParseSubcontextPushStart($e);
+ }
+
+ if (need_wire_pointer($e)) {
+ ParsePtrPush($e, $ptr_prefix.$var_prefix);
+ } elsif (is_inline_array($e)) {
+ ParseArrayPush($e, $ndr, "r->", "NDR_SCALARS");
} elsif (need_alloc($e)) {
# no scalar component
- } elsif (my $switch = util::has_property($e, "switch_is")) {
- ParseElementPushSwitch($e, $var_prefix, $ndr_flags, $switch);
- } elsif (defined $sub_size) {
- pidl "NDR_CHECK(ndr_push_subcontext_flags_fn(ndr, $sub_size, $cprefix$var_prefix$e->{NAME}, (ndr_push_flags_fn_t) ndr_push_$e->{TYPE}));";
} else {
- pidl "NDR_CHECK(ndr_push_$e->{TYPE}(ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
+ if (my $switch = util::has_property($e, "switch_is")) {
+ ParseSwitchPush($e, $ndr, $var_prefix, $ndr_flags, $switch);
+ }
+
+ pidl "NDR_CHECK(ndr_push_$e->{TYPE}($ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
+ }
+
+ if (defined $sub_size and $e->{POINTERS} == 0) {
+ ParseSubcontextPushEnd($e);
}
end_flags($e);
#####################################################################
# parse a pointer in a struct element or function
-sub ParseElementPushPtr($$$)
+sub ParsePtrPush($$)
{
my $e = shift;
my $var_prefix = shift;
- my $ndr_flags = shift;
- pidl "NDR_CHECK(ndr_push_unique_ptr(ndr, $var_prefix$e->{NAME}));";
+ if (util::has_property($e, "ref")) {
+ pidl "NDR_CHECK(ndr_push_ref_ptr(ndr, $var_prefix$e->{NAME}));";
+ } elsif (util::has_property($e, "relative")) {
+ pidl "NDR_CHECK(ndr_push_relative_ptr1(ndr, $var_prefix$e->{NAME}));";
+ } else {
+ pidl "NDR_CHECK(ndr_push_unique_ptr(ndr, $var_prefix$e->{NAME}));";
+ }
}
-
#####################################################################
# print scalars in a structure element
-sub ParseElementPrintScalar($$)
+sub ParseElementPrint($$)
{
my($e) = shift;
my($var_prefix) = shift;
my $cprefix = c_push_prefix($e);
+ my $ptr_prefix = c_ptr_prefix($e);
- if (util::has_property($e, "noprint")) {
- return;
- }
+ return if (util::has_property($e, "noprint"));
if (my $value = util::has_property($e, "value")) {
pidl "if (ndr->flags & LIBNDR_PRINT_SET_VALUES) {";
- indent;
- pidl "$cprefix$var_prefix$e->{NAME} = $value;";
- deindent;
+ pidl "\t$cprefix$var_prefix$e->{NAME} = $value;";
pidl "}";
}
- if (util::is_fixed_array($e)) {
- ParseElementPrintBuffer($e, $var_prefix);
- } elsif ($e->{POINTERS} || util::array_size($e)) {
+ my $l = $e->{POINTERS};
+ $l++ if (util::array_size($e) and $l == 0 and !is_fixed_array($e));
+
+ foreach my $i (1..$l) {
pidl "ndr_print_ptr(ndr, \"$e->{NAME}\", $var_prefix$e->{NAME});";
pidl "ndr->depth++;";
- ParseElementPrintBuffer($e, $var_prefix);
- pidl "ndr->depth--;";
+ if ($i > $l-need_wire_pointer($e)) {
+ pidl "if ($ptr_prefix$var_prefix$e->{NAME}) {";
+ indent;
+ }
+ }
+
+ if (util::array_size($e)) {
+ ParseArrayPrint($e, $var_prefix)
} elsif (my $switch = util::has_property($e, "switch_is")) {
- ParseElementPrintSwitch($e, $var_prefix, $switch);
+ my $switch_var = ParseExpr($e, $switch, $var_prefix);
+ check_null_pointer_void($switch_var);
+
+ pidl "ndr_print_$e->{TYPE}(ndr, \"$e->{NAME}\", $switch_var, $cprefix$var_prefix$e->{NAME});";
} else {
pidl "ndr_print_$e->{TYPE}(ndr, \"$e->{NAME}\", $cprefix$var_prefix$e->{NAME});";
}
+
+ foreach my $i (1..$l) {
+ if ($i > $l-need_wire_pointer($e)) {
+ deindent;
+ pidl "}";
+ }
+ pidl "ndr->depth--;";
+ }
}
#####################################################################
# parse scalars in a structure element - pull size
-sub ParseElementPullSwitch($$$$)
+sub ParseSwitchPull($$$$$)
{
my($e) = shift;
+ my $ndr = shift;
my($var_prefix) = shift;
my($ndr_flags) = shift;
my $switch = shift;
my $cprefix = c_pull_prefix($e);
- my $utype = $typedefs{$e->{TYPE}};
+ my $utype = typelist::getType($e->{TYPE});
check_null_pointer($switch_var);
- if (!defined $utype ||
- !util::has_property($utype, "nodiscriminant")) {
- my $e2 = find_sibling($e, $switch);
- my $type_decl = util::map_type($e2->{TYPE});
- pidl "if (($ndr_flags) & NDR_SCALARS) {";
- indent;
- if ($typedefs{$e2->{TYPE}}->{DATA}->{TYPE} eq "ENUM") {
- $type_decl = util::enum_type_decl($e2);
- } elsif ($typedefs{$e2->{TYPE}}->{DATA}->{TYPE} eq "BITMAP") {
- $type_decl = util::bitmap_type_decl($e2);
- }
- pidl "$type_decl _level;";
- pidl "NDR_CHECK(ndr_pull_$e2->{TYPE}(ndr, NDR_SCALARS, &_level));";
- if ($switch_var =~ /r->in/) {
- pidl "if (!(ndr->flags & LIBNDR_FLAG_REF_ALLOC) && _level != $switch_var) {";
- indent;
- } else {
- pidl "if (_level != $switch_var) {";
- indent;
- }
- pidl "return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value %u in $e->{NAME}\", _level);";
- deindent;
- if ($switch_var =~ /r->/) {
- pidl "} else { $switch_var = _level; }";
- } else {
- pidl "}";
- }
- deindent;
- pidl "}";
- }
-
- my $sub_size = util::has_property($e, "subcontext");
- if (defined $sub_size) {
- pidl "if (($ndr_flags) & NDR_SCALARS) {";
- indent;
- pidl "NDR_CHECK(ndr_pull_subcontext_union_fn(ndr, $sub_size, $switch_var, $cprefix$var_prefix$e->{NAME}, (ndr_pull_union_fn_t) ndr_pull_$e->{TYPE}));";
- deindent;
- pidl "}";
- } else {
- pidl "NDR_CHECK(ndr_pull_$e->{TYPE}(ndr, $ndr_flags, $switch_var, $cprefix$var_prefix$e->{NAME}));";
- }
-
+ pidl "NDR_CHECK(ndr_pull_set_switch_value($ndr, $cprefix$var_prefix$e->{NAME}, $switch_var));";
}
#####################################################################
# push switch element
-sub ParseElementPushSwitch($$$$)
+sub ParseSwitchPush($$$$$)
{
my($e) = shift;
+ my $ndr = shift;
my($var_prefix) = shift;
my($ndr_flags) = shift;
my $switch = shift;
check_null_pointer($switch_var);
- my $utype = $typedefs{$e->{TYPE}};
- if (!defined $utype ||
- !util::has_property($utype, "nodiscriminant")) {
- my $e2 = find_sibling($e, $switch);
- pidl "if (($ndr_flags) & NDR_SCALARS) {";
- indent;
- pidl "NDR_CHECK(ndr_push_$e2->{TYPE}(ndr, NDR_SCALARS, $switch_var));";
- deindent;
- pidl "}";
- }
+ pidl "NDR_CHECK(ndr_push_set_switch_value($ndr, $cprefix$var_prefix$e->{NAME}, $switch_var));";
- my $sub_size = util::has_property($e, "subcontext");
- if (defined $sub_size) {
- pidl "if(($ndr_flags) & NDR_SCALARS) {";
- indent;
- pidl "NDR_CHECK(ndr_push_subcontext_union_fn(ndr, $sub_size, $switch_var, $cprefix$var_prefix$e->{NAME}, (ndr_push_union_fn_t) ndr_push_$e->{TYPE}));";
- deindent;
- pidl "}";
- } else {
- pidl "NDR_CHECK(ndr_push_$e->{TYPE}(ndr, $ndr_flags, $switch_var, $cprefix$var_prefix$e->{NAME}));";
- }
}
-#####################################################################
-# print scalars in a structure element
-sub ParseElementPrintSwitch($$$)
-{
- my($e) = shift;
- my($var_prefix) = shift;
- my $switch = shift;
- my $switch_var = ParseExpr($e, $switch, $var_prefix);
- my $cprefix = c_push_prefix($e);
-
- check_null_pointer_void($switch_var);
-
- pidl "ndr_print_$e->{TYPE}(ndr, \"$e->{NAME}\", $switch_var, $cprefix$var_prefix$e->{NAME});";
-}
-
-
#####################################################################
# parse scalars in a structure element - pull size
sub ParseElementPullScalar($$$)
my($var_prefix) = shift;
my($ndr_flags) = shift;
my $cprefix = c_pull_prefix($e);
+ my $ptr_prefix = c_ptr_prefix($e);
my $sub_size = util::has_property($e, "subcontext");
+ my $ndr = "ndr";
start_flags($e);
- if (util::is_inline_array($e)) {
- ParseArrayPull($e, "r->", "NDR_SCALARS");
+ if (defined $sub_size && $e->{POINTERS} == 0) {
+ $ndr = ParseSubcontextPullStart($e);
+ $ndr_flags = "NDR_SCALARS|NDR_BUFFERS";
+ }
+
+ if (is_inline_array($e)) {
+ ParseArrayPull($e, $ndr, "r->", "NDR_SCALARS");
} elsif (need_wire_pointer($e)) {
- ParseElementPullPtr($e, $var_prefix, $ndr_flags);
- } elsif (need_alloc($e)) {
- # no scalar component
- } elsif (my $switch = util::has_property($e, "switch_is")) {
- ParseElementPullSwitch($e, $var_prefix, $ndr_flags, $switch);
- } elsif (defined $sub_size) {
- pidl "NDR_CHECK(ndr_pull_subcontext_flags_fn(ndr, $sub_size, $cprefix$var_prefix$e->{NAME}, (ndr_pull_flags_fn_t) ndr_pull_$e->{TYPE}));";
+ ParsePtrPull($e, $ptr_prefix.$var_prefix);
+ } elsif (is_surrounding_array($e)) {
} else {
- pidl "NDR_CHECK(ndr_pull_$e->{TYPE}(ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
+ if (my $switch = util::has_property($e, "switch_is")) {
+ ParseSwitchPull($e, $ndr, $var_prefix, $ndr_flags, $switch);
+ }
+
+ pidl "NDR_CHECK(ndr_pull_$e->{TYPE}($ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
}
+
if (my $range = util::has_property($e, "range")) {
my ($low, $high) = split(/ /, $range, 2);
pidl "if ($var_prefix$e->{NAME} < $low || $var_prefix$e->{NAME} > $high) {";
- pidl "\treturn ndr_pull_error(ndr, NDR_ERR_RANGE, \"value out of range\");";
+ pidl "\treturn ndr_pull_error($ndr, NDR_ERR_RANGE, \"value out of range\");";
pidl "}";
}
+ if (defined $sub_size && $e->{POINTERS} == 0) {
+ ParseSubcontextPullEnd($e);
+ }
+
end_flags($e);
}
#####################################################################
# parse a pointer in a struct element or function
-sub ParseElementPullPtr($$$)
+sub ParsePtrPull($$)
{
my($e) = shift;
my($var_prefix) = shift;
- my($ndr_flags) = shift;
- pidl "NDR_CHECK(ndr_pull_unique_ptr(ndr, &_ptr_$e->{NAME}));";
+ if (util::has_property($e, "ref")) {
+ pidl "NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_$e->{NAME}));";
+ } else {
+ pidl "NDR_CHECK(ndr_pull_unique_ptr(ndr, &_ptr_$e->{NAME}));";
+ }
pidl "if (_ptr_$e->{NAME}) {";
indent;
pidl "NDR_ALLOC(ndr, $var_prefix$e->{NAME});";
#####################################################################
# parse buffers in a structure element
-sub ParseElementPushBuffer($$$)
+sub ParseElementPushBuffer($$)
{
my($e) = shift;
my($var_prefix) = shift;
- my($ndr_flags) = shift;
my $cprefix = c_push_prefix($e);
my $sub_size = util::has_property($e, "subcontext");
+ my $ndr = "ndr";
- if (is_pure_scalar($e)) {
- return;
- }
+ return unless (need_buffers_section($e));
start_flags($e);
- if (need_wire_pointer($e)) {
- pidl "if ($var_prefix$e->{NAME}) {";
- indent;
- if (util::has_property($e, "relative")) {
- pidl "NDR_CHECK(ndr_push_relative_ptr2(ndr, $var_prefix$e->{NAME}));";
+ my $pointers = c_ptr_prefix($e);
+ for my $i (1..need_wire_pointer($e)) {
+ if ($i > 1) {
+ ParsePtrPush($e,$pointers.$var_prefix);
}
+ pidl "if ($pointers$var_prefix$e->{NAME}) {";
+ indent;
+ $pointers.="*";
}
-
- if (util::is_inline_array($e)) {
- ParseArrayPush($e, "r->", "NDR_BUFFERS");
- } elsif (util::array_size($e)) {
- ParseArrayPush($e, "r->", "NDR_SCALARS|NDR_BUFFERS");
- } elsif (my $switch = util::has_property($e, "switch_is")) {
- if ($e->{POINTERS}) {
- ParseElementPushSwitch($e, $var_prefix, "NDR_BUFFERS|NDR_SCALARS", $switch);
- } else {
- ParseElementPushSwitch($e, $var_prefix, "NDR_BUFFERS", $switch);
- }
- } elsif (defined $sub_size) {
- if ($e->{POINTERS}) {
- pidl "NDR_CHECK(ndr_push_subcontext_flags_fn(ndr, $sub_size, $cprefix$var_prefix$e->{NAME}, (ndr_push_flags_fn_t) ndr_push_$e->{TYPE}));";
- }
- } elsif ($e->{POINTERS}) {
- pidl "NDR_CHECK(ndr_push_$e->{TYPE}(ndr, NDR_SCALARS|NDR_BUFFERS, $cprefix$var_prefix$e->{NAME}));";
- } else {
- pidl "NDR_CHECK(ndr_push_$e->{TYPE}(ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
+
+ if (util::has_property($e, "relative")) {
+ pidl "NDR_CHECK(ndr_push_relative_ptr2(ndr, $var_prefix$e->{NAME}));";
}
- if (need_wire_pointer($e)) {
- deindent;
- pidl "}";
- }
-
- end_flags($e);
-}
-
-#####################################################################
-# print buffers in a structure element
-sub ParseElementPrintBuffer($$)
-{
- my($e) = shift;
- my($var_prefix) = shift;
- my $cprefix = c_push_prefix($e);
+ my $ndr_flags = "NDR_BUFFERS";
+ if ($e->{POINTERS} || (util::array_size($e) && !is_inline_array($e)))
+ {
+ $ndr_flags="NDR_SCALARS|$ndr_flags"
+ }
- if (need_wire_pointer($e)) {
- pidl "if ($var_prefix$e->{NAME}) {";
- indent;
+ if (defined $sub_size) {
+ $ndr = ParseSubcontextPushStart($e);
+ $ndr_flags = "NDR_SCALARS|NDR_BUFFERS";
}
if (util::array_size($e)) {
- ParseArrayPrint($e, $var_prefix)
- } elsif (my $switch = util::has_property($e, "switch_is")) {
- ParseElementPrintSwitch($e, $var_prefix, $switch);
+ ParseArrayPush($e, $ndr, "r->", $ndr_flags);
} else {
- pidl "ndr_print_$e->{TYPE}(ndr, \"$e->{NAME}\", $cprefix$var_prefix$e->{NAME});";
+ if (my $switch = util::has_property($e, "switch_is")) {
+ ParseSwitchPush($e, $ndr, $var_prefix, $ndr_flags, $switch);
+ }
+
+ pidl "NDR_CHECK(ndr_push_$e->{TYPE}($ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
}
- if (need_wire_pointer($e)) {
+ if (defined $sub_size) {
+ ParseSubcontextPushEnd($e);
+ }
+
+ for my $i (1..need_wire_pointer($e)) {
deindent;
pidl "}";
- }
+ }
+
+ end_flags($e);
}
#####################################################################
# parse buffers in a structure element - pull side
-sub ParseElementPullBuffer($$$)
+sub ParseElementPullBuffer($$)
{
my($e) = shift;
my($var_prefix) = shift;
- my($ndr_flags) = shift;
my $cprefix = c_pull_prefix($e);
my $sub_size = util::has_property($e, "subcontext");
+ my $ndr = "ndr";
- if (is_pure_scalar($e)) {
- return;
- }
+ return unless (need_buffers_section($e));
start_flags($e);
- if (need_wire_pointer($e)) {
- pidl "if ($var_prefix$e->{NAME}) {";
- indent;
- if (util::has_property($e, "relative")) {
- pidl "struct ndr_pull_save _relative_save;";
- pidl "ndr_pull_save(ndr, &_relative_save);";
- pidl "NDR_CHECK(ndr_pull_relative_ptr2(ndr, $var_prefix$e->{NAME}));";
- }
+ my $pointers = c_ptr_prefix($e);
+ for my $i (1..need_wire_pointer($e)) {
+ if ($i > 1) {
+ ParsePtrPull($e,$pointers.$var_prefix);
+ }
+ pidl "if ($pointers$var_prefix$e->{NAME}) {";
+ indent;
+ $pointers.="*";
+ }
+
+ if (util::has_property($e, "relative")) {
+ pidl "struct ndr_pull_save _relative_save;";
+ pidl "ndr_pull_save(ndr, &_relative_save);";
+ pidl "NDR_CHECK(ndr_pull_relative_ptr2(ndr, $var_prefix$e->{NAME}));";
+ }
+
+ my $ndr_flags = "NDR_BUFFERS";
+ if ($e->{POINTERS} || (util::array_size($e) && !is_inline_array($e)))
+ {
+ $ndr_flags="NDR_SCALARS|$ndr_flags"
}
-
- if (util::is_inline_array($e)) {
- ParseArrayPull($e, "r->", "NDR_BUFFERS");
- } elsif (util::array_size($e)) {
- ParseArrayPull($e, "r->", "NDR_SCALARS|NDR_BUFFERS");
- } elsif (my $switch = util::has_property($e, "switch_is")) {
- if ($e->{POINTERS}) {
- ParseElementPullSwitch($e, $var_prefix, "NDR_SCALARS|NDR_BUFFERS", $switch);
- } else {
- ParseElementPullSwitch($e, $var_prefix, "NDR_BUFFERS", $switch);
- }
- } elsif (defined $sub_size) {
- if ($e->{POINTERS}) {
- pidl "NDR_CHECK(ndr_pull_subcontext_flags_fn(ndr, $sub_size, $cprefix$var_prefix$e->{NAME}, (ndr_pull_flags_fn_t) ndr_pull_$e->{TYPE}));";
- }
- } elsif ($e->{POINTERS}) {
- pidl "NDR_CHECK(ndr_pull_$e->{TYPE}(ndr, NDR_SCALARS|NDR_BUFFERS, $cprefix$var_prefix$e->{NAME}));";
- } else {
- pidl "NDR_CHECK(ndr_pull_$e->{TYPE}(ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
+
+ if (defined $sub_size) {
+ $ndr = ParseSubcontextPullStart($e);
+ $ndr_flags = "NDR_SCALARS|NDR_BUFFERS";
}
- if (need_wire_pointer($e)) {
- if (util::has_property($e, "relative")) {
- pidl "ndr_pull_restore(ndr, &_relative_save);";
+ if (util::array_size($e)) {
+ ParseArrayPull($e, $ndr, "r->", $ndr_flags);
+ } else {
+ if (my $switch = util::has_property($e, "switch_is")) {
+ ParseSwitchPull($e, $ndr, $var_prefix, $ndr_flags, $switch);
}
+
+ pidl "NDR_CHECK(ndr_pull_$e->{TYPE}($ndr, $ndr_flags, $cprefix$var_prefix$e->{NAME}));";
+ }
+
+ if (defined $sub_size) {
+ ParseSubcontextPullEnd($e);
+ }
+
+ if (util::has_property($e, "relative")) {
+ pidl "ndr_pull_restore(ndr, &_relative_save);";
+ }
+
+ for my $i (1..need_wire_pointer($e)) {
deindent;
pidl "}";
- }
+ }
end_flags($e);
}
# the wire before the structure (and even before the structure
# alignment)
my $e = $struct->{ELEMENTS}[-1];
- if (defined $e->{ARRAY_LEN} && $e->{ARRAY_LEN} eq "*") {
- my $size = ParseExpr($e, util::array_size($e), "r->");
- $e->{CONFORMANT_SIZE} = $size;
- check_null_pointer($size);
- pidl "NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, $size));";
+ if (is_conformant_array($e) and is_surrounding_array($e)) {
+ ParseArrayPushPreceding($e, "r->", "NDR_SCALARS");
}
if (defined $e->{TYPE} && $e->{TYPE} eq "string"
pidl "buffers:";
pidl "if (!(ndr_flags & NDR_BUFFERS)) goto done;";
foreach my $e (@{$struct->{ELEMENTS}}) {
- ParseElementPushBuffer($e, "r->", "NDR_BUFFERS");
+ ParseElementPushBuffer($e, "r->");
}
pidl "ndr_push_struct_end(ndr);";
sub ParseEnumPush($)
{
my($enum) = shift;
- my($type_fn) = util::enum_type_fn($enum);
+ my($type_fn) = typelist::enum_type_fn($enum);
start_flags($enum);
sub ParseEnumPull($)
{
my($enum) = shift;
- my($type_fn) = util::enum_type_fn($enum);
- my($type_v_decl) = util::map_type(util::enum_type_fn($enum));
+ my($type_fn) = typelist::enum_type_fn($enum);
+ my($type_v_decl) = typelist::mapScalarType(typelist::enum_type_fn($enum));
pidl "$type_v_decl v;";
start_flags($enum);
end_flags($enum);
}
+sub ArgsEnumPush($)
+{
+ my $e = shift;
+ return "struct ndr_push *ndr, int ndr_flags, enum $e->{NAME} r";
+}
+
+sub ArgsEnumPrint($)
+{
+ my $e = shift;
+ return "struct ndr_print *ndr, const char *name, enum $e->{NAME} r";
+}
+
+sub ArgsEnumPull($)
+{
+ my $e = shift;
+ return "struct ndr_pull *ndr, int ndr_flags, enum $e->{NAME} *r";
+}
+
$typefamily{ENUM} = {
PUSH_FN_BODY => \&ParseEnumPush,
+ PUSH_FN_ARGS => \&ArgsEnumPush,
PULL_FN_BODY => \&ParseEnumPull,
+ PULL_FN_ARGS => \&ArgsEnumPull,
PRINT_FN_BODY => \&ParseEnumPrint,
- ALIGN => sub { return align_type(util::enum_type_fn(shift)); }
+ PRINT_FN_ARGS => \&ArgsEnumPrint,
+ ALIGN => sub { return align_type(typelist::enum_type_fn(shift)); }
};
#####################################################################
sub ParseBitmapPush($)
{
my($bitmap) = shift;
- my($type_fn) = util::bitmap_type_fn($bitmap);
+ my($type_fn) = typelist::bitmap_type_fn($bitmap);
start_flags($bitmap);
sub ParseBitmapPull($)
{
my($bitmap) = shift;
- my($type_fn) = util::bitmap_type_fn($bitmap);
- my($type_decl) = util::bitmap_type_decl($bitmap);
+ my($type_fn) = typelist::bitmap_type_fn($bitmap);
+ my($type_decl) = typelist::mapType($bitmap);
pidl "$type_decl v;";
start_flags($bitmap);
{
my($e) = shift;
my($bitmap) = shift;
- my($type_decl) = util::bitmap_type_decl($bitmap);
- my($type_fn) = util::bitmap_type_fn($bitmap);
+ my($type_decl) = typelist::mapType($bitmap);
+ my($type_fn) = typelist::bitmap_type_fn($bitmap);
my($name) = $bitmap->{PARENT}->{NAME};
my($flag);
sub ParseBitmapPrint($)
{
my($bitmap) = shift;
- my($type_decl) = util::bitmap_type_decl($bitmap);
- my($type_fn) = util::bitmap_type_fn($bitmap);
+ my($type_decl) = typelist::mapType($bitmap);
+ my($type_fn) = typelist::bitmap_type_fn($bitmap);
start_flags($bitmap);
end_flags($bitmap);
}
+sub ArgsBitmapPush($)
+{
+ my $e = shift;
+ my $type_decl = typelist::mapType($e->{DATA});
+ return "struct ndr_push *ndr, int ndr_flags, $type_decl r";
+}
+
+sub ArgsBitmapPrint($)
+{
+ my $e = shift;
+ my $type_decl = typelist::mapType($e->{DATA});
+ return "struct ndr_print *ndr, const char *name, $type_decl r";
+}
+
+sub ArgsBitmapPull($)
+{
+ my $e = shift;
+ my $type_decl = typelist::mapType($e->{DATA});
+ return "struct ndr_pull *ndr, int ndr_flags, $type_decl *r";
+}
+
$typefamily{BITMAP} = {
PUSH_FN_BODY => \&ParseBitmapPush,
+ PUSH_FN_ARGS => \&ArgsBitmapPush,
PULL_FN_BODY => \&ParseBitmapPull,
+ PULL_FN_ARGS => \&ArgsBitmapPull,
PRINT_FN_BODY => \&ParseBitmapPrint,
- ALIGN => sub { return align_type(util::bitmap_type_fn(shift)); }
+ PRINT_FN_ARGS => \&ArgsBitmapPrint,
+ ALIGN => sub { return align_type(typelist::bitmap_type_fn(shift)); }
};
#####################################################################
pidl "ndr->depth++;";
foreach my $e (@{$struct->{ELEMENTS}}) {
- ParseElementPrintScalar($e, "r->");
+ ParseElementPrint($e, "r->");
}
pidl "ndr->depth--;";
# the wire before the structure (and even before the structure
# alignment)
my $e = $struct->{ELEMENTS}[-1];
- if (defined $e->{ARRAY_LEN} && $e->{ARRAY_LEN} eq "*") {
+ if (is_conformant_array($e) and is_surrounding_array($e)) {
$conform_e = $e;
}
$conform_e = $e;
}
- if (defined $conform_e) {
- $conform_e = $e;
- pidl "uint32_t _conformant_size;";
- $conform_e->{CONFORMANT_SIZE} = "_conformant_size";
- }
-
# declare any internal pointers we need
foreach my $e (@{$struct->{ELEMENTS}}) {
if (need_wire_pointer($e)) {
pidl "NDR_CHECK(ndr_pull_struct_start(ndr));";
if (defined $conform_e) {
- pidl "NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &$conform_e->{CONFORMANT_SIZE}));";
+ ParseArrayPullPreceding($conform_e, "r->", "NDR_SCALARS");
}
my $align = find_largest_alignment($struct);
pidl "buffers:\n";
pidl "if (!(ndr_flags & NDR_BUFFERS)) goto done;";
foreach my $e (@{$struct->{ELEMENTS}}) {
- ParseElementPullBuffer($e, "r->", "NDR_BUFFERS");
+ ParseElementPullBuffer($e, "r->");
}
foreach my $e (@{$struct->{ELEMENTS}}) {
my $static = fn_prefix($t);
my $sizevar;
- pidl "size_t ndr_size_$t->{NAME}(const struct $t->{NAME} *r, int flags)";
- pidl "{";
- indent;
if (my $flags = util::has_property($t, "flag")) {
pidl "flags |= $flags;";
}
pidl "return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_$t->{NAME});";
- deindent;
- pidl "}";
- pidl "";
+}
+
+sub ArgsStructPush($)
+{
+ my $e = shift;
+ return "struct ndr_push *ndr, int ndr_flags, struct $e->{NAME} *r";
+}
+
+sub ArgsStructPrint($)
+{
+ my $e = shift;
+ return "struct ndr_print *ndr, const char *name, struct $e->{NAME} *r";
+}
+
+sub ArgsStructPull($)
+{
+ my $e = shift;
+ return "struct ndr_pull *ndr, int ndr_flags, struct $e->{NAME} *r";
+}
+
+sub ArgsStructNdrSize($)
+{
+ my $d = shift;
+ return "const struct $d->{NAME} *r, int flags";
}
$typefamily{STRUCT} = {
PUSH_FN_BODY => \&ParseStructPush,
+ PUSH_FN_ARGS => \&ArgsStructPush,
PULL_FN_BODY => \&ParseStructPull,
+ PULL_FN_ARGS => \&ArgsStructPull,
PRINT_FN_BODY => \&ParseStructPrint,
- SIZE_FN => \&ParseStructNdrSize,
+ PRINT_FN_ARGS => \&ArgsStructPrint,
+ SIZE_FN_BODY => \&ParseStructNdrSize,
+ SIZE_FN_ARGS => \&ArgsStructNdrSize,
ALIGN => \&find_largest_alignment
};
my $static = fn_prefix($t);
my $sizevar;
- pidl "size_t ndr_size_$t->{NAME}(const union $t->{NAME} *r, int level, int flags)";
- pidl "{";
- indent;
if (my $flags = util::has_property($t, "flag")) {
pidl "flags |= $flags;";
}
pidl "return ndr_size_union(r, flags, level, (ndr_push_union_fn_t)ndr_push_$t->{NAME});";
- deindent;
- pidl "}";
- pidl "";;
}
#####################################################################
my $e = shift;
my $have_default = 0;
+ pidl "int level;";
+
start_flags($e);
+ pidl "level = ndr_push_get_switch_value(ndr, r);";
+
pidl "if (!(ndr_flags & NDR_SCALARS)) goto buffers;";
+ if (!util::has_property($e, "nodiscriminant")) {
+ my $switch_type = util::has_property($e, "switch_type");
+ $switch_type = "uint32" unless (defined ($switch_type));
+ pidl "NDR_CHECK(ndr_push_$switch_type(ndr, NDR_SCALARS, level));";
+ }
+
pidl "NDR_CHECK(ndr_push_struct_start(ndr));";
# my $align = union_alignment($e);
}
if ($el->{TYPE} ne "EMPTY") {
indent;
- ParseElementPushBuffer($el, "r->", "NDR_BUFFERS");
+ ParseElementPushBuffer($el, "r->");
deindent;
}
pidl "break;";
}
if ($el->{TYPE} ne "EMPTY") {
indent;
- ParseElementPrintScalar($el, "r->");
+ ParseElementPrint($el, "r->");
deindent;
}
pidl "break;";
{
my $e = shift;
my $have_default = 0;
+ my $switch_type = util::has_property($e, "switch_type");
+ $switch_type = "uint32" unless defined($switch_type);
+
+ pidl "int level;";
+ if (!util::has_property($e, "nodiscriminant")) {
+ if (typelist::typeIs($switch_type, "ENUM")) {
+ $switch_type = typelist::enum_type_fn(typelist::getType($switch_type));
+ }
+ pidl typelist::mapScalarType($switch_type) . " _level;";
+ }
start_flags($e);
+ pidl "level = ndr_pull_get_switch_value(ndr, r);";
+
pidl "if (!(ndr_flags & NDR_SCALARS)) goto buffers;";
+ if (!util::has_property($e, "nodiscriminant")) {
+ pidl "NDR_CHECK(ndr_pull_$switch_type(ndr, NDR_SCALARS, &_level));";
+ pidl "if (_level != level) {";
+ pidl "\treturn ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, \"Bad switch value %u for $e->{PARENT}->{NAME}\", _level);";
+ pidl "}";
+ }
+
pidl "NDR_CHECK(ndr_pull_struct_start(ndr));";
# my $align = union_alignment($e);
}
if ($el->{TYPE} ne "EMPTY") {
indent;
- ParseElementPullBuffer($el, "r->", "NDR_BUFFERS");
+ ParseElementPullBuffer($el, "r->");
deindent;
}
pidl "break;";
end_flags($e);
}
+sub ArgsUnionPush($)
+{
+ my $e = shift;
+ return "struct ndr_push *ndr, int ndr_flags, union $e->{NAME} *r";
+}
+
+sub ArgsUnionPrint($)
+{
+ my $e = shift;
+ return "struct ndr_print *ndr, const char *name, int level, union $e->{NAME} *r";
+}
+
+sub ArgsUnionPull($)
+{
+ my $e = shift;
+ return "struct ndr_pull *ndr, int ndr_flags, union $e->{NAME} *r";
+}
+
+sub ArgsUnionNdrSize($)
+{
+ my $d = shift;
+ return "const union $d->{NAME} *r, uint32_t level, int flags";
+}
+
$typefamily{UNION} = {
PUSH_FN_BODY => \&ParseUnionPush,
+ PUSH_FN_ARGS => \&ArgsUnionPush,
PULL_FN_BODY => \&ParseUnionPull,
+ PULL_FN_ARGS => \&ArgsUnionPull,
PRINT_FN_BODY => \&ParseUnionPrint,
- SIZE_FN => \&ParseUnionNdrSize,
+ PRINT_FN_ARGS => \&ArgsUnionPrint,
+ SIZE_FN_ARGS => \&ArgsUnionNdrSize,
+ SIZE_FN_BODY => \&ParseUnionNdrSize,
ALIGN => \&find_largest_alignment
};
-
#####################################################################
# parse a typedef - push side
my($e) = shift;
my $static = fn_prefix($e);
- if (! needed::is_needed("push_$e->{NAME}")) {
-# print "push_$e->{NAME} not needed\n";
- return;
- }
+ return unless needed::is_needed("push_$e->{NAME}");
- my $args;
- if ($e->{DATA}->{TYPE} eq "STRUCT") {
- $args = "struct ndr_push *ndr, int ndr_flags, struct $e->{NAME} *r";
- }
-
- if ($e->{DATA}->{TYPE} eq "UNION") {
- $args = "struct ndr_push *ndr, int ndr_flags, int level, union $e->{NAME} *r";
- }
-
- if ($e->{DATA}->{TYPE} eq "ENUM") {
- $args = "struct ndr_push *ndr, int ndr_flags, enum $e->{NAME} r";
- }
-
- if ($e->{DATA}->{TYPE} eq "BITMAP") {
- my $type_decl = util::bitmap_type_decl($e->{DATA});
- $args = "struct ndr_push *ndr, int ndr_flags, $type_decl r";
- }
-
+ my $args = $typefamily{$e->{DATA}->{TYPE}}->{PUSH_FN_ARGS}->($e);
pidl $static . "NTSTATUS ndr_push_$e->{NAME}($args)";
pidl "{";
pidl "";;
}
+
#####################################################################
# parse a typedef - pull side
sub ParseTypedefPull($)
my($e) = shift;
my $static = fn_prefix($e);
- if (! needed::is_needed("pull_$e->{NAME}")) {
-# print "pull_$e->{NAME} not needed\n";
- return;
- }
-
- my $args = "";
-
- if ($e->{DATA}->{TYPE} eq "STRUCT") {
- $args = "struct ndr_pull *ndr, int ndr_flags, struct $e->{NAME} *r";
- }
-
- if ($e->{DATA}->{TYPE} eq "UNION") {
- $args = "struct ndr_pull *ndr, int ndr_flags, int level, union $e->{NAME} *r";
- }
+ return unless needed::is_needed("pull_$e->{NAME}");
- if ($e->{DATA}->{TYPE} eq "ENUM") {
- $args = "struct ndr_pull *ndr, int ndr_flags, enum $e->{NAME} *r";
- }
+ my $args = $typefamily{$e->{DATA}->{TYPE}}->{PULL_FN_ARGS}->($e);
- if ($e->{DATA}->{TYPE} eq "BITMAP") {
- my $type_decl = util::bitmap_type_decl($e->{DATA});
- $args = "struct ndr_pull *ndr, int ndr_flags, $type_decl *r";
- }
-
pidl $static . "NTSTATUS ndr_pull_$e->{NAME}($args)";
pidl "{";
{
my($e) = shift;
- if ($e->{DATA}->{TYPE} eq "STRUCT") {
- pidl "void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, struct $e->{NAME} *r)";
- }
-
- if ($e->{DATA}->{TYPE} eq "UNION") {
- pidl "void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, int level, union $e->{NAME} *r)";
- }
-
- if ($e->{DATA}->{TYPE} eq "ENUM") {
- pidl "void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, enum $e->{NAME} r)";
- }
+ my $args = $typefamily{$e->{DATA}->{TYPE}}->{PRINT_FN_ARGS}->($e);
- if ($e->{DATA}->{TYPE} eq "BITMAP") {
- my $type_decl = util::bitmap_type_decl($e->{DATA});
- pidl "void ndr_print_$e->{NAME}(struct ndr_print *ndr, const char *name, $type_decl r)";
- }
+ return unless !util::has_property($e, "noprint");
+ pidl "void ndr_print_$e->{NAME}($args)";
pidl "{";
indent;
$typefamily{$e->{DATA}->{TYPE}}->{PRINT_FN_BODY}->($e->{DATA});
sub ParseTypedefNdrSize($)
{
my($t) = shift;
- if (! needed::is_needed("ndr_size_$t->{NAME}")) {
- return;
- }
- $typefamily{$t->{DATA}->{TYPE}}->{SIZE_FN}($t);
+ return unless needed::is_needed("ndr_size_$t->{NAME}");
+
+ my $tf = $typefamily{$t->{DATA}->{TYPE}};
+ my $args = $tf->{SIZE_FN_ARGS}->($t);
+
+ pidl "size_t ndr_size_$t->{NAME}($args)";
+ pidl "{";
+ indent;
+ $typefamily{$t->{DATA}->{TYPE}}->{SIZE_FN_BODY}->($t);
+ deindent;
+ pidl "}";
+ pidl "";
}
#####################################################################
{
my($fn) = shift;
+ return unless !util::has_property($fn, "noprint");
+
pidl "void ndr_print_$fn->{NAME}(struct ndr_print *ndr, const char *name, int flags, struct $fn->{NAME} *r)";
pidl "{";
indent;
foreach my $e (@{$fn->{ELEMENTS}}) {
if (util::has_property($e, "in")) {
- ParseElementPrintScalar($e, "r->in.");
+ ParseElementPrint($e, "r->in.");
}
}
pidl "ndr->depth--;";
pidl "ndr->depth++;";
foreach my $e (@{$fn->{ELEMENTS}}) {
if (util::has_property($e, "out")) {
- ParseElementPrintScalar($e, "r->out.");
+ ParseElementPrint($e, "r->out.");
}
}
if ($fn->{RETURN_TYPE} && $fn->{RETURN_TYPE} ne "void") {
if (util::array_size($e)) {
if (need_wire_pointer($e)) {
- pidl "NDR_CHECK(ndr_push_unique_ptr(ndr, r->$inout.$e->{NAME}));";
+ ParsePtrPush($e, "r->$inout.");
pidl "if (r->$inout.$e->{NAME}) {";
indent;
- ParseArrayPush($e, "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
+ ParseArrayPush($e, "ndr", "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
deindent;
pidl "}";
} else {
- ParseArrayPush($e, "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
+ ParseArrayPush($e, "ndr", "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
}
} else {
ParseElementPushScalar($e, "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
-
- if ($e->{POINTERS}) {
- ParseElementPushBuffer($e, "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
+ if (need_wire_pointer($e)) {
+ ParseElementPushBuffer($e, "r->$inout.");
}
}
}
my($fn) = shift;
my $static = fn_prefix($fn);
+ return unless !util::has_property($fn, "nopush");
+
pidl $static . "NTSTATUS ndr_push_$fn->{NAME}(struct ndr_push *ndr, int flags, struct $fn->{NAME} *r)";
pidl "{";
indent;
foreach my $e (@{$fn->{ELEMENTS}}) {
if (util::has_property($e, "in")) {
+ if (util::has_property($e, "ref")) {
+ check_null_pointer("*r->in.$e->{NAME}");
+ }
ParseFunctionElementPush($e, "in");
}
}
foreach my $e (@{$fn->{ELEMENTS}}) {
if (util::has_property($e, "out")) {
+ if (util::has_property($e, "ref")) {
+ check_null_pointer("*r->out.$e->{NAME}");
+ }
ParseFunctionElementPush($e, "out");
}
}
} elsif ($inout eq "out" && util::has_property($e, "ref")) {
pidl "if (r->$inout.$e->{NAME}) {";
indent;
- } else {
- pidl "{";
- indent;
}
- ParseArrayPull($e, "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
- deindent;
- pidl "}";
+
+ ParseArrayPull($e, "ndr", "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
+
+ if (need_wire_pointer($e) or ($inout eq "out" and util::has_property($e, "ref"))) {
+ deindent;
+ pidl "}";
+ }
} else {
if ($inout eq "out" && util::has_property($e, "ref")) {
pidl "if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {";
pidl "\tNDR_ALLOC(ndr, r->out.$e->{NAME});";
pidl "}";
}
+
if ($inout eq "in" && util::has_property($e, "ref")) {
pidl "NDR_ALLOC(ndr, r->in.$e->{NAME});";
}
ParseElementPullScalar($e, "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
- if ($e->{POINTERS}) {
- ParseElementPullBuffer($e, "r->$inout.", "NDR_SCALARS|NDR_BUFFERS");
+ if (need_wire_pointer($e)) {
+ ParseElementPullBuffer($e, "r->$inout.");
}
}
}
my($fn) = shift;
my $static = fn_prefix($fn);
+ return unless !util::has_property($fn, "nopull");
+
# pull function args
pidl $static . "NTSTATUS ndr_pull_$fn->{NAME}(struct ndr_pull *ndr, int flags, struct $fn->{NAME} *r)";
pidl "{";
pidl "";
pidl "static const struct dcerpc_endpoint_list $interface->{NAME}\_endpoints = {";
- pidl "\t$endpoint_count, $interface->{NAME}\_endpoint_strings";
+ pidl "\t.count\t= $endpoint_count,";
+ pidl "\t.names\t= $interface->{NAME}\_endpoint_strings";
+ pidl "};";
+ pidl "";
+
+ if (! defined $interface->{PROPERTIES}->{authservice}) {
+ $interface->{PROPERTIES}->{authservice} = "\"host\"";
+ }
+
+ my @a = split / /, $interface->{PROPERTIES}->{authservice};
+ my $authservice_count = $#a + 1;
+
+ pidl "static const char * const $interface->{NAME}\_authservice_strings[] = {";
+ foreach my $ap (@a) {
+ pidl "\t$ap, ";
+ }
+ pidl "};";
+ pidl "";
+
+ pidl "static const struct dcerpc_authservice_list $interface->{NAME}\_authservices = {";
+ pidl "\t.count\t= $endpoint_count,";
+ pidl "\t.names\t= $interface->{NAME}\_authservice_strings";
pidl "};";
pidl "";
pidl "\nconst struct dcerpc_interface_table dcerpc_table_$interface->{NAME} = {";
- pidl "\t\"$interface->{NAME}\",";
- pidl "\tDCERPC_$uname\_UUID,";
- pidl "\tDCERPC_$uname\_VERSION,";
- pidl "\tDCERPC_$uname\_HELPSTRING,";
- pidl "\t$count,";
- pidl "\t$interface->{NAME}\_calls,";
- pidl "\t&$interface->{NAME}\_endpoints";
+ pidl "\t.name\t\t= \"$interface->{NAME}\",";
+ pidl "\t.uuid\t\t= DCERPC_$uname\_UUID,";
+ pidl "\t.if_version\t= DCERPC_$uname\_VERSION,";
+ pidl "\t.helpstring\t= DCERPC_$uname\_HELPSTRING,";
+ pidl "\t.num_calls\t= $count,";
+ pidl "\t.calls\t\t= $interface->{NAME}\_calls,";
+ pidl "\t.endpoints\t= &$interface->{NAME}\_endpoints,";
+ pidl "\t.authservices\t= &$interface->{NAME}\_authservices";
pidl "};";
pidl "";
# Print functions
foreach my $d (@{$data}) {
- if ($d->{TYPE} eq "TYPEDEF" &&
- !util::has_property($d, "noprint")) {
+ ($d->{TYPE} eq "TYPEDEF") &&
ParseTypedefPrint($d);
- }
- if ($d->{TYPE} eq "FUNCTION" &&
- !util::has_property($d, "noprint")) {
+ ($d->{TYPE} eq "FUNCTION") &&
ParseFunctionPrint($d);
- }
}
# Size functions
foreach my $d (@{$x->{DATA}}) {
if (($d->{TYPE} eq "DECLARE") or ($d->{TYPE} eq "TYPEDEF")) {
- $typedefs{$d->{NAME}} = $d;
if ($d->{DATA}->{TYPE} eq "STRUCT" or $d->{DATA}->{TYPE} eq "UNION") {
CheckPointerTypes($d->{DATA}, $x->{PROPERTIES}->{pointer_default});
}
}
}
-# Add ORPC specific bits to an interface.
-sub InterfaceORPC($)
-{
- my $x = shift;
- # Add [in] ORPCTHIS *this, [out] ORPCTHAT *that
- # for 'object' interfaces
- if (util::has_property($x, "object")) {
- foreach my $e (@{$x->{DATA}}) {
- if($e->{TYPE} eq "FUNCTION") {
- $e->{PROPERTIES}->{object} = 1;
- unshift(@{$e->{ELEMENTS}},
- { 'NAME' => 'ORPCthis',
- 'POINTERS' => 0,
- 'PROPERTIES' => { 'in' => '1' },
- 'TYPE' => 'ORPCTHIS'
- });
- unshift(@{$e->{ELEMENTS}},
- { 'NAME' => 'ORPCthat',
- 'POINTERS' => 0,
- 'PROPERTIES' => { 'out' => '1' },
- 'TYPE' => 'ORPCTHAT'
- });
- }
- }
- }
-}
-
sub Load($)
{
my $idl = shift;
return $res;
}
-RegisterPrimitives();
-
1;
git.samba.org / samba.git / blobdiff