summaryrefslogtreecommitdiff
path: root/source4/scripting/ejs
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2006-10-02 20:39:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:31 -0500
commit882d352151bd05c37e18de8f8f619787f831a311 (patch)
tree84e7be0d80a80bdc4b54b71bd25ec51f2b806daf /source4/scripting/ejs
parenta22d785d7cdfbb662a0755552acfbf995d865d0c (diff)
downloadsamba-882d352151bd05c37e18de8f8f619787f831a311.tar.gz
samba-882d352151bd05c37e18de8f8f619787f831a311.tar.bz2
samba-882d352151bd05c37e18de8f8f619787f831a311.zip
r19051: JSON-RPC server work-in-progress. It's almost working.
(This used to be commit 6e9cb2ed1cf87aed322fd7821237d088c2fef340)
Diffstat (limited to 'source4/scripting/ejs')
-rw-r--r--source4/scripting/ejs/smbcalls.c33
-rw-r--r--source4/scripting/ejs/smbcalls_sys.c2
2 files changed, 34 insertions, 1 deletions
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 839ec7b634..815b3e2b5d 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -203,6 +203,38 @@ static int jsonrpc_include(int eid, int argc, char **argv)
}
+static int ejs_debug(int eid, int argc, char **argv)
+{
+ int i;
+ int level;
+ void *ctx = mprMemCtx();
+ char *msg;
+
+
+ if (argc < 2) {
+ return -1;
+ }
+
+ level = atoi(argv[0]);
+
+ msg = talloc_zero_size(ctx, 1);
+ if (msg == NULL) {
+ DEBUG(0, ("out of memory in debug()\n"));
+ return 0;
+ }
+
+ for (i = 1; i < argc; i++) {
+ msg = talloc_append_string(ctx, msg, argv[i]);
+ if (msg == NULL) {
+ DEBUG(0, ("out of memory in debug()\n"));
+ return 0;
+ }
+ }
+
+ DEBUG(level, ("%s", msg));
+ talloc_free(msg);
+ return 0;
+}
static void (*ejs_exception_handler) (const char *) = NULL;
@@ -241,5 +273,6 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
ejsDefineCFunction(-1, "version", ejs_version, NULL, MPR_VAR_SCRIPT_HANDLE);
ejsDefineStringCFunction(-1, "jsonrpc_include", jsonrpc_include, NULL, MPR_VAR_SCRIPT_HANDLE);
+ ejsDefineStringCFunction(-1, "debug", ejs_debug, NULL, MPR_VAR_SCRIPT_HANDLE);
}
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 42990f49c0..97fcc19cd1 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -413,7 +413,7 @@ static int ejs_sys_init(MprVarHandle eid, int argc, struct MprVar **argv)
mprSetCFunction(obj, "interfaces", ejs_sys_interfaces);
mprSetCFunction(obj, "hostname", ejs_sys_hostname);
mprSetCFunction(obj, "nttime", ejs_sys_nttime);
- mprSetCFunction(obj, "getTimeOfDay", ejs_sys_gettimeofday);
+ mprSetCFunction(obj, "gettimeofday", ejs_sys_gettimeofday);
mprSetCFunction(obj, "unix2nttime", ejs_sys_unix2nttime);
mprSetCFunction(obj, "gmmktime", ejs_sys_gmmktime);
mprSetCFunction(obj, "gmtime", ejs_sys_gmtime);