1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00

r8260: added an init based registration system for the generated ejs rpc code, so

adding a new pipe only involves changes to librpc/config.mk
This commit is contained in:
Andrew Tridgell 2005-07-09 11:48:59 +00:00 committed by Gerald (Jerry) Carter
parent 50d8ccacca
commit 0e54fa4466
4 changed files with 63 additions and 18 deletions

View File

@ -674,13 +674,16 @@ sub EjsInterface($)
pidl "void setup_ejs_$name(void)";
pidl "{";
indent;
foreach (@fns) {
pidl "ejsDefineCFunction(-1, \"dcerpc_$_\", ejs_$_, NULL, MPR_VAR_SCRIPT_HANDLE);";
}
deindent;
pidl "}\n";
pidl "void setup_ejs_constants_$name(int eid)";
pidl "{";
indent;
foreach my $v (keys %constants) {
my $value = $constants{$v};
if (substr($value, 0, 1) eq "\"") {
@ -689,6 +692,14 @@ sub EjsInterface($)
pidl "ejs_set_constant_int(eid, \"$v\", $value);";
}
}
deindent;
pidl "}\n";
pidl "NTSTATUS ejs_init_$name(void)";
pidl "{";
indent;
pidl "return smbcalls_register_ejs(\"$name\", setup_ejs_$name, setup_ejs_constants_$name);";
deindent;
pidl "}";
}

View File

@ -552,26 +552,31 @@ REQUIRED_SUBSYSTEMS = NDR_RAW RPC_RAW LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL ND
################################################
[SUBSYSTEM::RPC_EJS_ECHO]
INIT_FUNCTION = ejs_init_rpcecho
OBJ_FILES = librpc/gen_ndr/ndr_echo_ejs.o
REQUIRED_SUBSYSTEMS = RPC NDR_ECHO
NOPROTO = YES
[SUBSYSTEM::RPC_EJS_MISC]
INIT_FUNCTION = ejs_init_misc
OBJ_FILES = librpc/gen_ndr/ndr_misc_ejs.o
REQUIRED_SUBSYSTEMS = RPC NDR_MISC
NOPROTO = YES
[SUBSYSTEM::RPC_EJS_SAMR]
INIT_FUNCTION = ejs_init_samr
OBJ_FILES = librpc/gen_ndr/ndr_samr_ejs.o
REQUIRED_SUBSYSTEMS = RPC NDR_SAMR
NOPROTO = YES
[SUBSYSTEM::RPC_EJS_SECURITY]
INIT_FUNCTION = ejs_init_security
OBJ_FILES = librpc/gen_ndr/ndr_security_ejs.o
REQUIRED_SUBSYSTEMS = RPC LIB_SECURITY_NDR
NOPROTO = YES
[SUBSYSTEM::RPC_EJS_LSA]
INIT_FUNCTION = ejs_init_lsarpc
OBJ_FILES = librpc/gen_ndr/ndr_lsa_ejs.o
REQUIRED_SUBSYSTEMS = RPC NDR_LSA
NOPROTO = YES

View File

@ -36,6 +36,13 @@ typedef NTSTATUS (*ejs_push_function_t)(struct ejs_rpc *, struct MprVar *, const
NTSTATUS ejs_panic(struct ejs_rpc *ejs, const char *why);
void ejs_set_switch(struct ejs_rpc *ejs, uint32_t switch_var);
typedef void (*ejs_setup_t)(void);
typedef void (*ejs_constants_t)(int);
NTSTATUS smbcalls_register_ejs(const char *name,
ejs_setup_t setup,
ejs_constants_t constants);
int ejs_rpc_call(int eid, int argc, struct MprVar **argv, const char *callname,
ejs_pull_function_t ejs_pull, ejs_push_function_t ejs_push);

View File

@ -25,6 +25,7 @@
#include "librpc/gen_ndr/ndr_echo.h"
#include "lib/cmdline/popt_common.h"
#include "scripting/ejs/ejsrpc.h"
#include "dlinklist.h"
/*
connect to an rpc server
@ -175,22 +176,46 @@ done:
}
/* a list of registered ejs rpc modules */
static struct ejs_register {
struct ejs_register *next, *prev;
const char *name;
ejs_setup_t setup;
ejs_constants_t constants;
} *ejs_registered;
/*
register a generated ejs module
*/
NTSTATUS smbcalls_register_ejs(const char *name,
ejs_setup_t setup,
ejs_constants_t constants)
{
struct ejs_register *r;
void *ctx = ejs_registered;
if (ctx == NULL) {
ctx = talloc_autofree_context();
}
r = talloc(ctx, struct ejs_register);
NT_STATUS_HAVE_NO_MEMORY(r);
r->name = name;
r->setup = setup;
r->constants = constants;
DLIST_ADD(ejs_registered, r);
return NT_STATUS_OK;
}
/*
setup C functions that be called from ejs
*/
void smb_setup_ejs_rpc(void)
{
void setup_ejs_rpcecho(void);
void setup_ejs_samr(void);
void setup_ejs_misc(void);
void setup_ejs_security(void);
struct ejs_register *r;
ejsDefineCFunction(-1, "rpc_connect", ejs_rpc_connect, NULL, MPR_VAR_SCRIPT_HANDLE);
setup_ejs_rpcecho();
setup_ejs_samr();
setup_ejs_misc();
setup_ejs_security();
for (r=ejs_registered;r;r=r->next) {
r->setup();
}
}
/*
@ -198,18 +223,15 @@ void smb_setup_ejs_rpc(void)
*/
void smb_setup_ejs_rpc_constants(int eid)
{
struct ejs_register *r;
struct MprVar v;
void setup_ejs_constants_rpcecho(int);
void setup_ejs_constants_samr(int);
void setup_ejs_constants_misc(int);
void setup_ejs_constants_security(int);
for (r=ejs_registered;r;r=r->next) {
r->constants(eid);
}
setup_ejs_constants_rpcecho(eid);
setup_ejs_constants_samr(eid);
setup_ejs_constants_misc(eid);
setup_ejs_constants_security(eid);
v = mprCreatePtrVar(NULL, "NULL");
mprSetProperty(ejsGetGlobalObject(eid), "NULL", &v);
}