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)

3 files changed, 73 insertions, 167 deletions

diff --git a/source3/rpc_server/srv_echo.c b/source3/rpc_server/srv_echo.c
deleted file mode 100644
index c6cfde07c1..0000000000
--- a/source3/rpc_server/srv_echo.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines for rpcecho
- *  Copyright (C) Tim Potter                   2003.
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/* This is the interface to the rpcecho pipe. */
-
-#include "includes.h"
-#include "nterr.h"
-
-#ifdef DEVELOPER
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_SRV
-
-static BOOL api_add_one(pipes_struct *p)
-{
-	ECHO_Q_ADD_ONE q_u;
-	ECHO_R_ADD_ONE r_u;
-
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-	
-	if(!echo_io_q_add_one("", &q_u, data, 0))
-		return False;
-	
-	_echo_add_one(p, &q_u, &r_u);
-	
-	if(!echo_io_r_add_one("", &r_u, rdata, 0))
-		return False;
-
-	return True;
-}
-
-static BOOL api_echo_data(pipes_struct *p)
-{
-	ECHO_Q_ECHO_DATA q_u;
-	ECHO_R_ECHO_DATA r_u;
-
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-	
-	if(!echo_io_q_echo_data("", &q_u, data, 0))
-		return False;
-	
-	_echo_data(p, &q_u, &r_u);
-	
-	if(!echo_io_r_echo_data("", &r_u, rdata, 0))
-		return False;
-
-	return True;
-}
-
-static BOOL api_source_data(pipes_struct *p)
-{
-	ECHO_Q_SOURCE_DATA q_u;
-	ECHO_R_SOURCE_DATA r_u;
-
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-	
-	if(!echo_io_q_source_data("", &q_u, data, 0))
-		return False;
-	
-	_source_data(p, &q_u, &r_u);
-	
-	if(!echo_io_r_source_data("", &r_u, rdata, 0))
-		return False;
-
-	return True;
-}
-
-static BOOL api_sink_data(pipes_struct *p)
-{
-	ECHO_Q_SINK_DATA q_u;
-	ECHO_R_SINK_DATA r_u;
-
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-	
-	if(!echo_io_q_sink_data("", &q_u, data, 0))
-		return False;
-	
-	_sink_data(p, &q_u, &r_u);
-	
-	if(!echo_io_r_sink_data("", &r_u, rdata, 0))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-\pipe\rpcecho commands
-********************************************************************/
-
-struct api_struct api_echo_cmds[] = {
-	{"ADD_ONE",       ECHO_ADD_ONE,     api_add_one },
-	{"ECHO_DATA",     ECHO_DATA,        api_echo_data },
-	{"SOURCE_DATA",   ECHO_SOURCE_DATA, api_source_data },
-	{"SINK_DATA",     ECHO_SINK_DATA,   api_sink_data },
-};
-
-
-void echo_get_pipe_fns( struct api_struct **fns, int *n_fns )
-{
-	*fns = api_echo_cmds;
-	*n_fns = sizeof(api_echo_cmds) / sizeof(struct api_struct);
-}
-
-NTSTATUS rpc_echo_init(void)
-{
-	return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION,
-		"rpcecho", "rpcecho", api_echo_cmds,
-		sizeof(api_echo_cmds) / sizeof(struct api_struct));
-}
-
-#else /* DEVELOPER */
-
-NTSTATUS rpc_echo_init(void)
-{
-	return NT_STATUS_OK;
-}
-#endif /* DEVELOPER */
diff --git a/source3/rpc_server/srv_echo_nt.c b/source3/rpc_server/srv_echo_nt.c
index c861c74cc6..221f4bc8b2 100644
--- a/source3/rpc_server/srv_echo_nt.c
+++ b/source3/rpc_server/srv_echo_nt.c
@@ -30,29 +30,25 @@
 
 /* Add one to the input and return it */
 
-void _echo_add_one(pipes_struct *p, ECHO_Q_ADD_ONE *q_u, ECHO_R_ADD_ONE *r_u)
+void _echo_AddOne(pipes_struct *p, uint32_t in_data, uint32_t *out_data)
 {
 	DEBUG(10, ("_echo_add_one\n"));
 
-	r_u->response = q_u->request + 1;
+	*out_data = in_data + 1;
 }
 
 /* Echo back an array of data */
 
-void _echo_data(pipes_struct *p, ECHO_Q_ECHO_DATA *q_u, 
-		ECHO_R_ECHO_DATA *r_u)
+void _echo_EchoData(pipes_struct *p, uint32_t len, uint8_t *in_data, uint8_t *out_data)
 {
 	DEBUG(10, ("_echo_data\n"));
 
-	r_u->data = (char *)TALLOC(p->mem_ctx, q_u->size);
-	r_u->size = q_u->size;
-	memcpy(r_u->data, q_u->data, q_u->size);
+	memcpy(out_data, in_data, len);
 }
 
 /* Sink an array of data */
 
-void _sink_data(pipes_struct *p, ECHO_Q_SINK_DATA *q_u, 
-		ECHO_R_SINK_DATA *r_u)
+void _echo_SinkData(pipes_struct *p, uint32_t len, uint8_t *data)
 {
 	DEBUG(10, ("_sink_data\n"));
 
@@ -61,18 +57,78 @@ void _sink_data(pipes_struct *p, ECHO_Q_SINK_DATA *q_u,
 
 /* Source an array of data */
 
-void _source_data(pipes_struct *p, ECHO_Q_SOURCE_DATA *q_u, 
-		  ECHO_R_SOURCE_DATA *r_u)
+void _echo_SourceData(pipes_struct *p, uint32_t len, uint8_t *data)
 {
 	uint32 i;
 
 	DEBUG(10, ("_source_data\n"));
 
-	r_u->data = (char *)TALLOC(p->mem_ctx, q_u->size);
-	r_u->size = q_u->size;
+	for (i = 0; i < len; i++)
+		data[i] = i & 0xff;
+}
 
-	for (i = 0; i < r_u->size; i++)
-		r_u->data[i] = i & 0xff;
+void _echo_TestCall(pipes_struct *p, const char *s1, const char **s2)
+{
+	*s2 = talloc_strdup(p->mem_ctx, s1);
+}
+
+NTSTATUS _echo_TestCall2(pipes_struct *p, uint16_t level, union echo_Info *info)
+{
+	switch (level) {
+	case 1:
+		info->info1.v = 10;
+		break;
+	case 2:
+		info->info2.v = 20;
+		break;
+	case 3:
+		info->info3.v = 30;
+		break;
+	case 4:
+		info->info4.v = 40;
+		break;
+	case 5:
+		info->info5.v1 = 50;
+		info->info5.v2 = 60;
+		break;
+	case 6:
+		info->info6.v1 = 70;
+		info->info6.info1.v= 80;
+		break;
+	case 7:
+		info->info7.v1 = 80;
+		info->info7.info4.v = 90;
+		break;
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+	}
+
+	return NT_STATUS_OK;
+}
+
+uint32 _echo_TestSleep(pipes_struct *p, uint32_t seconds)
+{
+	sleep(seconds);
+	return seconds;
+}
+
+void _echo_TestEnum(pipes_struct *p, enum echo_Enum1 *foo1, struct echo_Enum2 *foo2, union echo_Enum3 *foo3)
+{
+}
+
+void _echo_TestSurrounding(pipes_struct *p, struct echo_Surrounding *data)
+{
+	data->x *= 2;
+	data->surrounding = talloc_zero_array(p->mem_ctx, uint16_t, data->x);
+}
+
+uint16 _echo_TestDoublePointer(pipes_struct *p, uint16_t ***data)
+{
+	if (!*data) 
+		return 0;
+	if (!**data)
+		return 0;
+	return ***data;
 }
 
 #endif /* DEVELOPER */
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 74583f075b..4c798e4300 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -2385,8 +2385,8 @@ void get_pipe_fns( int idx, struct api_struct **fns, int *n_fns )
 			ntsvcs_get_pipe_fns( &cmds, &n_cmds );
 			break;
 #ifdef DEVELOPER
-		case PI_ECHO:
-			echo_get_pipe_fns( &cmds, &n_cmds );
+		case PI_RPCECHO:
+			rpcecho_get_pipe_fns( &cmds, &n_cmds );
 			break;
 #endif
 		default: