sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
539 discussions

git:master:9077a879: app_jsdt: exposed KSR.x.drop()
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: 9077a87978ff57ff369f8fbc103d8c52b92be622 URL: https://github.com/kamailio/kamailio/commit/9077a87978ff57ff369f8fbc103d8c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-08T14:01:58+01:00 app_jsdt: exposed KSR.x.drop() --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9077a87978ff57ff369f8fbc103d8c5… Patch: https://github.com/kamailio/kamailio/commit/9077a87978ff57ff369f8fbc103d8c5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index bf6686a..a903375 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -411,6 +411,17 @@ static int jsdt_sr_exit (duk_context *J) /** * */ +static int jsdt_sr_drop (duk_context *J) +{ + sr_kemi_core_drop(NULL); + duk_eval_string_noresult(J, JSDT_SR_EXIT_EXEC_STR); + return 0; +} + + +/** + * + */ static int jsdt_sr_modf (duk_context *J) { int ret; @@ -572,6 +583,7 @@ static int jsdt_sr_modf (duk_context *J) const duk_function_list_entry _sr_kemi_x_J_Map[] = { { "exit", jsdt_sr_exit, 0 /* 0 args */ }, + { "drop", jsdt_sr_drop, 0 /* 0 args */ }, { "modf", jsdt_sr_modf, DUK_VARARGS /* var args */ }, { NULL, NULL, 0 } };

1 0

git:master:3017abf7: core: kemi - exposed set drop flag function
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: 3017abf74d770adf6574159a11409060cb63837d URL: https://github.com/kamailio/kamailio/commit/3017abf74d770adf6574159a1140906… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-08T13:33:34+01:00 core: kemi - exposed set drop flag function --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/3017abf74d770adf6574159a1140906… Patch: https://github.com/kamailio/kamailio/commit/3017abf74d770adf6574159a1140906… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 1b880a1..86c08d5 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -115,7 +115,7 @@ static int sr_kemi_core_log(sip_msg_t *msg, str *level, str *txt) /** * */ -static int sr_kemi_core_drop(sip_msg_t *msg) +int sr_kemi_core_drop(sip_msg_t *msg) { if(_sr_kemi_act_ctx==NULL) return 0; diff --git a/src/core/kemi.h b/src/core/kemi.h index 4145950..df8ae5e 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -124,4 +124,6 @@ run_act_ctx_t* sr_kemi_act_ctx_get(void); str *sr_kemi_param_map_get_name(int ptype); str *sr_kemi_param_map_get_params(int *ptypes); +int sr_kemi_core_drop(sip_msg_t *msg); + #endif

1 0

git:master:96da7ff4: app_jsdt: rpc js script reload
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: 96da7ff441bbf92fbab374a3c34ccba26d1d915e URL: https://github.com/kamailio/kamailio/commit/96da7ff441bbf92fbab374a3c34ccba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-08T13:32:47+01:00 app_jsdt: rpc js script reload --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/96da7ff441bbf92fbab374a3c34ccba… Patch: https://github.com/kamailio/kamailio/commit/96da7ff441bbf92fbab374a3c34ccba…

1 0

git:master:459a8914: examples: kemi - added basic script for jsdt engine
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: 459a8914ab873d0f2cb7df7ccc764b872fc2b9d6 URL: https://github.com/kamailio/kamailio/commit/459a8914ab873d0f2cb7df7ccc764b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-08T10:08:47+01:00 examples: kemi - added basic script for jsdt engine --- Added: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/459a8914ab873d0f2cb7df7ccc764b8… Patch: https://github.com/kamailio/kamailio/commit/459a8914ab873d0f2cb7df7ccc764b8…

1 0

git:master:058fa994: app_jsdt: filled api list rpc command
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: 058fa9946b740c2b748ca592968aeec22c485ce6 URL: https://github.com/kamailio/kamailio/commit/058fa9946b740c2b748ca592968aeec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-08T09:33:43+01:00 app_jsdt: filled api list rpc command --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/058fa9946b740c2b748ca592968aeec… Patch: https://github.com/kamailio/kamailio/commit/058fa9946b740c2b748ca592968aeec… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 47187ac..83404d1 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1236,7 +1236,48 @@ static const char* app_jsdt_rpc_api_list_doc[2] = { static void app_jsdt_rpc_api_list(rpc_t* rpc, void* ctx) { - rpc->fault(ctx, 500, "Not implemented"); + int i; + int n; + sr_kemi_t *ket; + void* th; + void* sh; + void* ih; + + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + n = 0; + for(i=0; i<SR_KEMI_JSDT_EXPORT_SIZE; i++) { + ket = sr_kemi_jsdt_export_get(i); + if(ket==NULL) continue; + n++; + } + + if(rpc->struct_add(th, "d[", + "msize", n, + "methods", &ih)<0) + { + rpc->fault(ctx, 500, "Internal error array structure"); + return; + } + for(i=0; i<SR_KEMI_JSDT_EXPORT_SIZE; i++) { + ket = sr_kemi_jsdt_export_get(i); + if(ket==NULL) continue; + if(rpc->struct_add(ih, "{", "func", &sh)<0) { + rpc->fault(ctx, 500, "Internal error internal structure"); + return; + } + if(rpc->struct_add(sh, "SSSS", + "ret", sr_kemi_param_map_get_name(ket->rtype), + "module", &ket->mname, + "name", &ket->fname, + "params", sr_kemi_param_map_get_params(ket->ptypes))<0) { + LM_ERR("failed to add the structure with attributes (%d)\n", i); + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return; + } + } } rpc_export_t app_jsdt_rpc_cmds[] = {

1 0

git:master:5df2933a: examples: kemi - show how app_jsdt can be used as kemi config engine
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: 5df2933a3ee8595b954cb694d8434ea7997be88c URL: https://github.com/kamailio/kamailio/commit/5df2933a3ee8595b954cb694d8434ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-07T22:03:51+01:00 examples: kemi - show how app_jsdt can be used as kemi config engine --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/5df2933a3ee8595b954cb694d8434ea… Patch: https://github.com/kamailio/kamailio/commit/5df2933a3ee8595b954cb694d8434ea… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index ae56d03..a9cdc78 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -219,6 +219,10 @@ loadmodule "app_lua.so" loadmodule "app_python.so" #!endif +#!ifdef WITH_CFGJSDT +loadmodule "app_jsdt.so" +#!endif + # ----------------- setting module-specific parameters --------------- # ----- jsonrpcs params ----- @@ -359,9 +363,16 @@ cfgengine "python" modparam("app_lua", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-lua.lua") cfgengine "lua" #!else + +#!ifdef WITH_CFGJSDT +modparam("app_jsdt", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-jsdt.js") +cfgengine "lua" +#!else cfgengine "native" include_file "/usr/local/etc/kamailio/kamailio-basic-kemi-native.cfg" #!endif #!endif +#!endif +

1 0

git:master:d66762b6: app_jsdt: execution of cfg module functions from js
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: d66762b6169218df0e831480d16089e86b1e343e URL: https://github.com/kamailio/kamailio/commit/d66762b6169218df0e831480d16089e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-07T22:02:04+01:00 app_jsdt: execution of cfg module functions from js --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d66762b6169218df0e831480d16089e… Patch: https://github.com/kamailio/kamailio/commit/d66762b6169218df0e831480d16089e…

1 0

git:master:f8cbf687: app_jsdt: export submodules as KSR_mod and then set it to KSR.mod in js
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: f8cbf6873a0c3b49394906fdfbbe1ac43c705e20 URL: https://github.com/kamailio/kamailio/commit/f8cbf6873a0c3b49394906fdfbbe1ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-07T18:38:02+01:00 app_jsdt: export submodules as KSR_mod and then set it to KSR.mod in js --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/f8cbf6873a0c3b49394906fdfbbe1ac… Patch: https://github.com/kamailio/kamailio/commit/f8cbf6873a0c3b49394906fdfbbe1ac…

1 0

git:master:a37bc486: examples: removed mi modules from kemi configs
by Daniel-Constantin Mierla 08 Jan '17

08 Jan '17

Module: kamailio Branch: master Commit: a37bc486cda1e7f0cba6c871a6bd58aa554e1b4d URL: https://github.com/kamailio/kamailio/commit/a37bc486cda1e7f0cba6c871a6bd58a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-07T13:10:21+01:00 examples: removed mi modules from kemi configs --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/a37bc486cda1e7f0cba6c871a6bd58a… Patch: https://github.com/kamailio/kamailio/commit/a37bc486cda1e7f0cba6c871a6bd58a… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index c943a1c..ae56d03 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -166,7 +166,7 @@ mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" #!endif -loadmodule "mi_fifo.so" +loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" @@ -183,7 +183,6 @@ loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_AUTH @@ -222,9 +221,12 @@ loadmodule "app_python.so" # ----------------- setting module-specific parameters --------------- - -# ----- mi_fifo params ----- -#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- #modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl")

1 0

git:master:040fea8c: jsonrpcs: reordered static functions to avoid compile issues
by Daniel-Constantin Mierla 07 Jan '17

07 Jan '17

Module: kamailio Branch: master Commit: 040fea8c217b3a4dec90c59ce766553dcdf76507 URL: https://github.com/kamailio/kamailio/commit/040fea8c217b3a4dec90c59ce766553… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-07T12:42:19+01:00 jsonrpcs: reordered static functions to avoid compile issues --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/040fea8c217b3a4dec90c59ce766553… Patch: https://github.com/kamailio/kamailio/commit/040fea8c217b3a4dec90c59ce766553… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index ca67500..c641d0a 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -236,36 +236,6 @@ static void jsonrpc_reset_plain_reply(void (*free_fn)(void*)) memset(&_jsonrpc_plain_reply, 0, sizeof(jsonrpc_plain_reply_t)); } -/** Implementation of rpc_fault function required by the management API. - * - * This function will be called whenever a management function - * indicates that an error ocurred while it was processing the request. The - * function takes the reply code and reason phrase as parameters, these will - * be put in the body of the reply. - * - * @param ctx A pointer to the context structure of the request being - * processed. - * @param code Reason code. - * @param fmt Formatting string used to build the reason phrase. - */ -static void jsonrpc_fault(jsonrpc_ctx_t* ctx, int code, char* fmt, ...) -{ - va_list ap; - - jsonrpc_delayed_reply_ctx_init(ctx); - - ctx->http_code = code; - va_start(ap, fmt); - vsnprintf(jsonrpc_error_buf, JSONRPC_ERROR_REASON_BUF_LEN, fmt, ap); - va_end(ap); - ctx->http_text.len = strlen(jsonrpc_error_buf); - ctx->http_text.s = jsonrpc_error_buf; - if(ctx->error_code == 0) ctx->error_code = -32000; - - return; -} - - /** Initialize jsonrpc reply data structure. * @@ -296,6 +266,50 @@ static int jsonrpc_init_reply(jsonrpc_ctx_t *ctx) return 0; } + +/** if this a delayed reply context, + * and it's never been use before, initialize it */ +static int jsonrpc_delayed_reply_ctx_init(jsonrpc_ctx_t* ctx) +{ + if ((ctx->flags & JSONRPC_DELAYED_CTX_F) + && (ctx->jrpl==0)) { + if (jsonrpc_init_reply(ctx) < 0) + return -1; + jsonrpc_reset_plain_reply(ctx->jrpl->free_fn); + } + return 0; +} + +/** Implementation of rpc_fault function required by the management API. + * + * This function will be called whenever a management function + * indicates that an error ocurred while it was processing the request. The + * function takes the reply code and reason phrase as parameters, these will + * be put in the body of the reply. + * + * @param ctx A pointer to the context structure of the request being + * processed. + * @param code Reason code. + * @param fmt Formatting string used to build the reason phrase. + */ +static void jsonrpc_fault(jsonrpc_ctx_t* ctx, int code, char* fmt, ...) +{ + va_list ap; + + jsonrpc_delayed_reply_ctx_init(ctx); + + ctx->http_code = code; + va_start(ap, fmt); + vsnprintf(jsonrpc_error_buf, JSONRPC_ERROR_REASON_BUF_LEN, fmt, ap); + va_end(ap); + ctx->http_text.len = strlen(jsonrpc_error_buf); + ctx->http_text.s = jsonrpc_error_buf; + if(ctx->error_code == 0) ctx->error_code = -32000; + + return; +} + + /** Implementation of rpc_send function required by the management API. * * This is the function that will be called whenever a management function @@ -918,19 +932,6 @@ static rpc_capabilities_t jsonrpc_capabilities(jsonrpc_ctx_t* ctx) return RPC_DELAYED_REPLY; } -/** if this a delayed reply context, - * and it's never been use before, initialize it */ -static int jsonrpc_delayed_reply_ctx_init(jsonrpc_ctx_t* ctx) -{ - if ((ctx->flags & JSONRPC_DELAYED_CTX_F) - && (ctx->jrpl==0)) { - if (jsonrpc_init_reply(ctx) < 0) - return -1; - jsonrpc_reset_plain_reply(ctx->jrpl->free_fn); - } - return 0; -} - /** Returns a new "delayed reply" context. * Creates a new delayed reply context in shm and returns it.

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017