r24606: move librpc/rpc/table.c -> librpc/ndr/ndr_table.c

and rename the containing functions to have a ndr_
prefix

metze
(This used to be commit cb234d43ae693af5d8a921a15c9bcac3c6f0359a)

6 files changed, 16 insertions, 15 deletions

diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index d6011265e7..76d838517c 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -23,7 +23,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/rpc/dcerpc_table.h"
+#include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 
 
@@ -264,7 +264,7 @@ BOOL torture_rpc_autoidl(struct torture_context *torture)
 	TALLOC_CTX *mem_ctx;
 	const struct ndr_interface_table *iface;
 		
-	iface = idl_iface_by_name("drsuapi");
+	iface = ndr_table_by_name("drsuapi");
 	if (!iface) {
 		printf("Unknown interface!\n");
 		return False;
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index e400fcdbe3..e2e222d2ec 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -22,8 +22,8 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/rpc/dcerpc.h"
-#include "librpc/rpc/dcerpc_table.h"
+#include "librpc/ndr/libndr.h"
+#include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 
 
@@ -112,7 +112,7 @@ BOOL torture_rpc_countcalls(struct torture_context *torture)
 	}
 	iface_name = lp_parm_string(-1, "countcalls", "interface");
 	if (iface_name != NULL) {
-		iface = idl_iface_by_name(iface_name);
+		iface = ndr_table_by_name(iface_name);
 		if (!iface) {
 			printf("Unknown interface '%s'\n", iface_name);
 			return False;
@@ -120,7 +120,7 @@ BOOL torture_rpc_countcalls(struct torture_context *torture)
 		return count_calls(mem_ctx, iface, False);
 	}
 
-	for (l=librpc_dcerpc_pipes();l;l=l->next) {		
+	for (l=ndr_table_list();l;l=l->next) {		
 		TALLOC_CTX *loop_ctx;
 		loop_ctx = talloc_named(mem_ctx, 0, "torture_rpc_councalls loop context");
 		ret &= count_calls(loop_ctx, l->table, True);
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index ca4520e856..b4e5b97679 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
-#include "librpc/rpc/dcerpc_table.h"
+#include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 
 
@@ -63,7 +63,7 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	dcerpc_floor_get_lhs_data(&twr->tower.floors[0], &syntax);
 
 	printf("epm_Map results for '%s':\n", 
-	       idl_pipe_name(&syntax.uuid, syntax.if_version));
+	       ndr_interface_name(&syntax.uuid, syntax.if_version));
 
 	twr->tower.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN;
 	twr->tower.floors[2].lhs.lhs_data = data_blob(NULL, 0);
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 475e933bd2..5604b87c6e 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -22,7 +22,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_mgmt_c.h"
 #include "auth/gensec/gensec.h"
-#include "librpc/rpc/dcerpc_table.h"
+#include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 
 
@@ -65,7 +65,8 @@ BOOL test_inq_if_ids(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 		printf("\tuuid %s  version 0x%08x  '%s'\n",
 		       GUID_string(mem_ctx, &id->uuid),
-		       id->if_version, idl_pipe_name(&id->uuid, id->if_version));
+		       id->if_version,
+		       ndr_interface_name(&id->uuid, id->if_version));
 
 		if (per_id_test) {
 			per_id_test(priv, mem_ctx, id);
@@ -211,7 +212,7 @@ BOOL torture_rpc_mgmt(struct torture_context *torture)
 		return False;
 	}
 
-	for (l=librpc_dcerpc_pipes();l;l=l->next) {		
+	for (l=ndr_table_list();l;l=l->next) {		
 		loop_ctx = talloc_named(mem_ctx, 0, "torture_rpc_mgmt loop context");
 		
 		/* some interfaces are not mappable */
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 92baca7ee0..250945a8a2 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -24,7 +24,7 @@
 #include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 #include "torture/torture.h"
-#include "librpc/rpc/dcerpc_table.h"
+#include "librpc/ndr/ndr_table.h"
 #include "lib/util/dlinklist.h"
 
 /* open a rpc connection to the chosen binding string */
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index b60d325c7c..1f74b8b1cf 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_mgmt_c.h"
-#include "librpc/rpc/dcerpc_table.h"
+#include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
 
 /*
@@ -76,7 +76,7 @@ static BOOL test_num_calls(const struct ndr_interface_table *iface,
 	}
 
 	printf("\t%d calls available\n", i);
-	idl_calls = idl_num_calls(&id->uuid, id->if_version);
+	idl_calls = ndr_interface_num_calls(&id->uuid, id->if_version);
 	if (idl_calls == -1) {
 		printf("\tinterface not known in local IDL\n");
 	} else if (i != idl_calls) {
@@ -117,7 +117,7 @@ BOOL torture_rpc_scanner(struct torture_context *torture)
 		return False;
 	}
 
-	for (l=librpc_dcerpc_pipes();l;l=l->next) {		
+	for (l=ndr_table_list();l;l=l->next) {		
 		loop_ctx = talloc_named(mem_ctx, 0, "torture_rpc_scanner loop context");
 		/* some interfaces are not mappable */
 		if (l->table->num_calls == 0 ||