sr-dev January 2023

sr-dev@lists.kamailio.org

14 participants
279 discussions

git:master:6c3cff35: jsonrpcs: check if rpc command has execution limit with delta interval

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6c3cff35a2ae2c29a93f0c2bd8507ccbed00464c URL: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:26:22+01:00 jsonrpcs: check if rpc command has execution limit with delta interval --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… Patch: https://github.com/kamailio/kamailio/commit/6c3cff35a2ae2c29a93f0c2bd8507cc… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index a966f6438ee..801eae441f1 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1271,11 +1271,12 @@ static void mod_destroy(void) */ static int ki_jsonrpcs_dispatch(sip_msg_t* msg) { - rpc_export_t* rpce; + rpc_exportx_t* rpce; jsonrpc_ctx_t* ctx; int ret = 0; srjson_t *nj = NULL; str val; + unsigned int rdata; if(!IS_HTTP(msg)) { LM_DBG("Got non HTTP msg\n"); @@ -1332,20 +1333,26 @@ static int ki_jsonrpcs_dispatch(sip_msg_t* msg) val.s = nj->valuestring; val.len = strlen(val.s); ctx->method = val.s; - rpce = find_rpc_export(ctx->method, 0); - if (!rpce || !rpce->function) { + rpce = rpc_lookupx(val.s, val.len, &rdata); + if (!rpce || !rpce->r.function) { LM_ERR("method callback not found [%.*s]\n", val.len, val.s); jsonrpc_fault(ctx, 500, "Method Not Found"); goto send_reply; } - ctx->flags = rpce->flags; + if (rdata & RPC_EXEC_DELTA) { + LM_ERR("execution of command [%.*s] is limited by delta [%d]\n", + val.len, val.s, ksr_rpc_exec_delta); + jsonrpc_fault(ctx, 500, "Command Executed Too Fast"); + goto send_reply; + } + ctx->flags = rpce->r.flags; nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "params"); if(nj!=NULL && nj->type!=srjson_Array && nj->type!=srjson_Object) { LM_ERR("params field is not an array or object\n"); goto send_reply; } if(nj!=NULL) ctx->req_node = nj->child; - rpce->function(&func_param, ctx); + rpce->r.function(&func_param, ctx); send_reply: if (!ctx->reply_sent && !(ctx->flags&JSONRPC_DELAYED_REPLY_F)) { @@ -1367,12 +1374,13 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) int jsonrpc_exec_ex(str *cmd, str *rpath) { - rpc_export_t* rpce; + rpc_exportx_t* rpce; jsonrpc_ctx_t* ctx; int ret; srjson_t *nj = NULL; str val; str scmd; + unsigned int rdata = 0; scmd = *cmd; @@ -1441,20 +1449,26 @@ int jsonrpc_exec_ex(str *cmd, str *rpath) val.s = nj->valuestring; val.len = strlen(val.s); ctx->method = val.s; - rpce = find_rpc_export(ctx->method, 0); - if (!rpce || !rpce->function) { + rpce = rpc_lookupx(val.s, val.len, &rdata); + if (!rpce || !rpce->r.function) { LM_ERR("method callback not found [%.*s]\n", val.len, val.s); jsonrpc_fault(ctx, 500, "Method Not Found"); goto send_reply; } - ctx->flags = rpce->flags; + if (rdata & RPC_EXEC_DELTA) { + LM_ERR("execution of command [%.*s] is limited by delta [%d]\n", + val.len, val.s, ksr_rpc_exec_delta); + jsonrpc_fault(ctx, 500, "Command Executed Too Fast"); + goto send_reply; + } + ctx->flags = rpce->r.flags; nj = srjson_GetObjectItem(ctx->jreq, ctx->jreq->root, "params"); if(nj!=NULL && nj->type!=srjson_Array && nj->type!=srjson_Object) { LM_ERR("params field is not an array or object\n"); goto send_reply; } if(nj!=NULL) ctx->req_node = nj->child; - rpce->function(&func_param, ctx); + rpce->r.function(&func_param, ctx); ret = 1; send_reply:

1 year, 10 months

git:master:cc482ee9: xhttp_rpc: updates to use the new structure from rpc_sarray

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc482ee970ef1abd3cabd15aa5907ad995e57cfe URL: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:25:05+01:00 xhttp_rpc: updates to use the new structure from rpc_sarray --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c Modified: src/modules/xhttp_rpc/xhttp_rpc_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad… Patch: https://github.com/kamailio/kamailio/commit/cc482ee970ef1abd3cabd15aa5907ad…

1 year, 10 months

git:master:8b311277: core: export core rpc commands later when shm is initialized

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8b3112774fe08f5b6d808ee916431c3331a2e819 URL: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:23:24+01:00 core: export core rpc commands later when shm is initialized --- Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… Patch: https://github.com/kamailio/kamailio/commit/8b3112774fe08f5b6d808ee916431c3… --- diff --git a/src/core/globals.h b/src/core/globals.h index 8d72807aee..109e4474cf 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -233,6 +233,8 @@ extern char *ksr_stats_namesep; extern str ksr_ipv6_hex_style; extern int ksr_local_rport; +extern int ksr_rpc_exec_delta; + #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ extern unsigned int dns_timer_interval; /* gc timer interval in s */ diff --git a/src/main.c b/src/main.c index f2ffe02665..07b89604f8 100644 --- a/src/main.c +++ b/src/main.c @@ -2430,7 +2430,6 @@ int main(int argc, char** argv) if (pv_init_api()<0) goto error; if (pv_register_core_vars()!=0) goto error; if (init_rpcs()<0) goto error; - if (register_core_rpcs()!=0) goto error; /* Fix the value of cfg_file variable.*/ if (fix_cfg_file() < 0) goto error; @@ -2762,6 +2761,8 @@ int main(int argc, char** argv) if (pv_reinit_buffer()<0) goto error; + if (register_core_rpcs()!=0) goto error; + if (ksr_route_locks_set_init()<0) goto error;

1 year, 10 months

git:master:017089c0: core: new rpc command core.echo_delta

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 017089c04f2d6876fcb43ea494f287e687efc5d9 URL: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:22:00+01:00 core: new rpc command core.echo_delta - example of rpc command exported with RPC_EXEC_DELTA flag --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… Patch: https://github.com/kamailio/kamailio/commit/017089c04f2d6876fcb43ea494f287e… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 3c9f08e332..c89111d39e 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -240,7 +240,7 @@ static void system_listMethods(rpc_t* rpc, void* c) int i; for(i=0; i<rpc_sarray_crt_size; i++){ - if (rpc->add(c, "s", rpc_sarray[i]->name) < 0) return; + if (rpc->add(c, "s", rpc_sarray[i]->r.name) < 0) return; } } @@ -326,6 +326,20 @@ static void core_echo(rpc_t* rpc, void* c) } +static const char* core_echo_delta_doc[] = { + "Returns back its parameters with execution delta limit.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + + +static void core_echo_delta(rpc_t* rpc, void* c) +{ + char* string = 0; + while((rpc->scan(c, "*.s", &string)>0)) + rpc->add(c, "s", string); +} + + static const char* core_version_doc[] = { "Returns the version string of the server.", /* Documentation string */ 0 /* Method signature(s) */ @@ -1114,6 +1128,8 @@ static rpc_export_t core_rpc_methods[] = { RET_ARRAY}, {"core.echo", core_echo, core_echo_doc, RET_ARRAY}, + {"core.echo_delta", core_echo_delta, core_echo_delta_doc, + RET_ARRAY|RPC_EXEC_DELTA}, {"core.version", core_version, core_version_doc, 0 }, {"core.flags", core_flags, core_flags_doc,

1 year, 10 months

git:master:e65c5784: core: new parameter rpc_exec_delta to set rpc command delta interval execution

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e65c5784fee4952d1260016b1f1d94177f8f405d URL: https://github.com/kamailio/kamailio/commit/e65c5784fee4952d1260016b1f1d941… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-04T10:20:35+01:00 core: new parameter rpc_exec_delta to set rpc command delta interval execution - value is seconds - default is 0 (no delta interval execution) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/e65c5784fee4952d1260016b1f1d941… Patch: https://github.com/kamailio/kamailio/commit/e65c5784fee4952d1260016b1f1d941… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d4379da3fc..e0500769bb 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -500,6 +500,8 @@ LATENCY_LIMIT_DB latency_limit_db LATENCY_LIMIT_ACTION latency_limit_action LATENCY_LIMIT_CFG latency_limit_cfg +RPC_EXEC_DELTA_CFG "rpc_exec_delta" + URI_HOST_EXTRA_CHARS "uri_host_extra_chars" HDR_NAME_EXTRA_CHARS "hdr_name_extra_chars" @@ -1041,6 +1043,7 @@ IMPORTFILE "import_file" <INITIAL>{LATENCY_LIMIT_DB} { count(); yylval.strval=yytext; return LATENCY_LIMIT_DB;} <INITIAL>{LATENCY_LIMIT_ACTION} { count(); yylval.strval=yytext; return LATENCY_LIMIT_ACTION;} <INITIAL>{LATENCY_LIMIT_CFG} { count(); yylval.strval=yytext; return LATENCY_LIMIT_CFG;} +<INITIAL>{RPC_EXEC_DELTA_CFG} { count(); yylval.strval=yytext; return RPC_EXEC_DELTA_CFG;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } <INITIAL>{LOADMODULEX} { count(); yylval.strval=yytext; return LOADMODULEX; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 230be193dd..43804b0706 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -529,6 +529,7 @@ extern char *default_routename; %token LATENCY_LIMIT_DB %token LATENCY_LIMIT_ACTION %token LATENCY_LIMIT_CFG +%token RPC_EXEC_DELTA_CFG %token MSG_TIME %token ONSEND_RT_REPLY %token URI_HOST_EXTRA_CHARS @@ -1967,6 +1968,8 @@ assign_stm: | LATENCY_LIMIT_ACTION EQUAL error { yyerror("number expected"); } | LATENCY_LIMIT_CFG EQUAL NUMBER { default_core_cfg.latency_limit_cfg=$3; } | LATENCY_LIMIT_CFG EQUAL error { yyerror("number expected"); } + | RPC_EXEC_DELTA_CFG EQUAL NUMBER { ksr_rpc_exec_delta=$3; } + | RPC_EXEC_DELTA_CFG EQUAL error { yyerror("number expected"); } | MSG_TIME EQUAL NUMBER { sr_msg_time=$3; } | MSG_TIME EQUAL error { yyerror("number expected"); } | ONSEND_RT_REPLY EQUAL NUMBER { onsend_route_reply=$3; }

1 year, 10 months

Job offer Kamailio/VoIP developer

by Henning Westerholt

Hello and Happy New Year, we are looking for a new Kamailio & VoIP developer colleague to join and grow our international team. More detail about the position can be found at: https://gilawa.com/en/about/careers If you are interested, please send me a (direct) email. Please include the information described in the linked job description. Best regards, Henning Westerholt -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 year, 10 months

git:master:6a5483a1: core: rpc - removed define switch for copying rpc export

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6a5483a1767f689bc5ad261e2ead86da33c0dc73 URL: https://github.com/kamailio/kamailio/commit/6a5483a1767f689bc5ad261e2ead86d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-03T11:17:28+01:00 core: rpc - removed define switch for copying rpc export - set for many years without change --- Modified: src/core/rpc_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/6a5483a1767f689bc5ad261e2ead86d… Patch: https://github.com/kamailio/kamailio/commit/6a5483a1767f689bc5ad261e2ead86d… --- diff --git a/src/core/rpc_lookup.c b/src/core/rpc_lookup.c index 5203609db3..f1e6e06617 100644 --- a/src/core/rpc_lookup.c +++ b/src/core/rpc_lookup.c @@ -29,8 +29,6 @@ #define RPC_HASH_SIZE 32 #define RPC_SARRAY_SIZE 32 /* initial size */ -#define RPC_COPY_EXPORT - static struct str_hash_table rpc_hash_table; /* array of pointer to rpc exports, sorted after their name @@ -97,21 +95,15 @@ static int rpc_hash_add(struct rpc_export* rpc) doc1_len=rpc->doc_str[1]?strlen(rpc->doc_str[1]):0; /* alloc everything into one block */ -#ifdef RPC_COPY_EXPORT e=pkg_malloc(ROUND_POINTER(sizeof(struct str_hash_entry)) +ROUND_POINTER(sizeof(*rpc))+2*sizeof(char*)+ +name_len+1+doc0_len+(rpc->doc_str[0]!=0) +doc1_len+(rpc->doc_str[1]!=0) ); -#else /* RPC_COPY_EXPORT */ - e=pkg_malloc(ROUND_POINTER(sizeof(struct str_hash_entry))); -#endif /* RPC_COPY_EXPORT */ - if (e==0){ PKG_MEM_ERROR; goto error; } -#ifdef RPC_COPY_EXPORT n_rpc=(rpc_export_t*)((char*)e+ ROUND_POINTER(sizeof(struct str_hash_entry))); /* copy rpc into n_rpc */ @@ -135,9 +127,6 @@ static int rpc_hash_add(struct rpc_export* rpc) }else{ n_rpc->doc_str[1]=0; } -#else /* RPC_COPY_EXPORT */ - n_rpc=rpc; -#endif /* RPC_COPY_EXPORT */ e->key.s=(char*)n_rpc->name; e->key.len=name_len;

1 year, 10 months

git:master:7a357300: core: rpc - removed old todo, whitespacing and define guards coherence

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7a3573002fddffd74999c4cd5a859a4019d0227a URL: https://github.com/kamailio/kamailio/commit/7a3573002fddffd74999c4cd5a859a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-03T11:06:00+01:00 core: rpc - removed old todo, whitespacing and define guards coherence --- Modified: src/core/rpc.h Modified: src/core/rpc_lookup.c Modified: src/core/rpc_lookup.h --- Diff: https://github.com/kamailio/kamailio/commit/7a3573002fddffd74999c4cd5a859a4… Patch: https://github.com/kamailio/kamailio/commit/7a3573002fddffd74999c4cd5a859a4…

1 year, 10 months

Happy New Year 2023!

by Daniel-Constantin Mierla

A Happy, Peaceful And Prosperous Year 2023 to everyone using Kamailio and helping to improve the project! Looking forward to meeting many of you around this world during 2023 and collaborating in a friendly environment! Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - June 5-7, 2023 - www.kamailioworld.com

1 year, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023