sr-dev

sr-dev@lists.kamailio.org

13 participants
45255 discussions

git:master:9af58986: tm: support mode=start for rpc tm.t_uac_attrs
by Daniel-Constantin Mierla 11 Jul '25

11 Jul '25

Module: kamailio Branch: master Commit: 9af589867e9777a2e3c7203d15750d922d764fd1 URL: https://github.com/kamailio/kamailio/commit/9af589867e9777a2e3c7203d15750d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-11T08:37:18+02:00 tm: support mode=start for rpc tm.t_uac_attrs - complete the variants of t_uac commands --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/9af589867e9777a2e3c7203d15750d9… Patch: https://github.com/kamailio/kamailio/commit/9af589867e9777a2e3c7203d15750d9… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 2b43b53c6eb..44f05cd75fd 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -1038,6 +1038,9 @@ void rpc_t_uac_attrs(rpc_t *rpc, void *c) if(pit->body.len == 4 && strncasecmp(pit->name.s, "wait", 4) == 0) { tattrs.reply_wait = 1; + } else if(pit->body.len == 5 + && strncasecmp(pit->name.s, "start", 5) == 0) { + tattrs.reply_wait = 0; } else if(pit->body.len == 5 && strncasecmp(pit->name.s, "block", 5) == 0) { tattrs.reply_wait = 2;

1 0

git:master:d21836a9: tm: docs update of rpc tm.t_uac_attrs for mode attribute
by Daniel-Constantin Mierla 11 Jul '25

11 Jul '25

Module: kamailio Branch: master Commit: d21836a9cbdcab3b420fe31b1d913564ed7040e1 URL: https://github.com/kamailio/kamailio/commit/d21836a9cbdcab3b420fe31b1d91356… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-11T08:37:18+02:00 tm: docs update of rpc tm.t_uac_attrs for mode attribute --- Modified: src/modules/tm/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/d21836a9cbdcab3b420fe31b1d91356… Patch: https://github.com/kamailio/kamailio/commit/d21836a9cbdcab3b420fe31b1d91356… --- diff --git a/src/modules/tm/doc/rpc.xml b/src/modules/tm/doc/rpc.xml index 21b77bab2ec..56925d08c52 100644 --- a/src/modules/tm/doc/rpc.xml +++ b/src/modules/tm/doc/rpc.xml @@ -187,7 +187,7 @@ </para> <itemizedlist> <listitem><para> - <emphasis>reply</emphasis> - control how the reply is waited. If + <emphasis>mode</emphasis> - control how the command is done. If not provided, acts like tm.t_uac_start. The values can be: "wait" - act like tm.t_uac_wait; "block" - act like tm.t_uac_wait_block.

1 0

git:master:ebdc7993: tm: renamed reply attribute to mode for tm.t_uac_attrs rpc command
by Daniel-Constantin Mierla 11 Jul '25

11 Jul '25

Module: kamailio Branch: master Commit: ebdc7993aaca23b25da3788f7ff4311e2bd71be4 URL: https://github.com/kamailio/kamailio/commit/ebdc7993aaca23b25da3788f7ff4311… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-11T08:37:18+02:00 tm: renamed reply attribute to mode for tm.t_uac_attrs rpc command --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ebdc7993aaca23b25da3788f7ff4311… Patch: https://github.com/kamailio/kamailio/commit/ebdc7993aaca23b25da3788f7ff4311… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 19b9b528a5c..2b43b53c6eb 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -1034,8 +1034,7 @@ void rpc_t_uac_attrs(rpc_t *rpc, void *c) return; } for(pit = params_list; pit; pit = pit->next) { - if(pit->name.len == 5 - && strncasecmp(pit->name.s, "reply", 5) == 0) { + if(pit->name.len == 4 && strncasecmp(pit->name.s, "mode", 4) == 0) { if(pit->body.len == 4 && strncasecmp(pit->name.s, "wait", 4) == 0) { tattrs.reply_wait = 1;

1 0

git:master:58948be8: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 10 Jul '25

10 Jul '25

Module: kamailio Branch: master Commit: 58948be86e28043f365ba0dc6c5bedef9a940f2b URL: https://github.com/kamailio/kamailio/commit/58948be86e28043f365ba0dc6c5bede… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-10T16:31:09+02:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/58948be86e28043f365ba0dc6c5bede… Patch: https://github.com/kamailio/kamailio/commit/58948be86e28043f365ba0dc6c5bede…

1 0

[kamailio/kamailio] db_redis: add Redis auto expiry support by changing sets to hashes (PR #4306)
by Lucian Balaceanu 10 Jul '25

10 Jul '25

Kudos go to Pawel Kuzak. Redis v7.4, hashes support auto-expiry for individual keys. By transforming sets into hashes we can support auto-expiry. Adding module parameters use_redis_hashes and expires to control the described feature.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4306 -- Commit Summary -- * db_redis: add Redis auto expiry support by changing sets to hashes -- File Changes -- M src/modules/db_redis/db_redis_mod.c (18) M src/modules/db_redis/doc/db_redis_admin.xml (46) M src/modules/db_redis/redis_connection.c (47) M src/modules/db_redis/redis_dbase.c (385) M src/modules/db_redis/redis_dbase.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4306.patch https://github.com/kamailio/kamailio/pull/4306.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4306 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4306(a)github.com>

2 18

git:master:0cf64710: db_redis: add Redis auto expiry support by changing sets to hashes
by Lucian Balaceanu 10 Jul '25

10 Jul '25

Module: kamailio Branch: master Commit: 0cf6471045b4ebbc83ef64c026040b26b907df1a URL: https://github.com/kamailio/kamailio/commit/0cf6471045b4ebbc83ef64c026040b2… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2025-07-10T17:18:41+03:00 db_redis: add Redis auto expiry support by changing sets to hashes Kudos go to Pawel Kuzak. Redis v7.4, hashes support auto-expiry for individual keys. By transforming sets into hashes we can support auto-expiry. Adding module parameters mapping_struct_type, hash_expires, hash_value to control the described feature. --- Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/db_redis_mod.h Modified: src/modules/db_redis/doc/db_redis_admin.xml Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_dbase.h --- Diff: https://github.com/kamailio/kamailio/commit/0cf6471045b4ebbc83ef64c026040b2… Patch: https://github.com/kamailio/kamailio/commit/0cf6471045b4ebbc83ef64c026040b2…

1 0

git:master:8e4c52e3: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 10 Jul '25

10 Jul '25

Module: kamailio Branch: master Commit: 8e4c52e3763ff2d535c0521d84a56cc77328335b URL: https://github.com/kamailio/kamailio/commit/8e4c52e3763ff2d535c0521d84a56cc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-07-10T11:01:10+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/8e4c52e3763ff2d535c0521d84a56cc… Patch: https://github.com/kamailio/kamailio/commit/8e4c52e3763ff2d535c0521d84a56cc…

1 0

git:master:2131af64: tm: docs for rpc command tm.t_uac_attrs
by Daniel-Constantin Mierla 10 Jul '25

10 Jul '25

Module: kamailio Branch: master Commit: 2131af6464623a6bab1b23489cc1891faf7378b8 URL: https://github.com/kamailio/kamailio/commit/2131af6464623a6bab1b23489cc1891… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-10T10:51:05+02:00 tm: docs for rpc command tm.t_uac_attrs --- Modified: src/modules/tm/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/2131af6464623a6bab1b23489cc1891… Patch: https://github.com/kamailio/kamailio/commit/2131af6464623a6bab1b23489cc1891… --- diff --git a/src/modules/tm/doc/rpc.xml b/src/modules/tm/doc/rpc.xml index 00164bc5793..21b77bab2ec 100644 --- a/src/modules/tm/doc/rpc.xml +++ b/src/modules/tm/doc/rpc.xml @@ -173,6 +173,46 @@ </para> </section> + <section id="tm.rpc.t_uac_attrs"> + <title> + <function moreinfo="none">tm.t_uac_attrs</function> + </title> + <para> + Combine the tm.t_uac_* variants, by providing the first parameter with + attributes, then the other parameters are like for tm.t_uac_start. + </para> + <para> + The attributes are in the format "name1=value1;...;nameX=valueX". The + name of the attribute can be: + </para> + <itemizedlist> + <listitem><para> + <emphasis>reply</emphasis> - control how the reply is waited. If + not provided, acts like tm.t_uac_start. The values can be: + "wait" - act like tm.t_uac_wait; "block" - act like + tm.t_uac_wait_block. + </para></listitem> + <listitem><para> + <emphasis>cbflags</emphasis> - the transaction callback flags. The + values can be: "noack" - to not automatically send ACK for local + INVITE requests + </para></listitem> + <listitem><para> + <emphasis>rpflags</emphasis> - RPC parameters flags. The values + can be: 1 - the body is hexa-encoded value. + </para></listitem> + </itemizedlist> + <example> + <title>Using <quote>tm.t_uac_attrs</quote></title> + <programlisting format="linespecific"> +... +kamcli rpc tm.t_uac_attrs 'reply=wait;cbflags=noack;rpflags=1' 'INVITE' ... +... +</programlisting> + </example> + </section> + + <section id="tm.rpc.cancel"> <title> <function moreinfo="none">tm.cancel</function>

1 0

git:master:3ee78cbd: tm: added rpc command tm.t_uac_attrs
by Daniel-Constantin Mierla 10 Jul '25

10 Jul '25

Module: kamailio Branch: master Commit: 3ee78cbdf6c01aaf1c3b1dd32f12396d77519a3b URL: https://github.com/kamailio/kamailio/commit/3ee78cbdf6c01aaf1c3b1dd32f12396… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-10T10:51:05+02:00 tm: added rpc command tm.t_uac_attrs - combine the variants of tm.t_uac_* by providing first parameter with attributes in the format 'name=value;...' --- Modified: src/modules/tm/rpc_uac.c Modified: src/modules/tm/rpc_uac.h Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3ee78cbdf6c01aaf1c3b1dd32f12396… Patch: https://github.com/kamailio/kamailio/commit/3ee78cbdf6c01aaf1c3b1dd32f12396… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index dfd038a3f2c..19b9b528a5c 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -1004,6 +1004,68 @@ void rpc_t_uac_wait_block_noack_hex(rpc_t *rpc, void *c) rpc_t_uac(rpc, c, 2, TMCB_DONT_ACK, 1); } +/** t_uac with attributes. + * @see rpc_t_uac. + */ +void rpc_t_uac_attrs(rpc_t *rpc, void *c) +{ + tm_rpc_uac_attrs_t tattrs; + str sattrs = STR_NULL; + param_t *params_list = NULL; + param_hooks_t phooks; + param_t *pit = NULL; + int ival = 0; + int ret; + + memset(&tattrs, 0, sizeof(tm_rpc_uac_attrs_t)); + + ret = rpc->scan(c, "SSSSSS*S", &sattrs, &tattrs.method, &tattrs.ruri, + &tattrs.nexthop, &tattrs.send_socket, &tattrs.headers, + &tattrs.body); + if(ret < 6 && !(-ret == 6)) { + rpc->fault(c, 400, "too few parameters (%d/5)", ret ? ret : -ret); + return; + } + if(sattrs.len > 0) { + if(sattrs.s[sattrs.len - 1] == ';') { + sattrs.len--; + } + if(parse_params(&sattrs, CLASS_ANY, &phooks, &params_list) < 0) { + return; + } + for(pit = params_list; pit; pit = pit->next) { + if(pit->name.len == 5 + && strncasecmp(pit->name.s, "reply", 5) == 0) { + if(pit->body.len == 4 + && strncasecmp(pit->name.s, "wait", 4) == 0) { + tattrs.reply_wait = 1; + } else if(pit->body.len == 5 + && strncasecmp(pit->name.s, "block", 5) == 0) { + tattrs.reply_wait = 2; + } else { + LM_ERR("unknown reply attribute value\n"); + } + } else if(pit->name.len == 7 + && strncasecmp(pit->name.s, "cbflags", 7) == 0) { + if(pit->body.len == 5 + && strncasecmp(pit->name.s, "noack", 5) == 0) { + tattrs.cbflags |= TMCB_DONT_ACK; + } else { + LM_ERR("unknown cbflags attribute value\n"); + } + } else if(pit->name.len == 7 + && strncasecmp(pit->name.s, "rpflags", 7) == 0) { + str2sint(&pit->body, &ival); + tattrs.rpflags |= ival; + } else { + LM_ERR("unknown attribute provided\n"); + } + } + } + + rpc_t_uac_attrs_helper(rpc, c, &tattrs); +} + static int t_uac_check_msg(struct sip_msg *msg, str *method, str *body, str *fromtag, int *cseq_is, int *cseq, str *callid) { diff --git a/src/modules/tm/rpc_uac.h b/src/modules/tm/rpc_uac.h index 7826c9ef544..95d01649178 100644 --- a/src/modules/tm/rpc_uac.h +++ b/src/modules/tm/rpc_uac.h @@ -38,6 +38,8 @@ void rpc_t_uac_wait_noack_hex(rpc_t *rpc, void *c); void rpc_t_uac_wait_block_noack(rpc_t *rpc, void *c); void rpc_t_uac_wait_block_noack_hex(rpc_t *rpc, void *c); +void rpc_t_uac_attrs(rpc_t *rpc, void *c); + int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, str *headers, str *body); diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 54d06950199..8997abe983b 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2975,6 +2975,12 @@ static const char *rpc_t_uac_wait_block_noack_hex_doc[2] = { 0 }; +static const char *rpc_t_uac_attrs_doc[2] = { + "starts a tm uac using a list of string parameters: attributes, method," + " ruri, dst_uri, send_sock, headers (CRLF separated) and body (optional)", + 0 +}; + static const char *tm_rpc_list_doc[2] = { "List transactions.", 0 @@ -3020,6 +3026,8 @@ static rpc_export_t tm_rpc[] = { rpc_t_uac_wait_block_noack_doc, 0}, {"tm.t_uac_wait_block_noack_hex", rpc_t_uac_wait_block_noack_hex, rpc_t_uac_wait_block_noack_hex_doc, 0}, + {"tm.t_uac_attrs", rpc_t_uac_attrs, + rpc_t_uac_attrs_doc, RET_ARRAY}, {"tm.list", tm_rpc_list, tm_rpc_list_doc, RET_ARRAY}, {"tm.clean", tm_rpc_clean, tm_rpc_clean_doc, 0}, {0, 0, 0, 0}

1 0

git:master:099292b5: tm: use struct for rpc uac helper function
by Daniel-Constantin Mierla 10 Jul '25

10 Jul '25

Module: kamailio Branch: master Commit: 099292b5c19847536bc89a2d04bac9749f07415e URL: https://github.com/kamailio/kamailio/commit/099292b5c19847536bc89a2d04bac97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-07-10T10:51:05+02:00 tm: use struct for rpc uac helper function --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/099292b5c19847536bc89a2d04bac97… Patch: https://github.com/kamailio/kamailio/commit/099292b5c19847536bc89a2d04bac97…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev