sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
221 discussions

git:master:be5172a8: db_mysql: switch warn to dbg for log messages for opt_ssl_ca option

by Victor Seva

Module: kamailio Branch: master Commit: be5172a84b02a1ab4fc7e97e7dc0813056302bdd URL: https://github.com/kamailio/kamailio/commit/be5172a84b02a1ab4fc7e97e7dc0813… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-19T15:00:12+02:00 db_mysql: switch warn to dbg for log messages for opt_ssl_ca option fixes #3884 --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/be5172a84b02a1ab4fc7e97e7dc0813… Patch: https://github.com/kamailio/kamailio/commit/be5172a84b02a1ab4fc7e97e7dc0813… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 50e3375a11d..240d3f59a76 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -184,8 +184,8 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) mysql_options( ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); #else - LM_WARN("opt_ssl_ca option not supported by mysql version (value %s) - " - "ignoring\n", + LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " + "ignoring\n", db_mysql_opt_ssl_ca); #endif /* MYSQL_OPT_SSL_CA */

3 months, 1 week

git:5.8:ec27c020: rabbitmq: don't try to use ssl_socket functions to a tcp_socket

by Victor Seva

Module: kamailio Branch: 5.8 Commit: ec27c0207a364fd4f563707b740877ab77bfb5a5 URL: https://github.com/kamailio/kamailio/commit/ec27c0207a364fd4f563707b740877a… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-19T12:14:18+02:00 rabbitmq: don't try to use ssl_socket functions to a tcp_socket fixes #3883 (cherry picked from commit 3a803770d4fb80347ba70dac94625b0e9aeab44d) --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/ec27c0207a364fd4f563707b740877a… Patch: https://github.com/kamailio/kamailio/commit/ec27c0207a364fd4f563707b740877a… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 8547bacac79..a1e95ad55b3 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -597,19 +597,22 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) return RABBITMQ_ERR_SOCK; } - if(rmq_amqps_ca_file) { - if(amqp_ssl_socket_set_cacert(amqp_sock, rmq_amqps_ca_file)) { - LM_ERR("Failed to set CA certificate for amqps connection\n"); - return RABBITMQ_ERR_SSL_CACERT; + if(amqp_info.ssl) { // only valid for amqp_ssl_socket_t + if(rmq_amqps_ca_file) { + if(amqp_ssl_socket_set_cacert(amqp_sock, rmq_amqps_ca_file)) { + LM_ERR("Failed to set CA certificate for amqps connection\n"); + return RABBITMQ_ERR_SSL_CACERT; + } } - } #if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 - amqp_ssl_socket_set_verify(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #else - amqp_ssl_socket_set_verify_peer(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); - amqp_ssl_socket_set_verify_hostname(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify_peer(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify_hostname( + amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #endif + } ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port); if(ret != AMQP_STATUS_OK) {

3 months, 1 week

[kamailio/kamailio] rabbitmq: coredump trying to set ssl options (Issue #3883)

by Victor Seva

### Description amqp_ssl_socket_set_*() functions are just for amqp_ssl_socket sockets #### Reproduction ``` loadmodule "rabbitmq.so" modparam("rabbitmq", "url", "amqp://guest:guest@rabbitmq:5672/%2Fkamailio") ``` #### Debugging Data ``` (gdb) bt #0 __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44 #1 0x00007fd60b427e8f in __pthread_kill_internal (signo=6, threadid=<optimized out>) at ./nptl/pthread_kill.c:78 #2 0x00007fd60b3d8fb2 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26 #3 0x00007fd60b3c3472 in __GI_abort () at ./stdlib/abort.c:79 #4 0x00007fd5f5a78831 in amqp_abort (fmt=fmt@entry=0x7fd5f5a82358 "<%p> is not of type amqp_ssl_socket_t") at ./librabbitmq/amqp_api.c:183 #5 0x00007fd5f5a7f032 in amqp_ssl_socket_set_verify_peer (base=<optimized out>, verify=verify@entry=0) at ./librabbitmq/amqp_openssl.c:519 #6 0x00007fd5f5a8adf1 in rabbitmq_connect (conn=0x7fd5f5a98328 <amqp_conn>) at ./src/modules/rabbitmq/rabbitmq.c:610 #7 0x00007fd5f5a918e7 in mod_child_init (rank=-127) at ./src/modules/rabbitmq/rabbitmq.c:180 #8 0x000055ec03183a8f in init_mod_child (m=0x7fd607c8bd00, rank=-127) at core/sr_module.c:920 #9 0x000055ec031887ab in init_child (rank=rank@entry=-127) at core/sr_module.c:999 #10 0x000055ec02ff5e07 in main_loop () at ./src/main.c:1725 #11 0x000055ec02feba87 in main (argc=<optimized out>, argv=<optimized out>) at ./src/main.c:3256 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3883 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3883(a)github.com>

3 months, 1 week

git:master:3a803770: rabbitmq: don't try to use ssl_socket functions to a tcp_socket

by Victor Seva

Module: kamailio Branch: master Commit: 3a803770d4fb80347ba70dac94625b0e9aeab44d URL: https://github.com/kamailio/kamailio/commit/3a803770d4fb80347ba70dac94625b0… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-19T12:10:35+02:00 rabbitmq: don't try to use ssl_socket functions to a tcp_socket fixes #3883 --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/3a803770d4fb80347ba70dac94625b0… Patch: https://github.com/kamailio/kamailio/commit/3a803770d4fb80347ba70dac94625b0… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 8547bacac79..a1e95ad55b3 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -597,19 +597,22 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) return RABBITMQ_ERR_SOCK; } - if(rmq_amqps_ca_file) { - if(amqp_ssl_socket_set_cacert(amqp_sock, rmq_amqps_ca_file)) { - LM_ERR("Failed to set CA certificate for amqps connection\n"); - return RABBITMQ_ERR_SSL_CACERT; + if(amqp_info.ssl) { // only valid for amqp_ssl_socket_t + if(rmq_amqps_ca_file) { + if(amqp_ssl_socket_set_cacert(amqp_sock, rmq_amqps_ca_file)) { + LM_ERR("Failed to set CA certificate for amqps connection\n"); + return RABBITMQ_ERR_SSL_CACERT; + } } - } #if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 - amqp_ssl_socket_set_verify(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #else - amqp_ssl_socket_set_verify_peer(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); - amqp_ssl_socket_set_verify_hostname(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify_peer(amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); + amqp_ssl_socket_set_verify_hostname( + amqp_sock, (rmq_amqps_ca_file) ? 1 : 0); #endif + } ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port); if(ret != AMQP_STATUS_OK) {

3 months, 1 week

[kamailio/kamailio] IMS register fail for AAASendMessage() Can't find a suitable connected peer in the routing table. (Issue #3879)

by lglhust

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ![image](https://github.com/kamailio/kamailio/assets/64653660/c3a10d79-f713-43a4-8151-4e80ea8bfc90) ### Possible Solutions  If I restarted pcscf, ims registration worked well.After some time ,the error occurred again. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` kamailio v5.6.0 * **Operating System**:  ubuntu server 18.04 ``` (paste your output here) ``` [Uploading ims-reg-fail (1).zip…]() -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3879 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3879(a)github.com>

3 months, 1 week

git:5.8:e430a7b5: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.8 Commit: e430a7b5eac9311cde1ea6a4d6f9fddacebe7302 URL: https://github.com/kamailio/kamailio/commit/e430a7b5eac9311cde1ea6a4d6f9fdd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-19T11:16:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_icscf/README Modified: src/modules/ims_usrloc_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/e430a7b5eac9311cde1ea6a4d6f9fdd… Patch: https://github.com/kamailio/kamailio/commit/e430a7b5eac9311cde1ea6a4d6f9fdd…

3 months, 1 week

[kamailio/kamailio] Is it possible to decode an number within Kamailio? (Issue #3882)

by Chen Ziyan

Recently ,I've learned about Kamailio and set up it. I want to decode my phone number before my FS, so whether it is possible to decode an number within Kamailio?Any help? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3882 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3882(a)github.com>

3 months, 1 week

git:5.8:7360ab7f: db_mysql: switch warn to dbg for log messages for opt_ssl_mode

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 7360ab7fbe672259c7433b1a5199467d24183d79 URL: https://github.com/kamailio/kamailio/commit/7360ab7fbe672259c7433b1a5199467… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-19T10:59:29+02:00 db_mysql: switch warn to dbg for log messages for opt_ssl_mode - GH #3884 (cherry picked from commit 8f98317e92da61160a1c416e0da45938a205d358) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/7360ab7fbe672259c7433b1a5199467… Patch: https://github.com/kamailio/kamailio/commit/7360ab7fbe672259c7433b1a5199467… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 561a0037223..50e3375a11d 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -143,7 +143,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) #if MYSQL_VERSION_ID >= 100339 mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); #else - LM_WARN("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); + LM_DBG("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); #endif break; case 5: /* SSL_MODE_VERIFY_IDENTITY */ @@ -151,7 +151,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) (void *)&(int){1}); break; default: - LM_WARN("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", + LM_DBG("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", db_mysql_opt_ssl_mode); break; }

3 months, 1 week

git:5.8:1a6907f1: ims_usrloc_pcscf: Update the module document

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 1a6907f11b1c8455c14cd24f3a55aff7a3aa0184 URL: https://github.com/kamailio/kamailio/commit/1a6907f11b1c8455c14cd24f3a55aff… Author: H.Yavari <hyavari(a)senasoftware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-19T10:59:13+02:00 ims_usrloc_pcscf: Update the module document - Fixing the db_url param value from int to string in admin document. (cherry picked from commit 04e065af3d46e4b0def5ed3de6502442466f04bc) --- Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a6907f11b1c8455c14cd24f3a55aff… Patch: https://github.com/kamailio/kamailio/commit/1a6907f11b1c8455c14cd24f3a55aff…

3 months, 1 week

git:5.8:9cbe3176: ims_icscf: add missing documents for database params

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: 9cbe3176f5c8c298956ed2d4b83818ceb64af528 URL: https://github.com/kamailio/kamailio/commit/9cbe3176f5c8c298956ed2d4b83818c… Author: H.Yavari <hyavari(a)senasoftware.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-19T10:59:01+02:00 ims_icscf: add missing documents for database params - Adding missing ims_icscf database parameters to admin documents. - Change the default value for ims_icscf db_url to Kamailio default db_url value. (cherry picked from commit 57087e42f1b1cae86132c558aa9497f4839af7e0) --- Modified: src/modules/ims_icscf/doc/ims_icscf_admin.xml Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9cbe3176f5c8c298956ed2d4b83818c… Patch: https://github.com/kamailio/kamailio/commit/9cbe3176f5c8c298956ed2d4b83818c… --- diff --git a/src/modules/ims_icscf/doc/ims_icscf_admin.xml b/src/modules/ims_icscf/doc/ims_icscf_admin.xml index 9ae046e6794..e3c552a1c57 100644 --- a/src/modules/ims_icscf/doc/ims_icscf_admin.xml +++ b/src/modules/ims_icscf/doc/ims_icscf_admin.xml @@ -111,6 +111,106 @@ modparam("ims_icscf","scscf_entry_expiry", 300) </example> </section> + <section> + <title><varname>db_url</varname> (string)</title> + + <para> + &url; of the database to be used. + </para> + + <para> + If the db_url string is empty, the default database URL + will be used. + </para> + + <para> + <emphasis> + Default value is <quote>&defaultrodb;</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_url</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_url", "&exampledb;") +... + </programlisting> + </example> + </section> + + <section> + <title> + <varname>db_nds_table</varname> (string)</title> + + <para> + NDS (Network Domain Security) table name in database to be used. + </para> + + <para> + <emphasis> + Default value is <quote>nds_trusted_domains</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_nds_table</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_nds_table", "nds_trusted_domains") +... + </programlisting> + </example> + </section> + + <section> + <title> + <varname>db_scscf_table</varname> (string)</title> + + <para> + S-CSCF table name in database to be used. + </para> + + <para> + <emphasis> + Default value is <quote>s_cscf</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_scscf_table</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_scscf_table", "s_cscf") +... + </programlisting> + </example> + </section> + + <section> + <title> + <varname>db_capabilities_table</varname> (string)</title> + + <para> + S-CSCF capabilities table name in database to be used. + </para> + + <para> + <emphasis> + Default value is <quote>s_cscf_capabilities</quote>. + </emphasis> + </para> + + <example> + <title>Set <varname>db_capabilities_table</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ims_icscf", "db_capabilities_table", "s_cscf_capabilities") +... + </programlisting> + </example> + </section> + <section> <title><varname>cxdx_forced_peer</varname> (string)</title> diff --git a/src/modules/ims_icscf/ims_icscf_mod.c b/src/modules/ims_icscf/ims_icscf_mod.c index 502fcf68174..a690891ee46 100644 --- a/src/modules/ims_icscf/ims_icscf_mod.c +++ b/src/modules/ims_icscf/ims_icscf_mod.c @@ -71,7 +71,7 @@ stat_var *uar_replies_response_time = NULL; stat_var *lir_replies_response_time = NULL; //module parameters -char *ims_icscf_db_url = "mysql://icscf:heslo@localhost/hssdata"; /**< DB URL */ +char *ims_icscf_db_url = DEFAULT_RODB_URL; /**< DB URL */ char *ims_icscf_db_nds_table = "nds_trusted_domains"; /**< NDS table in DB */ char *ims_icscf_db_scscf_table = "s_cscf"; /**< S-CSCF table in db */ char *ims_icscf_db_capabilities_table =

3 months, 1 week

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024