mirror of
https://github.com/samba-team/samba.git
synced 2025-03-29 02:50:28 +03:00
r25916: ndr: change NTSTAUS into enum ndr_err_code (basic stuff)
librpc/ndr/ metze (This used to be commit 7e157bbcfd416c3d5c32c1e9fdc746bbee5967bb)
This commit is contained in:
Stefan Metzmacher
parent
3e1fb13024
commit
afa5f256e9
@ -23,7 +23,6 @@
|
||||
#include <talloc.h>
|
||||
#include "lib/util/util.h" /* for discard_const */
|
||||
#include "lib/charset/charset.h"
|
||||
#include "libcli/util/ntstatus.h"
|
||||
|
||||
/*
|
||||
this provides definitions for the libcli/rpc/ MSRPC library
|
||||
@ -160,6 +159,7 @@ struct ndr_print {
|
||||
#define NDR_BE(ndr) (((ndr)->flags & (LIBNDR_FLAG_BIGENDIAN|LIBNDR_FLAG_LITTLE_ENDIAN)) == LIBNDR_FLAG_BIGENDIAN)
|
||||
|
||||
enum ndr_err_code {
|
||||
NDR_ERR_SUCCESS = 0,
|
||||
NDR_ERR_ARRAY_SIZE,
|
||||
NDR_ERR_BAD_SWITCH,
|
||||
NDR_ERR_OFFSET,
|
||||
@ -179,6 +179,14 @@ enum ndr_err_code {
|
||||
NDR_ERR_UNREAD_BYTES
|
||||
};
|
||||
|
||||
#define NDR_ERR_CODE_IS_SUCCESS(x) (x == NDR_ERR_SUCCESS)
|
||||
|
||||
#define NDR_ERR_HAVE_NO_MEMORY(x) do { \
|
||||
if (NULL == (x)) { \
|
||||
return NDR_ERR_ALLOC; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
enum ndr_compression_alg {
|
||||
NDR_COMPRESSION_MSZIP = 2,
|
||||
NDR_COMPRESSION_XPRESS = 3
|
||||
@ -231,11 +239,13 @@ enum ndr_compression_alg {
|
||||
|
||||
/* these are used to make the error checking on each element in libndr
|
||||
less tedious, hopefully making the code more readable */
|
||||
#define NDR_CHECK(call) do { NTSTATUS _status; \
|
||||
_status = call; \
|
||||
if (!NT_STATUS_IS_OK(_status)) \
|
||||
return _status; \
|
||||
} while (0)
|
||||
#define NDR_CHECK(call) do { \
|
||||
enum ndr_err_code _status; \
|
||||
_status = call; \
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(_status)) { \
|
||||
return _status; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define NDR_PULL_GET_MEM_CTX(ndr) (ndr->current_mem_ctx)
|
||||
|
||||
@ -281,8 +291,8 @@ enum ndr_compression_alg {
|
||||
} while (0)
|
||||
|
||||
/* these are used when generic fn pointers are needed for ndr push/pull fns */
|
||||
typedef NTSTATUS (*ndr_push_flags_fn_t)(struct ndr_push *, int ndr_flags, const void *);
|
||||
typedef NTSTATUS (*ndr_pull_flags_fn_t)(struct ndr_pull *, int ndr_flags, void *);
|
||||
typedef enum ndr_err_code (*ndr_push_flags_fn_t)(struct ndr_push *, int ndr_flags, const void *);
|
||||
typedef enum ndr_err_code (*ndr_pull_flags_fn_t)(struct ndr_pull *, int ndr_flags, void *);
|
||||
typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, const void *);
|
||||
typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, const void *);
|
||||
|
||||
@ -324,11 +334,11 @@ struct ndr_interface_list {
|
||||
|
||||
/* FIXME: Use represent_as instead */
|
||||
struct dom_sid;
|
||||
NTSTATUS ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
|
||||
NTSTATUS ndr_pull_dom_sid2(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_pull_dom_sid2(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
|
||||
void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
|
||||
NTSTATUS ndr_push_dom_sid28(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
|
||||
NTSTATUS ndr_pull_dom_sid28(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_push_dom_sid28(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_pull_dom_sid28(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
|
||||
void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
|
||||
size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags);
|
||||
void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip);
|
||||
|
||||
@ -73,7 +73,7 @@ _PUBLIC_ struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX *
|
||||
/*
|
||||
advance by 'size' bytes
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_advance(struct ndr_pull *ndr, uint32_t size)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_advance(struct ndr_pull *ndr, uint32_t size)
|
||||
{
|
||||
ndr->offset += size;
|
||||
if (ndr->offset > ndr->data_size) {
|
||||
@ -81,13 +81,13 @@ _PUBLIC_ NTSTATUS ndr_pull_advance(struct ndr_pull *ndr, uint32_t size)
|
||||
"ndr_pull_advance by %u failed",
|
||||
size);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
set the parse offset to 'ofs'
|
||||
*/
|
||||
static NTSTATUS ndr_pull_set_offset(struct ndr_pull *ndr, uint32_t ofs)
|
||||
static enum ndr_err_code ndr_pull_set_offset(struct ndr_pull *ndr, uint32_t ofs)
|
||||
{
|
||||
ndr->offset = ofs;
|
||||
if (ndr->offset > ndr->data_size) {
|
||||
@ -95,7 +95,7 @@ static NTSTATUS ndr_pull_set_offset(struct ndr_pull *ndr, uint32_t ofs)
|
||||
"ndr_pull_set_offset %u failed",
|
||||
ofs);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/* save the offset/size of the current ndr state */
|
||||
@ -148,7 +148,7 @@ _PUBLIC_ DATA_BLOB ndr_push_blob(struct ndr_push *ndr)
|
||||
/*
|
||||
expand the available space in the buffer to ndr->offset + extra_size
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size)
|
||||
{
|
||||
uint32_t size = extra_size + ndr->offset;
|
||||
|
||||
@ -159,7 +159,7 @@ _PUBLIC_ NTSTATUS ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size)
|
||||
}
|
||||
|
||||
if (ndr->alloc_size > size) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
ndr->alloc_size += NDR_BASE_MARSHALL_SIZE;
|
||||
@ -172,7 +172,7 @@ _PUBLIC_ NTSTATUS ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size)
|
||||
ndr->alloc_size);
|
||||
}
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ void ndr_print_debug_helper(struct ndr_print *ndr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3)
|
||||
@ -353,9 +353,11 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags)
|
||||
(*pflags) |= new_flags;
|
||||
}
|
||||
|
||||
static NTSTATUS ndr_map_error(enum ndr_err_code ndr_err)
|
||||
NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err)
|
||||
{
|
||||
switch (ndr_err) {
|
||||
case NDR_ERR_SUCCESS:
|
||||
return NT_STATUS_OK;
|
||||
case NDR_ERR_BUFSIZE:
|
||||
return NT_STATUS_BUFFER_TOO_SMALL;
|
||||
case NDR_ERR_TOKEN:
|
||||
@ -379,7 +381,7 @@ static NTSTATUS ndr_map_error(enum ndr_err_code ndr_err)
|
||||
/*
|
||||
return and possibly log an NDR error
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_error(struct ndr_pull *ndr,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_error(struct ndr_pull *ndr,
|
||||
enum ndr_err_code ndr_err,
|
||||
const char *format, ...) _PRINTF_ATTRIBUTE(3,4)
|
||||
{
|
||||
@ -394,13 +396,13 @@ _PUBLIC_ NTSTATUS ndr_pull_error(struct ndr_pull *ndr,
|
||||
|
||||
free(s);
|
||||
|
||||
return ndr_map_error(ndr_err);
|
||||
return ndr_err;
|
||||
}
|
||||
|
||||
/*
|
||||
return and possibly log an NDR error
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_error(struct ndr_push *ndr,
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_error(struct ndr_push *ndr,
|
||||
enum ndr_err_code ndr_err,
|
||||
const char *format, ...) _PRINTF_ATTRIBUTE(3,4)
|
||||
{
|
||||
@ -415,14 +417,14 @@ _PUBLIC_ NTSTATUS ndr_push_error(struct ndr_push *ndr,
|
||||
|
||||
free(s);
|
||||
|
||||
return ndr_map_error(ndr_err);
|
||||
return ndr_err;
|
||||
}
|
||||
|
||||
/*
|
||||
handle subcontext buffers, which in midl land are user-marshalled, but
|
||||
we use magic in pidl to make them easier to cope with
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
struct ndr_pull **_subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is)
|
||||
@ -469,7 +471,7 @@ _PUBLIC_ NTSTATUS ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
NDR_PULL_NEED_BYTES(ndr, r_content_size);
|
||||
|
||||
subndr = talloc_zero(ndr, struct ndr_pull);
|
||||
NT_STATUS_HAVE_NO_MEMORY(subndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(subndr);
|
||||
subndr->flags = ndr->flags;
|
||||
subndr->current_mem_ctx = ndr->current_mem_ctx;
|
||||
|
||||
@ -478,10 +480,10 @@ _PUBLIC_ NTSTATUS ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
subndr->data_size = r_content_size;
|
||||
|
||||
*_subndr = subndr;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_pull_subcontext_end(struct ndr_pull *ndr,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_subcontext_end(struct ndr_pull *ndr,
|
||||
struct ndr_pull *subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is)
|
||||
@ -495,10 +497,10 @@ _PUBLIC_ NTSTATUS ndr_pull_subcontext_end(struct ndr_pull *ndr,
|
||||
advance = subndr->offset;
|
||||
}
|
||||
NDR_CHECK(ndr_pull_advance(ndr, advance));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_push_subcontext_start(struct ndr_push *ndr,
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_subcontext_start(struct ndr_push *ndr,
|
||||
struct ndr_push **_subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is)
|
||||
@ -506,17 +508,17 @@ _PUBLIC_ NTSTATUS ndr_push_subcontext_start(struct ndr_push *ndr,
|
||||
struct ndr_push *subndr;
|
||||
|
||||
subndr = ndr_push_init_ctx(ndr);
|
||||
NT_STATUS_HAVE_NO_MEMORY(subndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(subndr);
|
||||
subndr->flags = ndr->flags;
|
||||
|
||||
*_subndr = subndr;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a subcontext header
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_subcontext_end(struct ndr_push *ndr,
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_subcontext_end(struct ndr_push *ndr,
|
||||
struct ndr_push *subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is)
|
||||
@ -549,30 +551,30 @@ _PUBLIC_ NTSTATUS ndr_push_subcontext_end(struct ndr_push *ndr,
|
||||
}
|
||||
|
||||
NDR_CHECK(ndr_push_bytes(ndr, subndr->data, subndr->offset));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
store a token in the ndr context, for later retrieval
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_token_store(TALLOC_CTX *mem_ctx,
|
||||
_PUBLIC_ enum ndr_err_code ndr_token_store(TALLOC_CTX *mem_ctx,
|
||||
struct ndr_token_list **list,
|
||||
const void *key,
|
||||
uint32_t value)
|
||||
{
|
||||
struct ndr_token_list *tok;
|
||||
tok = talloc(mem_ctx, struct ndr_token_list);
|
||||
NT_STATUS_HAVE_NO_MEMORY(tok);
|
||||
NDR_ERR_HAVE_NO_MEMORY(tok);
|
||||
tok->key = key;
|
||||
tok->value = value;
|
||||
DLIST_ADD((*list), tok);
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
retrieve a token from a ndr context, using cmp_fn to match the tokens
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v,
|
||||
_PUBLIC_ enum ndr_err_code ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v,
|
||||
comparison_fn_t _cmp_fn, bool _remove_tok)
|
||||
{
|
||||
struct ndr_token_list *tok;
|
||||
@ -580,20 +582,20 @@ _PUBLIC_ NTSTATUS ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const
|
||||
if (_cmp_fn && _cmp_fn(tok->key,key)==0) goto found;
|
||||
else if (!_cmp_fn && tok->key == key) goto found;
|
||||
}
|
||||
return ndr_map_error(NDR_ERR_TOKEN);
|
||||
return NDR_ERR_TOKEN;
|
||||
found:
|
||||
*v = tok->value;
|
||||
if (_remove_tok) {
|
||||
DLIST_REMOVE((*list), tok);
|
||||
talloc_free(tok);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
retrieve a token from a ndr context
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_token_retrieve(struct ndr_token_list **list, const void *key, uint32_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_token_retrieve(struct ndr_token_list **list, const void *key, uint32_t *v)
|
||||
{
|
||||
return ndr_token_retrieve_cmp_fn(list, key, v, NULL, true);
|
||||
}
|
||||
@ -603,11 +605,11 @@ _PUBLIC_ NTSTATUS ndr_token_retrieve(struct ndr_token_list **list, const void *k
|
||||
*/
|
||||
_PUBLIC_ uint32_t ndr_token_peek(struct ndr_token_list **list, const void *key)
|
||||
{
|
||||
NTSTATUS status;
|
||||
enum ndr_err_code status;
|
||||
uint32_t v;
|
||||
|
||||
status = ndr_token_retrieve_cmp_fn(list, key, &v, NULL, false);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -617,7 +619,7 @@ _PUBLIC_ uint32_t ndr_token_peek(struct ndr_token_list **list, const void *key)
|
||||
/*
|
||||
pull an array size field and add it to the array_size_list token list
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_array_size(struct ndr_pull *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_array_size(struct ndr_pull *ndr, const void *p)
|
||||
{
|
||||
uint32_t size;
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &size));
|
||||
@ -635,7 +637,7 @@ _PUBLIC_ uint32_t ndr_get_array_size(struct ndr_pull *ndr, const void *p)
|
||||
/*
|
||||
check the stored array size field
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_check_array_size(struct ndr_pull *ndr, void *p, uint32_t size)
|
||||
_PUBLIC_ enum ndr_err_code ndr_check_array_size(struct ndr_pull *ndr, void *p, uint32_t size)
|
||||
{
|
||||
uint32_t stored;
|
||||
stored = ndr_token_peek(&ndr->array_size_list, p);
|
||||
@ -644,13 +646,13 @@ _PUBLIC_ NTSTATUS ndr_check_array_size(struct ndr_pull *ndr, void *p, uint32_t s
|
||||
"Bad array size - got %u expected %u\n",
|
||||
stored, size);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull an array length field and add it to the array_length_list token list
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_array_length(struct ndr_pull *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_array_length(struct ndr_pull *ndr, const void *p)
|
||||
{
|
||||
uint32_t length, offset;
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &offset));
|
||||
@ -673,7 +675,7 @@ _PUBLIC_ uint32_t ndr_get_array_length(struct ndr_pull *ndr, const void *p)
|
||||
/*
|
||||
check the stored array length field
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length)
|
||||
_PUBLIC_ enum ndr_err_code ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length)
|
||||
{
|
||||
uint32_t stored;
|
||||
stored = ndr_token_peek(&ndr->array_length_list, p);
|
||||
@ -682,23 +684,23 @@ _PUBLIC_ NTSTATUS ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t
|
||||
"Bad array length - got %u expected %u\n",
|
||||
stored, length);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
store a switch value
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_set_switch_value(struct ndr_push *ndr, const void *p, uint32_t val)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_set_switch_value(struct ndr_push *ndr, const void *p, uint32_t val)
|
||||
{
|
||||
return ndr_token_store(ndr, &ndr->switch_list, p, val);
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_pull_set_switch_value(struct ndr_pull *ndr, const void *p, uint32_t val)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_set_switch_value(struct ndr_pull *ndr, const void *p, uint32_t val)
|
||||
{
|
||||
return ndr_token_store(ndr, &ndr->switch_list, p, val);
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_print_set_switch_value(struct ndr_print *ndr, const void *p, uint32_t val)
|
||||
_PUBLIC_ enum ndr_err_code ndr_print_set_switch_value(struct ndr_print *ndr, const void *p, uint32_t val)
|
||||
{
|
||||
return ndr_token_store(ndr, &ndr->switch_list, p, val);
|
||||
}
|
||||
@ -724,58 +726,58 @@ _PUBLIC_ uint32_t ndr_print_get_switch_value(struct ndr_print *ndr, const void *
|
||||
/*
|
||||
pull a struct from a blob using NDR
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_struct_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_struct_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_pull *ndr;
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a struct from a blob using NDR - failing if all bytes are not consumed
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_pull *ndr;
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
if (ndr->offset < ndr->data_size) {
|
||||
return ndr_pull_error(ndr, NDR_ERR_UNREAD_BYTES,
|
||||
"not all bytes consumed ofs[%u] size[%u]",
|
||||
ndr->offset, ndr->data_size);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a union from a blob using NDR, given the union discriminator
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
uint32_t level, ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_pull *ndr;
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
NDR_CHECK(ndr_pull_set_switch_value(ndr, p, level));
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a union from a blob using NDR, given the union discriminator,
|
||||
failing if all bytes are not consumed
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
uint32_t level, ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_pull *ndr;
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx);
|
||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
NDR_CHECK(ndr_pull_set_switch_value(ndr, p, level));
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
if (ndr->offset < ndr->data_size) {
|
||||
@ -783,18 +785,18 @@ _PUBLIC_ NTSTATUS ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem
|
||||
"not all bytes consumed ofs[%u] size[%u]",
|
||||
ndr->offset, ndr->data_size);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a struct to a blob using NDR
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p,
|
||||
ndr_push_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_push *ndr;
|
||||
ndr = ndr_push_init_ctx(mem_ctx);
|
||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
|
||||
@ -802,18 +804,18 @@ _PUBLIC_ NTSTATUS ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, con
|
||||
talloc_steal(mem_ctx, blob->data);
|
||||
talloc_free(ndr);
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a union to a blob using NDR
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
uint32_t level, ndr_push_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_push *ndr;
|
||||
ndr = ndr_push_init_ctx(mem_ctx);
|
||||
NT_STATUS_HAVE_NO_MEMORY(ndr);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
|
||||
NDR_CHECK(ndr_push_set_switch_value(ndr, p, level));
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
@ -822,7 +824,7 @@ _PUBLIC_ NTSTATUS ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void
|
||||
talloc_steal(mem_ctx, blob->data);
|
||||
talloc_free(ndr);
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -831,7 +833,7 @@ _PUBLIC_ NTSTATUS ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void
|
||||
_PUBLIC_ size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t push)
|
||||
{
|
||||
struct ndr_push *ndr;
|
||||
NTSTATUS status;
|
||||
enum ndr_err_code status;
|
||||
size_t ret;
|
||||
|
||||
/* avoid recursion */
|
||||
@ -841,7 +843,7 @@ _PUBLIC_ size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t pu
|
||||
if (!ndr) return 0;
|
||||
ndr->flags |= flags | LIBNDR_FLAG_NO_NDR_SIZE;
|
||||
status = push(ndr, NDR_SCALARS|NDR_BUFFERS, discard_const(p));
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
|
||||
talloc_free(ndr);
|
||||
return 0;
|
||||
}
|
||||
@ -856,7 +858,7 @@ _PUBLIC_ size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t pu
|
||||
_PUBLIC_ size_t ndr_size_union(const void *p, int flags, uint32_t level, ndr_push_flags_fn_t push)
|
||||
{
|
||||
struct ndr_push *ndr;
|
||||
NTSTATUS status;
|
||||
enum ndr_err_code status;
|
||||
size_t ret;
|
||||
|
||||
/* avoid recursion */
|
||||
@ -867,12 +869,12 @@ _PUBLIC_ size_t ndr_size_union(const void *p, int flags, uint32_t level, ndr_pus
|
||||
ndr->flags |= flags | LIBNDR_FLAG_NO_NDR_SIZE;
|
||||
|
||||
status = ndr_push_set_switch_value(ndr, p, level);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
|
||||
talloc_free(ndr);
|
||||
return 0;
|
||||
}
|
||||
status = push(ndr, NDR_SCALARS|NDR_BUFFERS, p);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
|
||||
talloc_free(ndr);
|
||||
return 0;
|
||||
}
|
||||
@ -901,7 +903,7 @@ _PUBLIC_ void ndr_push_restore_relative_base_offset(struct ndr_push *ndr, uint32
|
||||
setup the current base for relative pointers for the push
|
||||
called in the NDR_SCALAR stage
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_setup_relative_base_offset1(struct ndr_push *ndr, const void *p, uint32_t offset)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_setup_relative_base_offset1(struct ndr_push *ndr, const void *p, uint32_t offset)
|
||||
{
|
||||
ndr->relative_base_offset = offset;
|
||||
return ndr_token_store(ndr, &ndr->relative_base_list, p, offset);
|
||||
@ -911,7 +913,7 @@ _PUBLIC_ NTSTATUS ndr_push_setup_relative_base_offset1(struct ndr_push *ndr, con
|
||||
setup the current base for relative pointers for the push
|
||||
called in the NDR_BUFFERS stage
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_setup_relative_base_offset2(struct ndr_push *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_setup_relative_base_offset2(struct ndr_push *ndr, const void *p)
|
||||
{
|
||||
return ndr_token_retrieve(&ndr->relative_base_list, p, &ndr->relative_base_offset);
|
||||
}
|
||||
@ -920,11 +922,11 @@ _PUBLIC_ NTSTATUS ndr_push_setup_relative_base_offset2(struct ndr_push *ndr, con
|
||||
push a relative object - stage1
|
||||
this is called during SCALARS processing
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p)
|
||||
{
|
||||
if (p == NULL) {
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
NDR_CHECK(ndr_push_align(ndr, 4));
|
||||
NDR_CHECK(ndr_token_store(ndr, &ndr->relative_list, p, ndr->offset));
|
||||
@ -935,12 +937,12 @@ _PUBLIC_ NTSTATUS ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p)
|
||||
push a relative object - stage2
|
||||
this is called during buffers processing
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p)
|
||||
{
|
||||
struct ndr_push_save save;
|
||||
uint32_t ptr_offset = 0xFFFFFFFF;
|
||||
if (p == NULL) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
ndr_push_save(ndr, &save);
|
||||
NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &ptr_offset));
|
||||
@ -957,7 +959,7 @@ _PUBLIC_ NTSTATUS ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p)
|
||||
}
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset - ndr->relative_base_offset));
|
||||
ndr_push_restore(ndr, &save);
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -980,7 +982,7 @@ _PUBLIC_ void ndr_pull_restore_relative_base_offset(struct ndr_pull *ndr, uint32
|
||||
setup the current base for relative pointers for the pull
|
||||
called in the NDR_SCALAR stage
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_setup_relative_base_offset1(struct ndr_pull *ndr, const void *p, uint32_t offset)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_setup_relative_base_offset1(struct ndr_pull *ndr, const void *p, uint32_t offset)
|
||||
{
|
||||
ndr->relative_base_offset = offset;
|
||||
return ndr_token_store(ndr, &ndr->relative_base_list, p, offset);
|
||||
@ -990,7 +992,7 @@ _PUBLIC_ NTSTATUS ndr_pull_setup_relative_base_offset1(struct ndr_pull *ndr, con
|
||||
setup the current base for relative pointers for the pull
|
||||
called in the NDR_BUFFERS stage
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_setup_relative_base_offset2(struct ndr_pull *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_setup_relative_base_offset2(struct ndr_pull *ndr, const void *p)
|
||||
{
|
||||
return ndr_token_retrieve(&ndr->relative_base_list, p, &ndr->relative_base_offset);
|
||||
}
|
||||
@ -999,7 +1001,7 @@ _PUBLIC_ NTSTATUS ndr_pull_setup_relative_base_offset2(struct ndr_pull *ndr, con
|
||||
pull a relative object - stage1
|
||||
called during SCALARS processing
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset)
|
||||
{
|
||||
rel_offset += ndr->relative_base_offset;
|
||||
if (rel_offset > ndr->data_size) {
|
||||
@ -1014,7 +1016,7 @@ _PUBLIC_ NTSTATUS ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, ui
|
||||
pull a relative object - stage2
|
||||
called during BUFFERS processing
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_relative_ptr2(struct ndr_pull *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code 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));
|
||||
|
||||
@ -58,126 +58,126 @@ _PUBLIC_ void ndr_check_padding(struct ndr_pull *ndr, size_t n)
|
||||
/*
|
||||
parse a int8_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_int8(struct ndr_pull *ndr, int ndr_flags, int8_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_int8(struct ndr_pull *ndr, int ndr_flags, int8_t *v)
|
||||
{
|
||||
NDR_PULL_NEED_BYTES(ndr, 1);
|
||||
*v = (int8_t)CVAL(ndr->data, ndr->offset);
|
||||
ndr->offset += 1;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a uint8_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *v)
|
||||
{
|
||||
NDR_PULL_NEED_BYTES(ndr, 1);
|
||||
*v = CVAL(ndr->data, ndr->offset);
|
||||
ndr->offset += 1;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a int16_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_int16(struct ndr_pull *ndr, int ndr_flags, int16_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_int16(struct ndr_pull *ndr, int ndr_flags, int16_t *v)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, 2);
|
||||
NDR_PULL_NEED_BYTES(ndr, 2);
|
||||
*v = (uint16_t)NDR_SVAL(ndr, ndr->offset);
|
||||
ndr->offset += 2;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a uint16_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_uint16(struct ndr_pull *ndr, int ndr_flags, uint16_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_uint16(struct ndr_pull *ndr, int ndr_flags, uint16_t *v)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, 2);
|
||||
NDR_PULL_NEED_BYTES(ndr, 2);
|
||||
*v = NDR_SVAL(ndr, ndr->offset);
|
||||
ndr->offset += 2;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a int32_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_int32(struct ndr_pull *ndr, int ndr_flags, int32_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_int32(struct ndr_pull *ndr, int ndr_flags, int32_t *v)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, 4);
|
||||
NDR_PULL_NEED_BYTES(ndr, 4);
|
||||
*v = NDR_IVALS(ndr, ndr->offset);
|
||||
ndr->offset += 4;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a uint32_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_uint32(struct ndr_pull *ndr, int ndr_flags, uint32_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_uint32(struct ndr_pull *ndr, int ndr_flags, uint32_t *v)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, 4);
|
||||
NDR_PULL_NEED_BYTES(ndr, 4);
|
||||
*v = NDR_IVAL(ndr, ndr->offset);
|
||||
ndr->offset += 4;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a pointer referent identifier
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v)
|
||||
{
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, v));
|
||||
if (*v != 0) {
|
||||
ndr->ptr_count++;
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a ref pointer referent identifier
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_ref_ptr(struct ndr_pull *ndr, uint32_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_ref_ptr(struct ndr_pull *ndr, uint32_t *v)
|
||||
{
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, v));
|
||||
/* ref pointers always point to data */
|
||||
*v = 1;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a udlong
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_udlong(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_udlong(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, 4);
|
||||
NDR_PULL_NEED_BYTES(ndr, 8);
|
||||
*v = NDR_IVAL(ndr, ndr->offset);
|
||||
*v |= (uint64_t)(NDR_IVAL(ndr, ndr->offset+4)) << 32;
|
||||
ndr->offset += 8;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a udlongr
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_udlongr(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_udlongr(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, 4);
|
||||
NDR_PULL_NEED_BYTES(ndr, 8);
|
||||
*v = ((uint64_t)NDR_IVAL(ndr, ndr->offset)) << 32;
|
||||
*v |= NDR_IVAL(ndr, ndr->offset+4);
|
||||
ndr->offset += 8;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
parse a dlong
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_dlong(struct ndr_pull *ndr, int ndr_flags, int64_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_dlong(struct ndr_pull *ndr, int ndr_flags, int64_t *v)
|
||||
{
|
||||
return ndr_pull_udlong(ndr, ndr_flags, (uint64_t *)v);
|
||||
}
|
||||
@ -185,7 +185,7 @@ _PUBLIC_ NTSTATUS ndr_pull_dlong(struct ndr_pull *ndr, int ndr_flags, int64_t *v
|
||||
/*
|
||||
parse a hyper
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_hyper(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_hyper(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, 8);
|
||||
return ndr_pull_udlong(ndr, ndr_flags, v);
|
||||
@ -194,7 +194,7 @@ _PUBLIC_ NTSTATUS ndr_pull_hyper(struct ndr_pull *ndr, int ndr_flags, uint64_t *
|
||||
/*
|
||||
parse a pointer
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_pointer(struct ndr_pull *ndr, int ndr_flags, void* *v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_pointer(struct ndr_pull *ndr, int ndr_flags, void* *v)
|
||||
{
|
||||
intptr_t h;
|
||||
NDR_PULL_ALIGN(ndr, sizeof(h));
|
||||
@ -202,24 +202,24 @@ _PUBLIC_ NTSTATUS ndr_pull_pointer(struct ndr_pull *ndr, int ndr_flags, void* *v
|
||||
memcpy(&h, ndr->data+ndr->offset, sizeof(h));
|
||||
ndr->offset += sizeof(h);
|
||||
*v = (void *)h;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a NTSTATUS
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_NTSTATUS(struct ndr_pull *ndr, int ndr_flags, NTSTATUS *status)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_NTSTATUS(struct ndr_pull *ndr, int ndr_flags, NTSTATUS *status)
|
||||
{
|
||||
uint32_t v;
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
|
||||
*status = NT_STATUS(v);
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a NTSTATUS
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_NTSTATUS(struct ndr_push *ndr, int ndr_flags, NTSTATUS status)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_NTSTATUS(struct ndr_push *ndr, int ndr_flags, NTSTATUS status)
|
||||
{
|
||||
return ndr_push_uint32(ndr, ndr_flags, NT_STATUS_V(status));
|
||||
}
|
||||
@ -232,18 +232,18 @@ _PUBLIC_ void ndr_print_NTSTATUS(struct ndr_print *ndr, const char *name, NTSTAT
|
||||
/*
|
||||
pull a WERROR
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_WERROR(struct ndr_pull *ndr, int ndr_flags, WERROR *status)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_WERROR(struct ndr_pull *ndr, int ndr_flags, WERROR *status)
|
||||
{
|
||||
uint32_t v;
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
|
||||
*status = W_ERROR(v);
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a WERROR
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_WERROR(struct ndr_push *ndr, int ndr_flags, WERROR status)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_WERROR(struct ndr_push *ndr, int ndr_flags, WERROR status)
|
||||
{
|
||||
return ndr_push_uint32(ndr, NDR_SCALARS, W_ERROR_V(status));
|
||||
}
|
||||
@ -256,21 +256,21 @@ _PUBLIC_ void ndr_print_WERROR(struct ndr_print *ndr, const char *name, WERROR r
|
||||
/*
|
||||
parse a set of bytes
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_bytes(struct ndr_pull *ndr, uint8_t *data, uint32_t n)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_bytes(struct ndr_pull *ndr, uint8_t *data, uint32_t n)
|
||||
{
|
||||
NDR_PULL_NEED_BYTES(ndr, n);
|
||||
memcpy(data, ndr->data + ndr->offset, n);
|
||||
ndr->offset += n;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull an array of uint8
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_array_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *data, uint32_t n)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_array_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *data, uint32_t n)
|
||||
{
|
||||
if (!(ndr_flags & NDR_SCALARS)) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
return ndr_pull_bytes(ndr, data, n);
|
||||
}
|
||||
@ -278,103 +278,103 @@ _PUBLIC_ NTSTATUS ndr_pull_array_uint8(struct ndr_pull *ndr, int ndr_flags, uint
|
||||
/*
|
||||
push a int8_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_int8(struct ndr_push *ndr, int ndr_flags, int8_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_int8(struct ndr_push *ndr, int ndr_flags, int8_t v)
|
||||
{
|
||||
NDR_PUSH_NEED_BYTES(ndr, 1);
|
||||
SCVAL(ndr->data, ndr->offset, (uint8_t)v);
|
||||
ndr->offset += 1;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a uint8_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_uint8(struct ndr_push *ndr, int ndr_flags, uint8_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_uint8(struct ndr_push *ndr, int ndr_flags, uint8_t v)
|
||||
{
|
||||
NDR_PUSH_NEED_BYTES(ndr, 1);
|
||||
SCVAL(ndr->data, ndr->offset, v);
|
||||
ndr->offset += 1;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a int16_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_int16(struct ndr_push *ndr, int ndr_flags, int16_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_int16(struct ndr_push *ndr, int ndr_flags, int16_t v)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, 2);
|
||||
NDR_PUSH_NEED_BYTES(ndr, 2);
|
||||
NDR_SSVAL(ndr, ndr->offset, (uint16_t)v);
|
||||
ndr->offset += 2;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a uint16_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_uint16(struct ndr_push *ndr, int ndr_flags, uint16_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_uint16(struct ndr_push *ndr, int ndr_flags, uint16_t v)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, 2);
|
||||
NDR_PUSH_NEED_BYTES(ndr, 2);
|
||||
NDR_SSVAL(ndr, ndr->offset, v);
|
||||
ndr->offset += 2;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a int32_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_int32(struct ndr_push *ndr, int ndr_flags, int32_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_int32(struct ndr_push *ndr, int ndr_flags, int32_t v)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, 4);
|
||||
NDR_PUSH_NEED_BYTES(ndr, 4);
|
||||
NDR_SIVALS(ndr, ndr->offset, v);
|
||||
ndr->offset += 4;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a uint32_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_uint32(struct ndr_push *ndr, int ndr_flags, uint32_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_uint32(struct ndr_push *ndr, int ndr_flags, uint32_t v)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, 4);
|
||||
NDR_PUSH_NEED_BYTES(ndr, 4);
|
||||
NDR_SIVAL(ndr, ndr->offset, v);
|
||||
ndr->offset += 4;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a udlong
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_udlong(struct ndr_push *ndr, int ndr_flags, uint64_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_udlong(struct ndr_push *ndr, int ndr_flags, uint64_t v)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, 4);
|
||||
NDR_PUSH_NEED_BYTES(ndr, 8);
|
||||
NDR_SIVAL(ndr, ndr->offset, (v & 0xFFFFFFFF));
|
||||
NDR_SIVAL(ndr, ndr->offset+4, (v>>32));
|
||||
ndr->offset += 8;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a udlongr
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_udlongr(struct ndr_push *ndr, int ndr_flags, uint64_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_udlongr(struct ndr_push *ndr, int ndr_flags, uint64_t v)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, 4);
|
||||
NDR_PUSH_NEED_BYTES(ndr, 8);
|
||||
NDR_SIVAL(ndr, ndr->offset, (v>>32));
|
||||
NDR_SIVAL(ndr, ndr->offset+4, (v & 0xFFFFFFFF));
|
||||
ndr->offset += 8;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a dlong
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_dlong(struct ndr_push *ndr, int ndr_flags, int64_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_dlong(struct ndr_push *ndr, int ndr_flags, int64_t v)
|
||||
{
|
||||
return ndr_push_udlong(ndr, NDR_SCALARS, (uint64_t)v);
|
||||
}
|
||||
@ -382,7 +382,7 @@ _PUBLIC_ NTSTATUS ndr_push_dlong(struct ndr_push *ndr, int ndr_flags, int64_t v)
|
||||
/*
|
||||
push a hyper
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_hyper(struct ndr_push *ndr, int ndr_flags, uint64_t v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_hyper(struct ndr_push *ndr, int ndr_flags, uint64_t v)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, 8);
|
||||
return ndr_push_udlong(ndr, NDR_SCALARS, v);
|
||||
@ -391,57 +391,57 @@ _PUBLIC_ NTSTATUS ndr_push_hyper(struct ndr_push *ndr, int ndr_flags, uint64_t v
|
||||
/*
|
||||
push a pointer
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_pointer(struct ndr_push *ndr, int ndr_flags, void* v)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_pointer(struct ndr_push *ndr, int ndr_flags, void* v)
|
||||
{
|
||||
intptr_t h = (intptr_t)v;
|
||||
NDR_PUSH_ALIGN(ndr, sizeof(h));
|
||||
NDR_PUSH_NEED_BYTES(ndr, sizeof(h));
|
||||
memcpy(ndr->data+ndr->offset, &h, sizeof(h));
|
||||
ndr->offset += sizeof(h);
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_push_align(struct ndr_push *ndr, size_t size)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_align(struct ndr_push *ndr, size_t size)
|
||||
{
|
||||
NDR_PUSH_ALIGN(ndr, size);
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_pull_align(struct ndr_pull *ndr, size_t size)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_align(struct ndr_pull *ndr, size_t size)
|
||||
{
|
||||
NDR_PULL_ALIGN(ndr, size);
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push some bytes
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_bytes(struct ndr_push *ndr, const uint8_t *data, uint32_t n)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_bytes(struct ndr_push *ndr, const uint8_t *data, uint32_t n)
|
||||
{
|
||||
NDR_PUSH_NEED_BYTES(ndr, n);
|
||||
memcpy(ndr->data + ndr->offset, data, n);
|
||||
ndr->offset += n;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push some zero bytes
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_zero(struct ndr_push *ndr, uint32_t n)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_zero(struct ndr_push *ndr, uint32_t n)
|
||||
{
|
||||
NDR_PUSH_NEED_BYTES(ndr, n);
|
||||
memset(ndr->data + ndr->offset, 0, n);
|
||||
ndr->offset += n;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push an array of uint8
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_array_uint8(struct ndr_push *ndr, int ndr_flags, const uint8_t *data, uint32_t n)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_flags, const uint8_t *data, uint32_t n)
|
||||
{
|
||||
if (!(ndr_flags & NDR_SCALARS)) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
return ndr_push_bytes(ndr, data, n);
|
||||
}
|
||||
@ -465,7 +465,7 @@ _PUBLIC_ void ndr_push_restore(struct ndr_push *ndr, struct ndr_push_save *save)
|
||||
/*
|
||||
push a unique non-zero value if a pointer is non-NULL, otherwise 0
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_unique_ptr(struct ndr_push *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_unique_ptr(struct ndr_push *ndr, const void *p)
|
||||
{
|
||||
uint32_t ptr = 0;
|
||||
if (p) {
|
||||
@ -479,7 +479,7 @@ _PUBLIC_ NTSTATUS ndr_push_unique_ptr(struct ndr_push *ndr, const void *p)
|
||||
/*
|
||||
push a 'simple' full non-zero value if a pointer is non-NULL, otherwise 0
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_full_ptr(struct ndr_push *ndr, const void *p)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_full_ptr(struct ndr_push *ndr, const void *p)
|
||||
{
|
||||
uint32_t ptr = 0;
|
||||
if (p) {
|
||||
@ -497,7 +497,7 @@ _PUBLIC_ NTSTATUS ndr_push_full_ptr(struct ndr_push *ndr, const void *p)
|
||||
/*
|
||||
push always a 0, if a pointer is NULL it's a fatal error
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_ref_ptr(struct ndr_push *ndr)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_ref_ptr(struct ndr_push *ndr)
|
||||
{
|
||||
return ndr_push_uint32(ndr, NDR_SCALARS, 0xAEF1AEF1);
|
||||
}
|
||||
@ -506,63 +506,63 @@ _PUBLIC_ NTSTATUS ndr_push_ref_ptr(struct ndr_push *ndr)
|
||||
/*
|
||||
push a NTTIME
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_NTTIME(struct ndr_push *ndr, int ndr_flags, NTTIME t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_NTTIME(struct ndr_push *ndr, int ndr_flags, NTTIME t)
|
||||
{
|
||||
NDR_CHECK(ndr_push_udlong(ndr, ndr_flags, t));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a NTTIME
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_NTTIME(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_NTTIME(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
|
||||
{
|
||||
NDR_CHECK(ndr_pull_udlong(ndr, ndr_flags, t));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a NTTIME
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_NTTIME_1sec(struct ndr_push *ndr, int ndr_flags, NTTIME t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_NTTIME_1sec(struct ndr_push *ndr, int ndr_flags, NTTIME t)
|
||||
{
|
||||
t /= 10000000;
|
||||
NDR_CHECK(ndr_push_hyper(ndr, ndr_flags, t));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a NTTIME_1sec
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
|
||||
{
|
||||
NDR_CHECK(ndr_pull_hyper(ndr, ndr_flags, t));
|
||||
(*t) *= 10000000;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a NTTIME_hyper
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_NTTIME_hyper(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_NTTIME_hyper(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
|
||||
{
|
||||
NDR_CHECK(ndr_pull_hyper(ndr, ndr_flags, t));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a NTTIME_hyper
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_NTTIME_hyper(struct ndr_push *ndr, int ndr_flags, NTTIME t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_NTTIME_hyper(struct ndr_push *ndr, int ndr_flags, NTTIME t)
|
||||
{
|
||||
NDR_CHECK(ndr_push_hyper(ndr, ndr_flags, t));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a time_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_time_t(struct ndr_push *ndr, int ndr_flags, time_t t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_time_t(struct ndr_push *ndr, int ndr_flags, time_t t)
|
||||
{
|
||||
return ndr_push_uint32(ndr, ndr_flags, t);
|
||||
}
|
||||
@ -570,32 +570,32 @@ _PUBLIC_ NTSTATUS ndr_push_time_t(struct ndr_push *ndr, int ndr_flags, time_t t)
|
||||
/*
|
||||
pull a time_t
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_time_t(struct ndr_pull *ndr, int ndr_flags, time_t *t)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_time_t(struct ndr_pull *ndr, int ndr_flags, time_t *t)
|
||||
{
|
||||
uint32_t tt;
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &tt));
|
||||
*t = tt;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
pull a ipv4address
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_ipv4address(struct ndr_pull *ndr, int ndr_flags, const char **address)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_ipv4address(struct ndr_pull *ndr, int ndr_flags, const char **address)
|
||||
{
|
||||
struct in_addr in;
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &in.s_addr));
|
||||
in.s_addr = htonl(in.s_addr);
|
||||
*address = talloc_strdup(ndr->current_mem_ctx, inet_ntoa(in));
|
||||
NT_STATUS_HAVE_NO_MEMORY(*address);
|
||||
return NT_STATUS_OK;
|
||||
NDR_ERR_HAVE_NO_MEMORY(*address);
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
push a ipv4address
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_ipv4address(struct ndr_push *ndr, int ndr_flags, const char *address)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_ipv4address(struct ndr_push *ndr, int ndr_flags, const char *address)
|
||||
{
|
||||
uint32_t addr;
|
||||
if (!is_ipaddress(address)) {
|
||||
@ -605,7 +605,7 @@ _PUBLIC_ NTSTATUS ndr_push_ipv4address(struct ndr_push *ndr, int ndr_flags, cons
|
||||
}
|
||||
addr = inet_addr(address);
|
||||
NDR_CHECK(ndr_push_uint32(ndr, ndr_flags, htonl(addr)));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -794,7 +794,7 @@ _PUBLIC_ void ndr_print_DATA_BLOB(struct ndr_print *ndr, const char *name, DATA_
|
||||
/*
|
||||
push a DATA_BLOB onto the wire.
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob)
|
||||
{
|
||||
if (ndr->flags & LIBNDR_ALIGN_FLAGS) {
|
||||
if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
|
||||
@ -810,13 +810,13 @@ _PUBLIC_ NTSTATUS ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_B
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, blob.length));
|
||||
}
|
||||
NDR_CHECK(ndr_push_bytes(ndr, blob.data, blob.length));
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
pull a DATA_BLOB from the wire.
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flags, DATA_BLOB *blob)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flags, DATA_BLOB *blob)
|
||||
{
|
||||
uint32_t length = 0;
|
||||
|
||||
@ -839,7 +839,7 @@ _PUBLIC_ NTSTATUS ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flags, DATA_B
|
||||
NDR_PULL_NEED_BYTES(ndr, length);
|
||||
*blob = data_blob_talloc(ndr->current_mem_ctx, ndr->data+ndr->offset, length);
|
||||
ndr->offset += length;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ uint32_t ndr_size_DATA_BLOB(int ret, const DATA_BLOB *data, int flags)
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
/**
|
||||
pull a general string from the wire
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
|
||||
{
|
||||
char *as=NULL;
|
||||
uint32_t len1, ofs, len2;
|
||||
@ -37,7 +37,7 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
|
||||
unsigned c_len_term = 0;
|
||||
|
||||
if (!(ndr_flags & NDR_SCALARS)) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
if (NDR_BE(ndr)) {
|
||||
@ -304,14 +304,14 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
|
||||
ndr->flags & LIBNDR_STRING_FLAGS);
|
||||
}
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
push a general string onto the wire
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
|
||||
{
|
||||
ssize_t s_len, c_len, d_len;
|
||||
int chset = CH_UTF16;
|
||||
@ -320,7 +320,7 @@ _PUBLIC_ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const cha
|
||||
uint8_t *dest = NULL;
|
||||
|
||||
if (!(ndr_flags & NDR_SCALARS)) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
if (NDR_BE(ndr)) {
|
||||
@ -420,7 +420,7 @@ _PUBLIC_ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const cha
|
||||
|
||||
talloc_free(dest);
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -478,7 +478,7 @@ _PUBLIC_ uint32_t ndr_size_string(int ret, const char * const* string, int flags
|
||||
/**
|
||||
pull a general string array from the wire
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, const char ***_a)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, const char ***_a)
|
||||
{
|
||||
const char **a = *_a;
|
||||
uint32_t count;
|
||||
@ -486,7 +486,7 @@ _PUBLIC_ NTSTATUS ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, con
|
||||
unsigned saved_flags = ndr->flags;
|
||||
|
||||
if (!(ndr_flags & NDR_SCALARS)) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
switch (flags & LIBNDR_STRING_FLAGS) {
|
||||
@ -499,7 +499,7 @@ _PUBLIC_ NTSTATUS ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, con
|
||||
TALLOC_CTX *tmp_ctx;
|
||||
const char *s = NULL;
|
||||
a = talloc_realloc(ndr->current_mem_ctx, a, const char *, count + 2);
|
||||
NT_STATUS_HAVE_NO_MEMORY(a);
|
||||
NDR_ERR_HAVE_NO_MEMORY(a);
|
||||
a[count] = NULL;
|
||||
a[count+1] = NULL;
|
||||
|
||||
@ -541,7 +541,7 @@ _PUBLIC_ NTSTATUS ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, con
|
||||
TALLOC_CTX *tmp_ctx;
|
||||
const char *s = NULL;
|
||||
a = talloc_realloc(ndr->current_mem_ctx, a, const char *, count + 2);
|
||||
NT_STATUS_HAVE_NO_MEMORY(a);
|
||||
NDR_ERR_HAVE_NO_MEMORY(a);
|
||||
a[count] = NULL;
|
||||
a[count+1] = NULL;
|
||||
|
||||
@ -561,20 +561,20 @@ _PUBLIC_ NTSTATUS ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, con
|
||||
}
|
||||
|
||||
ndr->flags = saved_flags;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
push a general string array onto the wire
|
||||
*/
|
||||
_PUBLIC_ NTSTATUS ndr_push_string_array(struct ndr_push *ndr, int ndr_flags, const char **a)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_string_array(struct ndr_push *ndr, int ndr_flags, const char **a)
|
||||
{
|
||||
uint32_t count;
|
||||
unsigned flags = ndr->flags;
|
||||
unsigned saved_flags = ndr->flags;
|
||||
|
||||
if (!(ndr_flags & NDR_SCALARS)) {
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
switch (flags & LIBNDR_STRING_FLAGS) {
|
||||
@ -610,7 +610,7 @@ _PUBLIC_ NTSTATUS ndr_push_string_array(struct ndr_push *ndr, int ndr_flags, con
|
||||
}
|
||||
|
||||
ndr->flags = saved_flags;
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ void ndr_print_string_array(struct ndr_print *ndr, const char *name, const char **a)
|
||||
@ -647,7 +647,7 @@ _PUBLIC_ uint32_t ndr_string_length(const void *_var, uint32_t element_size)
|
||||
return i+1;
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size)
|
||||
_PUBLIC_ enum ndr_err_code ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size)
|
||||
{
|
||||
uint32_t i;
|
||||
struct ndr_pull_save save_offset;
|
||||
@ -666,15 +666,15 @@ _PUBLIC_ NTSTATUS ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t cou
|
||||
|
||||
ndr_pull_restore(ndr, &save_offset);
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset)
|
||||
{
|
||||
int ret;
|
||||
if (length == 0) {
|
||||
*var = talloc_strdup(ndr->current_mem_ctx, "");
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
if (NDR_BE(ndr) && chset == CH_UTF16) {
|
||||
@ -694,10 +694,10 @@ _PUBLIC_ NTSTATUS ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const ch
|
||||
}
|
||||
NDR_CHECK(ndr_pull_advance(ndr, length*byte_mul));
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
_PUBLIC_ NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, charset_t chset)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, charset_t chset)
|
||||
{
|
||||
ssize_t ret, required;
|
||||
|
||||
@ -723,7 +723,7 @@ _PUBLIC_ NTSTATUS ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const ch
|
||||
|
||||
ndr->offset += required;
|
||||
|
||||
return NT_STATUS_OK;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/* Return number of elements in a string in the specified charset */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user