sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-05 04:23:51 +03:00
Code Activity

r1671: make [relative] pointers in idl much more generic, treating them just

Browse Source 
like normal pointers in most cases. This means we can now support
relative pointers to unions, builtin types etc, whereas we could only
previously support relative pointers to structures.

metze needs this for the PAC decoding.
This commit is contained in:
Andrew Tridgell
2004-08-09 19:40:24 +00:00
committed by Gerald (Jerry) Carter
parent 74cc2cda92
commit 0d063725e1
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/build/pidl/parser.pm
View File

@@ -368,7 +368,7 @@ sub ParseElementPushScalar($$$)
} }
if (util::has_property($e, "relative")) { if (util::has_property($e, "relative")) {
pidl "\tNDR_CHECK(ndr_push_relative(ndr, NDR_SCALARS, $var_prefix$e->{NAME}, (ndr_push_const_fn_t) ndr_push_$e->{TYPE}));\n"; pidl "\tNDR_CHECK(ndr_push_relative(ndr, NDR_SCALARS, $var_prefix$e->{NAME}));\n";
} elsif (util::is_inline_array($e)) { } elsif (util::is_inline_array($e)) {
ParseArrayPush($e, "r->", "NDR_SCALARS"); ParseArrayPush($e, "r->", "NDR_SCALARS");
} elsif (util::need_wire_pointer($e)) { } elsif (util::need_wire_pointer($e)) {
@@ -520,14 +520,17 @@ sub ParseElementPullScalar($$$)
start_flags($e); start_flags($e);
if (util::has_property($e, "relative")) { if (util::is_inline_array($e)) {
pidl "\tNDR_CHECK(ndr_pull_relative(ndr, (const void **)&$var_prefix$e->{NAME}, sizeof(*$var_prefix$e->{NAME}), (ndr_pull_flags_fn_t)ndr_pull_$e->{TYPE}));\n";
} elsif (util::is_inline_array($e)) {
ParseArrayPull($e, "r->", "NDR_SCALARS"); ParseArrayPull($e, "r->", "NDR_SCALARS");
} elsif (util::need_wire_pointer($e)) { } elsif (util::need_wire_pointer($e)) {
pidl "\tNDR_CHECK(ndr_pull_ptr(ndr, &_ptr_$e->{NAME}));\n"; pidl "\tNDR_CHECK(ndr_pull_ptr(ndr, &_ptr_$e->{NAME}));\n";
pidl "\tif (_ptr_$e->{NAME}) {\n"; pidl "\tif (_ptr_$e->{NAME}) {\n";
pidl "\t\tNDR_ALLOC(ndr, $var_prefix$e->{NAME});\n"; if (util::has_property($e, "relative")) {
# NOTE: this assumes a pointer can hold a uint32. Not legal C
pidl "\t\t$var_prefix$e->{NAME} = (void *)_ptr_$e->{NAME};\n";
} else {
pidl "\t\tNDR_ALLOC(ndr, $var_prefix$e->{NAME});\n";
}
pidl "\t} else {\n"; pidl "\t} else {\n";
pidl "\t\t$var_prefix$e->{NAME} = NULL;\n"; pidl "\t\t$var_prefix$e->{NAME} = NULL;\n";
pidl "\t}\n"; pidl "\t}\n";
@@ -568,11 +571,12 @@ sub ParseElementPushBuffer($$$)
if (util::need_wire_pointer($e)) { if (util::need_wire_pointer($e)) {
pidl "\tif ($var_prefix$e->{NAME}) {\n"; pidl "\tif ($var_prefix$e->{NAME}) {\n";
if (util::has_property($e, "relative")) {
pidl "\t\tNDR_CHECK(ndr_push_relative(ndr, NDR_BUFFERS, $var_prefix$e->{NAME}));\n";
}
} }
if (util::has_property($e, "relative")) { if (util::is_inline_array($e)) {
pidl "\tNDR_CHECK(ndr_push_relative(ndr, NDR_BUFFERS, $cprefix$var_prefix$e->{NAME}, (ndr_push_const_fn_t) ndr_push_$e->{TYPE}));\n";
} elsif (util::is_inline_array($e)) {
ParseArrayPush($e, "r->", "NDR_BUFFERS"); ParseArrayPush($e, "r->", "NDR_BUFFERS");
} elsif (util::array_size($e)) { } elsif (util::array_size($e)) {
ParseArrayPush($e, "r->", "NDR_SCALARS|NDR_BUFFERS"); ParseArrayPush($e, "r->", "NDR_SCALARS|NDR_BUFFERS");
@@ -645,14 +649,16 @@ sub ParseElementPullBuffer($$$)
return; return;
} }
if (util::has_property($e, "relative")) {
return;
}
start_flags($e); start_flags($e);
if (util::need_wire_pointer($e)) { if (util::need_wire_pointer($e)) {
pidl "\tif ($var_prefix$e->{NAME}) {\n"; pidl "\tif ($var_prefix$e->{NAME}) {\n";
if (util::has_property($e, "relative")) {
pidl "\t\tstruct ndr_pull_save _relative_save;\n";
pidl "\t\tndr_pull_save(ndr, &_relative_save);\n";
pidl "\t\tNDR_CHECK(ndr_pull_set_offset(ndr, (uint32_t)$var_prefix$e->{NAME}));\n";
pidl "\t\tNDR_ALLOC(ndr, $var_prefix$e->{NAME});\n";
}
} }
if (util::is_inline_array($e)) { if (util::is_inline_array($e)) {
@@ -682,6 +688,9 @@ sub ParseElementPullBuffer($$$)
} }
if (util::need_wire_pointer($e)) { if (util::need_wire_pointer($e)) {
if (util::has_property($e, "relative")) {
pidl "\t\tndr_pull_restore(ndr, &_relative_save);\n";
}
pidl "\t}\n"; pidl "\t}\n";
} }
@@ -784,8 +793,7 @@ sub ParseStructPull($)
# declare any internal pointers we need # declare any internal pointers we need
foreach my $e (@{$struct->{ELEMENTS}}) { foreach my $e (@{$struct->{ELEMENTS}}) {
if (util::need_wire_pointer($e) && if (util::need_wire_pointer($e)) {
!util::has_property($e, "relative")) {
pidl "\tuint32_t _ptr_$e->{NAME};\n"; pidl "\tuint32_t _ptr_$e->{NAME};\n";
} }
} }

4
source/librpc/ndr/ndr.c
View File

@@ -686,8 +686,7 @@ NTSTATUS ndr_pull_relative(struct ndr_pull *ndr, const void **buf, size_t size,
/* /*
push a relative structure push a relative structure
*/ */
NTSTATUS ndr_push_relative(struct ndr_push *ndr, int ndr_flags, const void *p, NTSTATUS ndr_push_relative(struct ndr_push *ndr, int ndr_flags, const void *p)
NTSTATUS (*fn)(struct ndr_push *, int , const void *))
{ {
struct ndr_ofs_list *ofs; struct ndr_ofs_list *ofs;
if (ndr_flags & NDR_SCALARS) { if (ndr_flags & NDR_SCALARS) {
@@ -730,7 +729,6 @@ NTSTATUS ndr_push_relative(struct ndr_push *ndr, int ndr_flags, const void *p,
ndr->offset = ofs->offset; ndr->offset = ofs->offset;
NDR_CHECK(ndr_push_uint32(ndr, save.offset - ofs->base)); NDR_CHECK(ndr_push_uint32(ndr, save.offset - ofs->base));
ndr_push_restore(ndr, &save); ndr_push_restore(ndr, &save);
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
} }
return NT_STATUS_OK; return NT_STATUS_OK;
} }