sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
307 discussions

git:master:c1087058: posops: store len of matched string with search function
by Daniel-Constantin Mierla 29 Sep '21

29 Sep '21

Module: kamailio Branch: master Commit: c108705810e3e84c18c91bcc7755077002443643 URL: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-29T09:23:42+02:00 posops: store len of matched string with search function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… Patch: https://github.com/kamailio/kamailio/commit/c108705810e3e84c18c91bcc7755077… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 7e219e63e5..6efb201ae4 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -54,6 +54,7 @@ static int w_posops_pos_search(sip_msg_t* msg, char* p1idx, char* p2re); typedef struct posops_data { int ret; int idx; + int len; } posops_data_t; static int posops_idx0 = -255; @@ -659,6 +660,7 @@ static int ki_posops_pos_search_helper(sip_msg_t *msg, int idx, regex_t *re) _posops_data.idx = (int)(msg->buf + idx + pmatch.rm_so); _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; + _posops_data.len = pmatch.rm_eo-pmatch.rm_so; return _posops_data.ret; } @@ -708,6 +710,8 @@ static int pv_posops_get_pos(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, _posops_data.idx); case 1: /* ret */ return pv_get_sintval(msg, param, res, _posops_data.ret); + case 2: /* len */ + return pv_get_sintval(msg, param, res, _posops_data.len); } return pv_get_null(msg, param, res); } @@ -723,6 +727,8 @@ static int pv_posops_parse_pos_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "ret", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "len", 3)==0) + sp->pvp.pvn.u.isname.name.n = 2; else goto error; break;

1 0

git:5.5:548e14cb: topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852)
by Henning Westerholt 28 Sep '21

28 Sep '21

Module: kamailio Branch: 5.5 Commit: 548e14cb12a9d39374ee20c9e5ab35b84c609a0c URL: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-28T11:30:29Z topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852) (cherry picked from commit 5484b7a2bf662d3bced662d11a04e1f25f965023) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… Patch: https://github.com/kamailio/kamailio/commit/548e14cb12a9d39374ee20c9e5ab35b… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b94a960340..1a67c0252c 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -352,7 +352,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, td->cp++; } - /* contact_host xavu takes preference */ + /* contact_host xavu takes preference, reset vavu */ + vavu = NULL; if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, &_tps_xavu_field_contact_host);

1 0

git:master:5484b7a2: topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852)
by Henning Westerholt 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: 5484b7a2bf662d3bced662d11a04e1f25f965023 URL: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-28T11:27:50Z topos: reset vavu variable, otherwise we will get errors in contact_mode 2 (GH #2852) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… Patch: https://github.com/kamailio/kamailio/commit/5484b7a2bf662d3bced662d11a04e1f… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b94a960340..1a67c0252c 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -352,7 +352,8 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, td->cp++; } - /* contact_host xavu takes preference */ + /* contact_host xavu takes preference, reset vavu */ + vavu = NULL; if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, &_tps_xavu_field_contact_host);

1 0

git:master:d0e51c2f: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: d0e51c2f862ce0089c899d97c16906b037c485b3 URL: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-28T10:46:28+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… Patch: https://github.com/kamailio/kamailio/commit/d0e51c2f862ce0089c899d97c16906b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 9d5e39f488..a9caf8951f 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2748,6 +2748,8 @@ ackets, 0 errors is enabled, the sessions are still allowed to finish for the hidden old nodes. + The execution of this command is limited to 10 seconds intervals. + Example 1.103. rtpengine.reload usage ... $ kamcmd rtpengine.reload

1 0

git:master:a9c9b83c: rtpengine: docs - note that rpc reload is limited to 10secs frequency
by Daniel-Constantin Mierla 28 Sep '21

28 Sep '21

Module: kamailio Branch: master Commit: a9c9b83c9dd1c09738b5a33362a8e339c20b786c URL: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-28T10:35:12+02:00 rtpengine: docs - note that rpc reload is limited to 10secs frequency --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… Patch: https://github.com/kamailio/kamailio/commit/a9c9b83c9dd1c09738b5a33362a8e33… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 2106241f8d..c3201bbf37 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -3285,7 +3285,7 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); <title>RPC Commands</title> <section id="rtpengine.r.reload"> - <title>rtpengine.reload</title> + <title><function moreinfo="none">rtpengine.reload</function></title> <para> Reloads the database node table content <emphasis>if configured</emphasis>. Returns specific message related to success, failure and no db_url configured. @@ -3295,6 +3295,9 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); hides old ones, based on the database content. If allow_op modparam is enabled, the sessions are still allowed to finish for the hidden old nodes. </para> + <para> + The execution of this command is limited to 10 seconds intervals. + </para> <example> <title> <function moreinfo="none">rtpengine.reload</function> usage</title>

1 0

seas module
by dpaape 27 Sep '21

27 Sep '21

I’m attempting to connect my application to kamailio via the seas module. Kamailio ver. 5.3.2 I have loaded all the necessary configuration file components. I start kamailio and everything looks good. I then start my app server which connects to the loopback ports 5040 and 5041 and send my counted string “servername” to each connection. Again everything looks good. Seas module responds with : “… EUREKA, we have a new connected AS: myappserver I then send a register request to kamailio. Request_route calls as_relay_t(myappserver) and I subsequently get an ERROR – w_as_relay_t(): no processer found for packet dst xxx.xxx.xxx.xxx:pppp As best as I can figure out from the source…. It looks as if something else needs to be sent to kamailio (from myappserver) in order for a processor_id to be assigned to ‘as->bound_processor[i] My application server is just straight up C code. I must be forgetting something or maybe completely off the mark as to how the seas module functions. Any help would be greatly appreciated. Thanks, Dan Sent from Mail for Windows

1 0

git:master:2fdf550a: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: 2fdf550ac0a865ba2336e80ce2d450f3c378ad50 URL: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-27T12:46:18+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… Patch: https://github.com/kamailio/kamailio/commit/2fdf550ac0a865ba2336e80ce2d450f… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index d5f49f0cbb..6e126f645f 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -41,6 +41,7 @@ Daniel-Constantin Mierla 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) List of Examples @@ -56,6 +57,7 @@ Daniel-Constantin Mierla 1.10. pos_findi_str() usage 1.11. pos_find_str() usage 1.12. pos_rfindi_str() usage + 1.13. pos_search() usage Chapter 1. Admin Guide @@ -84,6 +86,7 @@ Chapter 1. Admin Guide 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) 1. Overview @@ -140,6 +143,7 @@ modparam("posops", "idx0", -200) 4.9. pos_findi_str(idx, val) 4.10. pos_rfind_str(idx, val) 4.11. pos_rfindi_str(idx, val) + 4.12. pos_search(idx, re) 4.1. pos_append(idx, val) @@ -316,3 +320,23 @@ $var(idx) = pos_rfind_str("100", "kamailio"); ... $var(idx) = pos_rfindi_str("100", "kamailio"); ... + +4.12. pos_search(idx, re) + + Return the position that starts matching the regular expression re in + message buffer starting at idx. In case of not finding it or error, the + return code is negative. If val is at index 0, it returns the value + specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The re can be a static regular expression string. + + This function can be used from ANY_ROUTE. + + Example 1.13. pos_search() usage +... +$var(idx) = pos_search("100", "[0-9]+"); +...

1 0

git:master:efe64a9a: posops: function to get the position of a regexp match
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: efe64a9a14af608c47819678520c08eac98f52d7 URL: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T12:35:47+02:00 posops: function to get the position of a regexp match --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e… Patch: https://github.com/kamailio/kamailio/commit/efe64a9a14af608c47819678520c08e…

1 0

git:master:421ba0ad: core: fixup helper for igp and regexp params
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: 421ba0adde21ebc9f1e7a2289901a9574cc37259 URL: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T12:31:59+02:00 core: fixup helper for igp and regexp params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… Patch: https://github.com/kamailio/kamailio/commit/421ba0adde21ebc9f1e7a2289901a95… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 49dbb44f1f..148ba50227 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -251,6 +251,50 @@ int fixup_free_regexp_regexp(void** param, int param_no) return fixup_free_regexp_null(param, 1); } +int fixup_igp_regexp(void** param, int param_no) +{ + struct regex_fixup* re; + + if (param_no == 1) { + return fixup_igp_null(param, param_no); + } + if (param_no == 2) { + if ((re=pkg_malloc(sizeof(*re))) ==0) { + PKG_MEM_ERROR; + goto error; + } + if (regcomp(&re->regex, *param, + REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + goto error; + re->orig = *param; + *param = re; + } + return 0; +error: + if (re) + pkg_free(re); + return E_UNSPEC; +} + +int fixup_free_igp_regexp(void** param, int param_no) +{ + struct regex_fixup* re; + + if (param_no == 1) { + return fixup_free_igp_null(param, param_no); + } + if (param_no == 2) { + if (*param) { + re = *param; + *param = re->orig; + regfree(&re->regex); + pkg_free(re); + } + } + return 0; +} + + /* fixup_pvar_*() has to be written "by hand", since it needs to save the original pointer (the fixup users expects a pointer to the pv_spec_t in *param and hence the original value diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 29d937a261..f91e489f68 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -159,4 +159,7 @@ free_fixup_function mod_fix_get_fixup_free(fixup_function f); int fixup_vstr_all(void** param, int param_no); int fixup_free_vstr_all(void** param, int param_no); int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); + +int fixup_igp_regexp(void** param, int param_no); +int fixup_free_igp_regexp(void** param, int param_no); #endif

1 0

git:master:ed3b2506: async: docs - added section ids for parameters
by Daniel-Constantin Mierla 27 Sep '21

27 Sep '21

Module: kamailio Branch: master Commit: ed3b2506e13214d25a3dd78e487ed35ed13053ac URL: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-27T11:38:42+02:00 async: docs - added section ids for parameters --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… Patch: https://github.com/kamailio/kamailio/commit/ed3b2506e13214d25a3dd78e487ed35… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 5e9277a194..a56c60d7d2 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -68,7 +68,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="async.p.workers"> <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous @@ -88,7 +88,7 @@ modparam("async", "workers", 2) </programlisting> </example> </section> - <section> + <section id="async.p.ms_timer"> <title><varname>ms_timer</varname> (int)</title> <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions.

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021