- sr-dev - kamailio.org

git:master:13f77911: core: parameter to set async_tkv_evcb
by Daniel-Constantin Mierla 27 Nov '24

27 Nov '24

Module: kamailio Branch: master Commit: 13f77911ebf5c5b53c9793727a9c5b4f1f0865fe URL: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-27T12:20:05+01:00 core: parameter to set async_tkv_evcb - name of event route or kemi callback for tkv processing --- 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/13f77911ebf5c5b53c9793727a9c5b4… Patch: https://github.com/kamailio/kamailio/commit/13f77911ebf5c5b53c9793727a9c5b4…

1 0

[kamailio/kamailio] kamailio exceed limit issue (Issue #4040)
by Muhammad Jawad Ud Din 27 Nov '24

27 Nov '24

route[HANDLE_INVITE] { if (!has_totag()) { if (!t_newtran()) { xlog("L_ERROR", "Failed to create new transaction\n"); sl_reply_error(); exit; } if (!is_present_hf("X-VICIdial-Client-Id")) { xlog("L_WARN", "INVITE received without X-VICIdial-Client-Id header\n"); t_reply("400", "Bad Request - Missing Client ID"); exit; } if ($rU == $null) { xlog("L_WARN", "INVITE received with empty Request-URI username\n"); t_reply("400", "Bad Request - Missing User"); exit; } $var(full_client_id) = $hdr(X-VICIdial-Client-Id); # Extract parent ID if ($var(full_client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_client_id) = $(var(full_client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); } else { $var(parent_client_id) = $var(full_client_id); } # CPS Check and Rate Limiting lock("cps_counter"); # Get current CPS count and max limit $var(current_cps) = $sht(client_limits=>$var(parent_client_id)); $var(max_cps) = $sht(client_max_cps=>$var(parent_client_id)); xlog("L_INFO", "CPS Check - Client: $var(parent_client_id), Current: $var(current_cps), Max: $var(max_cps)\n"); # Check for configured limit if($var(max_cps) == $null) { unlock("cps_counter"); xlog("L_WARN", "No CPS limit configured for client $var(parent_client_id)\n"); t_reply("403", "Client Not Authorized"); exit; } # Get concurrent calls $var(concurrent_calls) = $sht(client_calls=>$var(parent_client_id)); if($var(concurrent_calls) == $null) { $var(concurrent_calls) = 0; } # Strict limit check if($var(concurrent_calls) >= $var(max_cps)) { unlock("cps_counter"); xlog("L_WARN", "Concurrent call limit reached for $var(parent_client_id): $var(concurrent_calls)/$var(max_cps)\n"); t_reply("503", "Concurrent Call Limit Exceeded"); exit; } # Allow call and increment counter if($var(current_cps) == $null) { $sht(client_limits=>$var(parent_client_id)) = 1; } else { $sht(client_limits=>$var(parent_client_id)) = $var(current_cps) + 1; } xlog("L_INFO", "Call allowed for $var(parent_client_id): Concurrent=$var(concurrent_calls+1)/$var(max_cps)\n"); unlock("cps_counter"); $var(user) = $rU; # Extract parent client ID if this is a child ID if ($var(full_client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_client_id) = $(var(full_client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); $var(is_child) = 1; } else { $var(parent_client_id) = $var(full_client_id); $var(is_child) = 0; } $avp(full_client_id) = $var(full_client_id); $avp(parent_client_id) = $var(parent_client_id); $avp(user) = $var(user); $var(call_id) = $ci; route(GENERATE_SERIAL_NUMBER); # Track client calls lock("client_counter"); # Update parent counter $var(parent_calls) = $sht(client_calls=>$var(parent_client_id)); if($var(parent_calls) == $null) { $var(parent_calls) = 0; } $sht(client_calls=>$var(parent_client_id)) = $var(parent_calls) + 1; # If it's a child ID, update its individual counter too if ($var(is_child) == 1) { $var(child_calls) = $sht(client_calls=>$var(full_client_id)); if($var(child_calls) == $null) { $var(child_calls) = 0; } $sht(client_calls=>$var(full_client_id)) = $var(child_calls) + 1; } # Store mappings $sht(client_calls=>$var(call_id)) = $var(parent_client_id); $sht(client_original=>$var(call_id)) = $var(full_client_id); unlock("client_counter"); # Find destination with lowest active calls $var(min_calls) = 999; $var(selected_dst) = ""; lock("calls_counter"); if (ds_select_dst("4", "4")) { $var(count) = 0; # Add counter $var(current_calls) = $sht(active_calls=>$du); if ($var(current_calls) == $null) { $var(current_calls) = 0; } if ($var(current_calls) < $var(min_calls)) { $var(min_calls) = $var(current_calls); $var(selected_dst) = $du; } while(ds_next_dst() && $var(count) < 350) { # Set higher than 280 $var(count) = $var(count) + 1; $var(current_calls) = $sht(active_calls=>$du); if ($var(current_calls) == $null) { $var(current_calls) = 0; } if ($var(current_calls) < $var(min_calls)) { $var(min_calls) = $var(current_calls); $var(selected_dst) = $du; } } } if ($var(selected_dst) != "" && $var(min_calls) < 25) { $du = $var(selected_dst); # Add this block - Double check the count hasn't changed $var(current_count) = $sht(active_calls=>$du); if ($var(current_count) >= 25) { unlock("calls_counter"); xlog("L_ERROR", "Count increased during selection for $du to $var(current_count)\n"); t_reply("503", "Service Unavailable"); exit; } # Store Call-ID to destination mapping $sht(active_calls=>$var(call_id)) = $du; # Increment call counter $sht(active_calls=>$du) = $var(min_calls) + 1; unlock("calls_counter"); route(RELAY_INVITE); } else { unlock("calls_counter"); xlog("L_NOTICE", "Unlocked $ci"); $du = "sip:34.125.5.64:5060"; t_on_failure("FINAL_FAILURE"); if (!t_relay()) { t_reply("500", "Internal Server Error"); } } } else { route(RELAY); } } here is my invite rout configuration if you look at to the cps limit this is occultly the call per second limit on the client id when i set it 200 and the start calling up to 3000 per seconds so some time or for a bit of time it exceed the limit 201 or 202 then it start enforce 200 so if anyone have the best idea or suggestion regarding to this with the good ms time -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4040 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4040(a)github.com>

2 2

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

git:master:cf724165: dispatcher: ds_oc_set_attrs() return -2 when no oc attributes are updated
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: cf72416567d915c1024471e917b933d057452ed9 URL: https://github.com/kamailio/kamailio/commit/cf72416567d915c1024471e917b933d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:36:07+01:00 dispatcher: ds_oc_set_attrs() return -2 when no oc attributes are updated --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cf72416567d915c1024471e917b933d… Patch: https://github.com/kamailio/kamailio/commit/cf72416567d915c1024471e917b933d… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 1c31ca3fc95..3d536b7c171 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -483,6 +483,7 @@ int ds_oc_set_attrs( tdiff.tv_sec = (((itval > 0) ? itval : 500) * 1000) / 1000000; tdiff.tv_usec = (((itval > 0) ? itval : 500) * 1000) % 1000000; + ret = -2; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len && strncasecmp(idx->dlist[i].uri.s, duri->s, duri->len) == 0) {

1 0

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

26 Nov '24

Module: kamailio Branch: master Commit: 0571cb9c7ae2ba3a045e11b003bfba9e5ca6c9fc URL: https://github.com/kamailio/kamailio/commit/0571cb9c7ae2ba3a045e11b003bfba9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-26T10:31:10+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/0571cb9c7ae2ba3a045e11b003bfba9… Patch: https://github.com/kamailio/kamailio/commit/0571cb9c7ae2ba3a045e11b003bfba9… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 2a6148504db..ef5c56f6df6 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -122,7 +122,8 @@ Federico Cabiddu 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) + 4.17. ds_dsg_fetch_uri(setid, uri) + 4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -213,9 +214,10 @@ Federico Cabiddu 1.57. ds_load_unset usage 1.58. ds_reload usage 1.59. ds_dsg_fetch() usage - 1.60. ds_oc_set_attrs() usage - 1.61. dispatcher list file - 1.62. Kamailio config script - sample dispatcher usage + 1.60. ds_dsg_fetch_uri() usage + 1.61. ds_oc_set_attrs() usage + 1.62. dispatcher list file + 1.63. Kamailio config script - sample dispatcher usage Chapter 1. Admin Guide @@ -292,7 +294,8 @@ Chapter 1. Admin Guide 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) + 4.17. ds_dsg_fetch_uri(setid, uri) + 4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) 5. RPC Commands @@ -1120,7 +1123,8 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) + 4.17. ds_dsg_fetch_uri(setid, uri) + 4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) 4.1. ds_select_dst(set, alg[, limit]) @@ -1638,7 +1642,24 @@ onreply_route { xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... -4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) +4.17. ds_dsg_fetch_uri(setid, uri) + + Sets the destination group id to setid for fetching $dsg(key) + attributes and the overload-control attributes to the corresponding uri + record from that group. + + Parameters: setid - integer or variable holding the set id value; uri - + string or variables holding the SIP URI value. + + This function can be used from ANY_ROUTE. + + Example 1.60. ds_dsg_fetch_uri() usage +... + ds_dsg_fetch_uri("1", "sip:127.0.0.1:5080"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active); $dsg(ocrate)\n"); +... + +4.18. ds_oc_set_attrs(setid, uri, rval, tval, sval) Sets the overload control rate, time internval limit and sequence number for the destination record (setid, uri) following RFC7339 @@ -1659,7 +1680,7 @@ onreply_route { This function can be used from ANY_ROUTE. - Example 1.60. ds_oc_set_attrs() usage + Example 1.61. ds_oc_set_attrs() usage ... ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "180000", "1"); ... @@ -1964,7 +1985,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) For database, each element of a line resides in a different column. Next is a dispatcher.list file example: - Example 1.61. dispatcher list file + Example 1.62. dispatcher list file ... # # dispatcher destination sets (groups) @@ -1989,7 +2010,7 @@ r,opt) Next listing shows a sample config for using the dispatcher module. - Example 1.62. Kamailio config script - sample dispatcher usage + Example 1.63. Kamailio config script - sample dispatcher usage ... #!KAMAILIO #

1 0

git:master:2bbba597: dispatcher: docs for ds_dsg_fetch_uri()
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: 2bbba597c6b7bbef79b0c8be78b4dc94e010ec26 URL: https://github.com/kamailio/kamailio/commit/2bbba597c6b7bbef79b0c8be78b4dc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:16:20+01:00 dispatcher: docs for ds_dsg_fetch_uri() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2bbba597c6b7bbef79b0c8be78b4dc9… Patch: https://github.com/kamailio/kamailio/commit/2bbba597c6b7bbef79b0c8be78b4dc9… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 81d5b19cd00..5e7cb95953c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2011,6 +2011,31 @@ onreply_route { ds_dsg_fetch("1"); xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_dsg_fetch_uri"> + <title> + <function moreinfo="none">ds_dsg_fetch_uri(setid, uri)</function> + </title> + <para> + Sets the destination group id to setid for fetching $dsg(key) attributes + and the overload-control attributes to the corresponding uri record from + that group. + </para> + <para>Parameters: <emphasis>setid</emphasis> - integer or variable + holding the set id value; <emphasis>uri</emphasis> - string or variables + holding the SIP URI value.</para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_dsg_fetch_uri()</function> usage</title> + <programlisting format="linespecific"> +... + ds_dsg_fetch_uri("1", "sip:127.0.0.1:5080"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active); $dsg(ocrate)\n"); +... </programlisting> </example> </section>

1 0

git:master:c1f814b2: fipatcher: more fields to $dsg(...) related to overload control
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: c1f814b2c01d2589e41eac06d3e63571933105eb URL: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:11:24+01:00 fipatcher: more fields to $dsg(...) related to overload control --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… Patch: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 852296bbad1..d5abb6a62ac 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1528,6 +1528,14 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 4: /* pinactive */ return pv_get_sintval( msg, param, res, (int)((inactive * 100) / count)); + case 5: /* octime_sec */ + return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_sec); + case 6: /* octime_usec */ + return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_usec); + case 7: /* ocseq */ + return pv_get_sintval(msg, param, res, ocdata.ocseq); + case 8: /* ocrate */ + return pv_get_sintval(msg, param, res, ocdata.ocrate); default: return pv_get_null(msg, param, res); } @@ -1545,12 +1553,16 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) case 5: if(strncmp(in->s, "count", 5) == 0) sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "ocseq", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 6: if(strncmp(in->s, "active", 6) == 0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "ocrate", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 8; else goto error; break; @@ -1572,6 +1584,18 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) else goto error; break; + case 10: + if(strncmp(in->s, "octime_sec", 10) == 0) + sp->pvp.pvn.u.isname.name.n = 5; + else + goto error; + break; + case 11: + if(strncmp(in->s, "octime_usec", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 6; + else + goto error; + break; default: goto error; }

1 0

git:master:c9ec6cad: dispatcher: function to fetch by group id and uri
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: c9ec6cad7300d40beef095116bcdd361bc9690c4 URL: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 dispatcher: function to fetch by group id and uri --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Patch: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index d9626000ddc..852296bbad1 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -185,6 +185,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_oc_set_attrs(sip_msg_t*, char*, char*, char*, char*, char*); static int fixup_ds_is_from_list(void** param, int param_no); @@ -199,6 +200,7 @@ static int pv_parse_dsv(pv_spec_p sp, str *in); static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_dsg(pv_spec_p sp, str *in); static void ds_dsg_fetch(int dg); +static void ds_dsg_fetch_uri(int dg, str *uri); static pv_export_t mod_pvs[] = { { {"dsv", (sizeof("dsv")-1)}, PVT_OTHER, pv_get_dsv, 0, @@ -266,6 +268,8 @@ static cmd_export_t cmds[]={ fixup_isiii, fixup_free_isiii, ANY_ROUTE}, {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"ds_dsg_fetch_uri", (cmd_function)w_ds_dsg_fetch_uri, 2, + fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -1367,14 +1371,32 @@ static int pv_parse_dsv(pv_spec_p sp, str *in) /** * */ -static int _pv_dsg_fetch = 1; +static int _pv_dsg_fetch_dg = 1; +static str _pv_dsg_fetch_uri = STR_NULL; /** * */ static void ds_dsg_fetch(int dg) { - _pv_dsg_fetch = dg; + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + _pv_dsg_fetch_uri.s = NULL; + _pv_dsg_fetch_uri.len = 0; +} + +/** + * + */ +static void ds_dsg_fetch_uri(int dg, str *uri) +{ + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + pkg_str_dup(&_pv_dsg_fetch_uri, uri); } /** @@ -1393,6 +1415,28 @@ static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) return 1; } +/** + * + */ +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri) +{ + int set; + str suri = STR_NULL; + + if(fixup_get_ivalue(msg, (gparam_p)pset, &set) != 0) { + LM_ERR("cannot get set id param value\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_p)puri, &suri) != 0) { + LM_ERR("cannot get uri param value\n"); + return -1; + } + + ds_dsg_fetch_uri(set, &suri); + + return 1; +} + /** * */ @@ -1439,16 +1483,19 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int active = 0; int inactive = 0; int j = 0; + ds_ocdata_t ocdata; if(param == NULL) { return -1; } - dsg = ds_list_lookup(_pv_dsg_fetch); + dsg = ds_list_lookup(_pv_dsg_fetch_dg); if(dsg == NULL) { return pv_get_null(msg, param, res); } + memset(&ocdata, 0, sizeof(ds_ocdata_t)); + lock_get(&dsg->lock); count = dsg->nr; for(j = 0; j < dsg->nr; j++) { @@ -1457,6 +1504,14 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } else { active++; } + if(_pv_dsg_fetch_uri.s != NULL && _pv_dsg_fetch_uri.len > 0) { + if((_pv_dsg_fetch_uri.len == dsg->dlist[j].uri.len) + && (strncmp(dsg->dlist[j].uri.s, _pv_dsg_fetch_uri.s, + _pv_dsg_fetch_uri.len) + == 0)) { + memcpy(&ocdata, &dsg->dlist[j].ocdata, sizeof(ds_ocdata_t)); + } + } } lock_release(&dsg->lock);

1 0

git:master:556efcaa: core: tcp - emit async tkv event for read error
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 556efcaa34367dc689ee653b0de9f22ccef073f9 URL: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 core: tcp - emit async tkv event for read error --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Patch: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index cd7790eb958..c08d9bf074f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -52,6 +52,7 @@ #include "ut.h" #include "trim.h" #include "pt.h" +#include "async_task.h" #include "daemonize.h" #include "cfg/cfg_struct.h" #ifdef CORE_TLS @@ -269,6 +270,9 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, strerror(errno), errno, ip_addr2xa(&c->rcv.src_ip), c->rcv.src_port, ip_addr2xa(&c->rcv.dst_ip), c->rcv.dst_port); + async_tkv_emit(1200, "tcp-read-error", + "erno=%d;srcip=%s;dstip=%s", errno, + ip_addr2xa(&c->rcv.src_ip), ip_addr2xa(&c->rcv.dst_ip)); if(errno == ETIMEDOUT) { c->event = TCP_CLOSED_TIMEOUT; } else if(errno == ECONNRESET) {

1 0

[kamailio/kamailio] cdp: fixes for various issues found with Coverity (PR #4030)
by Dragos Vingarzan 25 Nov '24

25 Nov '24

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Various fixes for issues discovered with the Coverity static analysis tooling. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4030 -- Commit Summary -- * cdp: fixes for various issues found with coverity -- File Changes -- M src/modules/cdp/authstatemachine.c (2) M src/modules/cdp/common.c (8) M src/modules/cdp/diameter_peer.c (6) M src/modules/cdp/receiver.c (4) M src/modules/cdp/session.c (12) M src/modules/cdp/session.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4030.patch https://github.com/kamailio/kamailio/pull/4030.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4030 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4030(a)github.com>

4 15

git:master:1ceeba73: cdp: fixed issues discovered during static code analysis
by Dragos Vingarzan 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 1ceeba7364b745b6ca2840e830d006a37460d10e URL: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-11-25T13:33:40+01:00 cdp: fixed issues discovered during static code analysis This fixes: - 4-bytes (typically uint32_t) used for time_t storage (Y2K38) - print of time_t with %d instead of %ld - reuse of same loop index variable in a sub-loop - use of random(), when kam_rand() could theoretically be better - copy-paste mistake in sp2/sp parameter, where sp2 was meant and sp is probably NULL --- Modified: src/modules/cdp/authstatemachine.c Modified: src/modules/cdp/common.c Modified: src/modules/cdp/diameter_peer.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/session.c Modified: src/modules/cdp/session.h --- Diff: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Patch: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a…

1 0

git:master:55691f82: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 55691f82666f361bac5efb6355e6f32afb508660 URL: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-25T10:46:10+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Patch: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32…

1 0

[kamailio/kamailio] Add timer to ping rtpengine (PR #4016)
by Xenofon Karamanos 25 Nov '24

25 Nov '24

- Added parameter to control the interval   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds a timer that its interval can be controlled with the param `ping_interval`. The timer pings all registered rtpengines and disables if any are found not responsive and vice versa. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4016 -- Commit Summary -- * Add timer to ping rtpengines -- File Changes -- M src/modules/rtpengine/rtpengine.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4016.patch https://github.com/kamailio/kamailio/pull/4016.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4016 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4016(a)github.com>

4 27

git:master:f7fa3a39: rtpengine/docs: Add ping_interval docs
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: f7fa3a39f6c97ca8323a70f30ad4e33699ede23e URL: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine/docs: Add ping_interval docs --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Patch: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9a57c2e551e..a6c58ce401e 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2404,6 +2404,25 @@ modparam("rtpengine", "ping_mode", 0) </section> +<section id="rtpengine.p.ping_interval"> + <title><varname>ping_interval</varname> (integer)</title> + <para> + Specify the interval in seconds between pings to all rtpengines registered. + </para> + <para> + <emphasis> + Default value is <quote>60</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ping_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "ping_interval", 10) +... + </programlisting> + </example> +</section> <section> <title>Functions</title>

1 0

git:master:a29afb3d: rtpengine: Add doxygen function descriptions
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: a29afb3de6d9dd1491667a5858187ae782d8d56d URL: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Add doxygen function descriptions --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Patch: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae…

1 0

git:master:e183a3e2: rtpengine: Re-enable down servers (but not disabled ones)
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: e183a3e25c3f2088435b3911d13fcb376a89f5c0 URL: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Re-enable down servers (but not disabled ones) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Patch: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index cd3a76b1403..bdb4b76e4f1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1898,6 +1898,12 @@ static int rtpengine_iter_cb_ping( *found_rtpp_disabled = 1; crt_rtpp->rn_disabled = 1; } + /* if ping success, enable the rtpp and reset ticks, ONLY IF was not disabled manually */ + else if(crt_rtpp->rn_recheck_ticks != RTPENGINE_MAX_RECHECK_TICKS) { + crt_rtpp->rn_recheck_ticks = RTPENGINE_MIN_RECHECK_TICKS; + crt_rtpp->rn_disabled = 0; + *found_rtpp_disabled = 0; + } return 0; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev