From e5db7fee0f5cb3bd7434cdefebabc7a8376aa0d4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 15 Sep 2006 22:49:27 +0000 Subject: r18572: Use the autogenerated client and server for the echo interface and implement some of the missing functions. RPC-ECHO now passes against Samba3. (This used to be commit 9e9a05366176454cc1779acc6c2b6070743f5939) --- source3/librpc/gen_ndr/cli_echo.c | 203 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 source3/librpc/gen_ndr/cli_echo.c (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c new file mode 100644 index 0000000000..8632077055 --- /dev/null +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -0,0 +1,203 @@ +/* + * Unix SMB/CIFS implementation. + * client auto-generated by pidl. DO NOT MODIFY! + */ + +#include "includes.h" +#include "librpc/gen_ndr/cli_echo.h" + +NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t in_data, uint32_t *out_data) +{ + struct echo_AddOne r; + NTSTATUS status; + + /* In parameters */ + r.in.in_data = in_data; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ADDONE, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_AddOne, (ndr_push_flags_fn_t)ndr_push_echo_AddOne); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *out_data = *r.out.out_data; + + /* Return result */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *in_data, uint8_t *out_data) +{ + struct echo_EchoData r; + NTSTATUS status; + + /* In parameters */ + r.in.len = len; + r.in.in_data = in_data; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ECHODATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_EchoData, (ndr_push_flags_fn_t)ndr_push_echo_EchoData); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *out_data = *r.out.out_data; + + /* Return result */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data) +{ + struct echo_SinkData r; + NTSTATUS status; + + /* In parameters */ + r.in.len = len; + r.in.data = data; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SINKDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SinkData, (ndr_push_flags_fn_t)ndr_push_echo_SinkData); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + + /* Return result */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data) +{ + struct echo_SourceData r; + NTSTATUS status; + + /* In parameters */ + r.in.len = len; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SOURCEDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SourceData, (ndr_push_flags_fn_t)ndr_push_echo_SourceData); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *data = *r.out.data; + + /* Return result */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *s1, const char **s2) +{ + struct echo_TestCall r; + NTSTATUS status; + + /* In parameters */ + r.in.s1 = s1; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall, (ndr_push_flags_fn_t)ndr_push_echo_TestCall); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *s2 = *r.out.s2; + + /* Return result */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t level, union echo_Info *info) +{ + struct echo_TestCall2 r; + NTSTATUS status; + + /* In parameters */ + r.in.level = level; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL2, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall2, (ndr_push_flags_fn_t)ndr_push_echo_TestCall2); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *info = *r.out.info; + + /* Return result */ + return r.out.result; +} + +NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t seconds) +{ + struct echo_TestSleep r; + NTSTATUS status; + + /* In parameters */ + r.in.seconds = seconds; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSLEEP, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSleep, (ndr_push_flags_fn_t)ndr_push_echo_TestSleep); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + + /* Return result */ + /* Sorry, don't know how to convert uint32 to NTSTATUS */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, enum echo_Enum1 *foo1, struct echo_Enum2 *foo2, union echo_Enum3 *foo3) +{ + struct echo_TestEnum r; + NTSTATUS status; + + /* In parameters */ + r.in.foo1 = foo1; + r.in.foo2 = foo2; + r.in.foo3 = foo3; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTENUM, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestEnum, (ndr_push_flags_fn_t)ndr_push_echo_TestEnum); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *foo1 = *r.out.foo1; + *foo2 = *r.out.foo2; + *foo3 = *r.out.foo3; + + /* Return result */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct echo_Surrounding *data) +{ + struct echo_TestSurrounding r; + NTSTATUS status; + + /* In parameters */ + r.in.data = data; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSURROUNDING, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSurrounding, (ndr_push_flags_fn_t)ndr_push_echo_TestSurrounding); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + *data = *r.out.data; + + /* Return result */ + return NT_STATUS_OK; +} + +NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t ***data) +{ + struct echo_TestDoublePointer r; + NTSTATUS status; + + /* In parameters */ + r.in.data = data; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTDOUBLEPOINTER, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestDoublePointer, (ndr_push_flags_fn_t)ndr_push_echo_TestDoublePointer); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + + /* Return variables */ + + /* Return result */ + /* Sorry, don't know how to convert uint16 to NTSTATUS */ + return NT_STATUS_OK; +} + -- cgit From e3068ef054b6c500e9d9be16ffebda5cb2402f3a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 19 Sep 2006 22:39:15 +0000 Subject: r18692: Dump debug data when DEBUGLEVEL >= 10 (This used to be commit 503d1a27d5838718355fdd37968c3670f53b1cd7) --- source3/librpc/gen_ndr/cli_echo.c | 80 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index 8632077055..9cfe744e76 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -13,7 +13,15 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui /* In parameters */ r.in.in_data = in_data; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_AddOne, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ADDONE, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_AddOne, (ndr_push_flags_fn_t)ndr_push_echo_AddOne); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_AddOne, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -33,7 +41,15 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.len = len; r.in.in_data = in_data; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_EchoData, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ECHODATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_EchoData, (ndr_push_flags_fn_t)ndr_push_echo_EchoData); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_EchoData, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -53,7 +69,15 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.len = len; r.in.data = data; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_SinkData, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SINKDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SinkData, (ndr_push_flags_fn_t)ndr_push_echo_SinkData); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_SinkData, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -71,7 +95,15 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx /* In parameters */ r.in.len = len; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_SourceData, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SOURCEDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SourceData, (ndr_push_flags_fn_t)ndr_push_echo_SourceData); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_SourceData, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -90,7 +122,15 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.s1 = s1; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_TestCall, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall, (ndr_push_flags_fn_t)ndr_push_echo_TestCall); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_TestCall, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -109,7 +149,15 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.level = level; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_TestCall2, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL2, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall2, (ndr_push_flags_fn_t)ndr_push_echo_TestCall2); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_TestCall2, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -128,7 +176,15 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.seconds = seconds; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_TestSleep, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSLEEP, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSleep, (ndr_push_flags_fn_t)ndr_push_echo_TestSleep); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_TestSleep, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -149,7 +205,15 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, r.in.foo1 = foo1; r.in.foo2 = foo2; r.in.foo3 = foo3; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_TestEnum, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTENUM, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestEnum, (ndr_push_flags_fn_t)ndr_push_echo_TestEnum); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_TestEnum, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -170,7 +234,15 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me /* In parameters */ r.in.data = data; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_TestSurrounding, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSURROUNDING, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSurrounding, (ndr_push_flags_fn_t)ndr_push_echo_TestSurrounding); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_TestSurrounding, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } @@ -189,7 +261,15 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * /* In parameters */ r.in.data = data; + + if (DEBUGLEVEL >= 10) + NDR_PRINT_IN_DEBUG(echo_TestDoublePointer, &r); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTDOUBLEPOINTER, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestDoublePointer, (ndr_push_flags_fn_t)ndr_push_echo_TestDoublePointer); + + if (DEBUGLEVEL >= 10) + NDR_PRINT_OUT_DEBUG(echo_TestDoublePointer, &r); + if (NT_STATUS_IS_ERR(status)) { return status; } -- cgit From 18d417663395febe60b23f376b2e92c9869e1126 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 28 Sep 2006 21:19:08 +0000 Subject: r18981: * cleanup some vestiges of old cli_reg.c code and mark some TODO items in cac_winreg.c * Get 'net rpc registry enumerate' to list values again * Fix winreg.idl QueryInfoKey(). The max_subkeysize is the max_classlen (we previously had this correct in Samba3") * fix valgrind error about uninitialized memory and use-before-set on size value inmemset() call * Fix key enumeration in 'net rpc registry enumerate' * regenerate gen_dir files based on local pidl patches Please note that the generated ndr files are from my local copy of pidl. If you need to regenerate, please apply the patch that I posted to the samba-technical list earlier today. (This used to be commit 5d843612a1b9d92022f76626f1c7473faebec4ba) --- source3/librpc/gen_ndr/cli_echo.c | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index 9cfe744e76..c393de477c 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -19,6 +19,10 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ADDONE, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_AddOne, (ndr_push_flags_fn_t)ndr_push_echo_AddOne); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_AddOne, &r); @@ -47,6 +51,10 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ECHODATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_EchoData, (ndr_push_flags_fn_t)ndr_push_echo_EchoData); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_EchoData, &r); @@ -75,6 +83,10 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SINKDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SinkData, (ndr_push_flags_fn_t)ndr_push_echo_SinkData); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_SinkData, &r); @@ -101,6 +113,10 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SOURCEDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SourceData, (ndr_push_flags_fn_t)ndr_push_echo_SourceData); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_SourceData, &r); @@ -128,6 +144,10 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall, (ndr_push_flags_fn_t)ndr_push_echo_TestCall); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestCall, &r); @@ -155,6 +175,10 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL2, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall2, (ndr_push_flags_fn_t)ndr_push_echo_TestCall2); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestCall2, &r); @@ -182,6 +206,10 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSLEEP, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSleep, (ndr_push_flags_fn_t)ndr_push_echo_TestSleep); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestSleep, &r); @@ -211,6 +239,10 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTENUM, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestEnum, (ndr_push_flags_fn_t)ndr_push_echo_TestEnum); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestEnum, &r); @@ -240,6 +272,10 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSURROUNDING, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSurrounding, (ndr_push_flags_fn_t)ndr_push_echo_TestSurrounding); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestSurrounding, &r); @@ -267,6 +303,10 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTDOUBLEPOINTER, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestDoublePointer, (ndr_push_flags_fn_t)ndr_push_echo_TestDoublePointer); + if ( !NT_STATUS_IS_OK(status) ) { + return status; + } + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestDoublePointer, &r); -- cgit From 01367cdfd03d2412904c57807e1ff3c62696d05f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 19 Nov 2006 18:57:52 +0000 Subject: r19797: Convert the remaining pipes to the "new" unique out ptr handling (This used to be commit bc4e0a388a2859d2ddcfb8f07920f3b121a37894) --- source3/librpc/gen_ndr/cli_echo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index c393de477c..5b6be275b8 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -37,7 +37,7 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui return NT_STATUS_OK; } -NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *in_data, uint8_t *out_data) +NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *in_data, uint8_t **out_data) { struct echo_EchoData r; NTSTATUS status; @@ -63,7 +63,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, } /* Return variables */ - *out_data = *r.out.out_data; + *out_data = r.out.out_data; /* Return result */ return NT_STATUS_OK; @@ -100,7 +100,7 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data) +NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t **data) { struct echo_SourceData r; NTSTATUS status; @@ -125,7 +125,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx } /* Return variables */ - *data = *r.out.data; + *data = r.out.data; /* Return result */ return NT_STATUS_OK; -- cgit From 62e11c4f1748d98f479110c8c0e656a8f65dca4d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Jan 2007 15:42:03 +0000 Subject: r20832: Remove extra pointers previously added to unique [out] pointers. Instead, add [ref] pointers where necessary (top-level [ref] pointers, by spec, don't appear on the wire). This brings us closer to the DCE/RPC standard again. (This used to be commit 580f2a7197b1bc9db14a643fdd112b40ef37aaef) --- source3/librpc/gen_ndr/cli_echo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index 5b6be275b8..c393de477c 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -37,7 +37,7 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui return NT_STATUS_OK; } -NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *in_data, uint8_t **out_data) +NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *in_data, uint8_t *out_data) { struct echo_EchoData r; NTSTATUS status; @@ -63,7 +63,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, } /* Return variables */ - *out_data = r.out.out_data; + *out_data = *r.out.out_data; /* Return result */ return NT_STATUS_OK; @@ -100,7 +100,7 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t **data) +NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data) { struct echo_SourceData r; NTSTATUS status; @@ -125,7 +125,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx } /* Return variables */ - *data = r.out.data; + *data = *r.out.data; /* Return result */ return NT_STATUS_OK; -- cgit From 4003edf0df14b69fca0d1af923badbd682c0008c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 16 Feb 2007 14:50:57 +0000 Subject: r21385: Regenerate IDL after pidl changes, sync winreg.idl from samba4. (This used to be commit b84370513fbf790e599c33f177fb271a2a992b72) --- source3/librpc/gen_ndr/cli_echo.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index c393de477c..ee7e0f6114 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -19,7 +19,7 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ADDONE, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_AddOne, (ndr_push_flags_fn_t)ndr_push_echo_AddOne); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -51,7 +51,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ECHODATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_EchoData, (ndr_push_flags_fn_t)ndr_push_echo_EchoData); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -63,7 +63,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, } /* Return variables */ - *out_data = *r.out.out_data; + memcpy(out_data, r.out.out_data, r.in.len); /* Return result */ return NT_STATUS_OK; @@ -83,7 +83,7 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SINKDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SinkData, (ndr_push_flags_fn_t)ndr_push_echo_SinkData); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -113,7 +113,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SOURCEDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SourceData, (ndr_push_flags_fn_t)ndr_push_echo_SourceData); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -125,7 +125,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx } /* Return variables */ - *data = *r.out.data; + memcpy(data, r.out.data, r.in.len); /* Return result */ return NT_STATUS_OK; @@ -144,7 +144,7 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall, (ndr_push_flags_fn_t)ndr_push_echo_TestCall); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -175,7 +175,7 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL2, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall2, (ndr_push_flags_fn_t)ndr_push_echo_TestCall2); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -206,7 +206,7 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSLEEP, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSleep, (ndr_push_flags_fn_t)ndr_push_echo_TestSleep); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -220,7 +220,6 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* Return variables */ /* Return result */ - /* Sorry, don't know how to convert uint32 to NTSTATUS */ return NT_STATUS_OK; } @@ -239,7 +238,7 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTENUM, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestEnum, (ndr_push_flags_fn_t)ndr_push_echo_TestEnum); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -272,7 +271,7 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSURROUNDING, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSurrounding, (ndr_push_flags_fn_t)ndr_push_echo_TestSurrounding); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -303,7 +302,7 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTDOUBLEPOINTER, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestDoublePointer, (ndr_push_flags_fn_t)ndr_push_echo_TestDoublePointer); - if ( !NT_STATUS_IS_OK(status) ) { + if (!NT_STATUS_IS_OK(status)) { return status; } @@ -317,7 +316,6 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * /* Return variables */ /* Return result */ - /* Sorry, don't know how to convert uint16 to NTSTATUS */ return NT_STATUS_OK; } -- cgit From 8da26d3f96ac66e3f0be8aaec209867d3f285e49 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 19 Aug 2007 22:10:11 +0000 Subject: r24561: merge from SAMBA_4_0: rename some DCERPC_ prefixes into NDR_ metze (This used to be commit 8f07b8ab658ae3d63487ca5fb20065318cdd9d0e) --- source3/librpc/gen_ndr/cli_echo.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index ee7e0f6114..6c33f69c29 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -17,7 +17,7 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_AddOne, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ADDONE, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_AddOne, (ndr_push_flags_fn_t)ndr_push_echo_AddOne); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_ADDONE, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_AddOne, (ndr_push_flags_fn_t)ndr_push_echo_AddOne); if (!NT_STATUS_IS_OK(status)) { return status; @@ -49,7 +49,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_EchoData, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_ECHODATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_EchoData, (ndr_push_flags_fn_t)ndr_push_echo_EchoData); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_ECHODATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_EchoData, (ndr_push_flags_fn_t)ndr_push_echo_EchoData); if (!NT_STATUS_IS_OK(status)) { return status; @@ -81,7 +81,7 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_SinkData, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SINKDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SinkData, (ndr_push_flags_fn_t)ndr_push_echo_SinkData); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_SINKDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SinkData, (ndr_push_flags_fn_t)ndr_push_echo_SinkData); if (!NT_STATUS_IS_OK(status)) { return status; @@ -111,7 +111,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_SourceData, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_SOURCEDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SourceData, (ndr_push_flags_fn_t)ndr_push_echo_SourceData); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_SOURCEDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SourceData, (ndr_push_flags_fn_t)ndr_push_echo_SourceData); if (!NT_STATUS_IS_OK(status)) { return status; @@ -142,7 +142,7 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestCall, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall, (ndr_push_flags_fn_t)ndr_push_echo_TestCall); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTCALL, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall, (ndr_push_flags_fn_t)ndr_push_echo_TestCall); if (!NT_STATUS_IS_OK(status)) { return status; @@ -173,7 +173,7 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestCall2, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTCALL2, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall2, (ndr_push_flags_fn_t)ndr_push_echo_TestCall2); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTCALL2, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall2, (ndr_push_flags_fn_t)ndr_push_echo_TestCall2); if (!NT_STATUS_IS_OK(status)) { return status; @@ -204,7 +204,7 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestSleep, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSLEEP, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSleep, (ndr_push_flags_fn_t)ndr_push_echo_TestSleep); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTSLEEP, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSleep, (ndr_push_flags_fn_t)ndr_push_echo_TestSleep); if (!NT_STATUS_IS_OK(status)) { return status; @@ -236,7 +236,7 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestEnum, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTENUM, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestEnum, (ndr_push_flags_fn_t)ndr_push_echo_TestEnum); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTENUM, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestEnum, (ndr_push_flags_fn_t)ndr_push_echo_TestEnum); if (!NT_STATUS_IS_OK(status)) { return status; @@ -269,7 +269,7 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestSurrounding, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTSURROUNDING, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSurrounding, (ndr_push_flags_fn_t)ndr_push_echo_TestSurrounding); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTSURROUNDING, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSurrounding, (ndr_push_flags_fn_t)ndr_push_echo_TestSurrounding); if (!NT_STATUS_IS_OK(status)) { return status; @@ -300,7 +300,7 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestDoublePointer, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, DCERPC_ECHO_TESTDOUBLEPOINTER, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestDoublePointer, (ndr_push_flags_fn_t)ndr_push_echo_TestDoublePointer); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTDOUBLEPOINTER, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestDoublePointer, (ndr_push_flags_fn_t)ndr_push_echo_TestDoublePointer); if (!NT_STATUS_IS_OK(status)) { return status; -- cgit From 18a48df488f5fcf9b55abf61b09778bdc15373d7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 21 Aug 2007 12:20:33 +0000 Subject: r24594: pass down the ndr_interface_table in the samba3 client bindings instead of the pull and push functions metze (This used to be commit 5e3d4df9bca069708d72f548dc5ddfc7708ac122) --- source3/librpc/gen_ndr/cli_echo.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index 6c33f69c29..4da2d7a209 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -17,7 +17,7 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_AddOne, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_ADDONE, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_AddOne, (ndr_push_flags_fn_t)ndr_push_echo_AddOne); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ADDONE, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -49,7 +49,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_EchoData, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_ECHODATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_EchoData, (ndr_push_flags_fn_t)ndr_push_echo_EchoData); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ECHODATA, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -81,7 +81,7 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_SinkData, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_SINKDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SinkData, (ndr_push_flags_fn_t)ndr_push_echo_SinkData); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SINKDATA, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -111,7 +111,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_SourceData, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_SOURCEDATA, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_SourceData, (ndr_push_flags_fn_t)ndr_push_echo_SourceData); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SOURCEDATA, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -142,7 +142,7 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestCall, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTCALL, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall, (ndr_push_flags_fn_t)ndr_push_echo_TestCall); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -173,7 +173,7 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestCall2, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTCALL2, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestCall2, (ndr_push_flags_fn_t)ndr_push_echo_TestCall2); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL2, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -204,7 +204,7 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestSleep, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTSLEEP, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSleep, (ndr_push_flags_fn_t)ndr_push_echo_TestSleep); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSLEEP, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -236,7 +236,7 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestEnum, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTENUM, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestEnum, (ndr_push_flags_fn_t)ndr_push_echo_TestEnum); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTENUM, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -269,7 +269,7 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestSurrounding, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTSURROUNDING, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestSurrounding, (ndr_push_flags_fn_t)ndr_push_echo_TestSurrounding); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSURROUNDING, &r); if (!NT_STATUS_IS_OK(status)) { return status; @@ -300,7 +300,7 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestDoublePointer, &r); - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, NDR_ECHO_TESTDOUBLEPOINTER, &r, (ndr_pull_flags_fn_t)ndr_pull_echo_TestDoublePointer, (ndr_push_flags_fn_t)ndr_push_echo_TestDoublePointer); + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTDOUBLEPOINTER, &r); if (!NT_STATUS_IS_OK(status)) { return status; -- cgit From 791fe3119ef1756fc476b17b8c590241bee5de2e Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 8 Jan 2008 18:07:55 +0100 Subject: Pedantic cosmetics: rerun make idl. Guenther (This used to be commit d1fa8049b1c0a3cebbc2c64e245e8055c8d3e84b) --- source3/librpc/gen_ndr/cli_echo.c | 160 +++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index 4da2d7a209..2d6187a937 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -10,29 +10,29 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui { struct echo_AddOne r; NTSTATUS status; - + /* In parameters */ r.in.in_data = in_data; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_AddOne, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ADDONE, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_AddOne, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ *out_data = *r.out.out_data; - + /* Return result */ return NT_STATUS_OK; } @@ -41,30 +41,30 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, { struct echo_EchoData r; NTSTATUS status; - + /* In parameters */ r.in.len = len; r.in.in_data = in_data; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_EchoData, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ECHODATA, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_EchoData, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ memcpy(out_data, r.out.out_data, r.in.len); - + /* Return result */ return NT_STATUS_OK; } @@ -73,29 +73,29 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, { struct echo_SinkData r; NTSTATUS status; - + /* In parameters */ r.in.len = len; r.in.data = data; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_SinkData, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SINKDATA, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_SinkData, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ - + /* Return result */ return NT_STATUS_OK; } @@ -104,29 +104,29 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx { struct echo_SourceData r; NTSTATUS status; - + /* In parameters */ r.in.len = len; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_SourceData, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SOURCEDATA, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_SourceData, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ memcpy(data, r.out.data, r.in.len); - + /* Return result */ return NT_STATUS_OK; } @@ -135,29 +135,29 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, { struct echo_TestCall r; NTSTATUS status; - + /* In parameters */ r.in.s1 = s1; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestCall, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestCall, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ *s2 = *r.out.s2; - + /* Return result */ return NT_STATUS_OK; } @@ -166,29 +166,29 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, { struct echo_TestCall2 r; NTSTATUS status; - + /* In parameters */ r.in.level = level; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestCall2, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL2, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestCall2, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ *info = *r.out.info; - + /* Return result */ return r.out.result; } @@ -197,28 +197,28 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, { struct echo_TestSleep r; NTSTATUS status; - + /* In parameters */ r.in.seconds = seconds; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestSleep, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSLEEP, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestSleep, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ - + /* Return result */ return NT_STATUS_OK; } @@ -227,33 +227,33 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, { struct echo_TestEnum r; NTSTATUS status; - + /* In parameters */ r.in.foo1 = foo1; r.in.foo2 = foo2; r.in.foo3 = foo3; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestEnum, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTENUM, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestEnum, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ *foo1 = *r.out.foo1; *foo2 = *r.out.foo2; *foo3 = *r.out.foo3; - + /* Return result */ return NT_STATUS_OK; } @@ -262,29 +262,29 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me { struct echo_TestSurrounding r; NTSTATUS status; - + /* In parameters */ r.in.data = data; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestSurrounding, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSURROUNDING, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestSurrounding, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ *data = *r.out.data; - + /* Return result */ return NT_STATUS_OK; } @@ -293,28 +293,28 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * { struct echo_TestDoublePointer r; NTSTATUS status; - + /* In parameters */ r.in.data = data; - + if (DEBUGLEVEL >= 10) NDR_PRINT_IN_DEBUG(echo_TestDoublePointer, &r); - + status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTDOUBLEPOINTER, &r); - + if (!NT_STATUS_IS_OK(status)) { return status; } - + if (DEBUGLEVEL >= 10) NDR_PRINT_OUT_DEBUG(echo_TestDoublePointer, &r); - + if (NT_STATUS_IS_ERR(status)) { return status; } - + /* Return variables */ - + /* Return result */ return NT_STATUS_OK; } -- cgit From 28ac552381e1e9e115fa08cd6743ec764ca84124 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 9 Jan 2008 11:59:11 +0100 Subject: Re-run make idl. The pidl generated code now fully complies to coding standards. Guenther (This used to be commit 3d34c87612138e4457e824e1a6e3981d1c3fe238) --- source3/librpc/gen_ndr/cli_echo.c | 179 +++++++++++++++++++++++++++++--------- 1 file changed, 139 insertions(+), 40 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index 2d6187a937..d2ef574821 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -6,7 +6,10 @@ #include "includes.h" #include "librpc/gen_ndr/cli_echo.h" -NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t in_data, uint32_t *out_data) +NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t in_data, + uint32_t *out_data) { struct echo_AddOne r; NTSTATUS status; @@ -14,17 +17,24 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui /* In parameters */ r.in.in_data = in_data; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_AddOne, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ADDONE, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_ADDONE, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_AddOne, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -37,7 +47,11 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, ui return NT_STATUS_OK; } -NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *in_data, uint8_t *out_data) +NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t len, + uint8_t *in_data, + uint8_t *out_data) { struct echo_EchoData r; NTSTATUS status; @@ -46,17 +60,24 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, r.in.len = len; r.in.in_data = in_data; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_EchoData, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ECHODATA, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_ECHODATA, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_EchoData, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -69,7 +90,10 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data) +NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t len, + uint8_t *data) { struct echo_SinkData r; NTSTATUS status; @@ -78,17 +102,24 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, r.in.len = len; r.in.data = data; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_SinkData, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SINKDATA, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_SINKDATA, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_SinkData, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -100,7 +131,10 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t len, uint8_t *data) +NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t len, + uint8_t *data) { struct echo_SourceData r; NTSTATUS status; @@ -108,17 +142,24 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx /* In parameters */ r.in.len = len; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_SourceData, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SOURCEDATA, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_SOURCEDATA, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_SourceData, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -131,7 +172,10 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx return NT_STATUS_OK; } -NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *s1, const char **s2) +NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *s1, + const char **s2) { struct echo_TestCall r; NTSTATUS status; @@ -139,17 +183,24 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.s1 = s1; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_TestCall, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_TESTCALL, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_TestCall, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -162,7 +213,10 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t level, union echo_Info *info) +NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint16_t level, + union echo_Info *info) { struct echo_TestCall2 r; NTSTATUS status; @@ -170,17 +224,24 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.level = level; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_TestCall2, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL2, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_TESTCALL2, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_TestCall2, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -193,7 +254,9 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return r.out.result; } -NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t seconds) +NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t seconds) { struct echo_TestSleep r; NTSTATUS status; @@ -201,17 +264,24 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, /* In parameters */ r.in.seconds = seconds; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_TestSleep, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSLEEP, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_TESTSLEEP, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_TestSleep, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -223,7 +293,11 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, enum echo_Enum1 *foo1, struct echo_Enum2 *foo2, union echo_Enum3 *foo3) +NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + enum echo_Enum1 *foo1, + struct echo_Enum2 *foo2, + union echo_Enum3 *foo3) { struct echo_TestEnum r; NTSTATUS status; @@ -233,17 +307,24 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, r.in.foo2 = foo2; r.in.foo3 = foo3; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_TestEnum, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTENUM, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_TESTENUM, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_TestEnum, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -258,7 +339,9 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct echo_Surrounding *data) +NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct echo_Surrounding *data) { struct echo_TestSurrounding r; NTSTATUS status; @@ -266,17 +349,24 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me /* In parameters */ r.in.data = data; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_TestSurrounding, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSURROUNDING, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_TESTSURROUNDING, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_TestSurrounding, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; @@ -289,7 +379,9 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *me return NT_STATUS_OK; } -NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint16_t ***data) +NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint16_t ***data) { struct echo_TestDoublePointer r; NTSTATUS status; @@ -297,17 +389,24 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX * /* In parameters */ r.in.data = data; - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_IN_DEBUG(echo_TestDoublePointer, &r); + } - status = cli_do_rpc_ndr(cli, mem_ctx, PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTDOUBLEPOINTER, &r); + status = cli_do_rpc_ndr(cli, + mem_ctx, + PI_RPCECHO, + &ndr_table_rpcecho, + NDR_ECHO_TESTDOUBLEPOINTER, + &r); if (!NT_STATUS_IS_OK(status)) { return status; } - if (DEBUGLEVEL >= 10) + if (DEBUGLEVEL >= 10) { NDR_PRINT_OUT_DEBUG(echo_TestDoublePointer, &r); + } if (NT_STATUS_IS_ERR(status)) { return status; -- cgit From a23b01541948fb99cea922d31f69d2099f2e2359 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 25 Mar 2008 17:52:33 +0100 Subject: Re-run make idl (after pidl change for adding header info to cli_ functions). Guenther (This used to be commit 492c26a9367d93802d3b6a9271dde16c49fffe69) --- source3/librpc/gen_ndr/cli_echo.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index d2ef574821..addeef65b5 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -8,8 +8,8 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint32_t in_data, - uint32_t *out_data) + uint32_t in_data /* [in] */, + uint32_t *out_data /* [out] [ref] */) { struct echo_AddOne r; NTSTATUS status; @@ -49,9 +49,9 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint32_t len, - uint8_t *in_data, - uint8_t *out_data) + uint32_t len /* [in] */, + uint8_t *in_data /* [in] [size_is(len)] */, + uint8_t *out_data /* [out] [size_is(len)] */) { struct echo_EchoData r; NTSTATUS status; @@ -92,8 +92,8 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint32_t len, - uint8_t *data) + uint32_t len /* [in] */, + uint8_t *data /* [in] [size_is(len)] */) { struct echo_SinkData r; NTSTATUS status; @@ -133,8 +133,8 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint32_t len, - uint8_t *data) + uint32_t len /* [in] */, + uint8_t *data /* [out] [size_is(len)] */) { struct echo_SourceData r; NTSTATUS status; @@ -174,8 +174,8 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - const char *s1, - const char **s2) + const char *s1 /* [in] [ref,charset(UTF16)] */, + const char **s2 /* [out] [ref,charset(UTF16)] */) { struct echo_TestCall r; NTSTATUS status; @@ -215,8 +215,8 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint16_t level, - union echo_Info *info) + uint16_t level /* [in] */, + union echo_Info *info /* [out] [ref,switch_is(level)] */) { struct echo_TestCall2 r; NTSTATUS status; @@ -256,7 +256,7 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint32_t seconds) + uint32_t seconds /* [in] */) { struct echo_TestSleep r; NTSTATUS status; @@ -295,9 +295,9 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - enum echo_Enum1 *foo1, - struct echo_Enum2 *foo2, - union echo_Enum3 *foo3) + enum echo_Enum1 *foo1 /* [in,out] [ref] */, + struct echo_Enum2 *foo2 /* [in,out] [ref] */, + union echo_Enum3 *foo3 /* [in,out] [ref,switch_is(*foo1)] */) { struct echo_TestEnum r; NTSTATUS status; @@ -341,7 +341,7 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - struct echo_Surrounding *data) + struct echo_Surrounding *data /* [in,out] [ref] */) { struct echo_TestSurrounding r; NTSTATUS status; @@ -381,7 +381,7 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint16_t ***data) + uint16_t ***data /* [in] [ref] */) { struct echo_TestDoublePointer r; NTSTATUS status; -- cgit From c05c5dba8a3ae832df4d2b1c58761089147288f1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 15 Apr 2008 16:11:10 +0200 Subject: Regenerate DCE/RPC client code after fixing memcpy() length bug in pidl. (This used to be commit ac4c63d999f9ae61428bcdae400d127459896d6c) --- source3/librpc/gen_ndr/cli_echo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index addeef65b5..23a8907de3 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -84,7 +84,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(out_data, r.out.out_data, r.in.len); + memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data)); /* Return result */ return NT_STATUS_OK; @@ -166,7 +166,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, } /* Return variables */ - memcpy(data, r.out.data, r.in.len); + memcpy(data, r.out.data, r.in.len * sizeof(*data)); /* Return result */ return NT_STATUS_OK; -- cgit From da6e4248eedfcf420797f42f589fff4875161303 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 21 Jul 2008 13:04:41 +0200 Subject: Make idl: cli_do_rpc_ndr does not use pipe_idx anymore (This used to be commit ffd2ff5325ef24f08dcb63e4561f5f62bffef6d3) --- source3/librpc/gen_ndr/cli_echo.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'source3/librpc/gen_ndr/cli_echo.c') diff --git a/source3/librpc/gen_ndr/cli_echo.c b/source3/librpc/gen_ndr/cli_echo.c index 23a8907de3..a775825f5f 100644 --- a/source3/librpc/gen_ndr/cli_echo.c +++ b/source3/librpc/gen_ndr/cli_echo.c @@ -23,7 +23,6 @@ NTSTATUS rpccli_echo_AddOne(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ADDONE, &r); @@ -66,7 +65,6 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_ECHODATA, &r); @@ -108,7 +106,6 @@ NTSTATUS rpccli_echo_SinkData(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SINKDATA, &r); @@ -148,7 +145,6 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_SOURCEDATA, &r); @@ -189,7 +185,6 @@ NTSTATUS rpccli_echo_TestCall(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL, &r); @@ -230,7 +225,6 @@ NTSTATUS rpccli_echo_TestCall2(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTCALL2, &r); @@ -270,7 +264,6 @@ NTSTATUS rpccli_echo_TestSleep(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSLEEP, &r); @@ -313,7 +306,6 @@ NTSTATUS rpccli_echo_TestEnum(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTENUM, &r); @@ -355,7 +347,6 @@ NTSTATUS rpccli_echo_TestSurrounding(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTSURROUNDING, &r); @@ -395,7 +386,6 @@ NTSTATUS rpccli_echo_TestDoublePointer(struct rpc_pipe_client *cli, status = cli_do_rpc_ndr(cli, mem_ctx, - PI_RPCECHO, &ndr_table_rpcecho, NDR_ECHO_TESTDOUBLEPOINTER, &r); -- cgit