sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

git:master:7bb4b7dc: pipelimit: match algorithm name case insensitive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7bb4b7dcc23c582ec666c71c9475e46e4ca12709 URL: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T16:30:24+02:00 pipelimit: match algorithm name case insensitive --- Modified: src/modules/pipelimit/pl_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… Patch: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… --- diff --git a/src/modules/pipelimit/pl_ht.h b/src/modules/pipelimit/pl_ht.h index cb5b9822f5..d2feaf40d5 100644 --- a/src/modules/pipelimit/pl_ht.h +++ b/src/modules/pipelimit/pl_ht.h @@ -112,11 +112,11 @@ static inline int str_i_cmp(const str * a, const str * b) static inline int str_map_str(const str_map_t * map, const str * key, int * ret) { for (; map->str.s; map++) - if (! str_cmp(&map->str, key)) { + if (! str_i_cmp(&map->str, key)) { *ret = map->id; return 0; } - LM_DBG("str_map_str() failed map=%p key=%.*s\n", map, key->len, key->s); + LM_DBG("failed to match - map=%p key=%.*s\n", map, key->len, key->s); return -1; } @@ -131,7 +131,7 @@ static inline int str_map_int(const str_map_t * map, int key, str * ret) *ret = map->str; return 0; } - LM_DBG("str_map_str() failed map=%p key=%d\n", map, key); + LM_DBG("failed to match - failed map=%p key=%d\n", map, key); return -1; } @@ -144,7 +144,7 @@ static inline int str_cpy(str * dest, str * src) dest->len = src->len; dest->s = shm_malloc(src->len); if (! dest->s) { - LM_ERR("oom: '%.*s'\n", src->len, src->s); + LM_ERR("out of shared memory: '%.*s'\n", src->len, src->s); return -1; } memcpy(dest->s, src->s, src->len);

7 years, 4 months

git:master:d3024229: tsilo: added section ids in docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d302422982aab79ec9af9b9d54d33dbf98dc7b63 URL: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T10:00:53+02:00 tsilo: added section ids in docs --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… Patch: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index 457aa7a219..e6cfe9b155 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -74,7 +74,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="tsilo.p.hash_size"> <title><varname>hash_size</varname> (integer)</title> <para> The size of the hash table internally used to keep the transaction. A @@ -97,7 +97,7 @@ modparam("tsilo", "hash_size", 1024) </example> </section> - <section> + <section id="tsilo.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> Specify if the domain part of the URI should be also saved and used for @@ -122,7 +122,7 @@ modparam("tsilo", "use_domain", 1) <section> <title>Functions</title> - <section> + <section id="tsilo.f.ts_store"> <title><function moreinfo="none">ts_store([uri])</function></title> <para> The method stores uri, tindex and tlabel of the current transaction. If @@ -146,7 +146,7 @@ if (is_method("INVITE")) { </programlisting> </example> </section> - <section> + <section id="tsilo.f.ts_append"> <title><function moreinfo="none">ts_append(domain, ruri)</function></title> <para> The method add branches to all the stored transactions for the &sip; @@ -184,7 +184,7 @@ if (is_method("REGISTER")) { </programlisting> </example> </section> - <section> + <section id="tsilo.f.ts_append_to"> <title><function moreinfo="none">ts_append_to(tindex, tlabel, domain, [uri])</function></title> <para> The method add branches to the transaction identified by tindex and tlabel, @@ -238,7 +238,7 @@ if (is_method("REGISTER")) { <section> <title>RPC Commands</title> - <section> + <section id="tsilo.rpc.ts.dump"> <title><varname>ts.dump</varname></title> <para>Dumps the content of the TSILO table</para> <para>Name: <emphasis>ts.dump</emphasis></para> @@ -247,7 +247,7 @@ if (is_method("REGISTER")) { kamcmd ts.dump </programlisting> </section> - <section> + <section id="tsilo.rpc.ts.lookup"> <title><varname>ts.lookup</varname></title> <para>Dumps the transactions stored for the given RURI</para> <para>Name: <emphasis>ts.lookup</emphasis></para> @@ -259,31 +259,31 @@ if (is_method("REGISTER")) { </section> <section> <title>Statistics</title> - <section> + <section id="tsilo.stat.stored_ruris"> <title><varname>stored_ruris</varname></title> <para> Number of ruris currently stored in the TSILO table. </para> </section> - <section> + <section id="tsilo.stat.stored_transactions"> <title><varname>stored_transactions</varname></title> <para> Number of transactions currently stored in the TSILO table. </para> </section> - <section> + <section id="tsilo.stat.added_branches"> <title><varname>added_branches</varname></title> <para> Total number of added branches from the startup. </para> </section> - <section> + <section id="tsilo.stat.total_ruris"> <title><varname>total_ruris</varname></title> <para> Total number of stored ruris from the startup. </para> </section> - <section> + <section id="tsilo.stat.total_transactions"> <title><varname>total_transactions</varname></title> <para> Total number of stored transactions from the startup.

7 years, 4 months

git:4.4:c5657b73: tls: explicit libssl v1.1+ cleanup when module is destroyed

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: c5657b7386f8be722e3d87c70b9e049d2b843c0d URL: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T12:56:03+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 (cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6) (cherry picked from commit 071b85f66cabaa3a705a014b26b7c1eb31029b26) --- Modified: modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… Patch: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 133bc7fc83..1ce9d716a5 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -778,4 +778,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

7 years, 4 months

git:5.0:071b85f6: tls: explicit libssl v1.1+ cleanup when module is destroyed

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 071b85f66cabaa3a705a014b26b7c1eb31029b26 URL: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T10:02:45+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 (cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… Patch: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 5d977fc810..b12209a0cd 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -778,4 +778,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

7 years, 4 months

git:master:00eb71da: tls: explicit libssl v1.1+ cleanup when module is destroyed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 00eb71da83347c9d2ea74feacec9c955f7b2a2e6 URL: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T09:54:18+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… Patch: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 6d78c37551..054d687e9c 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -847,4 +847,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

7 years, 4 months

git:master:62f573d4: kamctl: fix dangerous 'rm -rf' code in case if variables are not defined

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 62f573d4ecbbebe5f0f2d3b39be7ad4c2b460e65 URL: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… Author: Alexander Lutay <alutay(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T09:06:05+02:00 kamctl: fix dangerous 'rm -rf' code in case if variables are not defined --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… Patch: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 30d5878482..3aaecbd15a 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2614,7 +2614,7 @@ tls_ca() { merr "Failed to create root directory $CA_PATH" exit 1 fi - rm -fr $CA_PATH/* + rm -fr "${CA_PATH:?}"/* mkdir $CA_PATH/private mkdir $CA_PATH/certs touch $CA_PATH/index.txt @@ -2685,7 +2685,7 @@ tls_ca() { merr "Failed to create user directory $USER_DIR " exit 1 fi - rm -fr $USER_DIR/* + rm -fr "${USER_DIR:?}"/* mecho "Creating user certificate request" openssl req -config $USER_CFG -out $USER_DIR/$USER-cert_req.pem \

7 years, 4 months

[kamailio/kamailio] kamctl: fix dangerous 'rm -rf' code in case if variables are not defined (#1200)

by Alex Lutay

Hi, kamctl has a historical bomb which can be new https://github.com/MrMEEE/bumblebee-Old-and-abbandoned/issues/123 in case if variables are undefined for some reason. Have fun! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1200 -- Commit Summary -- * kamctl: fix dangerous 'rm -rf' code in case if variables are not defined -- File Changes -- M utils/kamctl/kamctl (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1200.patch https://github.com/kamailio/kamailio/pull/1200.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/1200

7 years, 4 months

git:master:e39dd796: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e39dd796a40fb01881858ccf4415fdcfa8529778 URL: https://github.com/kamailio/kamailio/commit/e39dd796a40fb01881858ccf4415fdc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-01T13:31:30+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/e39dd796a40fb01881858ccf4415fdc… Patch: https://github.com/kamailio/kamailio/commit/e39dd796a40fb01881858ccf4415fdc… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index d4d8701859..848279a2c2 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -380,9 +380,8 @@ modparam("uac","credential","username:domain:password") This can be used if the realm upstream will be using is not known in advance. - If you define it, you also need to define “auth_username_avp” - (Section 3.10, “auth_username_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define “auth_username_avp” (???) and + “auth_username_avp” (???). Example 1.9. Set auth_realm_avp parameter ... @@ -394,9 +393,8 @@ modparam("uac","auth_realm_avp","$avp(i:10)") The definition of an AVP that might contain the username to be used to perform authentication. - If you define it, you also need to define “auth_realm_avp” - (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define “auth_realm_avp” (???) and + “auth_username_avp” (???). Example 1.10. Set auth_username_avp parameter ... @@ -408,9 +406,8 @@ modparam("uac","auth_username_avp","$avp(i:11)") The definition of an AVP that might contain the password to be used to perform authentication. - If you define it, you also need to define “auth_password_avp” - (Section 3.11, “auth_password_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define “auth_password_avp” (???) and + “auth_username_avp” (???). Example 1.11. Set auth_password_avp parameter ...

7 years, 4 months

git:master:d1d2dda4: uac: fixes for section ids in docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d1d2dda40e1ac787a021c4ea9f9e179870dea99a URL: https://github.com/kamailio/kamailio/commit/d1d2dda40e1ac787a021c4ea9f9e179… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T13:30:26+02:00 uac: fixes for section ids in docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1d2dda40e1ac787a021c4ea9f9e179… Patch: https://github.com/kamailio/kamailio/commit/d1d2dda40e1ac787a021c4ea9f9e179…

7 years, 4 months

git:4.4:910f3c6d: pkg/kamailio: Fixed systemd unit failure on server boot

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 910f3c6da1cf0a3b154357a549a5f687cf4ba6ee URL: https://github.com/kamailio/kamailio/commit/910f3c6da1cf0a3b154357a549a5f68… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:58:25+02:00 pkg/kamailio: Fixed systemd unit failure on server boot --- Modified: pkg/kamailio/centos/7/kamailio.service Modified: pkg/kamailio/fedora/17/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/910f3c6da1cf0a3b154357a549a5f68… Patch: https://github.com/kamailio/kamailio/commit/910f3c6da1cf0a3b154357a549a5f68… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index 9de06c43b0..6332a5301d 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -1,6 +1,8 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Documentation=man:kamailio(8) https://www.kamailio.org/ +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service index 2f4ac95df5..61457e5fd6 100644 --- a/pkg/kamailio/fedora/17/kamailio.service +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -1,6 +1,8 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=syslog.target network.target +Documentation=man:kamailio(8) https://www.kamailio.org/ +Wants=network-online.target +After=syslog.target network-online.target [Service] Type=forking

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017