sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:5.3:0e9ccf07: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 0e9ccf0783570b3dabea1e97fddb234457d084b7 URL: https://github.com/kamailio/kamailio/commit/0e9ccf0783570b3dabea1e97fddb234… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-21T19:46:43+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/0e9ccf0783570b3dabea1e97fddb234… Patch: https://github.com/kamailio/kamailio/commit/0e9ccf0783570b3dabea1e97fddb234… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index b8f3688b4b..739e3b7ca1 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -31,11 +31,11 @@ Daniel-Constantin Mierla 3.4. auto_reconnect (integer) 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) + 3.7. opt_ssl_mode (integer) - 4. opt_ssl_mode (integer) - 5. Functions - 6. Installation - 7. Reading configuration from my.cnf + 4. Functions + 5. Installation + 6. Reading configuration from my.cnf List of Examples @@ -68,11 +68,11 @@ Chapter 1. Admin Guide 3.4. auto_reconnect (integer) 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) + 3.7. opt_ssl_mode (integer) - 4. opt_ssl_mode (integer) - 5. Functions - 6. Installation - 7. Reading configuration from my.cnf + 4. Functions + 5. Installation + 6. Reading configuration from my.cnf 1. Overview @@ -104,6 +104,7 @@ Chapter 1. Admin Guide 3.4. auto_reconnect (integer) 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) + 3.7. opt_ssl_mode (integer) 3.1. ping_interval (integer) @@ -184,7 +185,7 @@ modparam("db_mysql", "insert_delayed", 1) modparam("db_mysql", "update_affected_found", 1) ... -4. opt_ssl_mode (integer) +3.7. opt_ssl_mode (integer) Control how the connection to MySQL server is done in regards to SSL/TLS. If set to 1, SSL/TLS mode is disabled. @@ -208,11 +209,11 @@ modparam("db_mysql", "update_affected_found", 1) modparam("db_mysql", "opt_ssl_mode", 1) ... -5. Functions +4. Functions No function exported to be used from configuration file. -6. Installation +5. Installation Because it depends on an external library, the mysql module is not compiled and installed by default. You can use one of these options. @@ -222,7 +223,7 @@ modparam("db_mysql", "opt_ssl_mode", 1) * - from command line use: 'make all include_modules="db_mysql"; make install include_modules="db_mysql"'. -7. Reading configuration from my.cnf +6. Reading configuration from my.cnf In order to take into account specific mysql client options, a my.cnf config group can be passed using the db_url module parameter. This is

4 years, 6 months

git:master:e3cf23b1: modules: readme files regenerated - db_mysql ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e3cf23b11f2fef44f45aeffe28065f98f6eb105f URL: https://github.com/kamailio/kamailio/commit/e3cf23b11f2fef44f45aeffe28065f9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-21T19:46:24+02:00 modules: readme files regenerated - db_mysql ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/e3cf23b11f2fef44f45aeffe28065f9… Patch: https://github.com/kamailio/kamailio/commit/e3cf23b11f2fef44f45aeffe28065f9… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index a1425214eb..a09f5a0b4b 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -31,11 +31,11 @@ Daniel-Constantin Mierla 3.4. auto_reconnect (integer) 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) + 3.7. opt_ssl_mode (integer) - 4. opt_ssl_mode (integer) - 5. Functions - 6. Installation - 7. Reading configuration from my.cnf + 4. Functions + 5. Installation + 6. Reading configuration from my.cnf List of Examples @@ -68,11 +68,11 @@ Chapter 1. Admin Guide 3.4. auto_reconnect (integer) 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) + 3.7. opt_ssl_mode (integer) - 4. opt_ssl_mode (integer) - 5. Functions - 6. Installation - 7. Reading configuration from my.cnf + 4. Functions + 5. Installation + 6. Reading configuration from my.cnf 1. Overview @@ -104,6 +104,7 @@ Chapter 1. Admin Guide 3.4. auto_reconnect (integer) 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) + 3.7. opt_ssl_mode (integer) 3.1. ping_interval (integer) @@ -184,7 +185,7 @@ modparam("db_mysql", "insert_delayed", 1) modparam("db_mysql", "update_affected_found", 1) ... -4. opt_ssl_mode (integer) +3.7. opt_ssl_mode (integer) Control how the connection to MySQL server is done in regards to SSL/TLS. If set to 1, SSL/TLS mode is disabled. @@ -208,11 +209,11 @@ modparam("db_mysql", "update_affected_found", 1) modparam("db_mysql", "opt_ssl_mode", 1) ... -5. Functions +4. Functions No function exported to be used from configuration file. -6. Installation +5. Installation Because it depends on an external library, the mysql module is not compiled and installed by default. You can use one of these options. @@ -222,7 +223,7 @@ modparam("db_mysql", "opt_ssl_mode", 1) * - from command line use: 'make all include_modules="db_mysql"; make install include_modules="db_mysql"'. -7. Reading configuration from my.cnf +6. Reading configuration from my.cnf In order to take into account specific mysql client options, a my.cnf config group can be passed using the db_url module parameter. This is

4 years, 6 months

Re: [sr-dev] [kamailio/kamailio] db_mysql: docs for opt_ssl_mode parameter (f012c52)

by Daniel-Constantin Mierla

Indeed, it was misplaced, fixed now. -- 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/commit/f012c525264ed05fec2acb4b3924d4b…

4 years, 6 months

git:5.3:68290f9f: db_mysql: docs - proper location for opt_ssl_mode in params section

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 68290f9f48d3b7b7998c5831a0f11ebfa20e73a5 URL: https://github.com/kamailio/kamailio/commit/68290f9f48d3b7b7998c5831a0f11eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-21T19:33:10+02:00 db_mysql: docs - proper location for opt_ssl_mode in params section - reported by Juha Henianen (cherry picked from commit 56536708c5537c7443aa7a777fad0dc941e1bc71) --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/68290f9f48d3b7b7998c5831a0f11eb… Patch: https://github.com/kamailio/kamailio/commit/68290f9f48d3b7b7998c5831a0f11eb… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index ffe10b14e6..e0d1f23000 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -181,7 +181,6 @@ modparam("db_mysql", "update_affected_found", 1) </programlisting> </example> </section> - </section> <section id="db_mysql.p.opt_ssl_mode"> <title><varname>opt_ssl_mode</varname> (integer)</title> <para> @@ -215,6 +214,7 @@ modparam("db_mysql", "opt_ssl_mode", 1) </programlisting> </example> </section> + </section> <section> <title>Functions</title> <para>

4 years, 6 months

git:master:56536708: db_mysql: docs - proper location for opt_ssl_mode in params section

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 56536708c5537c7443aa7a777fad0dc941e1bc71 URL: https://github.com/kamailio/kamailio/commit/56536708c5537c7443aa7a777fad0dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-21T19:31:07+02:00 db_mysql: docs - proper location for opt_ssl_mode in params section - reported by Juha Henianen --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/56536708c5537c7443aa7a777fad0dc… Patch: https://github.com/kamailio/kamailio/commit/56536708c5537c7443aa7a777fad0dc… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index dfb16eca6f..7026cfab59 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -181,7 +181,6 @@ modparam("db_mysql", "update_affected_found", 1) </programlisting> </example> </section> - </section> <section id="db_mysql.p.opt_ssl_mode"> <title><varname>opt_ssl_mode</varname> (integer)</title> <para> @@ -215,6 +214,7 @@ modparam("db_mysql", "opt_ssl_mode", 1) </programlisting> </example> </section> + </section> <section> <title>Functions</title> <para>

4 years, 6 months

Re: [sr-dev] [kamailio/kamailio] db_mysql: docs for opt_ssl_mode parameter (f012c52)

by juha-h

This appears in README as its own section 4. Should it be among other parameters as a section 3 subsection? -- 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/commit/f012c525264ed05fec2acb4b3924d4b…

4 years, 6 months

git:master:fcd05ea3: sipdump: reimported the readme

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fcd05ea3f509181506f4ddb633ba016fe9ebf107 URL: https://github.com/kamailio/kamailio/commit/fcd05ea3f509181506f4ddb633ba016… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-20T21:44:37+02:00 sipdump: reimported the readme - somehow generation of it failed after the docbook update --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/fcd05ea3f509181506f4ddb633ba016… Patch: https://github.com/kamailio/kamailio/commit/fcd05ea3f509181506f4ddb633ba016…

4 years, 6 months

git:master:48dfc16c: sipdump: docs - fixed broken docbook format due to extra section tag

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48dfc16ccf8f0c6d4f1f51b48bc072e1a4ee3acd URL: https://github.com/kamailio/kamailio/commit/48dfc16ccf8f0c6d4f1f51b48bc072e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-20T14:11:35+02:00 sipdump: docs - fixed broken docbook format due to extra section tag --- Modified: src/modules/sipdump/README Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/48dfc16ccf8f0c6d4f1f51b48bc072e… Patch: https://github.com/kamailio/kamailio/commit/48dfc16ccf8f0c6d4f1f51b48bc072e… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index 139597f9cb..8b13789179 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -1,2 +1 @@ - diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 3bdc59c965..f783cb957f 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -294,9 +294,8 @@ event_route[sipdump:msg] { </section> </section> - <section> - <title>Usage Remarks</title> <section id="sipdump.x.usage-remarks"> + <title>Usage Remarks</title> <para> Note that the files with the SIP traffic and metadata are not deleted by the module itself. They have to be deleted explicitely by other

4 years, 6 months

git:5.3:681cb57e: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 681cb57e66f74634b2c8d32fa989f2c7314cc412 URL: https://github.com/kamailio/kamailio/commit/681cb57e66f74634b2c8d32fa989f2c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-19T15:31:22+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/681cb57e66f74634b2c8d32fa989f2c… Patch: https://github.com/kamailio/kamailio/commit/681cb57e66f74634b2c8d32fa989f2c… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index e78a7d1c86..b8f3688b4b 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -32,9 +32,10 @@ Daniel-Constantin Mierla 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) - 4. Functions - 5. Installation - 6. Reading configuration from my.cnf + 4. opt_ssl_mode (integer) + 5. Functions + 6. Installation + 7. Reading configuration from my.cnf List of Examples @@ -44,9 +45,10 @@ Daniel-Constantin Mierla 1.4. Set auto_reconnect parameter 1.5. Set insert_delayed parameter 1.6. Set update_affected_found parameter - 1.7. Set a my.cnf group in db_url parameter - 1.8. Adding a kamailio group to my.cnf - 1.9. Using [client] and specific group + 1.7. Set opt_ssl_mode parameter + 1.8. Set a my.cnf group in db_url parameter + 1.9. Adding a kamailio group to my.cnf + 1.10. Using [client] and specific group Chapter 1. Admin Guide @@ -67,9 +69,10 @@ Chapter 1. Admin Guide 3.5. insert_delayed (integer) 3.6. update_affected_found (integer) - 4. Functions - 5. Installation - 6. Reading configuration from my.cnf + 4. opt_ssl_mode (integer) + 5. Functions + 6. Installation + 7. Reading configuration from my.cnf 1. Overview @@ -181,11 +184,35 @@ modparam("db_mysql", "insert_delayed", 1) modparam("db_mysql", "update_affected_found", 1) ... -4. Functions +4. opt_ssl_mode (integer) + + Control how the connection to MySQL server is done in regards to + SSL/TLS. If set to 1, SSL/TLS mode is disabled. + + The 'include/mysql.h' starting with MySQL 5.7.11 defines the values for + this option as enum: 'mysql_ssl_mode { SSL_MODE_DISABLED=1, + SSL_MODE_PREFERRED, SSL_MODE_REQUIRED, SSL_MODE_VERIFY_CA, + SSL_MODE_VERIFY_IDENTITY}'. + + Note: if the value of this parameter is 1, it enforces + SSL_MODE_DISABLED, any other value is passed to the mysql_options(), + not checking if it is defined. + + Note: this option is supported only by libmysqlclient, not by + libmariadbclient. + + Default value is 0 (0 - off). + + Example 1.7. Set opt_ssl_mode parameter +... +modparam("db_mysql", "opt_ssl_mode", 1) +... + +5. Functions No function exported to be used from configuration file. -5. Installation +6. Installation Because it depends on an external library, the mysql module is not compiled and installed by default. You can use one of these options. @@ -195,7 +222,7 @@ modparam("db_mysql", "update_affected_found", 1) * - from command line use: 'make all include_modules="db_mysql"; make install include_modules="db_mysql"'. -6. Reading configuration from my.cnf +7. Reading configuration from my.cnf In order to take into account specific mysql client options, a my.cnf config group can be passed using the db_url module parameter. This is @@ -207,12 +234,12 @@ modparam("db_mysql", "update_affected_found", 1) * mysql://user:pass@[group]/db * mysql://[group]/db - Example 1.7. Set a my.cnf group in db_url parameter + Example 1.8. Set a my.cnf group in db_url parameter ... modparam("usrloc", "db_url", "mysql://[kamailio]/kamailio) ... - Example 1.8. Adding a kamailio group to my.cnf + Example 1.9. Adding a kamailio group to my.cnf ... [kamailio] socket = /path/to/mysql.sock @@ -226,7 +253,7 @@ default-character-set = utf8 both your specific group and the client group, then the value is taken from the last one. - Example 1.9. Using [client] and specific group + Example 1.10. Using [client] and specific group ... [client] socket = /var/run/mysql/mysqld.sock

4 years, 6 months

git:5.3:a6f11762: registrar: expires_range should not make expires < min_expires

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: a6f117620f97fd8dd22e160938d6d322cce955bd URL: https://github.com/kamailio/kamailio/commit/a6f117620f97fd8dd22e160938d6d32… Author: Kristian F. HÃ¸gh <kfh(a)uni-tel.dk> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:16:24+02:00 registrar: expires_range should not make expires < min_expires (cherry picked from commit c753932ebfa055d923c92b916937eec99cd14d23) --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/a6f117620f97fd8dd22e160938d6d32… Patch: https://github.com/kamailio/kamailio/commit/a6f117620f97fd8dd22e160938d6d32… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 62bc0d9a86..8af14b23ab 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -277,14 +277,17 @@ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novaria if ( *_e != 0 ) { - if (!novariation) { - *_e = randomize_expires( *_e, range ); - } - if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { *_e = cfg_get(registrar, registrar_cfg, min_expires); } + if (!novariation) { + *_e = randomize_expires( *_e, range ); + if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { + *_e = cfg_get(registrar, registrar_cfg, min_expires); + } + } + if (cfg_get(registrar, registrar_cfg, max_expires) && (*_e > cfg_get(registrar, registrar_cfg, max_expires))) { *_e = cfg_get(registrar, registrar_cfg, max_expires); }

4 years, 6 months

← Newer
1
...
16
17
18
19
20
21
22
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020