sr-dev

sr-dev@lists.kamailio.org

21 participants
45185 discussions

git:master:fe2dfebf: Revert "dialog: add parameter to configure synchronisation of all dialog states to DB"
by Henning Westerholt 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: fe2dfebf7b8da99b40f0f21a0cfbf05b9534899f URL: https://github.com/kamailio/kamailio/commit/fe2dfebf7b8da99b40f0f21a0cfbf05… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-14T15:09:25Z Revert "dialog: add parameter to configure synchronisation of all dialog states to DB" This reverts commit 37d83a5838a50350563f19387fad455d6a433a02 for now. It needs more rectoring and some extensions in the DB access layer for this module. --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fe2dfebf7b8da99b40f0f21a0cfbf05… Patch: https://github.com/kamailio/kamailio/commit/fe2dfebf7b8da99b40f0f21a0cfbf05… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 0078ee7468..61e4b0cbcf 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -114,7 +114,6 @@ int dlg_noack_timeout = 60; int dlg_end_timeout = 300; int dlg_enable_dmq = 0; -int dlg_update_all_states = 1; int dlg_event_rt[DLG_EVENTRT_MAX]; str dlg_event_callback = STR_NULL; @@ -328,7 +327,6 @@ static param_export_t mod_params[]={ { "h_id_start", PARAM_INT, &dlg_h_id_start }, { "h_id_step", PARAM_INT, &dlg_h_id_step }, { "keep_proxy_rr", INT_PARAM, &dlg_keep_proxy_rr }, - { "update_all_states", INT_PARAM, &dlg_update_all_states }, { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index df43c7e618..1325469675 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -81,7 +81,6 @@ static db1_con_t* dialog_db_handle = 0; /* database connection handle */ static db_func_t dialog_dbf; extern int dlg_enable_stats; -extern int dlg_update_all_states; extern int dlg_h_id_start; extern int dlg_h_id_step; @@ -816,7 +815,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) &sflags_column, /*18*/ &toroute_name_column, /*19*/ &req_uri_column, /*20*/ &xdata_column, /*21*/ &iflags_column /*22*/ }; - if((dlg_update_all_states == 0) && (cell->state<DLG_STATE_EARLY || cell->state==DLG_STATE_DELETED)) { + if(cell->state<DLG_STATE_EARLY || cell->state==DLG_STATE_DELETED) { LM_DBG("not storing dlg in db during initial or deleted states\n"); return 0; } diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 1940a968e3..987bd54545 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -82,8 +82,7 @@ <para><emphasis>5</emphasis> : Deleted dialog</para> </listitem> </itemizedlist> - <para>The early and deleted dialog states are updated in database storage, - unless deactivated with the <emphasis>update_all_states</emphasis> parameter. + <para>The early and deleted dialog states are not updated in database storage. </para> </section> @@ -1641,39 +1640,6 @@ modparam("dialog", "keep_proxy_rr", 1) </programlisting> </example> </section> - - <section id="dialog.p.update_all_states"> - <title><varname>update_all_states</varname> (string)</title> - <para> - When enabled the dialog modules will also synchronize the - early and deleted dialog states to the database. This is - useful in failover situations, but of course will generate - more load to the database from this module. - </para> - <para> - Valid values are: - </para> - <itemizedlist> - <listitem><para> - <emphasis>0</emphasis> - Don't synchronize early and deleted dialogs - </para></listitem> - <listitem><para> - <emphasis>1</emphasis> - Synchronize early and deleted dialogs - </para></listitem> - </itemizedlist> - <emphasis> - Default value is <quote>1</quote>. - </emphasis> - <example> - <title>Set <varname>update_all_states</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("dialog", "update_all_states", 1) -... -</programlisting> - </example> - </section> - </section> <section>

1 0

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

14 Jun '20

Module: kamailio Branch: master Commit: a86029bb088a080a3e81e2d74419aac1806f3d55 URL: https://github.com/kamailio/kamailio/commit/a86029bb088a080a3e81e2d74419aac… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-14T12:31:12+02:00 modules: readme files regenerated - db_mysql ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/a86029bb088a080a3e81e2d74419aac… Patch: https://github.com/kamailio/kamailio/commit/a86029bb088a080a3e81e2d74419aac… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index 8d67a41097..a1425214eb 100644 --- a/src/modules/db_mysql/README +++ b/src/modules/db_mysql/README @@ -198,6 +198,9 @@ modparam("db_mysql", "update_affected_found", 1) 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

1 0

git:master:5b727447: db_mysql: mariadb client library does not support ssl mode option
by Daniel-Constantin Mierla 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: 5b727447df9f5476c2ef818a8926f62525d0c349 URL: https://github.com/kamailio/kamailio/commit/5b727447df9f5476c2ef818a8926f62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-14T12:15:00+02:00 db_mysql: mariadb client library does not support ssl mode option --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/5b727447df9f5476c2ef818a8926f62… Patch: https://github.com/kamailio/kamailio/commit/5b727447df9f5476c2ef818a8926f62… --- 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

1 0

git:master:ae900a66: db_mysql: note that libmariadbclient does not support ssl mode option
by Daniel-Constantin Mierla 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: ae900a668aff4a472d6f1f7de5cf6277b5881ce9 URL: https://github.com/kamailio/kamailio/commit/ae900a668aff4a472d6f1f7de5cf627… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-14T12:16:29+02:00 db_mysql: note that libmariadbclient does not support ssl mode option --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae900a668aff4a472d6f1f7de5cf627… Patch: https://github.com/kamailio/kamailio/commit/ae900a668aff4a472d6f1f7de5cf627… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 68deb56cab..dfb16eca6f 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -199,6 +199,9 @@ modparam("db_mysql", "update_affected_found", 1) defined. </para> <para> + Note: this option is supported only by libmysqlclient, not by libmariadbclient. + </para> + <para> <emphasis> Default value is 0 (0 - off). </emphasis>

1 0

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

14 Jun '20

Module: kamailio Branch: master Commit: a10d6860c69a518a1b60a17640cfb4da65839214 URL: https://github.com/kamailio/kamailio/commit/a10d6860c69a518a1b60a17640cfb4d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-14T11:46:20+02:00 modules: readme files regenerated - db_mysql ... [skip ci] --- Modified: src/modules/db_mysql/README --- Diff: https://github.com/kamailio/kamailio/commit/a10d6860c69a518a1b60a17640cfb4d… Patch: https://github.com/kamailio/kamailio/commit/a10d6860c69a518a1b60a17640cfb4d… --- diff --git a/src/modules/db_mysql/README b/src/modules/db_mysql/README index 69bd5e979d..8d67a41097 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,32 @@ 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. + + 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 +219,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 +231,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 +250,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 = /run/mysql/mysqld.sock

1 0

Broken: kamailio/kamailio#8998 (master - f012c52)
by Travis CI 14 Jun '20

14 Jun '20

Build Update for kamailio/kamailio ------------------------------------- Build: #8998 Status: Broken Duration: 4 mins and 23 secs Commit: f012c52 (master) Author: Daniel-Constantin Mierla Message: db_mysql: docs for opt_ssl_mode parameter View the changeset: https://github.com/kamailio/kamailio/compare/1189d75511ba...f012c525264e View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/698161699?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:f012c525: db_mysql: docs for opt_ssl_mode parameter
by Daniel-Constantin Mierla 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: f012c525264ed05fec2acb4b3924d4b9a1cd3ab9 URL: https://github.com/kamailio/kamailio/commit/f012c525264ed05fec2acb4b3924d4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-14T11:31:59+02:00 db_mysql: docs for opt_ssl_mode parameter --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f012c525264ed05fec2acb4b3924d4b… Patch: https://github.com/kamailio/kamailio/commit/f012c525264ed05fec2acb4b3924d4b… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 26e32d8d36..68deb56cab 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -182,6 +182,36 @@ modparam("db_mysql", "update_affected_found", 1) </example> </section> </section> + <section id="db_mysql.p.opt_ssl_mode"> + <title><varname>opt_ssl_mode</varname> (integer)</title> + <para> + Control how the connection to MySQL server is done in regards to SSL/TLS. + If set to 1, SSL/TLS mode is disabled. + </para> + <para> + 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}'. + </para> + <para> + 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. + </para> + <para> + <emphasis> + Default value is 0 (0 - off). + </emphasis> + </para> + <example> + <title>Set <varname>opt_ssl_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_mysql", "opt_ssl_mode", 1) +... +</programlisting> + </example> + </section> <section> <title>Functions</title> <para>

1 0

git:master:150ab9d4: siputils: add quotes around contact uri if not there for param encoding
by Daniel-Constantin Mierla 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: 150ab9d445da9f7eca1c7312cb70ba176f320131 URL: https://github.com/kamailio/kamailio/commit/150ab9d445da9f7eca1c7312cb70ba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-13T11:33:52+02:00 siputils: add quotes around contact uri if not there for param encoding --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/150ab9d445da9f7eca1c7312cb70ba1… Patch: https://github.com/kamailio/kamailio/commit/150ab9d445da9f7eca1c7312cb70ba1… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 9f3e09ca46..65168bfc45 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -638,6 +638,8 @@ int ki_contact_param_encode(sip_msg_t *msg, str *nparam, str *saddr) str nuri; char bval[MAX_URI_SIZE]; str pval; + int q; + char *p; if((msg->contact == NULL) && ((parse_headers(msg, HDR_CONTACT_F, 0) == -1) @@ -677,9 +679,19 @@ int ki_contact_param_encode(sip_msg_t *msg, str *nparam, str *saddr) PKG_MEM_ERROR; return -1; } - nuri.len = snprintf(nuri.s, MAX_URI_SIZE-1, "%.*s;%.*s=%.*s", - saddr->len, saddr->s, nparam->len, nparam->s, - pval.len, pval.s); + q = 1; + for(p = c->uri.s-1; p > msg->buf; p++) { + if(*p == '<') { + q = 0; + break; + } + if(*p != ' ' && *p != '\t' && *p != '\n' && *p != '\n') { + break; + } + } + nuri.len = snprintf(nuri.s, MAX_URI_SIZE-1, "%s%.*s;%.*s=%.*s%s", + (q)?"<":"", saddr->len, saddr->s, nparam->len, nparam->s, + pval.len, pval.s, (q)?">":""); if(nuri.len<=0 || nuri.len>=MAX_URI_SIZE) { LM_ERR("failed to build the new contact for [%.*s] uri (%d)\n", c->uri.len, c->uri.s, nuri.len);

1 0

git:master:260e25e1: db_mysql: new parameter opt_ssl_mode - allow controling ssl mode
by Daniel-Constantin Mierla 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: 260e25e15c4aa68533ee560bd8fcbdd5ee7b7d6f URL: https://github.com/kamailio/kamailio/commit/260e25e15c4aa68533ee560bd8fcbdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-14T11:18:15+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 when ssl/tls is used, even on 127.0.0.1, this param can be used to disable it --- 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/260e25e15c4aa68533ee560bd8fcbdd… Patch: https://github.com/kamailio/kamailio/commit/260e25e15c4aa68533ee560bd8fcbdd… --- 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) ||

1 0

git:master:c7e55a33: siputils: proper use uri parameters for decoding contact
by Daniel-Constantin Mierla 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: c7e55a33e9026a4ab74170a96dc1029838a80c6e URL: https://github.com/kamailio/kamailio/commit/c7e55a33e9026a4ab74170a96dc1029… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-13T11:09:32+02:00 siputils: proper use uri parameters for decoding contact --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/c7e55a33e9026a4ab74170a96dc1029… Patch: https://github.com/kamailio/kamailio/commit/c7e55a33e9026a4ab74170a96dc1029… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 748e703bd4..9f3e09ca46 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -704,6 +704,10 @@ int ki_contact_param_decode(sip_msg_t *msg, str *nparam) { contact_body_t *cb; contact_t *c; + sip_uri_t puri; + str sparams; + param_t* params = NULL; + param_hooks_t phooks; param_t* pit; char boval[MAX_URI_SIZE]; char bnval[MAX_URI_SIZE]; @@ -726,9 +730,28 @@ int ki_contact_param_decode(sip_msg_t *msg, str *nparam) } cb = (contact_body_t *)msg->contact->parsed; - c = cb->contacts; - while(c != NULL) { - pit = c->params; + for(c = cb->contacts; c != NULL; c = c->next) { + if(c->uri.len<4) { + continue; + } + if (parse_uri(c->uri.s, c->uri.len, &puri) < 0) { + LM_ERR("failed to parse contact uri [%.*s]\n", c->uri.len, c->uri.s); + return -1; + } + if(puri.sip_params.len>0) { + sparams = puri.sip_params; + } else if(puri.params.len>0) { + sparams = puri.params; + } else { + continue; + } + + if (parse_params2(&sparams, CLASS_ANY, &phooks, &params, ';')<0) { + LM_ERR("failed to parse uri params [%.*s]\n", c->uri.len, c->uri.s); + continue; + } + + pit = params; while(pit!=NULL) { if(pit->name.len==nparam->len && strncasecmp(pit->name.s, nparam->s, nparam->len)==0) { @@ -736,46 +759,51 @@ int ki_contact_param_decode(sip_msg_t *msg, str *nparam) } pit=pit->next; } - if(pit!=NULL && pit->body.len>0) { - oval = pit->body; - if(oval.len % 4) { - if(oval.len + 4 >= MAX_URI_SIZE-1) { - LM_ERR("not enough space to insert padding [%.*s]\n", - c->uri.len, c->uri.s); - return -1; - } - memcpy(boval, oval.s, oval.len); - for(i=0; i < (4 - (oval.len % 4)); i++) { - boval[oval.len + i] = '='; - } - oval.s = boval; - oval.len += (4 - (oval.len % 4)); - /* move to next buffer */ - } - nval.len = base64url_dec(oval.s, oval.len, bnval, MAX_URI_SIZE-1); - if (nval.len <= 0) { - LM_ERR("failed to decode contact uri [%.*s]\n", - c->uri.len, c->uri.s); + if(pit==NULL || pit->body.len<=0) { + free_params(params); + continue; + } + + oval = pit->body; + if(oval.len % 4) { + if(oval.len + 4 >= MAX_URI_SIZE-1) { + LM_ERR("not enough space to insert padding [%.*s]\n", + c->uri.len, c->uri.s); + free_params(params); return -1; } - nval.s = (char*)pkg_malloc((nval.len+1)*sizeof(char)); - if(nval.s==NULL) { - PKG_MEM_ERROR; - return -1; + memcpy(boval, oval.s, oval.len); + for(i=0; i < (4 - (oval.len % 4)); i++) { + boval[oval.len + i] = '='; } - memcpy(nval.s, bnval, nval.len); - nval.s[nval.len] = '\0'; - - LM_DBG("decoded new uri [%.*s] (%d)\n", nval.len, nval.s, nval.len); - if(patch(msg, c->uri.s, c->uri.len, nval.s, nval.len) < 0) { - LM_ERR("failed to update contact uri [%.*s]\n", + oval.s = boval; + oval.len += (4 - (oval.len % 4)); + /* move to next buffer */ + } + nval.len = base64url_dec(oval.s, oval.len, bnval, MAX_URI_SIZE-1); + if (nval.len <= 0) { + free_params(params); + LM_ERR("failed to decode contact uri [%.*s]\n", c->uri.len, c->uri.s); - pkg_free(nval.s); - return -2; - } + return -1; + } + nval.s = (char*)pkg_malloc((nval.len+1)*sizeof(char)); + if(nval.s==NULL) { + free_params(params); + PKG_MEM_ERROR; + return -1; } + memcpy(nval.s, bnval, nval.len); + nval.s[nval.len] = '\0'; - c = c->next; + LM_DBG("decoded new uri [%.*s] (%d)\n", nval.len, nval.s, nval.len); + if(patch(msg, c->uri.s, c->uri.len, nval.s, nval.len) < 0) { + LM_ERR("failed to update contact uri [%.*s]\n", + c->uri.len, c->uri.s); + free_params(params); + pkg_free(nval.s); + return -2; + } } return 1;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev