converted the rpcecho pipe to use IDL

(This used to be commit 1b7a7bc4641e4f0e604bc20699c094fa5f49315d)

1 files changed, 35 insertions, 80 deletions

diff --git a/source4/librpc/ndr/ndr_echo.c b/source4/librpc/ndr/ndr_echo.c
index e2bb062d2e..afe7f0c873 100644
--- a/source4/librpc/ndr/ndr_echo.c
+++ b/source4/librpc/ndr/ndr_echo.c
@@ -1,114 +1,69 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   routines for marshalling/unmarshalling rpcecho pipe
-
-   Copyright (C) Andrew Tridgell 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.
-*/
-
+/* parser auto-generated by pidl */
 
 #include "includes.h"
 
-
-/*
-  parse a addone
-*/
-NTSTATUS ndr_pull_rpcecho_addone(struct ndr_pull *ndr, 
-				 struct rpcecho_addone *r)
+NTSTATUS ndr_push_echo_AddOne(struct ndr_push *ndr, struct echo_AddOne *r)
 {
-	NDR_CHECK(ndr_pull_uint32(ndr, &r->out.data));
-	return NT_STATUS_OK;
-}
-
+	NDR_CHECK(ndr_push_uint32(ndr, *r->in.v));
 
-/*
-  push a addone
-*/
-NTSTATUS ndr_push_rpcecho_addone(struct ndr_push *ndr, 
-				 struct rpcecho_addone *r)
-{
-	NDR_CHECK(ndr_push_uint32(ndr, r->in.data));
 	return NT_STATUS_OK;
 }
 
-
-/*
-  parse a echodata
-*/
-NTSTATUS ndr_pull_rpcecho_echodata(struct ndr_pull *ndr, 
-				   struct rpcecho_echodata *r)
+NTSTATUS ndr_pull_echo_AddOne(struct ndr_pull *ndr, struct echo_AddOne *r)
 {
-	NDR_CHECK(ndr_pull_uint32(ndr, &r->out.len));
-	NDR_ALLOC_N(ndr, r->out.data, r->out.len);
-	NDR_CHECK(ndr_pull_bytes(ndr, r->out.data, r->out.len));
+	NDR_CHECK(ndr_pull_uint32(ndr, r->out.v));
+
 	return NT_STATUS_OK;
 }
 
-/*
-  push a echodata
-*/
-NTSTATUS ndr_push_rpcecho_echodata(struct ndr_push *ndr, 
-				   struct rpcecho_echodata *r)
+NTSTATUS ndr_push_echo_EchoData(struct ndr_push *ndr, struct echo_EchoData *r)
 {
 	NDR_CHECK(ndr_push_uint32(ndr, r->in.len));
-	NDR_CHECK(ndr_push_uint32(ndr, r->in.len));
-	NDR_CHECK(ndr_push_bytes(ndr, r->in.data, r->in.len));
+	if (r->in.data) {
+		NDR_CHECK(ndr_push_array_uint8(ndr, r->in.data, r->in.len));
+	}
+
 	return NT_STATUS_OK;
 }
 
-/*
-  parse a sinkdata
-*/
-NTSTATUS ndr_pull_rpcecho_sinkdata(struct ndr_pull *ndr, 
-				   struct rpcecho_sinkdata *r)
+NTSTATUS ndr_pull_echo_EchoData(struct ndr_pull *ndr, struct echo_EchoData *r)
 {
+	if (r->out.data) {
+		NDR_CHECK(ndr_pull_array_uint8(ndr, r->out.data, r->in.len));
+	}
+
 	return NT_STATUS_OK;
 }
 
-/*
-  push a sinkdata
-*/
-NTSTATUS ndr_push_rpcecho_sinkdata(struct ndr_push *ndr, 
-				   struct rpcecho_sinkdata *r)
+NTSTATUS ndr_push_echo_SinkData(struct ndr_push *ndr, struct echo_SinkData *r)
 {
 	NDR_CHECK(ndr_push_uint32(ndr, r->in.len));
-	NDR_CHECK(ndr_push_uint32(ndr, r->in.len));
-	NDR_CHECK(ndr_push_bytes(ndr, r->in.data, r->in.len));
+	if (r->in.data) {
+		NDR_CHECK(ndr_push_array_uint8(ndr, r->in.data, r->in.len));
+	}
+
 	return NT_STATUS_OK;
 }
 
-/*
-  parse a sourcedata
-*/
-NTSTATUS ndr_pull_rpcecho_sourcedata(struct ndr_pull *ndr, 
-				   struct rpcecho_sourcedata *r)
+NTSTATUS ndr_pull_echo_SinkData(struct ndr_pull *ndr, struct echo_SinkData *r)
 {
-	NDR_CHECK(ndr_pull_uint32(ndr, &r->out.len));
-	NDR_ALLOC_N(ndr, r->out.data, r->out.len);
-	NDR_CHECK(ndr_pull_bytes(ndr, r->out.data, r->out.len));
+
 	return NT_STATUS_OK;
 }
 
-/*
-  push a sourcedata
-*/
-NTSTATUS ndr_push_rpcecho_sourcedata(struct ndr_push *ndr, 
-				   struct rpcecho_sourcedata *r)
+NTSTATUS ndr_push_echo_SourceData(struct ndr_push *ndr, struct echo_SourceData *r)
 {
 	NDR_CHECK(ndr_push_uint32(ndr, r->in.len));
+
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_pull_echo_SourceData(struct ndr_pull *ndr, struct echo_SourceData *r)
+{
+	if (r->out.data) {
+		NDR_CHECK(ndr_pull_array_uint8(ndr, r->out.data, r->in.len));
+	}
+
 	return NT_STATUS_OK;
 }
+