sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
243 discussions

git:5.5:42d4359e: uuid: use define for buffer size
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 42d4359e6c3288fdfb705c5d0e38f47443048550 URL: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:10:24+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode (cherry picked from commit e81f2e318bc32802d152ef69d005b8194e17ca42) --- Modified: src/… [View More]

1 0

git:master:f54788b5: core: sruid - api hooks for setting uuid generation callbacks
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: f54788b5ac1109a2113592871c1494704523d527 URL: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:06:29+01:00 core: sruid - api hooks for setting uuid generation callbacks - allow modules to set funtions for generating uuid strings following the api from libuuid --- Modified: src/… [View More]core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… Patch: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… --- diff --git a/src/core/utils/sruid.c b/src/core/utils/sruid.c index 510da8bb81..e7a49f2a62 100644 --- a/src/core/utils/sruid.c +++ b/src/core/utils/sruid.c @@ -49,6 +49,8 @@ static unsigned int sruid_lfsr32 = 0; static unsigned int sruid_lfsr31 = 0; +static sruid_uuid_api_t _sruid_uuid_api = {0}; + static int sruid_shift_lfsr(unsigned int *lfsr, unsigned int mask) { int feedback; @@ -267,3 +269,54 @@ int sruid_next_safe(sruid_t *sid) if(unlikely(sid->pid!=my_pid())) sruid_reinit(sid, sid->mode); return sruid_nextx(sid, NULL); } + +/** + * + */ +int sruid_uuid_api_set(sruid_uuid_api_t *sapi) +{ + if(_sruid_uuid_api.fgenerate!=NULL) { + LM_ERR("sruid uuid api already set\n"); + return -1; + } + + memcpy(&_sruid_uuid_api, sapi, sizeof(sruid_uuid_api_t)); + return 0; +} + +/** + * + */ +int sruid_uuid_generate(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate(out, len); +} + +/** + * + */ +int sruid_uuid_generate_time(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate_time == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate_time(out, len); +} + +/** + * + */ +int sruid_uuid_generate_random(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate_random == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate_random(out, len); +} + diff --git a/src/core/utils/sruid.h b/src/core/utils/sruid.h index 8d44635619..a97675167f 100644 --- a/src/core/utils/sruid.h +++ b/src/core/utils/sruid.h @@ -54,4 +54,17 @@ int sruid_nextx_safe(sruid_t *sid, str *x); int sruid_nexthid(sruid_t *sid, str *sval); int sruid_nexthid_safe(sruid_t *sid, str *sval); +typedef int (*sruid_uuid_generate_f)(char *out, int *len); + +typedef struct sruid_uuid_api { + sruid_uuid_generate_f fgenerate; + sruid_uuid_generate_f fgenerate_time; + sruid_uuid_generate_f fgenerate_random; +} sruid_uuid_api_t; + +int sruid_uuid_api_set(sruid_uuid_api_t *sapi); +int sruid_uuid_generate(char *out, int *len); +int sruid_uuid_generate_time(char *out, int *len); +int sruid_uuid_generate_random(char *out, int *len); + #endif [View Less]

1 0

[kamailio/kamailio] Gte the current debug level (Issue #3030)
by Matthias Urlichs 17 Feb '22

17 Feb '22

#3029 ## Description While the `kex` module exports a way to temporarily change the debug level, it cannot retrieve the current level. ### Expected behavior I can write Python code like this: ``` if KSR.kex.getdebug() > 2: ... # generate detailed and somewhat-time-consuming debug output ... # which would just get dropped on the floor otherwise ``` #### Actual observed behavior If there is a way to get Kamailio's current and/or configured debug level, I didn't find it.… [View More]

2 2

Releasing Kamailio v5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Hello, I am considering to release Kamailio v5.5.4 later this week, likely on Thursday, Feb 17, 2022. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Feb 21-24, 2022 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:e721e926: core: sruid - functions to get sruid with suffix from hasing a string
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e721e9262c4b48c3c2f5107f5f5d6195243662db URL: https://github.com/kamailio/kamailio/commit/e721e9262c4b48c3c2f5107f5f5d619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T13:34:05+01:00 core: sruid - functions to get sruid with suffix from hasing a string --- Modified: src/core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/… [View More]

1 0

Info: sipexer v1.0.0 - sip cli tool
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Hello, I want to announce the availability of sipexer v1.0.0 - a sip cli tool that can facilitate testing and monitoring of SIP signalling systems. It tries to have a modern approach, with a flexible templating system, supporting both IPv4 and IPv6 with all the common transport layers, respectively UDP, TCP, TLS and WebSocket (for WebRTC). The project can be found at: * https://github.com/miconda/sipexer It is written in Go language for better portability, binaries for Linux, MacOS … [View More]

8 9

git:master:88f1a1a6: tmx: use trimmed call-id value for hashing
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb URL: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T12:45:33+01:00 tmx: use trimmed call-id value for hashing --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4…… [View More]

1 0

git:master:0d688a69: async: exported functions to kemi to get async group name and data
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 0d688a69e27b1ea49bf8c06469e1ce2e11006d95 URL: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T12:05:40+01:00 async: exported functions to kemi to get async group name and data --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/… [View More]async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… Patch: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 60cd10e677..ee69e96e14 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -674,6 +674,16 @@ static sr_kemi_t sr_kemi_async_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("async"), str_init("get_gname"), + SR_KEMIP_XVAL, ki_async_get_gname, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("async"), str_init("get_data"), + SR_KEMIP_XVAL, ki_async_get_data, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index cfbfe98cef..b51887e351 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -675,3 +675,44 @@ int pv_parse_geoip_name(pv_spec_t *sp, str *in) LM_ERR("unknown PV time name %.*s\n", in->len, in->s); return -1; } + +/** + * + */ +static sr_kemi_xval_t _ksr_kemi_async_xval = {0}; + +/** + * + */ +sr_kemi_xval_t* ki_async_get_gname(sip_msg_t *msg) +{ + async_wgroup_t *awg = NULL; + + memset(&_ksr_kemi_async_xval, 0, sizeof(sr_kemi_xval_t)); + + awg = async_task_workers_get_crt(); + if(awg==NULL || awg->name.s==NULL || awg->name.len<0) { + sr_kemi_xval_null(&_ksr_kemi_async_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_async_xval; + } + _ksr_kemi_async_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_async_xval.v.s = awg->name; + return &_ksr_kemi_async_xval; +} + +/** + * + */ +sr_kemi_xval_t* ki_async_get_data(sip_msg_t *msg) +{ + memset(&_ksr_kemi_async_xval, 0, sizeof(sr_kemi_xval_t)); + + if(_ksr_async_data_param==NULL || _ksr_async_data_param->sval.s==NULL + || _ksr_async_data_param->sval.len<0) { + sr_kemi_xval_null(&_ksr_kemi_async_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_async_xval; + } + _ksr_kemi_async_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_async_xval.v.s = _ksr_async_data_param->sval; + return &_ksr_kemi_async_xval; +} diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index bb7dd042ce..254962bd70 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -56,4 +56,7 @@ int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_parse_async_name(pv_spec_t *sp, str *in); +sr_kemi_xval_t* ki_async_get_gname(sip_msg_t *msg); +sr_kemi_xval_t* ki_async_get_data(sip_msg_t *msg); + #endif [View Less]

1 0

git:master:e81f2e31: uuid: use define for buffer size
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e81f2e318bc32802d152ef69d005b8194e17ca42 URL: https://github.com/kamailio/kamailio/commit/e81f2e318bc32802d152ef69d005b81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T10:18:17+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:b311a01c: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: b311a01cde334106cea4ee777d40a75f0fab491f URL: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-16T09:46:22+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75…… [View More] Patch: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… --- diff --git a/src/modules/async/README b/src/modules/async/README index 744e98bf3e..8e165efa95 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -36,6 +36,8 @@ Daniel-Constantin Mierla 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) List of Examples @@ -48,6 +50,8 @@ Daniel-Constantin Mierla 1.7. async_workers usage 1.8. async_task_route usage 1.9. async_task_group_route usage + 1.10. async_task_data usage + 1.11. async_task_group_data usage Chapter 1. Admin Guide @@ -72,6 +76,8 @@ Chapter 1. Admin Guide 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) 1. Overview @@ -143,6 +149,8 @@ modparam("async", "ms_timer", 10) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 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.1. async_route(routename, seconds) @@ -335,3 +343,54 @@ route[RESUME] { exit; } ... + +4.7. async_task_data(routename, data) + + Send the data to a asynchronous task process (in the first group) that + executes the route[rountename] and makes the data available via + $async(data). + + The current SIP message is not suspended and it is not available in the + asynchronous task process, a local faked SIP request is used there. + + The parameters can contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.10. async_task_data usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... + +4.8. async_task_group_data(routename, groupname, data) + + Similar to async_task_route(), but allows to specify the name of the + group for asynchronous workers. See also 'async_workers_group' core + global parameter. + + This function can be used from ANY_ROUTE. + + Example 1.11. async_task_group_data usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "abc", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... [View Less]

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022