June 2020 - sr-dev - kamailio.org

git:5.3:21e69772: pkg/kamailio/deb: version set 5.3.5
by Victor Seva 22 Jun '20

22 Jun '20

Module: kamailio Branch: 5.3 Commit: 21e697728dc0b40cbd094c5d1c9de61eeeba5aea URL: https://github.com/kamailio/kamailio/commit/21e697728dc0b40cbd094c5d1c9de61… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-22T09:19:57+02:00 pkg/kamailio/deb: version set 5.3.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/… [View More]

1 0

git:5.3:12b4bf66: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Jun '20

22 Jun '20

Module: kamailio Branch: 5.3 Commit: 12b4bf66d3380f1e48023987db3d137f5be31e21 URL: https://github.com/kamailio/kamailio/commit/12b4bf66d3380f1e48023987db3d137… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-22T08:31:46+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/12b4bf66d3380f1e48023987db3d137… … [View More]

1 0

git:master:21a6c7bd: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 22 Jun '20

22 Jun '20

Module: kamailio Branch: master Commit: 21a6c7bd41b825a9dfff7632e432e05f761567a0 URL: https://github.com/kamailio/kamailio/commit/21a6c7bd41b825a9dfff7632e432e05… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-22T08:31:26+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/21a6c7bd41b825a9dfff7632e432e05… … [View More]

1 0

git:5.3:d232e2e4: uac: docs - updated examples to use avps with string names
by Daniel-Constantin Mierla 22 Jun '20

22 Jun '20

Module: kamailio Branch: 5.3 Commit: d232e2e48b1b668270dcab419638adeffa5cf0b2 URL: https://github.com/kamailio/kamailio/commit/d232e2e48b1b668270dcab419638ade… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-22T08:28:57+02:00 uac: docs - updated examples to use avps with string names - the recommended format instead of interger ids (cherry picked from commit 295e9a23df952bc98c2a2803d796e358363b2e22) -… [View More]

1 0

git:master:295e9a23: uac: docs - updated examples to use avps with string names
by Daniel-Constantin Mierla 22 Jun '20

22 Jun '20

Module: kamailio Branch: master Commit: 295e9a23df952bc98c2a2803d796e358363b2e22 URL: https://github.com/kamailio/kamailio/commit/295e9a23df952bc98c2a2803d796e35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-22T08:22:55+02:00 uac: docs - updated examples to use avps with string names - the recommended format instead of interger ids --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https:… [View More]

1 0

Releasing Kamailio v5.3.5
by Daniel-Constantin Mierla 22 Jun '20

22 Jun '20

Hello, I am considering to release next week (likely on Monday, June 22) the next minor version out of branch 5.3, respectively 5.3.5. Should anyone be aware of issues not reported to the bug tracker or commits for fixes in master not backported to 5.3 branch, let us know. For new issues, the best is to report them on the tracker. For commits, you can provide links/hashids or make pull requests. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 1

git:5.3:0e9ccf07: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Jun '20

21 Jun '20

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/… [View More]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 [View Less]

1 0

git:master:e3cf23b1: modules: readme files regenerated - db_mysql ... [skip ci]
by Kamailio Dev 21 Jun '20

21 Jun '20

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/… [View More]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 [View Less]

1 0

Re: [sr-dev] [kamailio/kamailio] db_mysql: docs for opt_ssl_mode parameter (f012c52)
by Daniel-Constantin Mierla 21 Jun '20

21 Jun '20

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…

1 0

git:5.3:68290f9f: db_mysql: docs - proper location for opt_ssl_mode in params section
by Daniel-Constantin Mierla 21 Jun '20

21 Jun '20

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) --- … [View More]

1 0

git:master:56536708: db_mysql: docs - proper location for opt_ssl_mode in params section
by Daniel-Constantin Mierla 21 Jun '20

21 Jun '20

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://… [View More]

1 0

Re: [sr-dev] [kamailio/kamailio] db_mysql: docs for opt_ssl_mode parameter (f012c52)
by juha-h 21 Jun '20

21 Jun '20

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…

1 0

git:master:fcd05ea3: sipdump: reimported the readme
by Daniel-Constantin Mierla 20 Jun '20

20 Jun '20

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/… [View More]

1 0

git:master:48dfc16c: sipdump: docs - fixed broken docbook format due to extra section tag
by Daniel-Constantin Mierla 20 Jun '20

20 Jun '20

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: … [View More]

1 0

git:5.3:681cb57e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 19 Jun '20

19 Jun '20

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/… [View More]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 [View Less]

1 0

git:5.3:a6f11762: registrar: expires_range should not make expires < min_expires
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

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 --- … [View More]

1 0

git:5.3:9dff6197: pv: use SIP_REQUEST/SIP_REPLY for value of $mt
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: 5.3 Commit: 9dff6197dcae5c4051194753382f95c5edaa379e URL: https://github.com/kamailio/kamailio/commit/9dff6197dcae5c4051194753382f95c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:15:38+02:00 pv: use SIP_REQUEST/SIP_REPLY for value of $mt (cherry picked from commit 7e402da261e1ced56019037d3dce9e72b5b2b0ea) --- Modified: src/modules/pv/pv_core.c --- Diff: https://… [View More]

1 0

git:5.3:0f90c016: db_mysql: use MARIADB_BASE_VERSION macro to check for MariaDB library
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: 5.3 Commit: 0f90c016a4591bc2768731bd583235aea1348455 URL: https://github.com/kamailio/kamailio/commit/0f90c016a4591bc2768731bd583235a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:49+02:00 db_mysql: use MARIADB_BASE_VERSION macro to check for MariaDB library (cherry picked from commit c5acc58863acb133748ad9f2f8a963ab714af871) --- Modified: src/modules/db_mysql/… [View More]km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/0f90c016a4591bc2768731bd583235a… Patch: https://github.com/kamailio/kamailio/commit/0f90c016a4591bc2768731bd583235a… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index edfbb58caf..fb4f7dd5af 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -51,7 +51,6 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) struct my_con* ptr; char *host, *grp, *egrp; unsigned int connection_flag = 0; - unsigned int optuint = 0; #if MYSQL_VERSION_ID > 50012 #if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION @@ -116,9 +115,9 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); -#ifndef LIBMARIADB -#if MYSQL_VERSION_ID > 50710 +#if MYSQL_VERSION_ID > 50710 && !defined(MARIADB_BASE_VERSION) if(db_mysql_opt_ssl_mode!=0) { + unsigned int optuint = 0; if(db_mysql_opt_ssl_mode==1) { if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", @@ -132,18 +131,11 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } #else if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", - optuint); - } -#endif -#else - if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; - LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", - optuint); + (unsigned int)db_mysql_opt_ssl_mode); } #endif + #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index df4d2df9db..2405468089 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -55,7 +55,6 @@ int my_con_connect(db_con_t* con) { struct my_con* mcon; struct my_uri* muri; - unsigned int optuint = 0; mcon = DB_GET_PAYLOAD(con); muri = DB_GET_PAYLOAD(con->uri); @@ -72,9 +71,9 @@ int my_con_connect(db_con_t* con) (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } -#ifndef LIBMARIADB -#if MYSQL_VERSION_ID > 50710 +#if MYSQL_VERSION_ID > 50710 && !defined(MARIADB_BASE_VERSION) if(db_mysql_opt_ssl_mode!=0) { + unsigned int optuint = 0; if(db_mysql_opt_ssl_mode==1) { if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", @@ -88,16 +87,8 @@ int my_con_connect(db_con_t* con) } #else if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", - optuint); - } -#endif -#else - if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; - LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", - optuint); + (unsigned int)db_mysql_opt_ssl_mode); } #endif [View Less]

1 0

git:5.3:0a5f69e8: db_mysql: note that libmariadbclient does not support ssl mode option
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: 5.3 Commit: 0a5f69e88d7d035a0966cbbe9c79b60163130c71 URL: https://github.com/kamailio/kamailio/commit/0a5f69e88d7d035a0966cbbe9c79b60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:31+02:00 db_mysql: note that libmariadbclient does not support ssl mode option (cherry picked from commit ae900a668aff4a472d6f1f7de5cf6277b5881ce9) --- Modified: src/modules/db_mysql/doc/… [View More]

1 0

git:5.3:88b1b6d1: db_mysql: mariadb client library does not support ssl mode option
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: 5.3 Commit: 88b1b6d164fbb1b487a9c0a441673e63d2928c43 URL: https://github.com/kamailio/kamailio/commit/88b1b6d164fbb1b487a9c0a441673e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:21+02:00 db_mysql: mariadb client library does not support ssl mode option (cherry picked from commit 5b727447df9f5476c2ef818a8926f62525d0c349) --- Modified: src/modules/db_mysql/… [View More]km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/88b1b6d164fbb1b487a9c0a441673e6… Patch: https://github.com/kamailio/kamailio/commit/88b1b6d164fbb1b487a9c0a441673e6… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 324e707e5b..edfbb58caf 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -116,6 +116,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); +#ifndef LIBMARIADB #if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode!=0) { if(db_mysql_opt_ssl_mode==1) { @@ -129,6 +130,19 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); } +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", + optuint); + } +#endif +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", + optuint); + } #endif #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index 349595ee8f..df4d2df9db 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -72,6 +72,7 @@ int my_con_connect(db_con_t* con) (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } +#ifndef LIBMARIADB #if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode!=0) { if(db_mysql_opt_ssl_mode==1) { @@ -85,6 +86,19 @@ int my_con_connect(db_con_t* con) } mysql_options(mcon->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); } +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", + optuint); + } +#endif +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", + optuint); + } #endif #if MYSQL_VERSION_ID >= 40101 [View Less]

1 0

git:5.3:0fc0b643: db_mysql: docs for opt_ssl_mode parameter
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: 5.3 Commit: 0fc0b643c655211ca0dfe12d560d1a8f9de284e6 URL: https://github.com/kamailio/kamailio/commit/0fc0b643c655211ca0dfe12d560d1a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:08+02:00 db_mysql: docs for opt_ssl_mode parameter (cherry picked from commit f012c525264ed05fec2acb4b3924d4b9a1cd3ab9) --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- … [View More]

1 0

git:5.3:31c6199d: db_mysql: new parameter opt_ssl_mode - allow controling ssl mode
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: 5.3 Commit: 31c6199d2204629240980b29cec861679493ce77 URL: https://github.com/kamailio/kamailio/commit/31c6199d2204629240980b29cec8616… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:13:58+02:00 db_mysql: new parameter opt_ssl_mode - allow controling ssl mode - can disable or enforce use of ssl - some combinations of libmysqlclient and libssl1.1 can result in crashing … [View More]when ssl/tls is used, even on 127.0.0.1, this param can be used to disable it (cherry picked from commit 260e25e15c4aa68533ee560bd8fcbdd5ee7b7d6f) --- Modified: src/modules/db_mysql/db_mysql.c Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/31c6199d2204629240980b29cec8616… Patch: https://github.com/kamailio/kamailio/commit/31c6199d2204629240980b29cec8616… --- diff --git a/src/modules/db_mysql/db_mysql.c b/src/modules/db_mysql/db_mysql.c index da130f1818..397372f5ac 100644 --- a/src/modules/db_mysql/db_mysql.c +++ b/src/modules/db_mysql/db_mysql.c @@ -45,6 +45,7 @@ unsigned int my_server_timezone = 0; /* Use FROM_UNIXTIME() for date conversion unsigned long my_client_ver = 0; int db_mysql_unsigned_type = 0; +int db_mysql_opt_ssl_mode = 0; struct mysql_counters_h mysql_cnts_h; counter_def_t mysql_cnt_defs[] = { @@ -100,6 +101,7 @@ static param_export_t params[] = { {"insert_delayed", INT_PARAM, &db_mysql_insert_all_delayed}, {"update_affected_found", INT_PARAM, &db_mysql_update_affected_found}, {"unsigned_type", PARAM_INT, &db_mysql_unsigned_type}, + {"opt_ssl_mode", PARAM_INT, &db_mysql_opt_ssl_mode}, {0, 0, 0} }; diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index bed21f92a7..324e707e5b 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -40,6 +40,8 @@ #include "../../core/ut.h" #include "db_mysql.h" +extern int db_mysql_opt_ssl_mode; + /*! \brief * Create a new connection structure, * open the MySQL connection and set reference count to 1 @@ -49,6 +51,8 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) struct my_con* ptr; char *host, *grp, *egrp; unsigned int connection_flag = 0; + unsigned int optuint = 0; + #if MYSQL_VERSION_ID > 50012 #if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION bool rec; @@ -112,6 +116,20 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); +#if MYSQL_VERSION_ID > 50710 + if(db_mysql_opt_ssl_mode!=0) { + if(db_mysql_opt_ssl_mode==1) { + if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { + LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", + SSL_MODE_DISABLED); + } + optuint = SSL_MODE_DISABLED; + } else { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + } + mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); + } +#endif #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index f64a90f0aa..349595ee8f 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -31,6 +31,7 @@ #include <string.h> #include <time.h> +extern int db_mysql_opt_ssl_mode; /* * Close the connection and release memory @@ -54,6 +55,7 @@ int my_con_connect(db_con_t* con) { struct my_con* mcon; struct my_uri* muri; + unsigned int optuint = 0; mcon = DB_GET_PAYLOAD(con); muri = DB_GET_PAYLOAD(con->uri); @@ -70,6 +72,20 @@ int my_con_connect(db_con_t* con) (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } +#if MYSQL_VERSION_ID > 50710 + if(db_mysql_opt_ssl_mode!=0) { + if(db_mysql_opt_ssl_mode==1) { + if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { + LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", + SSL_MODE_DISABLED); + } + optuint = SSL_MODE_DISABLED; + } else { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + } + mysql_options(mcon->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); + } +#endif #if MYSQL_VERSION_ID >= 40101 if ((my_client_ver >= 50025) || [View Less]

1 0

git:master:30c84383: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: 30c843836a34ad8e749d762b77ade6ebc987a55d URL: https://github.com/kamailio/kamailio/commit/30c843836a34ad8e749d762b77ade6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-19T15:16:13+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:47bd211d: sipdump: docs - usage remarks about cleaning generated files
by Daniel-Constantin Mierla 19 Jun '20

19 Jun '20

Module: kamailio Branch: master Commit: 47bd211da1474d8addbaf1df86627e11bb221ff4 URL: https://github.com/kamailio/kamailio/commit/47bd211da1474d8addbaf1df86627e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:09:51+02:00 sipdump: docs - usage remarks about cleaning generated files --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] topos: missing Record-Route on 200 OK leaving the server (downstream) (#2364)
by Victor Seva 19 Jun '20

19 Jun '20

### Description Seems that topos is not adding Record-Route headers in this scenario. ### Troubleshooting #### Reproduction ![topos](https://user-images.githubusercontent.com/63080/85021978-ea173900-b172-11ea-95dc-2b3be27378e3.png) ![no_topos](https://user-images.githubusercontent.com/63080/85021983-eb486600-b172-11ea-8383-816799e6251b.png) #### Log Messages I've added some more debug to topos: https://paste.debian.net/1152674/ Full [kamailio-lb.log](https://github.com/kamailio/kamailio/… [View More]files/4798522/kamaili… This is the part when processing of the 200 OK coming from PSTN(fake) ``` Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 127.0.0.1:5064;branch=z9hG4bKcf3d.49d855e2b5f83b9dff62c8a6b0cf23f8.0](80) - x_via2: [](0) - x_vbranch1: [z9hG4bKcf3d.49d855e2b5f83b9dff62c8a6b0cf23f8.0](46) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_storage.c:126]: tps_storage_lock_get(): tps lock get: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5eeb547f-3970-3] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_storage.c:391]: tps_storage_link_msg(): downstream: yes - acontact: [] - bcontact: [sip:127.0.2.1:50603;transport=UDP] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_storage.c:138]: tps_storage_lock_release(): tps lock release: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 127.0.0.1:5080;received=127.0.0.1;branch=z9hG4bKh2oO8aY.;rport=5080#015#012] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:910]: tps_response_received(): x_rr[] y_rr[] s_rr[<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Record-Route: <sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>#015#012] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bKcf3d.49d855e2b5f83b9dff62c8a6b0cf23f8.0#015#012] Jun 18 13:48:35 sp1 lb[14702]: NOTICE: REPLY_FROM_OUTBOUND <script>: Reply from Outbound - S=200 - OK M=INVITE IP=«udp»:«127.0.2.1»:«50603» ID=«NGCP%invite_peerout_outbound_socket%///1-15281(a)127.126.0.xn--1_b2b-1-yna UA='<null>' DESTIP=«127.0.0.1»:«5064» Jun 18 13:48:35 sp1 lb[14702]: NOTICE: REPLY_FROM_OUTBOUND <script>: NATed reply detected - ID=«NGCP%invite_peerout_outbound_socket%///1-15281(a)127.126.0.xn--1_b2b-1-yna UA='<null>' Jun 18 13:48:35 sp1 lb[14702]: NOTICE: REPLY_FROM_OUTBOUND <script>: Sending reply from outbound, fs='«udp:127.0.0.1:5060»' du='«127.0.0.1»:«5080»' - ID=«NGCP%invite_peerout_outbound_socket%///1-15281(a)127.126.0.xn--1_b2b-1-yna UA='<null>' Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [topos_mod.c:514]: tps_execute_event_route(): executing event_route[topos:topos:msg-sending] (2) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:1038]: tps_response_sent(): handling outgoing response Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 127.0.0.1:5080;received=127.0.0.1;branch=z9hG4bKh2oO8aY.;rport=5080](79) - x_via2: [](0) - x_vbranch1: [z9hG4bKh2oO8aY.](15) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>](214) - s_rr: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_storage.c:126]: tps_storage_lock_get(): tps lock get: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:1068]: tps_response_sent(): loaded branch a_uuid [atpsh-5eeb547f-3970-3] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_storage.c:138]: tps_storage_lock_release(): tps lock release: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5eeb547f-3970-3@127.0.0.1>#015#012] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:1101]: tps_response_sent(): x_rr[] y_rr[] s_rr[<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_storage.c:391]: tps_storage_link_msg(): downstream: yes - acontact: [] - bcontact: [sip:127.0.2.1:50603;transport=UDP] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [topos_mod.c:454]: tps_msg_sent(): new outbound buffer generated ``` ``` topos [tps_msg.c:910]: tps_response_received(): x_rr[] y_rr[] s_rr[<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>] ``` proper Record-Route value is on `s_rr` but [here](https://github.com/kamailio/kamailio/blob/93ab0791b409b9a708a1c7ac5cc… uses `x_rr` that is empty in this case #### SIP Traffic pcap files for the same scenario with and without topos [no_topos.zip](https://github.com/kamailio/kamailio/files/4798553/no_topos.z… [topos.zip](https://github.com/kamailio/kamailio/files/4798577/topos.zip) ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is Sipwise version based on 5.3.4, no patches on topos apart of the debug one. -- 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/2364 [View Less]

1 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020