- sr-dev - kamailio.org

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

mod_pike is broken in 5.4 branch ?
by Markus Bönke 24 Sep '21

24 Sep '21

Hello all, It looks like mod_pike is broken in 5.4 branch since 5.4.6 because this patch is missing: https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0… <https://github.com/kamailio/kamailio/commit/79fbb7c6df5d4c742b1283b752c2df0…> If I test my script and send a lot of REGISTER messages, I only see this DEBUG message, the IP is never added to the tree: DEBUG: {1 [100-6380(a)10.211.55.12 <mailto:100-6380@10.211.55.12>] [1 REGISTER] [0]} pike [ip_tree.c:291]: mark_node(): search on branch 10 (top=(nil)) Versions 5.5.x are OK again. Thanks and regards Markus

2 1

git:5.4:523085f0: pike: fixed regression
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: 5.4 Commit: 523085f0a3c0953faa47bed7113507eb3c8b4f2c URL: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… Author: Boris Korzun <korzun(a)miatel.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T18:06:32+02:00 pike: fixed regression - removed unnecessary NULL-return from mark_node() after previous commit (cherry picked from commit 79fbb7c6df5d4c742b1283b752c2df0f51e77f09) (cherry picked from commit b62a773c8f0c1daf1aa3d1cd57845d414eea5bac) --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… Patch: https://github.com/kamailio/kamailio/commit/523085f0a3c0953faa47bed7113507e… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index c0324c0476..1fe9227a5f 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -301,10 +301,6 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } - if(node==NULL) { - return NULL; - } - LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

git:master:932e46b0: core: jump to error in case of unexpected comma for parse addr spec
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: 932e46b09176544cf6e085a32677980b26e4d2eb URL: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T14:43:40+02:00 core: jump to error in case of unexpected comma for parse addr spec --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… Patch: https://github.com/kamailio/kamailio/commit/932e46b09176544cf6e085a32677980… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 1ff5a16908..f003e5f31a 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -494,6 +494,7 @@ static char *parse_to_param(char *const buffer, const char *const end, } LM_ERR("invalid character ',' in status %d: [%.*s]\n", status, (int)(tmp - buffer), ZSW(buffer)); + goto error; } default: switch(status) {

1 0

git:master:9d32ae36: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: 9d32ae36488ae988a8e6c13698f8f95eaab906f6 URL: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T12:31:20+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95… Patch: https://github.com/kamailio/kamailio/commit/9d32ae36488ae988a8e6c13698f8f95…

1 0

git:master:f5d73407: textopsx: exported msg_set_buffer(data) function
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: f5d7340773b9fb0f69644a6a1187ce5ef8cd55b8 URL: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T12:17:19+02:00 textopsx: exported msg_set_buffer(data) function - it was available to KEMI --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… Patch: https://github.com/kamailio/kamailio/commit/f5d7340773b9fb0f69644a6a1187ce5… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index b5a6cac103..3de3a6c8e6 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -46,6 +46,34 @@ if(msg_apply_changes()) } } ... +</programlisting> + </example> + </section> + + <section id="textopsx.f.msg_set_buffer"> + <title> + <function moreinfo="none">msg_set_buffer(data)</function> + </title> + <para> + Set the content of the SIP message buffer, replacing the exiting data. + The parameter can contain variables, its value must be a valid SIP + request or reply, a matter of what the old message is. + </para> + <para> + This function can be used from REQUEST_ROUTE or core REPLY_ROUTE. + </para> + <para> + Note: It must be used before the transaction is created in + request_route and not inside the onreply_route[name] executed by tm + module. Also, do not use after resuming a suspended request or reply, + at that moment the transaction is already created. + </para> + <example> + <title><function>msg_set_buffer()</function> usage</title> + <programlisting format="linespecific"> +... +msg_set_buffer("INVITE sip:..."); +... </programlisting> </example> </section> diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index a9a60f9ed8..5ddeffa2c7 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -46,6 +46,7 @@ MODULE_VERSION static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); +static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2); static int change_reply_status_f(sip_msg_t *, char *, char *); static int change_reply_status_fixup(void **param, int param_no); @@ -121,6 +122,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"msg_set_buffer", (cmd_function)msg_set_buffer_f, 1, + fixup_spve_null, fixup_free_spve_null, + REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, change_reply_status_fixup, 0, ONREPLY_ROUTE}, {"change_reply_status_code", change_reply_status_code_f, 1, @@ -242,6 +246,21 @@ static int ki_msg_set_buffer(sip_msg_t *msg, str *obuf) return ki_msg_update_buffer(msg, obuf); } +/** + * + */ +static int msg_set_buffer_f(sip_msg_t *msg, char *p1data, char *p2) +{ + str data = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)p1data, &data) < 0) { + LM_ERR("could not get string param value\n"); + return -1; + } + + return ki_msg_set_buffer(msg, &data); +} + /** * */

1 0

git:master:e51fa240: modules: readme files regenerated - sworker ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: e51fa240a0b8a39757c42f62fbdba21b3c1a2a11 URL: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T10:46:17+02:00 modules: readme files regenerated - sworker ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… Patch: https://github.com/kamailio/kamailio/commit/e51fa240a0b8a39757c42f62fbdba21… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index c5d571a179..d4aa30b864 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -23,15 +23,20 @@ Daniel-Constantin Mierla 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters - 3.1. sworker_active() - 3.2. swork_task(gname) + 3.1. xdata (str) + + 4. Functions + + 4.1. sworker_active() + 4.2. swork_task(gname) List of Examples - 1.1. sworker_active() usage - 1.2. sworker_task() usage + 1.1. xdata usage + 1.2. sworker_active() usage + 1.3. sworker_task() usage Chapter 1. Admin Guide @@ -43,10 +48,14 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Functions + 3. Parameters + + 3.1. xdata (str) - 3.1. sworker_active() - 3.2. swork_task(gname) + 4. Functions + + 4.1. sworker_active() + 4.2. swork_task(gname) 1. Overview @@ -81,19 +90,39 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * None -3. Functions +3. Parameters + + 3.1. xdata (str) + +3.1. xdata (str) + + Name of a script variable from where to take additional data to be + passed to special worker along with the SIP message. Same variable will + be set by the special worker, therefore it has to be a writable + variable. Moreover, it must be a variable that can be set without the + SIP message structure, like $var(name), otherwise it can lead to a + crash. + + Default value: not set. + + Example 1.1. xdata usage +... +modparam("sworker", "xdata", "$var(xdata)") +... + +4. Functions - 3.1. sworker_active() - 3.2. swork_task(gname) + 4.1. sworker_active() + 4.2. swork_task(gname) -3.1. sworker_active() +4.1. sworker_active() Return 1 (true) if the processing happens in an asyn process, or -1 (false) if the processing is happening in a SIP receiving process. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. - Example 1.1. sworker_active() usage + Example 1.2. sworker_active() usage ... request_route { ... @@ -103,7 +132,7 @@ request_route { } ... -3.2. swork_task(gname) +4.2. swork_task(gname) Delegate the processing of SIP message to a group of async workers. The function is restricted to be used inside event_route[core:pre-routing]. @@ -119,7 +148,7 @@ request_route { This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. - Example 1.2. sworker_task() usage + Example 1.3. sworker_task() usage ... event_route[core:pre-routing] { if(sworker_task("default")) {

1 0

git:master:d60c758e: sworker: added parameter to be able to pass extra data to worker
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: d60c758e26048d2c9f055e8715ac54eee0b5a5ee URL: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T10:31:12+02:00 sworker: added parameter to be able to pass extra data to worker --- Modified: src/modules/sworker/doc/sworker_admin.xml Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e… Patch: https://github.com/kamailio/kamailio/commit/d60c758e26048d2c9f055e8715ac54e…

1 0

git:master:b6431ea5: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: b6431ea5044897e6152d5785a30af71ed759e19c URL: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-24T08:46:16+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71… Patch: https://github.com/kamailio/kamailio/commit/b6431ea5044897e6152d5785a30af71…

1 0

git:master:f23008ea: pv: added functions for xavu params explode/implode
by Daniel-Constantin Mierla 24 Sep '21

24 Sep '21

Module: kamailio Branch: master Commit: f23008ea338e3fa67f50bab8fabf93cacc07804b URL: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-24T08:32:31+02:00 pv: added functions for xavu params explode/implode --- Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c… Patch: https://github.com/kamailio/kamailio/commit/f23008ea338e3fa67f50bab8fabf93c…

1 0

Releasing Kamailio 5.3.9
by Henning Westerholt 23 Sep '21

23 Sep '21

Hello, I am planning to release in two weeks (likely on Wednesday 7th October) the next minor version out of branch 5.3, version 5.3.9. Backports of fixed issues from other stable branches will be integrated as usual. If you are aware of new issues which were not yet reported on the issue tracker or are missing back-ports, report them. Please note that this will be the last minor release created from the 5.3.x stable branch. The stable branches are usually maintained from the Kamailio development team for a period of two years. The other two stable branches of Kamailio will still be maintained (5.4.x and 5.5.x). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

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

23 Sep '21

Module: kamailio Branch: master Commit: e41d23e2955ab9e311f4292b6ffe58e4e4a4432b URL: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-23T09:46:23+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Patch: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 319e654c50..d5f49f0cbb 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -39,6 +39,8 @@ Daniel-Constantin Mierla 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) List of Examples @@ -52,6 +54,8 @@ Daniel-Constantin Mierla 1.8. pos_body_end() usage 1.9. pos_find_str() usage 1.10. pos_findi_str() usage + 1.11. pos_find_str() usage + 1.12. pos_rfindi_str() usage Chapter 1. Admin Guide @@ -78,6 +82,8 @@ Chapter 1. Admin Guide 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 1. Overview @@ -132,6 +138,8 @@ modparam("posops", "idx0", -200) 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 4.1. pos_append(idx, val) @@ -236,7 +244,9 @@ $var(pos) = pos_body_end(); 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. + 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 val can be a static string or variables. @@ -254,7 +264,9 @@ $var(idx) = pos_find_str("100", "kamailio"); 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. + 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 val can be a static string or variables. @@ -264,3 +276,43 @@ $var(idx) = pos_find_str("100", "kamailio"); ... $var(idx) = pos_findi_str("100", "kamailio"); ... + +4.10. pos_rfind_str(idx, val) + + Return the last position of the val in message buffer starting at idx + (reverse search). 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 val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.11. pos_find_str() usage +... +$var(idx) = pos_rfind_str("100", "kamailio"); +... + +4.11. pos_rfindi_str(idx, val) + + Return the last position of the val (matching case insensitive) in + message buffer starting at idx (reverse search). 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 val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.12. pos_rfindi_str() usage +... +$var(idx) = pos_rfindi_str("100", "kamailio"); +...

1 0

git:master:2cd6f16f: posops: functions for getting the position by reverse search
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2cd6f16f9a377bf35a6f3f840dbedc5780897736 URL: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:25:43+02:00 posops: functions for getting the position by reverse search --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Patch: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5…

1 0

git:master:2ae296f5: posops: handle negative index parameter for find functions
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2ae296f5d8fa2baa2d451213d668fdd8fabe06d9 URL: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:06:51+02:00 posops: handle negative index parameter for find functions --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Patch: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 7aa9620343..b0b67b117e 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -246,7 +246,8 @@ $var(pos) = pos_body_end(); val is at index 0, it returns the value specified by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + 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. </para> <para> The val can be a static string or variables. @@ -274,7 +275,8 @@ $var(idx) = pos_find_str("100", "kamailio"); by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + 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. </para> <para> The val can be a static string or variables. diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 8c538720ce..6e367c53aa 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -427,13 +427,15 @@ static int ki_posops_pos_find_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; } - text.s = msg->buf + idx; text.len = msg->len - idx; p = str_search(&text, val); @@ -476,10 +478,13 @@ static int ki_posops_pos_findi_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; }

1 0

git:master:747ed6d1: core: ut - functions for reverse search of str value
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 747ed6d1c9434a90b77fd86c4dae35e447da9185 URL: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:22:21+02:00 core: ut - functions for reverse search of str value --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Patch: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… --- diff --git a/src/core/ut.c b/src/core/ut.c index 00254eba23..8dde51aaff 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -392,6 +392,49 @@ char *str_casesearch_strz(str *text, char *needlez) return str_casesearch(text, &needle); } +/** + * @brief search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rsearch(str *text, str *needle) +{ + char *p; + + if(text==NULL || text->s==NULL || needle==NULL || needle->s==NULL + || text->len<needle->len) + return NULL; + + for (p = text->s + text->len - needle->len; p >= text->s; p--) { + if (*p == *needle->s && memcmp(p, needle->s, needle->len)==0) { + return p; + } + } + + return NULL; +} + +/** + * @brief case insensitive search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rcasesearch(str *text, str *needle) +{ + int i,j; + for(i=text->len-needle->len;i>=0;i--) { + for(j=0;j<needle->len;j++) { + if ( !((text->s[i+j]==needle->s[j]) || + ( isalpha((int)text->s[i+j]) + && ((text->s[i+j])^(needle->s[j]))==0x20 )) ) + break; + } + if (j==needle->len) + return text->s+i; + } + return NULL; +} + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or diff --git a/src/core/ut.h b/src/core/ut.h index f2173d3dcf..385db99ca7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1110,6 +1110,10 @@ char *strz_casesearch_strz(char *textz, char *needlez); char *str_casesearch_strz(str *text, char *needlez); +char *str_rsearch(str *text, str *needle); + +char *str_rcasesearch(str *text, str *needle); + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or

1 0

git:master:706dd0c9: posops: adjust offset on negative index for update ops
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: master Commit: 706dd0c9bf528881d758bc5c26f05870d8f22e35 URL: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T21:19:01+02:00 posops: adjust offset on negative index for update ops --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Patch: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 4c0c1b1535..8c538720ce 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -153,7 +153,7 @@ static int ki_posops_pos_append(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -206,7 +206,7 @@ static int ki_posops_pos_insert(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -259,7 +259,7 @@ static int ki_posops_pos_rm(sip_msg_t *msg, int idx, int len) return -1; } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; }

1 0

[kamailio/kamailio] how to choose 2 different rr heads (#2861)
by hance2010 22 Sep '21

22 Sep '21

### Description how to choose 2 different rr heads when relay a public call to lan? Thanks! ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.1 ``` * **Operating System**:  ``` debian10 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2861

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev