sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:5.3:3a9ed0aa: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.3 Commit: 3a9ed0aab93d8fd04c33a35eec10481c1b699611 URL: https://github.com/kamailio/kamailio/commit/3a9ed0aab93d8fd04c33a35eec10481… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-27T19:16:44+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/3a9ed0aab93d8fd04c33a35eec10481… Patch: https://github.com/kamailio/kamailio/commit/3a9ed0aab93d8fd04c33a35eec10481… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index edaab1a5bb..f991ddd094 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1796,21 +1796,17 @@ 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), - SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - - 2(calculate crc32 sum over the callid). + 2 possibilities: legacy alogrithm - 0(very basic hash over callid) or + SHA1 - 1(apply sha1 over the callid and calculate hash). Default value is 0, legacy algorithm. - The values not falling into the range “0-2” are ignored. + The values not falling into the range “0-1” . 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

1 0

git:5.4:d0da7896: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.4 Commit: d0da78960e61aca42e75ba346b76616b59a16e86 URL: https://github.com/kamailio/kamailio/commit/d0da78960e61aca42e75ba346b76616… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-27T19:16:29+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/d0da78960e61aca42e75ba346b76616… Patch: https://github.com/kamailio/kamailio/commit/d0da78960e61aca42e75ba346b76616… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 0483ddd273..00e3746ffe 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1804,21 +1804,17 @@ 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), - SHA1 - 1(apply sha1 over the callid and calculate hash) or CRC32 - - 2(calculate crc32 sum over the callid). + 2 possibilities: legacy algorithm - 0(very basic hash over callid) or + SHA1 - 1(apply sha1 over the callid and calculate hash). Default value is 0, legacy algorithm. - The values not falling into the range “0-2” are ignored. + The values not falling into the range “0-1” 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

1 0

git:5.4:89b66e50: Revert "rtpengine: add CRC32 hash algo (#2558)"
by Henning Westerholt 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.4 Commit: 89b66e50b93465c120e818dabd4c94f9443bd686 URL: https://github.com/kamailio/kamailio/commit/89b66e50b93465c120e818dabd4c94f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-27T18:05:35Z Revert "rtpengine: add CRC32 hash algo (#2558)" This reverts commit bc1cf60f970c572ecaddf1ea154834d0e41d292e. --- 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/89b66e50b93465c120e818dabd4c94f… Patch: https://github.com/kamailio/kamailio/commit/89b66e50b93465c120e818dabd4c94f… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 60d8673a5f..362fa58910 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2022,14 +2022,13 @@ 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), SHA1 - 1(apply sha1 over the callid and calculate hash) or - CRC32 - 2(calculate crc32 sum over the callid). + algorithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-2</quote> are ignored. + The values not falling into the range <quote>0-1</quote> are ignored. </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2037,9 +2036,6 @@ 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 0a7c3b3b88..95726fa4a1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2974,9 +2974,6 @@ 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; @@ -2994,7 +2991,6 @@ 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 81f6cb388c..03999bf22f 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, RTP_HASH_CRC32_CALLID }; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; #endif

1 0

git:5.3:93ad3b9e: Revert "rtpengine: add CRC32 hash algo (#2558)"
by Henning Westerholt 27 Nov '20

27 Nov '20

Module: kamailio Branch: 5.3 Commit: 93ad3b9ed017f00984ef241a90186b4dfdab2728 URL: https://github.com/kamailio/kamailio/commit/93ad3b9ed017f00984ef241a90186b4… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-27T18:01:50Z Revert "rtpengine: add CRC32 hash algo (#2558)" This reverts commit 0bff74a16bb991ffe8c6690133414c5c9126bd1f. --- 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/93ad3b9ed017f00984ef241a90186b4… Patch: https://github.com/kamailio/kamailio/commit/93ad3b9ed017f00984ef241a90186b4… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 6c4c932b99..cafd6b6ef4 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2012,14 +2012,13 @@ 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), SHA1 - 1(apply sha1 over the callid and calculate hash) or - CRC32 - 2(calculate crc32 sum over the callid). + alogrithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). </para> <para> Default value is 0, legacy algorithm. </para> <para> - The values not falling into the range <quote>0-2</quote> are ignored. + The values not falling into the range <quote>0-1</quote> . </para> <example> <title>Set <varname>control_cmd_tos</varname> parameter</title> @@ -2027,9 +2026,6 @@ 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 3044fe4b07..8b72e5b675 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2943,9 +2943,6 @@ 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; @@ -2963,7 +2960,6 @@ 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 bea421ee9d..8a29210db2 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, RTP_HASH_CRC32_CALLID }; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; #endif

1 0

[kamailio/kamailio] rtpengine: add CRC32 hash algo (#2558)
by Stefan Mititelu 27 Nov '20

27 Nov '20

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add CRC32 selection algo. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2558 -- Commit Summary -- * rtpengine: add CRC32 hash algo -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (5) M src/modules/rtpengine/rtpengine.c (4) M src/modules/rtpengine/rtpengine.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2558.patch https://github.com/kamailio/kamailio/pull/2558.diff -- 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/pull/2558

4 9

git:master:06860832: core: skip running event_route[core:pre-routing] for internal routed messages
by Daniel-Constantin Mierla 27 Nov '20

27 Nov '20

Module: kamailio Branch: master Commit: 0686083209841be9f5d26ea61c3f4b660d74a9b8 URL: https://github.com/kamailio/kamailio/commit/0686083209841be9f5d26ea61c3f4b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-27T13:27:48+01:00 core: skip running event_route[core:pre-routing] for internal routed messages --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/0686083209841be9f5d26ea61c3f4b6… Patch: https://github.com/kamailio/kamailio/commit/0686083209841be9f5d26ea61c3f4b6… --- diff --git a/src/core/receive.c b/src/core/receive.c index b438182f26..f3b31fefbc 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -235,6 +235,11 @@ int ksr_evrt_pre_routing(sip_msg_t *msg) str evname = str_init("core:pre-routing"); recv_flags_t brflags; + if(msg->rcv.rflags & RECV_F_INTERNAL) { + DBG("skip internal routed message\n"); + return 0; + } + if(kemi_pre_routing_callback.len>0) { keng = sr_kemi_eng_get(); if(keng == NULL) {

1 0

git:master:98805c72: ndb_redis: set message level to debug on reconnect
by Victor Seva 27 Nov '20

27 Nov '20

Module: kamailio Branch: master Commit: 98805c723fbe01556e56d5b00ffc686b92014847 URL: https://github.com/kamailio/kamailio/commit/98805c723fbe01556e56d5b00ffc686… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-11-27T12:22:52+01:00 ndb_redis: set message level to debug on reconnect * logging error makes no sense here since there's going to be a reconnection afterwards --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/98805c723fbe01556e56d5b00ffc686… Patch: https://github.com/kamailio/kamailio/commit/98805c723fbe01556e56d5b00ffc686… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 15a86f7b10..42880310f2 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1011,7 +1011,7 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) /* null reply, reconnect and try again */ if(rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if(redisc_reconnect_server(rsrv)==0) { @@ -1054,7 +1054,7 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) /* null reply, reconnect and try again */ if(rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if(redisc_reconnect_server(rsrv)==0) { @@ -1152,7 +1152,7 @@ redisReply* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, /* null reply, reconnect and try again */ if(rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if(res)

1 0

git:master:b7d42f24: core: test if shm is initialized on early shutdown
by Daniel-Constantin Mierla 27 Nov '20

27 Nov '20

Module: kamailio Branch: master Commit: b7d42f248bef70a06d8ae23f4a7652fd3f0e4e61 URL: https://github.com/kamailio/kamailio/commit/b7d42f248bef70a06d8ae23f4a7652f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-27T07:49:27+01:00 core: test if shm is initialized on early shutdown --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/b7d42f248bef70a06d8ae23f4a7652f… Patch: https://github.com/kamailio/kamailio/commit/b7d42f248bef70a06d8ae23f4a7652f… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 56ba8bca59..ba6406ba46 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -43,6 +43,7 @@ #include "sr_compat.h" #include "ppcfg.h" #include "async_task.h" +#include "shm_init.h" #include <sys/stat.h> #include <regex.h> @@ -114,7 +115,7 @@ static int *_ksr_shutdown_phase = NULL; int ksr_shutdown_phase_init(void) { - if(_ksr_shutdown_phase == NULL) { + if((_ksr_shutdown_phase == NULL) && (shm_initialized())) { _ksr_shutdown_phase = (int*)shm_malloc(sizeof(int)); } return 0;

1 0

git:master:85b2f1a1: core: new global parameter async_workers_group
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: 85b2f1a18ad12a74bc80a4946d41510795e47e04 URL: https://github.com/kamailio/kamailio/commit/85b2f1a18ad12a74bc80a4946d41510… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T16:04:39+01:00 core: new global parameter async_workers_group - define groups of async worker processes - async_workers_group="name=abc;workers=N;nonblock=[0|1];usleep=M" - groups of worker processes can be used now with sworker module --- Modified: src/core/async_task.c Modified: src/core/async_task.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/85b2f1a18ad12a74bc80a4946d41510… Patch: https://github.com/kamailio/kamailio/commit/85b2f1a18ad12a74bc80a4946d41510…

1 0

git:master:aa13720e: core: check if the tcp clone rcv buffer is set when applying changes
by Daniel-Constantin Mierla 26 Nov '20

26 Nov '20

Module: kamailio Branch: master Commit: aa13720e5d78dde5ae5235c13399848cb8f5a0cc URL: https://github.com/kamailio/kamailio/commit/aa13720e5d78dde5ae5235c13399848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-26T13:55:17+01:00 core: check if the tcp clone rcv buffer is set when applying changes --- Modified: src/core/msg_translator.c Modified: src/core/tcp_options.h Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/aa13720e5d78dde5ae5235c13399848… Patch: https://github.com/kamailio/kamailio/commit/aa13720e5d78dde5ae5235c13399848… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 07e70b715f..f895df9683 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3252,7 +3252,12 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) LM_ERR("invalid buffer parameter\n"); return -1; } - +#ifdef USE_TCP + if(tcp_get_clone_rcvbuf()==0) { + LM_ERR("tcp clone received buffer not enabled\n"); + return -1; + } +#endif if(obuf->len >= BUF_SIZE) { LM_ERR("new buffer is too large (%d)\n", obuf->len); return -1; diff --git a/src/core/tcp_options.h b/src/core/tcp_options.h index f9729544df..61d5828c27 100644 --- a/src/core/tcp_options.h +++ b/src/core/tcp_options.h @@ -157,6 +157,7 @@ void tcp_options_get(struct cfg_group_tcp* t); #ifdef USE_TCP int tcp_set_clone_rcvbuf(int v); +int tcp_get_clone_rcvbuf(void); #endif /* USE_TCP */ #endif /* tcp_options_h */ diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8944d246c1..3ae21a71d9 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -109,6 +109,11 @@ int tcp_set_clone_rcvbuf(int v) return r; } +int tcp_get_clone_rcvbuf(void) +{ + return tcp_clone_rcvbuf; +} + #ifdef READ_HTTP11 int tcp_http11_continue(struct tcp_connection *c) {

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020