1 files changed, 29 insertions, 23 deletions

diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 8780b39f87..ebf82c692e 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -33,13 +33,16 @@ static BOOL test_addone(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	printf("\nTesting AddOne\n");
 
 	for (i=0;i<10;i++) {
-		int n;
-		status = dcerpc_rpcecho_addone(p, i, &n);
+		uint32 n = i;
+		struct echo_AddOne r;
+		r.in.v = &n;
+		r.out.v = &n;
+		status = dcerpc_echo_AddOne(p, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
 			printf("AddOne(%d) failed - %s\n", i, nt_errstr(status));
 			return False;
 		}
-		printf("%d + 1 = %d\n", i, n);
+		printf("%d + 1 = %u\n", i, n);
 	}
 
 	return True;
@@ -54,28 +57,28 @@ static BOOL test_echodata(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	NTSTATUS status;
 	char *data_in, *data_out;
 	int len = 1 + (random() % 5000);
-	int len_out;
+	struct echo_EchoData r;
 
 	printf("\nTesting EchoData\n");
 
 	data_in = talloc(mem_ctx, len);
+	data_out = talloc(mem_ctx, len);
 	for (i=0;i<len;i++) {
-		data_in[i] = i+1;
+		data_in[i] = i;
 	}
+	
+	r.in.len = len;
+	r.in.data = data_in;
+	r.out.data = data_out;
 
-	status = dcerpc_rpcecho_echodata(p, mem_ctx,
-					 len,
-					 data_in,
-					 &len_out,
-					 &data_out);
+	status = dcerpc_echo_EchoData(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("EchoData(%d) failed - %s\n", len, nt_errstr(status));
 		return False;
 	}
-	printf("EchoData(%d) returned %d bytes\n", len, len_out);
 
 	if (memcmp(data_in, data_out, len) != 0) {
-		printf("Bad data returned!\n");
+		printf("Bad data returned for len %d!\n", len);
 		return False;
 	}
 
@@ -91,26 +94,27 @@ static BOOL test_sourcedata(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	int i;
 	NTSTATUS status;
-	char *data_out;
 	int len = 200000 + (random() % 5000);
-	int len_out;
+	char *data_out;
+	struct echo_SourceData r;
 
 	printf("\nTesting SourceData\n");
 
-	status = dcerpc_rpcecho_sourcedata(p, mem_ctx,
-					   len,
-					   &len_out,
-					   &data_out);
+	data_out = talloc(mem_ctx, len);
+
+	r.in.len = len;
+	r.out.data = data_out;
+
+	status = dcerpc_echo_SourceData(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("SourceData(%d) failed - %s\n", len, nt_errstr(status));
 		return False;
 	}
-	printf("SourceData(%d) returned %d bytes\n", len, len_out);
 
 	for (i=0;i<len;i++) {
 		unsigned char *v = (unsigned char *)data_out;
 		if (v[i] != (i & 0xFF)) {
-			printf("bad data 0x%x at %d\n", data_out[i], i);
+			printf("bad data 0x%x at %d\n", (unsigned char)data_out[i], i);
 			return False;
 		}
 	}
@@ -127,6 +131,7 @@ static BOOL test_sinkdata(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	NTSTATUS status;
 	char *data_in;
 	int len = 200000 + (random() % 5000);
+	struct echo_SinkData r;
 
 	printf("\nTesting SinkData\n");
 
@@ -135,9 +140,10 @@ static BOOL test_sinkdata(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 		data_in[i] = i+1;
 	}
 
-	status = dcerpc_rpcecho_sinkdata(p, mem_ctx,
-					 len,
-					 data_in);
+	r.in.len = len;
+	r.in.data = data_in;
+
+	status = dcerpc_echo_SinkData(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("SinkData(%d) failed - %s\n", len, nt_errstr(status));
 		return False;