sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
389 discussions

git:master:70ecd99e: tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70ecd99e3d8069d0f89444a5b893f61dd1edd1b3 URL: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-06T13:29:09+01:00 tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… Patch: https://github.com/kamailio/kamailio/commit/70ecd99e3d8069d0f89444a5b893f61… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 997d1a5bb78..e0048f0604c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -645,6 +645,7 @@ int t_cancel_suspend(unsigned int hash_index, unsigned int label) /* The transaction does not need to be locked because this * function is either executed from the original route block * or from failure route which already locks */ + t->flags &= ~T_ASYNC_SUSPENDED; reset_kr(); /* the blind UAC of t_suspend has set kr */

1 year

[kamailio/kamailio] tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension (PR #3629)

by mtryfoss

#### Pre-Submission Checklist    - [x] 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) - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I've been testing the ims_charging module which relies on a diameter request and async reply. If there's no available diameter server, Ro_CCR() calls t_cancel_suspend() to cancel suspension of the transaction and return an error. Based on my understanding, it should now be possible to continue script logic as if the transaction was not suspended at all. In our case we want the call to go through anyway, as a fallback. The INVITE is being sent to the destination, but all replies are filtered since the suspended flag is still set. Tested this change locally, and it's now working according to our needs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3629 -- Commit Summary -- * tm: T_ASYNC_SUSPENDED flag not removed when cancelling a suspension -- File Changes -- M src/modules/tm/t_suspend.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3629.patch https://github.com/kamailio/kamailio/pull/3629.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3629 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3629(a)github.com>

1 year

git:master:4cec039c: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 4cec039ce1b7fa2d1980f8f30dd7bb1012e3c9cb URL: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-05T22:02:26+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… Patch: https://github.com/kamailio/kamailio/commit/4cec039ce1b7fa2d1980f8f30dd7bb1… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 216533fbfb6..41dced573d2 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -2101,6 +2101,9 @@ if (t_newtran()) { * code - Reply code number. * reason_phrase - Reason string. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE. + Example 1.63. t_reply usage ... t_reply("404", "Not found"); @@ -2111,7 +2114,8 @@ t_reply("404", "Not found"); Sends a stateful reply based in internal error code, similar to sl_send_error() from sl module. - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE. Example 1.64. t_reply_error usage ...

1 year

git:master:9bbf86a8: tm: docs updated for t_reply_error()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9bbf86a8a7e598a67254e2907dcc430af98f5689 URL: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-05T21:48:43+01:00 tm: docs updated for t_reply_error() --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… Patch: https://github.com/kamailio/kamailio/commit/9bbf86a8a7e598a67254e2907dcc430… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 7bcc3a43ccf..539e4f0dafb 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -359,6 +359,9 @@ if (t_newtran()) { </para> </listitem> </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE. + </para> <example> <title><function>t_reply</function> usage</title> <programlisting> @@ -378,7 +381,7 @@ t_reply("404", "Not found"); sl_send_error() from sl module. </para> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE. </para> <example> <title><function>t_reply_error</function> usage</title>

1 year

git:master:c8695084: tm: enable t_reply_error() in same routing blocks like t_reply()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c86950841dfc0ca18ad1956efd1dc374a4eb064b URL: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-04T16:42:46+01:00 tm: enable t_reply_error() in same routing blocks like t_reply() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… Patch: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index ec83abedaae..cb34dd4a036 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -256,7 +256,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"t_reply", w_t_reply, 2, fixup_t_reply, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"t_reply_error", w_t_reply_error, 0, 0, 0, REQUEST_ROUTE}, + {"t_reply_error", w_t_reply_error, 0, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"t_send_reply", w_t_send_reply, 2, fixup_t_reply, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"t_retransmit_reply", w_t_retransmit_reply, 0, 0, 0, REQUEST_ROUTE},

1 year

git:master:0def9a07: db_redis: wrapp field version_code.s with ZSW() to be safer when it is not set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0def9a071343c963ab3a497540534d8ea3b8eebc URL: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T11:40:29+01:00 db_redis: wrapp field version_code.s with ZSW() to be safer when it is not set --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… Patch: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index ff41aa45282..84c0c3a9459 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -22,6 +22,8 @@ #include <stdlib.h> #include <time.h> +#include "../../core/ut.h" + #include "db_redis_mod.h" #include "redis_connection.h" #include "redis_dbase.h" @@ -360,7 +362,7 @@ static int db_redis_find_query_key(redis_key_t *key, const str *table_name, goto err; } snprintf(key_name->s, len, "%.*s%.*s:%.*s::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type_name->len, type_name->s, val.len, val.s); key_name->len = len - 1; // subtract the term 0 char @@ -456,7 +458,7 @@ static int db_redis_find_query_key(redis_key_t *key, const str *table_name, goto err; } snprintf(key_name->s, len, "%.*s%.*s:%.*s", table->version_code.len, - table->version_code.s, table_name->len, table_name->s, + ZSW(table->version_code.s), table_name->len, table_name->s, type_name->len, type_name->s); key_name->len = len - 1; } @@ -621,7 +623,7 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, goto err; } sprintf(keyname.s, "%.*s%.*s::index::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type->type.len, type->type.s); if(db_redis_key_add_str(set_keys, &keyname) != 0) { @@ -787,7 +789,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, goto err; } sprintf(ts_scan_table->s, "%.*s%.*s::index::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type->type.len, type->type.s); } @@ -1094,7 +1096,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, return -1; } int len = sprintf(match, "%.*s%.*s:entry::*", table->version_code.len, - table->version_code.s, table_name->len, table_name->s); + ZSW(table->version_code.s), table_name->len, table_name->s); str match_pattern = {match, len}; ret = db_redis_scan_query_keys_pattern(con, &match_pattern, ts_scan_table, _n, query_keys, query_keys_count, manual_keys,

1 year

git:master:e24df12d: db_redis: init allocated redis table structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e24df12d10d8b88582907481d161c6a2db5cf8f1 URL: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T11:00:34+01:00 db_redis: init allocated redis table structure --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… Patch: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index 33b097a9674..10dd7d57960 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -433,8 +433,7 @@ static struct str_hash_entry *db_redis_create_table(str *table) pkg_free(e); return NULL; } - t->entry_keys = NULL; - t->types = NULL; + memset(t, 0, sizeof(redis_table_t)); if(str_hash_alloc(&t->columns, REDIS_HT_SIZE) != 0) { LM_ERR("Failed to allocate memory for table schema hashtable\n");

1 year

git:master:d4995bf2: modules: readme files regenerated - sl ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d4995bf2791bd1048ac8a7f32e51ae6949562ce3 URL: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-03T09:17:27+01:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… Patch: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 615e7a531bb..6433a1d7ebe 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 4. Statistics @@ -78,6 +79,7 @@ Daniel-Constantin Mierla 1.9. send_reply_mode usage 1.10. sl_reply_error usage 1.11. send_reply usage + 1.12. send_reply_error usage Chapter 1. Admin Guide @@ -100,6 +102,7 @@ Chapter 1. Admin Guide 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 4. Statistics @@ -252,6 +255,7 @@ modparam("sl", "event_callback_lres_sent", "ksr_event_sl_local_response") 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 3.1. sl_send_reply(code, reason) @@ -350,6 +354,20 @@ if(status=="408") sl_forward_reply("404", "Not found"); ... +3.6. send_reply_error() + + For the current request, the internal error code reply is sent back + stateful or stateless, depending of the TM module: if a transaction + exists for the current request, then the reply is sent statefully, + otherwise stateless. + + It can be used from REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. + + Example 1.12. send_reply_error usage +... +send_reply_error(); +... + 4. Statistics 4.1. 1xx_replies

1 year

git:master:cb529523: sl: docs for send_reply_error()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb5295234a1b106473c3fdb9ff25c23bfc9fbcd1 URL: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T09:06:38+01:00 sl: docs for send_reply_error() --- Modified: src/modules/sl/doc/sl_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… Patch: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… --- diff --git a/src/modules/sl/doc/sl_functions.xml b/src/modules/sl/doc/sl_functions.xml index 11ef4706755..8f2715b7a00 100644 --- a/src/modules/sl/doc/sl_functions.xml +++ b/src/modules/sl/doc/sl_functions.xml @@ -130,7 +130,7 @@ send_reply_mode("403", "Invalid user - $fU", "3"); </title> <para> Sends back an error reply describing the nature of the last - internal error. Usually this function should be used after a + internal error. Usually this function should be used after a script function that returned an error code. </para> <example> @@ -174,6 +174,29 @@ sl_reply_error(); if(status=="408") sl_forward_reply("404", "Not found"); ... +</programlisting> + </example> + </section> + + <section id="sl.f.send_reply_error"> + <title> + <function moreinfo="none">send_reply_error()</function> + </title> + <para> + For the current request, the internal error code reply is sent back + stateful or stateless, depending of the <acronym>TM</acronym> module: + if a transaction exists for the current request, then the reply is sent + statefully, otherwise stateless. + </para> + <para> + It can be used from REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. + </para> + <example> + <title><function>send_reply_error</function> usage</title> + <programlisting format="linespecific"> +... +send_reply_error(); +... </programlisting> </example> </section>

1 year

git:master:130dc00c: sl: added send_reply_error()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 130dc00c1700839248a044f8ae6d4a9e9c97d301 URL: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T09:00:14+01:00 sl: added send_reply_error() - wrapper around t_reply_error() and sl_reply_error() --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… Patch: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 0ee22efcc0a..2a8f49fe78c 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -73,6 +73,7 @@ static int w_sl_send_reply(struct sip_msg *msg, char *str1, char *str2); static int w_send_reply(struct sip_msg *msg, char *str1, char *str2); static int w_send_reply_mode( struct sip_msg *msg, char *str1, char *str2, char *str3); +static int w_send_reply_error(sip_msg_t *msg, char *str1, char *str2); static int w_sl_reply_error(struct sip_msg *msg, char *str1, char *str2); static int w_sl_forward_reply0(sip_msg_t *msg, char *str1, char *str2); static int w_sl_forward_reply1(sip_msg_t *msg, char *str1, char *str2); @@ -102,6 +103,8 @@ static cmd_export_t cmds[] = { {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, fixup_sl_reply_mode, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, + {"send_reply_error", w_send_reply_error, 0, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, 0, ONREPLY_ROUTE}, {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, 0, @@ -326,6 +329,29 @@ static int w_send_reply(struct sip_msg *msg, char *p1, char *p2) return send_reply(msg, code, &reason); } +/** + * + */ +static int ki_send_reply_error(sip_msg_t *msg) +{ + int ret; + if(sl_bind_tm != 0 && tmb.t_reply_error != NULL) { + ret = tmb.t_reply_error(msg); + if(ret > 0) { + return ret; + } + } + return sl_reply_error(msg); +} + +/** + * + */ +static int w_send_reply_error(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_send_reply_error(msg); +} + /** * @brief send stateful reply if transaction was created * @@ -672,6 +698,11 @@ static sr_kemi_t sl_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sl"), str_init("send_reply_error"), + SR_KEMIP_INT, ki_send_reply_error, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sl"), str_init("sl_forward_reply"), SR_KEMIP_INT, w_sl_forward_reply, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 year

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023