From 0ad7b308a1c602ddab73668952cdf3837623b877 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 Dec 2005 17:15:48 +0000 Subject: r12514: Move DCE/RPC interface table to a seperate file Be a bit more strict when checking for duplicate interfaces (This used to be commit b1286a6d27e2b5aa26f288f6aff70601b0d8ae74) --- source4/librpc/config.mk | 1 + source4/librpc/idl/dcom.idl | 9 --- source4/librpc/idl/protected_storage.idl | 6 +- source4/librpc/rpc/dcerpc.c | 27 ++++----- source4/librpc/rpc/dcerpc_util.c | 62 --------------------- source4/librpc/rpc/table.c | 94 ++++++++++++++++++++++++++++++++ source4/scripting/ejs/config.mk | 2 +- source4/torture/com/simple.c | 4 +- source4/torture/rpc/epmapper.c | 2 +- source4/torture/rpc/oxidresolve.c | 2 +- 10 files changed, 115 insertions(+), 94 deletions(-) create mode 100644 source4/librpc/rpc/table.c (limited to 'source4') diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 1e6fcbce4a..5f07723ce3 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -329,6 +329,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT [SUBSYSTEM::NDR_ALL] +OBJ_FILES = rpc/table.o REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHANGE \ NDR_DSBACKUP NDR_EFS NDR_MISC NDR_LSA NDR_DFS NDR_DRSUAPI \ NDR_POLICYAGENT NDR_UNIXINFO NDR_SAMR NDR_SPOOLSS NDR_WKSSVC NDR_SRVSVC NDR_ATSVC \ diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl index dc92aa602f..7b40461c16 100644 --- a/source4/librpc/idl/dcom.idl +++ b/source4/librpc/idl/dcom.idl @@ -185,15 +185,6 @@ interface IRemUnknown2 : IRemUnknown ); } -[ - object, - pointer_default(unique), - uuid("00000136-0000-0000-C000-000000000046") - ] interface ISCMActivator : IClassActivator -{ - WERROR SCMActivator_CreateInstance(); -} - [ object, pointer_default(unique), diff --git a/source4/librpc/idl/protected_storage.idl b/source4/librpc/idl/protected_storage.idl index 1a95d50957..221aad65e0 100644 --- a/source4/librpc/idl/protected_storage.idl +++ b/source4/librpc/idl/protected_storage.idl @@ -2,11 +2,11 @@ /* protected_storage interface definitions - Also seen with UUID: c9378ff1-16f7-11d0-a0b2-00aa0061426a ver 1.0 + Also seen with UUID: */ -[ uuid("e3514235-4b06-11d1-ab04-00c04fc2dcd2"), - version(4.0), +[ uuid("c9378ff1-16f7-11d0-a0b2-00aa0061426a"), + version(1.0), pointer_default(unique) ] interface protected_storage { diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 14305c3449..9e585f9612 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -31,20 +31,25 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c); -static struct dcerpc_interface_list *dcerpc_pipes = NULL; +struct dcerpc_interface_list *dcerpc_pipes = NULL; /* register a dcerpc client interface */ NTSTATUS librpc_register_interface(const struct dcerpc_interface_table *interface) { - struct dcerpc_interface_list *l = talloc(talloc_autofree_context(), - struct dcerpc_interface_list); - - if (idl_iface_by_name (interface->name) != NULL) { - DEBUG(0, ("Attempt to register interface %s twice\n", interface->name)); - return NT_STATUS_OBJECT_NAME_COLLISION; + struct dcerpc_interface_list *l; + + for (l = dcerpc_pipes; l; l = l->next) { + if (GUID_equal(&interface->uuid, &l->table->uuid)) { + DEBUG(0, ("Attempt to register interface %s which has the " + "same UUID as already registered interface %s\n", + interface->name, l->table->name)); + return NT_STATUS_OBJECT_NAME_COLLISION; + } } + + l = talloc(talloc_autofree_context(), struct dcerpc_interface_list); l->table = interface; DLIST_ADD(dcerpc_pipes, l); @@ -52,14 +57,6 @@ NTSTATUS librpc_register_interface(const struct dcerpc_interface_table *interfac return NT_STATUS_OK; } -/* - return the list of registered dcerpc_pipes -*/ -const struct dcerpc_interface_list *librpc_dcerpc_pipes(void) -{ - return dcerpc_pipes; -} - /* destroy a dcerpc connection */ static int dcerpc_connection_destructor(void *ptr) { diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 4e7550c701..6e814bce3f 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -27,68 +27,6 @@ #include "librpc/gen_ndr/ndr_epmapper.h" #include "librpc/gen_ndr/ndr_dcerpc.h" #include "librpc/gen_ndr/ndr_misc.h" -#include "libcli/raw/libcliraw.h" -#include "libcli/composite/composite.h" -#include "libcli/smb_composite/smb_composite.h" - -/* - find the pipe name for a local IDL interface -*/ -const char *idl_pipe_name(const struct GUID *uuid, uint32_t if_version) -{ - const struct dcerpc_interface_list *l; - for (l=librpc_dcerpc_pipes();l;l=l->next) { - if (GUID_equal(&l->table->uuid, uuid) && - l->table->if_version == if_version) { - return l->table->name; - } - } - return "UNKNOWN"; -} - -/* - find the number of calls defined by local IDL -*/ -int idl_num_calls(const struct GUID *uuid, uint32_t if_version) -{ - const struct dcerpc_interface_list *l; - for (l=librpc_dcerpc_pipes();l;l=l->next){ - if (GUID_equal(&l->table->uuid, uuid) && - l->table->if_version == if_version) { - return l->table->num_calls; - } - } - return -1; -} - - -/* - find a dcerpc interface by name -*/ -const struct dcerpc_interface_table *idl_iface_by_name(const char *name) -{ - const struct dcerpc_interface_list *l; - for (l=librpc_dcerpc_pipes();l;l=l->next) { - if (strcasecmp(l->table->name, name) == 0) { - return l->table; - } - } - return NULL; -} - -/* - find a dcerpc interface by uuid -*/ -const struct dcerpc_interface_table *idl_iface_by_uuid(const struct GUID *uuid) -{ - const struct dcerpc_interface_list *l; - for (l=librpc_dcerpc_pipes();l;l=l->next) { - if (GUID_equal(&l->table->uuid, uuid)) { - return l->table; - } - } - return NULL; -} /* find a dcerpc call on an interface by name diff --git a/source4/librpc/rpc/table.c b/source4/librpc/rpc/table.c new file mode 100644 index 0000000000..5450edb003 --- /dev/null +++ b/source4/librpc/rpc/table.c @@ -0,0 +1,94 @@ +/* + Unix SMB/CIFS implementation. + + dcerpc utility functions + + Copyright (C) Andrew Tridgell 2003 + Copyright (C) Jelmer Vernooij 2004 + + 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. +*/ + +#include "includes.h" + +/* + find the pipe name for a local IDL interface +*/ +const char *idl_pipe_name(const struct GUID *uuid, uint32_t if_version) +{ + const struct dcerpc_interface_list *l; + for (l=librpc_dcerpc_pipes();l;l=l->next) { + if (GUID_equal(&l->table->uuid, uuid) && + l->table->if_version == if_version) { + return l->table->name; + } + } + return "UNKNOWN"; +} + +/* + find the number of calls defined by local IDL +*/ +int idl_num_calls(const struct GUID *uuid, uint32_t if_version) +{ + const struct dcerpc_interface_list *l; + for (l=librpc_dcerpc_pipes();l;l=l->next){ + if (GUID_equal(&l->table->uuid, uuid) && + l->table->if_version == if_version) { + return l->table->num_calls; + } + } + return -1; +} + + +/* + find a dcerpc interface by name +*/ +const struct dcerpc_interface_table *idl_iface_by_name(const char *name) +{ + const struct dcerpc_interface_list *l; + for (l=librpc_dcerpc_pipes();l;l=l->next) { + if (strcasecmp(l->table->name, name) == 0) { + return l->table; + } + } + return NULL; +} + +/* + find a dcerpc interface by uuid +*/ +const struct dcerpc_interface_table *idl_iface_by_uuid(const struct GUID *uuid) +{ + const struct dcerpc_interface_list *l; + for (l=librpc_dcerpc_pipes();l;l=l->next) { + if (GUID_equal(&l->table->uuid, uuid)) { + return l->table; + } + } + return NULL; +} + +extern struct dcerpc_interface_list *dcerpc_pipes; +/* + return the list of registered dcerpc_pipes +*/ +const struct dcerpc_interface_list *librpc_dcerpc_pipes(void) +{ + return dcerpc_pipes; +} + + diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index f789cbad0e..93b053c0d1 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -30,7 +30,7 @@ OBJ_FILES = \ smbcalls_param.o \ ejsnet.o \ mprutil.o -REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET +REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING LIBSAMBA3 LIBNET NDR_ALL # End SUBSYSTEM SMBCALLS ####################### diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c index de16b113a2..09061422f5 100644 --- a/source4/torture/com/simple.c +++ b/source4/torture/com/simple.c @@ -41,8 +41,8 @@ static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host) com_init_ctx(&ctx, NULL); dcom_client_init(ctx, cmdline_credentials); - GUID_from_string(COM_ISTREAM_UUID, &IID[0]); - GUID_from_string(COM_IUNKNOWN_UUID, &IID[1]); + IID[0] = dcerpc_table_IStream.uuid; + IID[1] = dcerpc_table_IUnknown.uuid; GUID_from_string(CLSID_SIMPLE, &clsid); if (host) { diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index 9774b9681c..0085751cb7 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -259,7 +259,7 @@ static BOOL test_InqObject(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) struct epm_InqObject r; r.in.epm_object = talloc(mem_ctx, struct GUID); - GUID_from_string(DCERPC_EPMAPPER_UUID, r.in.epm_object); + *r.in.epm_object = dcerpc_table_epmapper.uuid; status = dcerpc_epm_InqObject(p, mem_ctx, &r); if (NT_STATUS_IS_ERR(status)) { diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index 61ef9b8ee8..fbdd9ad265 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -43,7 +43,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin r.in.num_protseqs = 3; r.in.protseq = protseq; r.in.Interfaces = 1; - GUID_from_string(DCERPC_IUNKNOWN_UUID, &iids[0]); + iids[0] = dcerpc_table_IUnknown.uuid; r.in.pIIDs = iids; status = dcerpc_RemoteActivation(p, mem_ctx, &r); -- cgit