{
struct ndr_pull *ndr;
- ndr = talloc_zero_p(mem_ctx, struct ndr_pull);
+ ndr = talloc_zero(mem_ctx, struct ndr_pull);
if (!ndr) return NULL;
ndr->data = blob->data;
{
struct ndr_push *ndr;
- ndr = talloc_zero_p(mem_ctx, struct ndr_push);
+ ndr = talloc_zero(mem_ctx, struct ndr_push);
if (!ndr) {
return NULL;
}
ndr->flags = 0;
ndr->alloc_size = NDR_BASE_MARSHALL_SIZE;
- ndr->data = talloc_array_p(ndr, uint8_t, ndr->alloc_size);
+ ndr->data = talloc_array(ndr, uint8_t, ndr->alloc_size);
if (!ndr->data) {
return NULL;
}
{
struct ndr_print *ndr;
- ndr = talloc_p(NULL, struct ndr_print);
+ ndr = talloc(NULL, struct ndr_print);
if (!ndr) return;
ndr->print = ndr_print_debug_helper;
ndr->depth = 1;
{
struct ndr_print *ndr;
- ndr = talloc_p(NULL, struct ndr_print);
+ ndr = talloc(NULL, struct ndr_print);
if (!ndr) return;
ndr->print = ndr_print_debug_helper;
ndr->depth = 1;
{
struct ndr_print *ndr;
- ndr = talloc_p(NULL, struct ndr_print);
+ ndr = talloc(NULL, struct ndr_print);
if (!ndr) return;
ndr->print = ndr_print_debug_helper;
ndr->depth = 1;
handle subcontext buffers, which in midl land are user-marshalled, but
we use magic in pidl to make them easier to cope with
*/
-static NTSTATUS ndr_pull_subcontext_header(struct ndr_pull *ndr,
+NTSTATUS ndr_pull_subcontext_header(struct ndr_pull *ndr,
size_t sub_size,
struct ndr_pull *ndr2)
{
+ ndr2->flags = ndr->flags;
+
switch (sub_size) {
case 0: {
uint32_t size = ndr->data_size - ndr->offset;
- if (size == 0) return NT_STATUS_OK;
NDR_CHECK(ndr_pull_subcontext(ndr, ndr2, size));
break;
}
case 2: {
uint16_t size;
- NDR_CHECK(ndr_pull_uint16(ndr, &size));
- if (size == 0) return NT_STATUS_OK;
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &size));
NDR_CHECK(ndr_pull_subcontext(ndr, ndr2, size));
break;
}
case 4: {
uint32_t size;
- NDR_CHECK(ndr_pull_uint32(ndr, &size));
- if (size == 0) return NT_STATUS_OK;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &size));
NDR_CHECK(ndr_pull_subcontext(ndr, ndr2, size));
break;
}
return NT_STATUS_OK;
}
-/*
- handle subcontext buffers, which in midl land are user-marshalled, but
- we use magic in pidl to make them easier to cope with
-*/
-NTSTATUS ndr_pull_subcontext_fn(struct ndr_pull *ndr, size_t sub_size,
- void *base, ndr_pull_fn_t fn)
-{
- struct ndr_pull *ndr2;
- NDR_ALLOC(ndr, ndr2);
- NDR_CHECK(ndr_pull_subcontext_header(ndr, sub_size, ndr2));
- NDR_CHECK(fn(ndr2, base));
- if (sub_size) {
- NDR_CHECK(ndr_pull_advance(ndr, ndr2->data_size));
- } else {
- NDR_CHECK(ndr_pull_advance(ndr, ndr2->offset));
- }
- return NT_STATUS_OK;
-}
-
-
-NTSTATUS ndr_pull_subcontext_flags_fn(struct ndr_pull *ndr, size_t sub_size,
- void *base, ndr_pull_flags_fn_t fn)
-{
- struct ndr_pull *ndr2;
- NDR_ALLOC(ndr, ndr2);
- NDR_CHECK(ndr_pull_subcontext_header(ndr, sub_size, ndr2));
- NDR_CHECK(fn(ndr2, NDR_SCALARS|NDR_BUFFERS, base));
- if (sub_size) {
- NDR_CHECK(ndr_pull_advance(ndr, ndr2->data_size));
- } else {
- NDR_CHECK(ndr_pull_advance(ndr, ndr2->offset));
- }
- return NT_STATUS_OK;
-}
-
-NTSTATUS ndr_pull_subcontext_union_fn(struct ndr_pull *ndr, size_t sub_size,
- uint32_t level, void *base, ndr_pull_union_fn_t fn)
-{
- struct ndr_pull *ndr2;
-
- NDR_ALLOC(ndr, ndr2);
- NDR_CHECK(ndr_pull_subcontext_header(ndr, sub_size, ndr2));
- NDR_CHECK(fn(ndr2, NDR_SCALARS|NDR_BUFFERS, level, base));
- if (sub_size) {
- NDR_CHECK(ndr_pull_advance(ndr, ndr2->data_size));
- } else {
- NDR_CHECK(ndr_pull_advance(ndr, ndr2->offset));
- }
- return NT_STATUS_OK;
-}
-
-
/*
push a subcontext header
*/
-static NTSTATUS ndr_push_subcontext_header(struct ndr_push *ndr,
+NTSTATUS ndr_push_subcontext_header(struct ndr_push *ndr,
size_t sub_size,
struct ndr_push *ndr2)
{
break;
case 2:
- NDR_CHECK(ndr_push_uint16(ndr, ndr2->offset));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, ndr2->offset));
break;
case 4:
- NDR_CHECK(ndr_push_uint32(ndr, ndr2->offset));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr2->offset));
break;
default:
return NT_STATUS_OK;
}
-/*
- handle subcontext buffers, which in midl land are user-marshalled, but
- we use magic in pidl to make them easier to cope with
-*/
-NTSTATUS ndr_push_subcontext_fn(struct ndr_push *ndr, size_t sub_size,
- void *base, ndr_push_fn_t fn)
-{
- struct ndr_push *ndr2;
-
- ndr2 = ndr_push_init_ctx(ndr);
- if (!ndr2) return NT_STATUS_NO_MEMORY;
-
- ndr2->flags = ndr->flags;
- NDR_CHECK(fn(ndr2, base));
- NDR_CHECK(ndr_push_subcontext_header(ndr, sub_size, ndr2));
- NDR_CHECK(ndr_push_bytes(ndr, ndr2->data, ndr2->offset));
- return NT_STATUS_OK;
-}
-
-/*
- handle subcontext buffers for function that take a flags arg
-*/
-NTSTATUS ndr_push_subcontext_flags_fn(struct ndr_push *ndr, size_t sub_size,
- void *base, ndr_push_flags_fn_t fn)
-{
- struct ndr_push *ndr2;
-
- ndr2 = ndr_push_init_ctx(ndr);
- if (!ndr2) return NT_STATUS_NO_MEMORY;
-
- ndr2->flags = ndr->flags;
- NDR_CHECK(fn(ndr2, NDR_SCALARS|NDR_BUFFERS, base));
- NDR_CHECK(ndr_push_subcontext_header(ndr, sub_size, ndr2));
- NDR_CHECK(ndr_push_bytes(ndr, ndr2->data, ndr2->offset));
- return NT_STATUS_OK;
-}
-
-/*
- handle subcontext buffers for function that take a union
-*/
-NTSTATUS ndr_push_subcontext_union_fn(struct ndr_push *ndr, size_t sub_size,
- uint32_t level, void *base, ndr_push_union_fn_t fn)
-{
- struct ndr_push *ndr2;
-
- ndr2 = ndr_push_init_ctx(ndr);
- if (!ndr2) return NT_STATUS_NO_MEMORY;
-
- ndr2->flags = ndr->flags;
- NDR_CHECK(fn(ndr2, NDR_SCALARS|NDR_BUFFERS, level, base));
- NDR_CHECK(ndr_push_subcontext_header(ndr, sub_size, ndr2));
- NDR_CHECK(ndr_push_bytes(ndr, ndr2->data, ndr2->offset));
- return NT_STATUS_OK;
-}
-
-
/*
mark the start of a structure
*/
uint32_t value)
{
struct ndr_token_list *tok;
- tok = talloc_p(mem_ctx, struct ndr_token_list);
+ tok = talloc(mem_ctx, struct ndr_token_list);
if (tok == NULL) {
return NT_STATUS_NO_MEMORY;
}
NTSTATUS ndr_pull_array_size(struct ndr_pull *ndr, const void *p)
{
uint32_t size;
- NDR_CHECK(ndr_pull_uint32(ndr, &size));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &size));
return ndr_token_store(ndr, &ndr->array_size_list, p, size);
}
NTSTATUS ndr_pull_array_length(struct ndr_pull *ndr, const void *p)
{
uint32_t length, offset;
- NDR_CHECK(ndr_pull_uint32(ndr, &offset));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &offset));
if (offset != 0) {
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
"non-zero array offset %u\n", offset);
}
- NDR_CHECK(ndr_pull_uint32(ndr, &length));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &length));
return ndr_token_store(ndr, &ndr->array_length_list, p, length);
}
return NT_STATUS_OK;
}
+/*
+ store a switch value
+ */
+NTSTATUS ndr_push_set_switch_value(struct ndr_push *ndr, void *p, uint32_t val)
+{
+ return ndr_token_store(ndr, &ndr->switch_list, p, val);
+}
+
+NTSTATUS ndr_pull_set_switch_value(struct ndr_pull *ndr, void *p, uint32_t val)
+{
+ return ndr_token_store(ndr, &ndr->switch_list, p, val);
+}
+
+/*
+ retrieve a switch value
+ */
+uint32_t ndr_push_get_switch_value(struct ndr_push *ndr, void *p)
+{
+ return ndr_token_peek(&ndr->switch_list, p);
+}
+
+uint32_t ndr_pull_get_switch_value(struct ndr_pull *ndr, void *p)
+{
+ return ndr_token_peek(&ndr->switch_list, p);
+}
+
/*
pull a relative object - stage1
called during SCALARS processing
*/
-NTSTATUS ndr_pull_relative1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset)
+NTSTATUS ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset)
{
if (ndr->flags & LIBNDR_FLAG_RELATIVE_CURRENT) {
return ndr_token_store(ndr, &ndr->relative_list, p,
pull a relative object - stage2
called during BUFFERS processing
*/
-NTSTATUS ndr_pull_relative2(struct ndr_pull *ndr, const void *p)
+NTSTATUS ndr_pull_relative_ptr2(struct ndr_pull *ndr, const void *p)
{
uint32_t rel_offset;
NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &rel_offset));
push a relative object - stage1
this is called during SCALARS processing
*/
-NTSTATUS ndr_push_relative1(struct ndr_push *ndr, const void *p)
+NTSTATUS ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p)
{
if (p == NULL) {
- NDR_CHECK(ndr_push_uint32(ndr, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
return NT_STATUS_OK;
}
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_token_store(ndr, &ndr->relative_list, p, ndr->offset));
- return ndr_push_uint32(ndr, 0xFFFFFFFF);
+ return ndr_push_uint32(ndr, NDR_SCALARS, 0xFFFFFFFF);
}
/*
push a relative object - stage2
this is called during buffers processing
*/
-NTSTATUS ndr_push_relative2(struct ndr_push *ndr, const void *p)
+NTSTATUS ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p)
{
struct ndr_push_save save;
if (p == NULL) {
ndr_push_save(ndr, &save);
NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &ndr->offset));
if (ndr->flags & LIBNDR_FLAG_RELATIVE_CURRENT) {
- NDR_CHECK(ndr_push_uint32(ndr, save.offset - ndr->offset));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset - ndr->offset));
} else {
- NDR_CHECK(ndr_push_uint32(ndr, save.offset));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset));
}
ndr_push_restore(ndr, &save);
return NT_STATUS_OK;
talloc_free(ndr);
return ret;
}
+
+/*
+ generic ndr_size_*() handler for unions
+*/
+size_t ndr_size_union(const void *p, int flags, uint32_t level, ndr_push_union_fn_t push)
+{
+ struct ndr_push *ndr;
+ NTSTATUS status;
+ size_t ret;
+
+ ndr = ndr_push_init_ctx(NULL);
+ if (!ndr) return 0;
+ ndr->flags |= flags;
+ status = push(ndr, NDR_SCALARS|NDR_BUFFERS, level, discard_const(p));
+ if (!NT_STATUS_IS_OK(status)) {
+ return 0;
+ }
+ ret = ndr->offset;
+ talloc_free(ndr);
+ return ret;
+}
git.samba.org / samba.git / blobdiff