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)

1 files changed, 71 insertions, 15 deletions

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 */