From ac3f08ddbe0b484375624db0e35999a8584b57f4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 21 May 2007 22:17:13 +0000 Subject: r23055: Rewrite messages.c to use auto-generated marshalling in the tdb. I'm doing this because for the clustering the marshalling is needed in more than one place, so I wanted a decent routine to marshall a message_rec struct which was not there before. Tridge, this seems about the same speed as it used to be before, the librpc/ndr overhead in my tests was under the noise. Volker (This used to be commit eaefd00563173dfabb7716c5695ac0a2f7139bb6) --- source3/librpc/gen_ndr/ndr_messaging.c | 115 +++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 source3/librpc/gen_ndr/ndr_messaging.c (limited to 'source3/librpc/gen_ndr/ndr_messaging.c') diff --git a/source3/librpc/gen_ndr/ndr_messaging.c b/source3/librpc/gen_ndr/ndr_messaging.c new file mode 100644 index 0000000000..21aec98a98 --- /dev/null +++ b/source3/librpc/gen_ndr/ndr_messaging.c @@ -0,0 +1,115 @@ +/* parser auto-generated by pidl */ + +#include "includes.h" +#include "librpc/gen_ndr/ndr_messaging.h" + +_PUBLIC_ NTSTATUS ndr_push_messaging_rec(struct ndr_push *ndr, int ndr_flags, const struct messaging_rec *r) +{ + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->msg_version)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->msg_type)); + NDR_CHECK(ndr_push_server_id(ndr, NDR_SCALARS, &r->dest)); + NDR_CHECK(ndr_push_server_id(ndr, NDR_SCALARS, &r->src)); + NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->buf)); + } + if (ndr_flags & NDR_BUFFERS) { + NDR_CHECK(ndr_push_server_id(ndr, NDR_BUFFERS, &r->dest)); + NDR_CHECK(ndr_push_server_id(ndr, NDR_BUFFERS, &r->src)); + } + return NT_STATUS_OK; +} + +_PUBLIC_ NTSTATUS ndr_pull_messaging_rec(struct ndr_pull *ndr, int ndr_flags, struct messaging_rec *r) +{ + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_align(ndr, 4)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->msg_version)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->msg_type)); + NDR_CHECK(ndr_pull_server_id(ndr, NDR_SCALARS, &r->dest)); + NDR_CHECK(ndr_pull_server_id(ndr, NDR_SCALARS, &r->src)); + NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->buf)); + } + if (ndr_flags & NDR_BUFFERS) { + NDR_CHECK(ndr_pull_server_id(ndr, NDR_BUFFERS, &r->dest)); + NDR_CHECK(ndr_pull_server_id(ndr, NDR_BUFFERS, &r->src)); + } + return NT_STATUS_OK; +} + +_PUBLIC_ void ndr_print_messaging_rec(struct ndr_print *ndr, const char *name, const struct messaging_rec *r) +{ + ndr_print_struct(ndr, name, "messaging_rec"); + ndr->depth++; + ndr_print_uint32(ndr, "msg_version", r->msg_version); + ndr_print_uint32(ndr, "msg_type", r->msg_type); + ndr_print_server_id(ndr, "dest", &r->dest); + ndr_print_server_id(ndr, "src", &r->src); + ndr_print_DATA_BLOB(ndr, "buf", r->buf); + ndr->depth--; +} + +_PUBLIC_ NTSTATUS ndr_push_messaging_array(struct ndr_push *ndr, int ndr_flags, const struct messaging_array *r) +{ + uint32_t cntr_messages_0; + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_messages)); + for (cntr_messages_0 = 0; cntr_messages_0 < r->num_messages; cntr_messages_0++) { + NDR_CHECK(ndr_push_messaging_rec(ndr, NDR_SCALARS, &r->messages[cntr_messages_0])); + } + } + if (ndr_flags & NDR_BUFFERS) { + for (cntr_messages_0 = 0; cntr_messages_0 < r->num_messages; cntr_messages_0++) { + NDR_CHECK(ndr_push_messaging_rec(ndr, NDR_BUFFERS, &r->messages[cntr_messages_0])); + } + } + return NT_STATUS_OK; +} + +_PUBLIC_ NTSTATUS ndr_pull_messaging_array(struct ndr_pull *ndr, int ndr_flags, struct messaging_array *r) +{ + uint32_t cntr_messages_0; + TALLOC_CTX *_mem_save_messages_0; + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_align(ndr, 4)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_messages)); + NDR_PULL_ALLOC_N(ndr, r->messages, r->num_messages); + _mem_save_messages_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->messages, 0); + for (cntr_messages_0 = 0; cntr_messages_0 < r->num_messages; cntr_messages_0++) { + NDR_CHECK(ndr_pull_messaging_rec(ndr, NDR_SCALARS, &r->messages[cntr_messages_0])); + } + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_messages_0, 0); + } + if (ndr_flags & NDR_BUFFERS) { + _mem_save_messages_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->messages, 0); + for (cntr_messages_0 = 0; cntr_messages_0 < r->num_messages; cntr_messages_0++) { + NDR_CHECK(ndr_pull_messaging_rec(ndr, NDR_BUFFERS, &r->messages[cntr_messages_0])); + } + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_messages_0, 0); + } + return NT_STATUS_OK; +} + +_PUBLIC_ void ndr_print_messaging_array(struct ndr_print *ndr, const char *name, const struct messaging_array *r) +{ + uint32_t cntr_messages_0; + ndr_print_struct(ndr, name, "messaging_array"); + ndr->depth++; + ndr_print_uint32(ndr, "num_messages", r->num_messages); + ndr->print(ndr, "%s: ARRAY(%d)", "messages", r->num_messages); + ndr->depth++; + for (cntr_messages_0=0;cntr_messages_0num_messages;cntr_messages_0++) { + char *idx_0=NULL; + asprintf(&idx_0, "[%d]", cntr_messages_0); + if (idx_0) { + ndr_print_messaging_rec(ndr, "messages", &r->messages[cntr_messages_0]); + free(idx_0); + } + } + ndr->depth--; + ndr->depth--; +} + -- cgit From 08ace73dbbcef5543bbaee9ba7ee16a0bd42a395 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 9 Nov 2007 14:38:47 +0100 Subject: rerun make idl metze (This used to be commit 53a636828d2ba01603401086f4a5f72f9b5ea214) --- source3/librpc/gen_ndr/ndr_messaging.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/librpc/gen_ndr/ndr_messaging.c') diff --git a/source3/librpc/gen_ndr/ndr_messaging.c b/source3/librpc/gen_ndr/ndr_messaging.c index 21aec98a98..413421f770 100644 --- a/source3/librpc/gen_ndr/ndr_messaging.c +++ b/source3/librpc/gen_ndr/ndr_messaging.c @@ -3,7 +3,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_messaging.h" -_PUBLIC_ NTSTATUS ndr_push_messaging_rec(struct ndr_push *ndr, int ndr_flags, const struct messaging_rec *r) +_PUBLIC_ enum ndr_err_code ndr_push_messaging_rec(struct ndr_push *ndr, int ndr_flags, const struct messaging_rec *r) { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); @@ -17,10 +17,10 @@ _PUBLIC_ NTSTATUS ndr_push_messaging_rec(struct ndr_push *ndr, int ndr_flags, co NDR_CHECK(ndr_push_server_id(ndr, NDR_BUFFERS, &r->dest)); NDR_CHECK(ndr_push_server_id(ndr, NDR_BUFFERS, &r->src)); } - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } -_PUBLIC_ NTSTATUS ndr_pull_messaging_rec(struct ndr_pull *ndr, int ndr_flags, struct messaging_rec *r) +_PUBLIC_ enum ndr_err_code ndr_pull_messaging_rec(struct ndr_pull *ndr, int ndr_flags, struct messaging_rec *r) { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); @@ -34,7 +34,7 @@ _PUBLIC_ NTSTATUS ndr_pull_messaging_rec(struct ndr_pull *ndr, int ndr_flags, st NDR_CHECK(ndr_pull_server_id(ndr, NDR_BUFFERS, &r->dest)); NDR_CHECK(ndr_pull_server_id(ndr, NDR_BUFFERS, &r->src)); } - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } _PUBLIC_ void ndr_print_messaging_rec(struct ndr_print *ndr, const char *name, const struct messaging_rec *r) @@ -49,7 +49,7 @@ _PUBLIC_ void ndr_print_messaging_rec(struct ndr_print *ndr, const char *name, c ndr->depth--; } -_PUBLIC_ NTSTATUS ndr_push_messaging_array(struct ndr_push *ndr, int ndr_flags, const struct messaging_array *r) +_PUBLIC_ enum ndr_err_code ndr_push_messaging_array(struct ndr_push *ndr, int ndr_flags, const struct messaging_array *r) { uint32_t cntr_messages_0; if (ndr_flags & NDR_SCALARS) { @@ -64,10 +64,10 @@ _PUBLIC_ NTSTATUS ndr_push_messaging_array(struct ndr_push *ndr, int ndr_flags, NDR_CHECK(ndr_push_messaging_rec(ndr, NDR_BUFFERS, &r->messages[cntr_messages_0])); } } - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } -_PUBLIC_ NTSTATUS ndr_pull_messaging_array(struct ndr_pull *ndr, int ndr_flags, struct messaging_array *r) +_PUBLIC_ enum ndr_err_code ndr_pull_messaging_array(struct ndr_pull *ndr, int ndr_flags, struct messaging_array *r) { uint32_t cntr_messages_0; TALLOC_CTX *_mem_save_messages_0; @@ -90,7 +90,7 @@ _PUBLIC_ NTSTATUS ndr_pull_messaging_array(struct ndr_pull *ndr, int ndr_flags, } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_messages_0, 0); } - return NT_STATUS_OK; + return NDR_ERR_SUCCESS; } _PUBLIC_ void ndr_print_messaging_array(struct ndr_print *ndr, const char *name, const struct messaging_array *r) -- cgit From 9712e3c11c69e2a40ea7c156dd3515dafed833ea Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 23 Feb 2008 10:54:59 +0100 Subject: make idl: Check return value of asprintf (This used to be commit d9fb7d7bdcd0e54838ff0b1cb64a7e75d8cd726a) --- source3/librpc/gen_ndr/ndr_messaging.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/librpc/gen_ndr/ndr_messaging.c') diff --git a/source3/librpc/gen_ndr/ndr_messaging.c b/source3/librpc/gen_ndr/ndr_messaging.c index 413421f770..db886316f1 100644 --- a/source3/librpc/gen_ndr/ndr_messaging.c +++ b/source3/librpc/gen_ndr/ndr_messaging.c @@ -103,8 +103,7 @@ _PUBLIC_ void ndr_print_messaging_array(struct ndr_print *ndr, const char *name, ndr->depth++; for (cntr_messages_0=0;cntr_messages_0num_messages;cntr_messages_0++) { char *idx_0=NULL; - asprintf(&idx_0, "[%d]", cntr_messages_0); - if (idx_0) { + if (asprintf(&idx_0, "[%d]", cntr_messages_0) != -1) { ndr_print_messaging_rec(ndr, "messages", &r->messages[cntr_messages_0]); free(idx_0); } -- cgit From d3eebed911becad9b97c78c10a53c9ca8ba066ec Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 31 Mar 2008 11:18:12 +0200 Subject: rerun 'make idl' metze (This used to be commit f34dad2b4ad97a845729ea0fb5beba7fd6cb7265) --- source3/librpc/gen_ndr/ndr_messaging.c | 81 ++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'source3/librpc/gen_ndr/ndr_messaging.c') diff --git a/source3/librpc/gen_ndr/ndr_messaging.c b/source3/librpc/gen_ndr/ndr_messaging.c index db886316f1..60cab9ae89 100644 --- a/source3/librpc/gen_ndr/ndr_messaging.c +++ b/source3/librpc/gen_ndr/ndr_messaging.c @@ -112,3 +112,84 @@ _PUBLIC_ void ndr_print_messaging_array(struct ndr_print *ndr, const char *name, ndr->depth--; } +_PUBLIC_ enum ndr_err_code ndr_push_dbwrap_tdb2_changes(struct ndr_push *ndr, int ndr_flags, const struct dbwrap_tdb2_changes *r) +{ + uint32_t cntr_keys_0; + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, "TDB2", 4, sizeof(uint8_t), CH_DOS)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 1)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8))); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->name, CH_UTF8))); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->name, ndr_charset_length(r->name, CH_UTF8), sizeof(uint8_t), CH_UTF8)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->old_seqnum)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->new_seqnum)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_changes)); + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_keys)); + for (cntr_keys_0 = 0; cntr_keys_0 < r->num_keys; cntr_keys_0++) { + NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->keys[cntr_keys_0])); + } + } + if (ndr_flags & NDR_BUFFERS) { + } + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ enum ndr_err_code ndr_pull_dbwrap_tdb2_changes(struct ndr_pull *ndr, int ndr_flags, struct dbwrap_tdb2_changes *r) +{ + uint32_t cntr_keys_0; + TALLOC_CTX *_mem_save_keys_0; + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_align(ndr, 4)); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->magic_string, 4, sizeof(uint8_t), CH_DOS)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->magic_version)); + NDR_CHECK(ndr_pull_array_size(ndr, &r->name)); + NDR_CHECK(ndr_pull_array_length(ndr, &r->name)); + if (ndr_get_array_length(ndr, &r->name) > ndr_get_array_size(ndr, &r->name)) { + return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->name), ndr_get_array_length(ndr, &r->name)); + } + NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t))); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->name, ndr_get_array_length(ndr, &r->name), sizeof(uint8_t), CH_UTF8)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->old_seqnum)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->new_seqnum)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_changes)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_keys)); + NDR_PULL_ALLOC_N(ndr, r->keys, r->num_keys); + _mem_save_keys_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->keys, 0); + for (cntr_keys_0 = 0; cntr_keys_0 < r->num_keys; cntr_keys_0++) { + NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->keys[cntr_keys_0])); + } + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_keys_0, 0); + } + if (ndr_flags & NDR_BUFFERS) { + } + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ void ndr_print_dbwrap_tdb2_changes(struct ndr_print *ndr, const char *name, const struct dbwrap_tdb2_changes *r) +{ + uint32_t cntr_keys_0; + ndr_print_struct(ndr, name, "dbwrap_tdb2_changes"); + ndr->depth++; + ndr_print_string(ndr, "magic_string", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?"TDB2":r->magic_string); + ndr_print_uint32(ndr, "magic_version", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?1:r->magic_version); + ndr_print_string(ndr, "name", r->name); + ndr_print_uint32(ndr, "old_seqnum", r->old_seqnum); + ndr_print_uint32(ndr, "new_seqnum", r->new_seqnum); + ndr_print_uint32(ndr, "num_changes", r->num_changes); + ndr_print_uint32(ndr, "num_keys", r->num_keys); + ndr->print(ndr, "%s: ARRAY(%d)", "keys", r->num_keys); + ndr->depth++; + for (cntr_keys_0=0;cntr_keys_0num_keys;cntr_keys_0++) { + char *idx_0=NULL; + if (asprintf(&idx_0, "[%d]", cntr_keys_0) != -1) { + ndr_print_DATA_BLOB(ndr, "keys", r->keys[cntr_keys_0]); + free(idx_0); + } + } + ndr->depth--; + ndr->depth--; +} + -- cgit From 16a9020029f809707b38d12960db12abbd2ef1be Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 22 Jul 2008 11:54:54 +0200 Subject: re-run make idl after Jelmer's "poperly cast array lengths" pidl change. (f321240fa91fa19c1131f119c42f64897d220682) Michael (This used to be commit 962c2670b10addf81a242d8cb381cc010e036b8e) --- source3/librpc/gen_ndr/ndr_messaging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/librpc/gen_ndr/ndr_messaging.c') diff --git a/source3/librpc/gen_ndr/ndr_messaging.c b/source3/librpc/gen_ndr/ndr_messaging.c index 60cab9ae89..6251c18ba3 100644 --- a/source3/librpc/gen_ndr/ndr_messaging.c +++ b/source3/librpc/gen_ndr/ndr_messaging.c @@ -99,7 +99,7 @@ _PUBLIC_ void ndr_print_messaging_array(struct ndr_print *ndr, const char *name, ndr_print_struct(ndr, name, "messaging_array"); ndr->depth++; ndr_print_uint32(ndr, "num_messages", r->num_messages); - ndr->print(ndr, "%s: ARRAY(%d)", "messages", r->num_messages); + ndr->print(ndr, "%s: ARRAY(%d)", "messages", (int)r->num_messages); ndr->depth++; for (cntr_messages_0=0;cntr_messages_0num_messages;cntr_messages_0++) { char *idx_0=NULL; @@ -180,7 +180,7 @@ _PUBLIC_ void ndr_print_dbwrap_tdb2_changes(struct ndr_print *ndr, const char *n ndr_print_uint32(ndr, "new_seqnum", r->new_seqnum); ndr_print_uint32(ndr, "num_changes", r->num_changes); ndr_print_uint32(ndr, "num_keys", r->num_keys); - ndr->print(ndr, "%s: ARRAY(%d)", "keys", r->num_keys); + ndr->print(ndr, "%s: ARRAY(%d)", "keys", (int)r->num_keys); ndr->depth++; for (cntr_keys_0=0;cntr_keys_0num_keys;cntr_keys_0++) { char *idx_0=NULL; -- cgit From 3f41545b61723f076c41e446cfec90fd08bd16ae Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 4 Sep 2008 15:13:22 +0200 Subject: messaging: move types to IDL. Guenther (This used to be commit 6c346d0eb20af5ba9b09f30319420f7c91480da6) --- source3/librpc/gen_ndr/ndr_messaging.c | 81 ++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) (limited to 'source3/librpc/gen_ndr/ndr_messaging.c') diff --git a/source3/librpc/gen_ndr/ndr_messaging.c b/source3/librpc/gen_ndr/ndr_messaging.c index 6251c18ba3..e1e95eef4e 100644 --- a/source3/librpc/gen_ndr/ndr_messaging.c +++ b/source3/librpc/gen_ndr/ndr_messaging.c @@ -3,12 +3,87 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_messaging.h" +_PUBLIC_ enum ndr_err_code ndr_push_messaging_type(struct ndr_push *ndr, int ndr_flags, enum messaging_type r) +{ + NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r)); + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ enum ndr_err_code ndr_pull_messaging_type(struct ndr_pull *ndr, int ndr_flags, enum messaging_type *r) +{ + uint32_t v; + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v)); + *r = v; + return NDR_ERR_SUCCESS; +} + +_PUBLIC_ void ndr_print_messaging_type(struct ndr_print *ndr, const char *name, enum messaging_type r) +{ + const char *val = NULL; + + switch (r) { + case MSG_DEBUG: val = "MSG_DEBUG"; break; + case MSG_PING: val = "MSG_PING"; break; + case MSG_PONG: val = "MSG_PONG"; break; + case MSG_PROFILE: val = "MSG_PROFILE"; break; + case MSG_REQ_DEBUGLEVEL: val = "MSG_REQ_DEBUGLEVEL"; break; + case MSG_DEBUGLEVEL: val = "MSG_DEBUGLEVEL"; break; + case MSG_REQ_PROFILELEVEL: val = "MSG_REQ_PROFILELEVEL"; break; + case MSG_PROFILELEVEL: val = "MSG_PROFILELEVEL"; break; + case MSG_REQ_POOL_USAGE: val = "MSG_REQ_POOL_USAGE"; break; + case MSG_POOL_USAGE: val = "MSG_POOL_USAGE"; break; + case MSG_REQ_DMALLOC_MARK: val = "MSG_REQ_DMALLOC_MARK"; break; + case MSG_REQ_DMALLOC_LOG_CHANGED: val = "MSG_REQ_DMALLOC_LOG_CHANGED"; break; + case MSG_SHUTDOWN: val = "MSG_SHUTDOWN"; break; + case MSG_FORCE_ELECTION: val = "MSG_FORCE_ELECTION"; break; + case MSG_WINS_NEW_ENTRY: val = "MSG_WINS_NEW_ENTRY"; break; + case MSG_SEND_PACKET: val = "MSG_SEND_PACKET"; break; + case MSG_PRINTER_NOTIFY: val = "MSG_PRINTER_NOTIFY"; break; + case MSG_PRINTER_NOTIFY2: val = "MSG_PRINTER_NOTIFY2"; break; + case MSG_PRINTER_DRVUPGRADE: val = "MSG_PRINTER_DRVUPGRADE"; break; + case MSG_PRINTERDATA_INIT_RESET: val = "MSG_PRINTERDATA_INIT_RESET"; break; + case MSG_PRINTER_UPDATE: val = "MSG_PRINTER_UPDATE"; break; + case MSG_PRINTER_MOD: val = "MSG_PRINTER_MOD"; break; + case MSG_SMB_CONF_UPDATED: val = "MSG_SMB_CONF_UPDATED"; break; + case MSG_SMB_FORCE_TDIS: val = "MSG_SMB_FORCE_TDIS"; break; + case MSG_SMB_SAM_SYNC: val = "MSG_SMB_SAM_SYNC"; break; + case MSG_SMB_SAM_REPL: val = "MSG_SMB_SAM_REPL"; break; + case MSG_SMB_UNLOCK: val = "MSG_SMB_UNLOCK"; break; + case MSG_SMB_BREAK_REQUEST: val = "MSG_SMB_BREAK_REQUEST"; break; + case MSG_SMB_BREAK_RESPONSE: val = "MSG_SMB_BREAK_RESPONSE"; break; + case MSG_SMB_ASYNC_LEVEL2_BREAK: val = "MSG_SMB_ASYNC_LEVEL2_BREAK"; break; + case MSG_SMB_OPEN_RETRY: val = "MSG_SMB_OPEN_RETRY"; break; + case MSG_SMB_KERNEL_BREAK: val = "MSG_SMB_KERNEL_BREAK"; break; + case MSG_SMB_FILE_RENAME: val = "MSG_SMB_FILE_RENAME"; break; + case MSG_SMB_INJECT_FAULT: val = "MSG_SMB_INJECT_FAULT"; break; + case MSG_SMB_BLOCKING_LOCK_CANCEL: val = "MSG_SMB_BLOCKING_LOCK_CANCEL"; break; + case MSG_SMB_NOTIFY: val = "MSG_SMB_NOTIFY"; break; + case MSG_SMB_STAT_CACHE_DELETE: val = "MSG_SMB_STAT_CACHE_DELETE"; break; + case MSG_PVFS_NOTIFY: val = "MSG_PVFS_NOTIFY"; break; + case MSG_SMB_BRL_VALIDATE: val = "MSG_SMB_BRL_VALIDATE"; break; + case MSG_SMB_RELEASE_IP: val = "MSG_SMB_RELEASE_IP"; break; + case MSG_SMB_CLOSE_FILE: val = "MSG_SMB_CLOSE_FILE"; break; + case MSG_WINBIND_FINISHED: val = "MSG_WINBIND_FINISHED"; break; + case MSG_WINBIND_FORGET_STATE: val = "MSG_WINBIND_FORGET_STATE"; break; + case MSG_WINBIND_ONLINE: val = "MSG_WINBIND_ONLINE"; break; + case MSG_WINBIND_OFFLINE: val = "MSG_WINBIND_OFFLINE"; break; + case MSG_WINBIND_ONLINESTATUS: val = "MSG_WINBIND_ONLINESTATUS"; break; + case MSG_WINBIND_TRY_TO_GO_ONLINE: val = "MSG_WINBIND_TRY_TO_GO_ONLINE"; break; + case MSG_WINBIND_FAILED_TO_GO_ONLINE: val = "MSG_WINBIND_FAILED_TO_GO_ONLINE"; break; + case MSG_WINBIND_VALIDATE_CACHE: val = "MSG_WINBIND_VALIDATE_CACHE"; break; + case MSG_WINBIND_DUMP_DOMAIN_LIST: val = "MSG_WINBIND_DUMP_DOMAIN_LIST"; break; + case MSG_DUMP_EVENT_LIST: val = "MSG_DUMP_EVENT_LIST"; break; + case MSG_DBWRAP_TDB2_CHANGES: val = "MSG_DBWRAP_TDB2_CHANGES"; break; + } + ndr_print_enum(ndr, name, "ENUM", val, r); +} + _PUBLIC_ enum ndr_err_code ndr_push_messaging_rec(struct ndr_push *ndr, int ndr_flags, const struct messaging_rec *r) { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->msg_version)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->msg_type)); + NDR_CHECK(ndr_push_messaging_type(ndr, NDR_SCALARS, r->msg_type)); NDR_CHECK(ndr_push_server_id(ndr, NDR_SCALARS, &r->dest)); NDR_CHECK(ndr_push_server_id(ndr, NDR_SCALARS, &r->src)); NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->buf)); @@ -25,7 +100,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_messaging_rec(struct ndr_pull *ndr, int ndr_ if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->msg_version)); - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->msg_type)); + NDR_CHECK(ndr_pull_messaging_type(ndr, NDR_SCALARS, &r->msg_type)); NDR_CHECK(ndr_pull_server_id(ndr, NDR_SCALARS, &r->dest)); NDR_CHECK(ndr_pull_server_id(ndr, NDR_SCALARS, &r->src)); NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->buf)); @@ -42,7 +117,7 @@ _PUBLIC_ void ndr_print_messaging_rec(struct ndr_print *ndr, const char *name, c ndr_print_struct(ndr, name, "messaging_rec"); ndr->depth++; ndr_print_uint32(ndr, "msg_version", r->msg_version); - ndr_print_uint32(ndr, "msg_type", r->msg_type); + ndr_print_messaging_type(ndr, "msg_type", r->msg_type); ndr_print_server_id(ndr, "dest", &r->dest); ndr_print_server_id(ndr, "src", &r->src); ndr_print_DATA_BLOB(ndr, "buf", r->buf); -- cgit