sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:3fde5ddc: modules: readme files regenerated - sworker ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3fde5ddcd8ae583b8d3fa6be43589bba2e07b984 URL: https://github.com/kamailio/kamailio/commit/3fde5ddcd8ae583b8d3fa6be43589bb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-26T13:46:28+01:00 modules: readme files regenerated - sworker ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/3fde5ddcd8ae583b8d3fa6be43589bb… Patch: https://github.com/kamailio/kamailio/commit/3fde5ddcd8ae583b8d3fa6be43589bb… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index e01307b175..241b077ab6 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2020 asipto.com + Copyright Â© 2020 asipto.com __________________________________________________________________ Table of Contents @@ -51,10 +51,19 @@ Chapter 1. Admin Guide 1. Overview This module can delegate processing of SIP requests to a group of - workers in the configuration file. The async workers have to defined - with the global parameter. + workers in the configuration file by using + event_route[core:pre-routing]. The async workers have to defined with + the global parameter. The worker process that received the message + internally does the usual execution of the config script, running + request_route or reply_route. - It does not create the transaction and nor suspend it. + Note: the behaviour is different than the async module, because it does + not create the transaction (obviously also not performing suspend). + + Note: it does not propagate anything set in the event_route, therefore + any set flag, or avp, etc. are lost. The SIP message is processed by + the delegated worker as it was fresh received from the network + (including parsing). 2. Dependencies @@ -77,7 +86,7 @@ Chapter 1. Admin Guide 3.1. sworker_active() 3.2. swork_task(gname) -3.1. sworker_active() +3.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. @@ -94,24 +103,28 @@ request_route { } ... -3.2. swork_task(gname) +3.2. swork_task(gname) - Delegate the processing of SIP message to a group of async workers. + 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]. The parameter gname provides the name of the group workers, it can contain pseudo-variables. - The function returns 0 (exit) in case the task is delegated. + The function returns 1 (true) in case the task is delegated. After + that, 'drop' must be used so processing of the message does not + continue to request_route or reply_route in the same process, it is + going to be done by the delegated group of workers. It returns -1 + (false) in case there was a proble delegating the processing. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. Example 1.2. sworker_task() usage ... -request_route { - if(!sworker_active()) { +event_route[core:pre-routing] { + if(sworker_task("default")) { xinfo("===== delegate processing [$Tf] [$si:$sp]\n"); - sworker_task("default"); - exit; + drop; } xinfo("===== processing continues [$Tf] [$si:$sp]\n"); ...

4 years

git:master:10292cf1: sworker: docs update to reflect use with event_route[core:pre-routing]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 10292cf151bd4d0ab9d2926d6acc9e2642b6f6da URL: https://github.com/kamailio/kamailio/commit/10292cf151bd4d0ab9d2926d6acc9e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:44:27+01:00 sworker: docs update to reflect use with event_route[core:pre-routing] --- Modified: src/modules/sworker/doc/sworker_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/10292cf151bd4d0ab9d2926d6acc9e2… Patch: https://github.com/kamailio/kamailio/commit/10292cf151bd4d0ab9d2926d6acc9e2… --- diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml index e1675a45bf..9656ff1071 100644 --- a/src/modules/sworker/doc/sworker_admin.xml +++ b/src/modules/sworker/doc/sworker_admin.xml @@ -17,11 +17,20 @@ <title>Overview</title> <para> This module can delegate processing of SIP requests to a group of - workers in the configuration file. The async workers have to defined - with the global parameter. + workers in the configuration file by using event_route[core:pre-routing]. + The async workers have to defined with the global parameter. The worker + process that received the message internally does the usual execution + of the config script, running request_route or reply_route. </para> <para> - It does not create the transaction and nor suspend it. + Note: the behaviour is different than the async module, because it does + not create the transaction (obviously also not performing suspend). + </para> + <para> + Note: it does not propagate anything set in the event_route, therefore + any set flag, or avp, etc. are lost. The SIP message is processed by the + delegated worker as it was fresh received from the network (including + parsing). </para> </section> @@ -88,14 +97,19 @@ request_route { <function moreinfo="none">swork_task(gname)</function> </title> <para> - Delegate the processing of SIP message to a group of async workers. + 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]. </para> <para> The parameter gname provides the name of the group workers, it can contain pseudo-variables. </para> <para> - The function returns 0 (exit) in case the task is delegated. + The function returns 1 (true) in case the task is delegated. After that, + 'drop' must be used so processing of the message does not continue to + request_route or reply_route in the same process, it is going to be done + by the delegated group of workers. It returns -1 (false) in case there + was a proble delegating the processing. </para> <para> This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE. @@ -104,11 +118,10 @@ request_route { <title><function>sworker_task()</function> usage</title> <programlisting format="linespecific"> ... -request_route { - if(!sworker_active()) { +event_route[core:pre-routing] { + if(sworker_task("default")) { xinfo("===== delegate processing [$Tf] [$si:$sp]\n"); - sworker_task("default"); - exit; + drop; } xinfo("===== processing continues [$Tf] [$si:$sp]\n"); ...

4 years

git:master:09d9a349: sworker: restrict use of sworker_task() in pre-processing phase

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 09d9a34923fa2ca3441f8b67a740383466a92481 URL: https://github.com/kamailio/kamailio/commit/09d9a34923fa2ca3441f8b67a740383… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:25:50+01:00 sworker: restrict use of sworker_task() in pre-processing phase - allow execution only in event_route[core:pre-routing] --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/09d9a34923fa2ca3441f8b67a740383… Patch: https://github.com/kamailio/kamailio/commit/09d9a34923fa2ca3441f8b67a740383… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index bf3782e5cb..33ee3361bd 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -167,12 +167,15 @@ int ki_sworker_task(sip_msg_t *msg, str *gname) return -1; } + if(!(msg->rcv.rflags & RECV_F_PREROUTING)) { + LM_WARN("not used in pre-routing phase\n"); + return -1; + } if(sworker_send_task(msg, gname) < 0) { return -1; } - /* force exit in config */ - return 0; + return 1; } /**

4 years

git:master:f86ced04: core: new event_route[core:pre-routing]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f86ced0419787a3c5196edb055f30b39684e37c5 URL: https://github.com/kamailio/kamailio/commit/f86ced0419787a3c5196edb055f30b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:23:05+01:00 core: new event_route[core:pre-routing] - executed before running config script for SIP messages, if received from the network, it is not executed if the message was dispatched internally - can be used to delegate processing to special workers via sworker module - if drop is used, then processing stops for that message, otherwise it goes forther to request_route or reply_route --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/ip_addr.h Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/f86ced0419787a3c5196edb055f30b3… Patch: https://github.com/kamailio/kamailio/commit/f86ced0419787a3c5196edb055f30b3…

4 years

git:master:ecea36c6: sworker: set the internal received flag

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ecea36c6281c60888b2273a046b8937858cd2f7b URL: https://github.com/kamailio/kamailio/commit/ecea36c6281c60888b2273a046b8937… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T09:50:00+01:00 sworker: set the internal received flag --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ecea36c6281c60888b2273a046b8937… Patch: https://github.com/kamailio/kamailio/commit/ecea36c6281c60888b2273a046b8937… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 06762cdbe5..bf3782e5cb 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -122,6 +122,7 @@ void sworker_exec_task(void *param) memcpy(buf, stp->buf, stp->len); len = stp->len; memcpy(&rcvi, &stp->rcv, sizeof(receive_info_t)); + rcvi.rflags |= RECV_F_INTERNAL; _sworker_active = 1; receive_msg(buf, len, &rcvi);

4 years

git:master:0792f6e5: core: added flags field for received info structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0792f6e5f9b8e43981f8dfa87a860f578d16da1e URL: https://github.com/kamailio/kamailio/commit/0792f6e5f9b8e43981f8dfa87a860f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T09:50:00+01:00 core: added flags field for received info structure --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/0792f6e5f9b8e43981f8dfa87a860f5… Patch: https://github.com/kamailio/kamailio/commit/0792f6e5f9b8e43981f8dfa87a860f5… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 7373e7bc24..8e26ee0c47 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -145,6 +145,10 @@ typedef struct snd_flags { unsigned short blst_imask; /* blocklist ignore mask */ } snd_flags_t; +/* recv flags */ +typedef enum recv_flags { + RECV_F_INTERNAL = (1 << 0), /* */ +} recv_flags_t; typedef struct receive_info { struct ip_addr src_ip; @@ -156,6 +160,7 @@ typedef struct receive_info { union sockaddr_union src_su; /* useful for replies*/ struct socket_info* bind_address; /* sock_info structure on which * the msg was received */ + recv_flags_t rflags; /* flags */ char proto; #ifdef USE_COMP char proto_pad0; /* padding field */

4 years

git:5.3:19ac8252: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 19ac8252b08521e79cd7c6608ac38bdf3bad767a URL: https://github.com/kamailio/kamailio/commit/19ac8252b08521e79cd7c6608ac38bd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-26T08:16:58+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/19ac8252b08521e79cd7c6608ac38bd… Patch: https://github.com/kamailio/kamailio/commit/19ac8252b08521e79cd7c6608ac38bd… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index f991ddd094..edaab1a5bb 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1796,17 +1796,21 @@ modparam("rtpengine", "control_cmd_tos", 144) 4.72. hash_algo (integer) Hashing algorithm to be used in node selection algorithm. Now there are - 2 possibilities: legacy alogrithm - 0(very basic hash over callid) or - SHA1 - 1(apply sha1 over the callid and calculate hash). + 2 possibilities: legacy algorithm - 0(very basic hash over callid), + SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - + 2(calculate crc32 sum over the callid). Default value is 0, legacy algorithm. - The values not falling into the range “0-1” . + The values not falling into the range “0-2” are ignored. Example 1.73. Set control_cmd_tos parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... 5. Functions

4 years

git:5.4:18edda18: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.4 Commit: 18edda18229ee6e75370a078a5deb8f980274e52 URL: https://github.com/kamailio/kamailio/commit/18edda18229ee6e75370a078a5deb8f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-26T08:16:39+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/18edda18229ee6e75370a078a5deb8f… Patch: https://github.com/kamailio/kamailio/commit/18edda18229ee6e75370a078a5deb8f… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 00e3746ffe..0483ddd273 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1804,17 +1804,21 @@ modparam("rtpengine", "control_cmd_tos", 144) 4.72. hash_algo (integer) Hashing algorithm to be used in node selection algorithm. Now there are - 2 possibilities: legacy algorithm - 0(very basic hash over callid) or - SHA1 - 1(apply sha1 over the callid and calculate hash). + 2 possibilities: legacy algorithm - 0(very basic hash over callid), + SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - + 2(calculate crc32 sum over the callid). Default value is 0, legacy algorithm. - The values not falling into the range “0-1” are ignored. + The values not falling into the range “0-2” are ignored. Example 1.73. Set control_cmd_tos parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... 5. Functions

4 years

git:5.4:bc1cf60f: rtpengine: add CRC32 hash algo (#2558)

by Stefan Mititelu

Module: kamailio Branch: 5.4 Commit: bc1cf60f970c572ecaddf1ea154834d0e41d292e URL: https://github.com/kamailio/kamailio/commit/bc1cf60f970c572ecaddf1ea154834d… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-11-26T09:13:40+02:00 rtpengine: add CRC32 hash algo (#2558) (cherry picked from commit 10349080490faabffaf1ab7cc5d591678b8c94dd) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/bc1cf60f970c572ecaddf1ea154834d… Patch: https://github.com/kamailio/kamailio/commit/bc1cf60f970c572ecaddf1ea154834d… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 362fa58910..60d8673a5f 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2022,13 +2022,14 @@ modparam("rtpengine", "control_cmd_tos", 144) <title><varname>hash_algo</varname> (integer)</title> <para> Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy - algorithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). + algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or + CRC32 - 2(calculate crc32 sum over the callid). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-1</quote> are ignored. + The values not falling into the range <quote>0-2</quote> are ignored. </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2036,6 +2037,9 @@ modparam("rtpengine", "control_cmd_tos", 144) ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... </programlisting> </example> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 95726fa4a1..0a7c3b3b88 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2974,6 +2974,9 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } break; + case RTP_HASH_CRC32_CALLID: + crc32_uint(&callid, &sum); + goto retry; default: LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; @@ -2991,6 +2994,7 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } retry: + LM_DBG("sum is = %u\n", sum); weight_sum = 0; lock_get(active_rtpp_set->rset_lock); diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 03999bf22f..81f6cb388c 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -103,6 +103,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; -enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; #endif

4 years

git:5.3:0bff74a1: rtpengine: add CRC32 hash algo (#2558)

by Stefan Mititelu

Module: kamailio Branch: 5.3 Commit: 0bff74a16bb991ffe8c6690133414c5c9126bd1f URL: https://github.com/kamailio/kamailio/commit/0bff74a16bb991ffe8c6690133414c5… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2020-11-26T09:09:58+02:00 rtpengine: add CRC32 hash algo (#2558) (cherry picked from commit 10349080490faabffaf1ab7cc5d591678b8c94dd) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/0bff74a16bb991ffe8c6690133414c5… Patch: https://github.com/kamailio/kamailio/commit/0bff74a16bb991ffe8c6690133414c5… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index cafd6b6ef4..6c4c932b99 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2012,13 +2012,14 @@ modparam("rtpengine", "control_cmd_tos", 144) <title><varname>hash_algo</varname> (integer)</title> <para> Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy - alogrithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). + algorithm - 0(very basic hash over callid), SHA1 - 1(apply sha1 over the callid and calculate hash) or + CRC32 - 2(calculate crc32 sum over the callid). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-1</quote> . + The values not falling into the range <quote>0-2</quote> are ignored. </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2026,6 +2027,9 @@ modparam("rtpengine", "control_cmd_tos", 144) ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1) + +### use CRC32 instead of legacy algorithm +modparam("rtpengine", "hash_algo", 2) ... </programlisting> </example> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8b72e5b675..3044fe4b07 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2943,6 +2943,9 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } break; + case RTP_HASH_CRC32_CALLID: + crc32_uint(&callid, &sum); + goto retry; default: LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; @@ -2960,6 +2963,7 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** } retry: + LM_DBG("sum is = %u\n", sum); weight_sum = 0; lock_get(active_rtpp_set->rset_lock); diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 8a29210db2..bea421ee9d 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -102,6 +102,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; -enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID, RTP_HASH_CRC32_CALLID }; #endif

4 years

← Newer
1
...
10
11
12
13
14
15
16
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020