sr-dev November 2024

sr-dev@lists.kamailio.org

20 participants
376 discussions

git:master:a6c7538c: core: new parameter to define async_tkv_gname
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: a6c7538cb873aa8ee173eadffecbe3fdefe40bd7 URL: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T09:18:06+01:00 core: new parameter to define async_tkv_gname --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… Patch: https://github.com/kamailio/kamailio/commit/a6c7538cb873aa8ee173eadffecbe3f… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index e66205335fa..66b3d2c0b08 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -537,6 +537,16 @@ int async_task_run(async_wgroup_t *awg, int idx) static async_wgroup_t *_async_tkv_awg = NULL; static async_tkv_param_t *_ksr_async_tkv_param = NULL; static int _ksr_async_tkv_ridx = -1; +static str async_tkv_gname = str_init("tkv"); + +/** + * + */ +void async_tkv_gname_set(char *gname) +{ + async_tkv_gname.s = gname; + async_tkv_gname.len = strlen(async_tkv_gname.s); +} /** * @@ -551,10 +561,12 @@ async_tkv_param_t *ksr_async_tkv_param_get(void) */ void async_tkv_init(void) { - str gname = str_init("tkv"); str evname = str_init("core:tkv"); - _async_tkv_awg = async_task_group_find(&gname); + if(async_tkv_gname.len <= 0) { + return; + } + _async_tkv_awg = async_task_group_find(&async_tkv_gname); _ksr_async_tkv_ridx = route_lookup(&event_rt, evname.s); if(_ksr_async_tkv_ridx <= 0 diff --git a/src/core/async_task.h b/src/core/async_task.h index 67df94d6169..8319f0b8a46 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -69,5 +69,6 @@ typedef struct async_tkv_param void async_tkv_init(void); int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); async_tkv_param_t *ksr_async_tkv_param_get(void); +void async_tkv_gname_set(char *gname); #endif diff --git a/src/core/cfg.lex b/src/core/cfg.lex index a557f62754f..91aece447f3 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -381,6 +381,7 @@ ASYNC_WORKERS async_workers ASYNC_USLEEP async_usleep ASYNC_NONBLOCK async_nonblock ASYNC_WORKERS_GROUP async_workers_group +ASYNC_TKV_GNAME async_tkv_gname CHECK_VIA check_via PHONE2TEL phone2tel MEMLOG "memlog"|"mem_log" @@ -874,6 +875,7 @@ IMPORTFILE "import_file" <INITIAL>{ASYNC_USLEEP} { count(); yylval.strval=yytext; return ASYNC_USLEEP; } <INITIAL>{ASYNC_NONBLOCK} { count(); yylval.strval=yytext; return ASYNC_NONBLOCK; } <INITIAL>{ASYNC_WORKERS_GROUP} { count(); yylval.strval=yytext; return ASYNC_WORKERS_GROUP; } +<INITIAL>{ASYNC_TKV_GNAME} { count(); yylval.strval=yytext; return ASYNC_TKV_GNAME; } <INITIAL>{CHECK_VIA} { count(); yylval.strval=yytext; return CHECK_VIA; } <INITIAL>{PHONE2TEL} { count(); yylval.strval=yytext; return PHONE2TEL; } <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 1033e61cb19..f5544a96ac6 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -397,6 +397,7 @@ extern char *default_routename; %token ASYNC_USLEEP %token ASYNC_NONBLOCK %token ASYNC_WORKERS_GROUP +%token ASYNC_TKV_GNAME %token CHECK_VIA %token PHONE2TEL %token MEMLOG @@ -1088,6 +1089,8 @@ assign_stm: | ASYNC_NONBLOCK EQUAL error { yyerror("number expected"); } | ASYNC_WORKERS_GROUP EQUAL STRING { async_task_set_workers_group($3); } | ASYNC_WORKERS_GROUP EQUAL error { yyerror("string expected"); } + | ASYNC_TKV_GNAME EQUAL STRING { async_tkv_gname_set($3); } + | ASYNC_TKV_GNAME EQUAL error { yyerror("string expected"); } | CHECK_VIA EQUAL NUMBER { check_via=$3; } | CHECK_VIA EQUAL error { yyerror("boolean value expected"); } | PHONE2TEL EQUAL NUMBER { phone2tel=$3; }

1 0

git:master:a433cdf5: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: a433cdf5532e9b2e945fa4ced2e07c0566c01eb3 URL: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T15:46:10+01:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… Patch: https://github.com/kamailio/kamailio/commit/a433cdf5532e9b2e945fa4ced2e07c0… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index d4aa520a5ea..1e14cf89af0 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -421,6 +421,8 @@ event_route[xhttp:request] { ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "corex.debug", "params": [ 2 ], "id": + 1}'); ... 6. JSONRPC Commands

1 0

git:master:5437ad1a: jsonrpcs: docs - example for jsonrpc_exec() with rpc params
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 5437ad1a1dd691707e6ea1774e5c8ff6a72d30a7 URL: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T15:41:44+01:00 jsonrpcs: docs - example for jsonrpc_exec() with rpc params --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… Patch: https://github.com/kamailio/kamailio/commit/5437ad1a1dd691707e6ea1774e5c8ff… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index ab8aee4fcd0..f16cac7a7ee 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -495,6 +495,7 @@ event_route[xhttp:request] { ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); +jsonrpc_exec('{"jsonrpc": "2.0", "method": "corex.debug", "params": [ 2 ], "id": 1}'); ... </programlisting> </example>

1 0

Request for assistance with Microsoft Teams and Asterisk integration
by Giuseppe Marletta 26 Nov '24

26 Nov '24

Dear Kamailio Team, My name is Marletta, and I am a technician. I am working on a project involving Kamailio and need some information or assistance to configure its integration with Microsoft Teams and Asterisk. Specifically, I would like to know: 1. Is this integration feasible? 2. Which certificates should be used? 3. How can I validate the communication between Kamailio and Teams? I have consulted the official documentation and forums but could not find comprehensive answers. Would it be possible to receive your support or be directed to relevant resources or experts? Thank you in advance for your time and for the work you do to support this remarkable open-source community. I remain available to provide further details or clarifications. Best regards / 此致 [cid:image001.png@01DB3F60.F5D74DE0] Giuseppe Marletta Viale Europa, 128 - 65010 SPOLTORE (PE) Tel [+39] 085 4450011- Fax [+39] 085 4459477 PI e C.F. 01635460684 www.tecnojest.com<http://www.tecnojest.com/> [Image result for you tube icon]<https://www.youtube.com/@tecnojestsrl>[cid:image003.png@01DB3F60.F5D74DE0]<http://www.tecnojest.com/> [cid:image004.png@01DB3F60.F5D74DE0] <https://www.linkedin.com/company/tecnojests.r.l./> Le informazioni contenute nella presente e-mail e nei documenti eventualmente allegati possono essere confidenziali e sono comunque riservate al destinatario della stessa. La loro diffusione, distribuzione e/o copiatura da parte di terzi è proibita. I contenuti testuali sono divulgati a mero titolo informativo, gli stessi non possono essere rivendicati come impegni, ordini o commesse se non accompagnati da specifico documento firmato a norma di legge. Se avete ricevuto questa comunicazione per errore, Vi preghiamo di informare immediatamente il mittente del messaggio e di distruggere questa e-mail. This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden.

2 1

git:master:50ae4a98: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 50ae4a986c93ef8e405732d52f79ab98505888a4 URL: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T13:31:10+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… Patch: https://github.com/kamailio/kamailio/commit/50ae4a986c93ef8e405732d52f79ab9… --- diff --git a/src/modules/async/README b/src/modules/async/README index a703c1224b1..f1ac057d01a 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -39,6 +39,7 @@ Daniel-Constantin Mierla 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) List of Examples @@ -54,6 +55,7 @@ Daniel-Constantin Mierla 1.10. async_task_group_route usage 1.11. async_task_data usage 1.12. async_task_group_data usage + 1.13. async_tkv_emit usage Chapter 1. Admin Guide @@ -81,6 +83,7 @@ Chapter 1. Admin Guide 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) 1. Overview @@ -168,6 +171,7 @@ modparam("async", "return", 1) 4.6. async_task_group_route(routename, groupname) 4.7. async_task_data(routename, data) 4.8. async_task_group_data(routename, groupname, data) + 4.9. async_tkv_emit(type, key, value) 4.1. async_route(routename, seconds) @@ -416,3 +420,24 @@ route[RESUME] { exit; } ... + +4.9. async_tkv_emit(type, key, value) + + Emit a type-key-value event. + + This function can be used from ANY_ROUTE. + + Example 1.13. async_tkv_emit usage +... +async_workers_group="name=tkv;workers=1;nonblock=0;usleep=0" +... +request_route { + ... + async_tkv_emit("8000", "call", "caller='$fU';callee='$tU'"); + ... +} +event_route[core:tkv] { + xinfo("$atkv(type) / $atkv(key) / $atkv(val)\n"); + exit; +} +...

1 0

git:master:3eff208d: async: docs for async_tkv_emit()
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 3eff208df921d6693a015836a266bf87212aae96 URL: https://github.com/kamailio/kamailio/commit/3eff208df921d6693a015836a266bf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T13:15:48+01:00 async: docs for async_tkv_emit() --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3eff208df921d6693a015836a266bf8… Patch: https://github.com/kamailio/kamailio/commit/3eff208df921d6693a015836a266bf8… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 152c6be5db7..f11e28540ed 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -463,6 +463,35 @@ route[RESUME] { exit; } ... +</programlisting> + </example> + </section> + <section id="async.f.async_tkv_emit"> + <title> + <function moreinfo="none">async_tkv_emit(type, key, value)</function> + </title> + <para> + Emit a type-key-value event. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>async_tkv_emit</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=tkv;workers=1;nonblock=0;usleep=0" +... +request_route { + ... + async_tkv_emit("8000", "call", "caller='$fU';callee='$tU'"); + ... +} +event_route[core:tkv] { + xinfo("$atkv(type) / $atkv(key) / $atkv(val)\n"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:dd081219: async: exported async_tkv_emit() function
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: dd0812196cede94aeea01f9c67ffe363a38ca100 URL: https://github.com/kamailio/kamailio/commit/dd0812196cede94aeea01f9c67ffe36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T12:58:40+01:00 async: exported async_tkv_emit() function --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dd0812196cede94aeea01f9c67ffe36… Patch: https://github.com/kamailio/kamailio/commit/dd0812196cede94aeea01f9c67ffe36… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index bd31880064f..5353082359f 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -63,6 +63,9 @@ static int w_async_task_group_data( sip_msg_t *msg, char *rt, char *gr, char *pdata); static int fixup_async_task_route(void **param, int param_no); +static int w_async_tkv_emit( + sip_msg_t *msg, char *ptype, char *pkey, char *pval); + /* tm */ struct tm_binds tmb; @@ -84,6 +87,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"async_task_group_data", (cmd_function)w_async_task_group_data, 3, fixup_async_task_route, 0, ANY_ROUTE}, + {"async_tkv_emit", (cmd_function)w_async_tkv_emit, 3, fixup_iss, + fixup_free_iss, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -644,6 +649,34 @@ static int w_async_task_group_data( return ki_async_task_group_data(msg, &rn, &gn, &sdata); } +/** + * + */ +static int w_async_tkv_emit(sip_msg_t *msg, char *ptype, char *pkey, char *pval) +{ + int ret = -1; + int vtype = 0; + str skey = STR_NULL; + str sval = STR_NULL; + + if(fixup_get_ivalue(msg, (gparam_t *)ptype, &vtype) != 0) { + LM_ERR("failed getting type parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pkey, &skey) != 0) { + LM_ERR("failed getting key parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pval, &sval) != 0) { + LM_ERR("failed getting value parameter\n"); + return -1; + } + + ret = async_tkv_emit(vtype, skey.s, "%s", sval.s); + + return (ret == 0) ? 1 : ret; +} + /** * */

1 0

git:master:e3349b79: core: helper fixup functions for int-str-str parameters
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: e3349b793f811538e84713472757b06634d16efb URL: https://github.com/kamailio/kamailio/commit/e3349b793f811538e84713472757b06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T12:45:28+01:00 core: helper fixup functions for int-str-str parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/e3349b793f811538e84713472757b06… Patch: https://github.com/kamailio/kamailio/commit/e3349b793f811538e84713472757b06… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 18785662936..767c6a45a82 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1062,6 +1062,38 @@ int fixup_free_isi(void **param, int param_no) } } +/** + * + */ +int fixup_iss(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_igp_null(param, 1); + case 2: + case 3: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_iss(void **param, int param_no) +{ + switch(param_no) { + case 1: + return fixup_free_igp_null(param, 1); + case 2: + case 3: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 092f65b93bc..6ec0280ac70 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -187,6 +187,9 @@ int fixup_free_ssii(void **param, int param_no); int fixup_isi(void **param, int param_no); int fixup_free_isi(void **param, int param_no); +int fixup_iss(void **param, int param_no); +int fixup_free_iss(void **param, int param_no); + int fixup_isii(void **param, int param_no); int fixup_free_isii(void **param, int param_no);

1 0

git:master:77e7494d: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 77e7494d29d891c44a49377a462b0c82e6769f1e URL: https://github.com/kamailio/kamailio/commit/77e7494d29d891c44a49377a462b0c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T10:46:10+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/77e7494d29d891c44a49377a462b0c8… Patch: https://github.com/kamailio/kamailio/commit/77e7494d29d891c44a49377a462b0c8… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index ef5c56f6df6..44439a450d7 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1678,6 +1678,11 @@ onreply_route { The parameters can include variables. + The returns 1 (cfg-true) when the oc attrbutes are udpated for a + destination record; -1 (cfg-false) when there is an internal error; -2 + (cfg-false) when no destination is updated (e.g., not found or the + ocseq condition fails). + This function can be used from ANY_ROUTE. Example 1.61. ds_oc_set_attrs() usage

1 0

git:master:76f2d91d: dispatcher: updated docs for ds_oc_set_attrs()
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 76f2d91dc00fa33368d4df0d5a25a2dbbbc9f8c7 URL: https://github.com/kamailio/kamailio/commit/76f2d91dc00fa33368d4df0d5a25a2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:39:35+01:00 dispatcher: updated docs for ds_oc_set_attrs() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/76f2d91dc00fa33368d4df0d5a25a2d… Patch: https://github.com/kamailio/kamailio/commit/76f2d91dc00fa33368d4df0d5a25a2d… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 5e7cb95953c..f311be2f1ff 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2073,6 +2073,10 @@ onreply_route { </listitem> </itemizedlist> <para>The parameters can include variables.</para> + <para>The returns 1 (cfg-true) when the oc attrbutes are udpated for a + destination record; -1 (cfg-false) when there is an internal error; + -2 (cfg-false) when no destination is updated (e.g., not found or the + ocseq condition fails).</para> <para> This function can be used from ANY_ROUTE. </para>

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2024