[sr-dev] git:5.7:64f0c3f3: db_mysql: switch warn to dbg for log messages for opt_ssl_mode

2024-07-08 Thread Daniel-Constantin Mierla via sr-dev
Module: kamailio
Branch: 5.7
Commit: 64f0c3f3979de7a40732067792d89c6d3b1c23d4
URL: 
https://github.com/kamailio/kamailio/commit/64f0c3f3979de7a40732067792d89c6d3b1c23d4

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2024-07-07T09:35:27+02:00

db_mysql: switch warn to dbg for log messages for opt_ssl_mode

- GH #3884

(cherry picked from commit 8f98317e92da61160a1c416e0da45938a205d358)
(cherry picked from commit 7360ab7fbe672259c7433b1a5199467d24183d79)

---

Modified: src/modules/db_mysql/km_my_con.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/64f0c3f3979de7a40732067792d89c6d3b1c23d4.diff
Patch: 
https://github.com/kamailio/kamailio/commit/64f0c3f3979de7a40732067792d89c6d3b1c23d4.patch

---

diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c
index 04982292673..8534ac0a156 100644
--- a/src/modules/db_mysql/km_my_con.c
+++ b/src/modules/db_mysql/km_my_con.c
@@ -133,7 +133,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 */
@@ -141,7 +141,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;
}

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] git:5.7:184aaf99: db_mysql: switch warn to dbg for log messages for opt_ssl_ca option

2024-07-08 Thread Daniel-Constantin Mierla via sr-dev
Module: kamailio
Branch: 5.7
Commit: 184aaf991b6ad74b63a7f8724058cd4066f3bbd3
URL: 
https://github.com/kamailio/kamailio/commit/184aaf991b6ad74b63a7f8724058cd4066f3bbd3

Author: Victor Seva 
Committer: Daniel-Constantin Mierla 
Date: 2024-07-07T09:35:36+02:00

db_mysql: switch warn to dbg for log messages for opt_ssl_ca option

fixes #3884

(cherry picked from commit be5172a84b02a1ab4fc7e97e7dc0813056302bdd)
(cherry picked from commit 4c75991aa662bddc1bbe65c83f7861cb72a65a61)

---

Modified: src/modules/db_mysql/km_my_con.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/184aaf991b6ad74b63a7f8724058cd4066f3bbd3.diff
Patch: 
https://github.com/kamailio/kamailio/commit/184aaf991b6ad74b63a7f8724058cd4066f3bbd3.patch

---

diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c
index 8534ac0a156..d6c7a43bdac 100644
--- a/src/modules/db_mysql/km_my_con.c
+++ b/src/modules/db_mysql/km_my_con.c
@@ -174,8 +174,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 */
 

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] kamailio 5.7.6 startup (Issue #3908)

2024-07-08 Thread Daniel-Constantin Mierla via sr-dev
The warning can be ignored, has no relevant impact. Actually, it was changed to 
a debug message later, but somehow backporting was overlooked to 5.7 branch, I 
have just done it. You can use now latest git branch 5.7 (deb packages will 
build over the next night and be available in the nightly repos).

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3908#issuecomment-2213370262
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] kamailio 5.7.6 startup (Issue #3908)

2024-07-08 Thread Daniel-Constantin Mierla via sr-dev
Closed #3908 as completed.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3908#event-13420025320
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] git:master:9d923764: core: basex - compute lenght for base58 decode

2024-07-08 Thread Daniel-Constantin Mierla via sr-dev
Module: kamailio
Branch: master
Commit: 9d923764747ff36152fc930da66e972201516b7b
URL: 
https://github.com/kamailio/kamailio/commit/9d923764747ff36152fc930da66e972201516b7b

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2024-07-08T12:08:13+02:00

core: basex - compute lenght for base58 decode

- GH #3907

---

Modified: src/core/basex.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/9d923764747ff36152fc930da66e972201516b7b.diff
Patch: 
https://github.com/kamailio/kamailio/commit/9d923764747ff36152fc930da66e972201516b7b.patch

---

diff --git a/src/core/basex.c b/src/core/basex.c
index a112ce77adb..2871afa22ee 100644
--- a/src/core/basex.c
+++ b/src/core/basex.c
@@ -412,7 +412,7 @@ char *b58_decode(char *outb, int *outbszp, char *b58, int 
b58sz)
break;
--*outbszp;
}
-   *outbszp += zerocount;
+   *outbszp = strlen(outb + i);
 
return outb + i;
 }

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] Base58 not decoding correctly (Issue #3907)

2024-07-08 Thread Daniel-Constantin Mierla via sr-dev
Closed #3907 as completed.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3907#event-13421729754
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] Base58 not decoding correctly (Issue #3907)

2024-07-08 Thread Daniel-Constantin Mierla via sr-dev
Pushed a commit to compute the length after decode, basic tests look ok. It is 
in master branch now, to be backported. Should you encounter issues with it, 
comment to reopen.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3907#issuecomment-2213653965
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] ims_registrar_pcscf,ims_qos: support for trusting bottom via (PR #3901)

2024-07-08 Thread Dragos Vingarzan via sr-dev
Many thanks for the review and help with this!

> Is it only for SUBSCRIBE or is it required for INVITE as well or UE remembers 
> it from the response to SUBSCRIBE?

This was just for the SUBSCRIBE which the P-CSCF itself originates, in UAC mode 
(so not the proxied SUBSCRIBE from a UE). I think this could also be routed 
through the I-CSCF, but I found that 3GPP said to skip that extra "work" (at 
HSS also) and target directly the same S-CSCF which indicated itself in the 
"Service-Route" header during registration.

---
Otherwise, for UE originated requests:
- The UE also might SUBSCRIBE to the same `reginfo` event at the S-CSCF, but 
that would be another dialog. And all the initial dialog requests (a.i. first 
SUBSCRIBE, first INVITE), or standalone ones (a.i. MESSAGE) should also use the 
Service-Route, including, based on the UE's behavior, also the P-CSCF in the 
route (some UEs might just force the outbound proxy without a Route, some add a 
Route and do loose route).
- All the subsequent dialog methods from the UE should use the saved 
Record-Routes for that dialog.

And in case the UE misbehaves, the P-CSCF must enforce all of these routes. 
(e.g. the `pcscf_force_service_routes()` from `ims_registrar_pcscf` should do 
it, respectively something similar from `dialog`/`ims_dialog`)



-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3901#issuecomment-2214646300
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] ims_registrar_pcscf,ims_qos: support for trusting bottom via (PR #3901)

2024-07-08 Thread Dragos Vingarzan via sr-dev
@vingarzan pushed 5 commits.

7eda2bea65ca2b0f10a249aac566a51641123ec7  core: added str2ushort() to avoid 
some questionable casting in ims_qos
3259d0f8f474e2902a639620d41952d72960b182  lib/ims: fixed a typo in a log message
b3672bd379ed3f8ea68a5230b8ea203f6ae3115c  ims_usrloc_pcscf: small log fixes
a079071130241bf030d252aea3b5f8bf62394c59  ims_qos: added trust_bottom_via 
parameter
b6b7e8d114f79a7edffe22427149083838b140bf  ims_registrar_pcscf: added 
trust_bottom_via parameter, added ignore_contact_rxproto_check, fixes for 
logging, fixes for SUBSCRIBE to reginfo for including Service-Route, allow use 
without ims_ipsec_pcscf

-- 
View it on GitHub:
https://github.com/kamailio/kamailio/pull/3901/files/2f2401684b825fb02e36e4737d9fa9bccb9eb6ba..b6b7e8d114f79a7edffe22427149083838b140bf
You are receiving this because you are subscribed to this thread.

Message ID: 

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] [WIP] ims_registrar_pcscf,ims_qos: added a parameter for trusting the bottom Via header on requests (PR #3891)

2024-07-08 Thread Dragos Vingarzan via sr-dev
Closed #3891.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3891#event-13427041954
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] [WIP] ims_registrar_pcscf,ims_qos: added a parameter for trusting the bottom Via header on requests (PR #3891)

2024-07-08 Thread Dragos Vingarzan via sr-dev
Closing as replaced by https://github.com/kamailio/kamailio/pull/3901

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3891#issuecomment-2214704287
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] [kamailio/kamailio] [db_mysql] MYSQL_OPT_SSL_CA is an enum not a macro (Issue #3910)

2024-07-08 Thread space88man via sr-dev


### Description

Recent commit
```
d53843c75da src/modules/db_mysql/km_my_con.c (Sergey Safarov   
2024-05-11 17:45:08 +0300 182) #ifdef MYSQL_OPT_SSL_CA
```

breaks db_mysql on 5.8.2

```
Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: 
WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca 
option not supported by mysql version (value /etc/pki/tls/certs/ca-cert.pem) - 
ignoring
Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: 
ERROR: db_mysql [km_my_con.c:217]: db_mysql_new_connection(): driver error: SSL 
connection error: CA certificate is required if ssl-mode is VERIFY_CA or 
VERIFY_IDENTITY
```

Ping @sergey-safarov 

### Troubleshooting


 Reproduction
* use 5.8.2
* configure `db_mysql` to use TLS with verification
 Debugging Data


 Log Messages
```
Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: 
WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca 
option not supported by mysql version (value /etc/pki/tls/certs/ca-cert.pem) - 
ignoring
Jul 09 08:40:31 voip-ssl3.voip.test /usr/local/kamailio/sbin/kamailio[10982]: 
ERROR: db_mysql [km_my_con.c:217]: db_mysql_new_connection(): driver error: SSL 
connection error: CA certificate is required if ssl-mode is VERIFY_CA or 
VERIFY_IDENTITY
```
### Additional Information

  * **Kamailio Version** - 5.8.2


-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3910
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] [db_mysql] MYSQL_OPT_SSL_CA is an enum not a macro (Issue #3910)

2024-07-08 Thread space88man via sr-dev
Closed with commit on master.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3910#issuecomment-2216299070
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] git:master:5b2be5e2: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

2024-07-08 Thread S-P Chan via sr-dev
Module: kamailio
Branch: master
Commit: 5b2be5e2c716ad8f8502b3be3db5194eb8474d39
URL: 
https://github.com/kamailio/kamailio/commit/5b2be5e2c716ad8f8502b3be3db5194eb8474d39

Author: S-P Chan 
Committer: S-P Chan 
Date: 2024-07-09T10:38:44+08:00

db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

- MYSQL_OPT_SSL_CA is an enum not a macro
- base check on MYSQL_VERSION_ID - 50568  used in CentOS 7

Addresses #3910

---

Modified: src/modules/db_mysql/km_my_con.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/5b2be5e2c716ad8f8502b3be3db5194eb8474d39.diff
Patch: 
https://github.com/kamailio/kamailio/commit/5b2be5e2c716ad8f8502b3be3db5194eb8474d39.patch

---

diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c
index 240d3f59a76..21ac5023c81 100644
--- a/src/modules/db_mysql/km_my_con.c
+++ b/src/modules/db_mysql/km_my_con.c
@@ -179,15 +179,15 @@ struct my_con *db_mysql_new_connection(const struct db_id 
*id)
 #endif /* MYSQL_VERSION_ID */
 #endif /* MARIADB_BASE_VERSION */
 
-#ifdef MYSQL_OPT_SSL_CA
+#if(MYSQL_VERSION_ID < 50600)
if(db_mysql_opt_ssl_ca)
mysql_options(
ptr->con, MYSQL_OPT_SSL_CA, (const void 
*)db_mysql_opt_ssl_ca);
 #else
-   LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - "
+   LM_DBG("opt_ssl_ca option not supported by mysql version (value %s:%d) 
- "
   "ignoring\n",
-   db_mysql_opt_ssl_ca);
-#endif /* MYSQL_OPT_SSL_CA */
+   MYSQL_SERVER_VERSION, MYSQL_VERSION_ID);
+#endif /* MYSQL_VERSION_ID */
 
 #ifdef KSR_MYSQL_OPT_RECONNECT
/* set reconnect flag if enabled */

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] [db_mysql] MYSQL_OPT_SSL_CA is an enum not a macro (Issue #3910)

2024-07-08 Thread space88man via sr-dev
Closed #3910 as completed.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3910#event-13432400018
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] git:master:92cfedaa: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

2024-07-08 Thread S-P Chan via sr-dev
Module: kamailio
Branch: master
Commit: 92cfedaaffb034db536f3bcf68695b433db92706
URL: 
https://github.com/kamailio/kamailio/commit/92cfedaaffb034db536f3bcf68695b433db92706

Author: S-P Chan 
Committer: S-P Chan 
Date: 2024-07-09T10:53:07+08:00

db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

- MYSQL_OPT_SSL_CA is an enum not a macro
- base check on MYSQL_VERSION_ID - 50568  used in CentOS 7

Addresses #3910

---

Modified: src/modules/db_mysql/km_my_con.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/92cfedaaffb034db536f3bcf68695b433db92706.diff
Patch: 
https://github.com/kamailio/kamailio/commit/92cfedaaffb034db536f3bcf68695b433db92706.patch

---

diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c
index 240d3f59a76..37508ce24c0 100644
--- a/src/modules/db_mysql/km_my_con.c
+++ b/src/modules/db_mysql/km_my_con.c
@@ -179,14 +179,14 @@ struct my_con *db_mysql_new_connection(const struct db_id 
*id)
 #endif /* MYSQL_VERSION_ID */
 #endif /* MARIADB_BASE_VERSION */
 
-#ifdef MYSQL_OPT_SSL_CA
+#if(MYSQL_VERSION_ID >= 50600)
if(db_mysql_opt_ssl_ca)
mysql_options(
ptr->con, MYSQL_OPT_SSL_CA, (const void 
*)db_mysql_opt_ssl_ca);
 #else
-   LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - "
+   LM_DBG("opt_ssl_ca option not supported by mysql version (value %d) - "
   "ignoring\n",
-   db_mysql_opt_ssl_ca);
+   MYSQL_VERSION_ID);
 #endif /* MYSQL_OPT_SSL_CA */
 
 #ifdef KSR_MYSQL_OPT_RECONNECT

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] git:master:0fc0c7b3: Revert "db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x"

2024-07-08 Thread S-P Chan via sr-dev
Module: kamailio
Branch: master
Commit: 0fc0c7b3d3d6ded300c46f504406447670fee4e8
URL: 
https://github.com/kamailio/kamailio/commit/0fc0c7b3d3d6ded300c46f504406447670fee4e8

Author: S-P Chan 
Committer: S-P Chan 
Date: 2024-07-09T10:50:14+08:00

Revert "db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x"

This reverts commit 5b2be5e2c716ad8f8502b3be3db5194eb8474d39.

The commit should check >= not <

---

Modified: src/modules/db_mysql/km_my_con.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/0fc0c7b3d3d6ded300c46f504406447670fee4e8.diff
Patch: 
https://github.com/kamailio/kamailio/commit/0fc0c7b3d3d6ded300c46f504406447670fee4e8.patch

---

diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c
index 21ac5023c81..240d3f59a76 100644
--- a/src/modules/db_mysql/km_my_con.c
+++ b/src/modules/db_mysql/km_my_con.c
@@ -179,15 +179,15 @@ struct my_con *db_mysql_new_connection(const struct db_id 
*id)
 #endif /* MYSQL_VERSION_ID */
 #endif /* MARIADB_BASE_VERSION */
 
-#if(MYSQL_VERSION_ID < 50600)
+#ifdef MYSQL_OPT_SSL_CA
if(db_mysql_opt_ssl_ca)
mysql_options(
ptr->con, MYSQL_OPT_SSL_CA, (const void 
*)db_mysql_opt_ssl_ca);
 #else
-   LM_DBG("opt_ssl_ca option not supported by mysql version (value %s:%d) 
- "
+   LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - "
   "ignoring\n",
-   MYSQL_SERVER_VERSION, MYSQL_VERSION_ID);
-#endif /* MYSQL_VERSION_ID */
+   db_mysql_opt_ssl_ca);
+#endif /* MYSQL_OPT_SSL_CA */
 
 #ifdef KSR_MYSQL_OPT_RECONNECT
/* set reconnect flag if enabled */

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] git:5.8:dbe51dc4: db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

2024-07-08 Thread S-P Chan via sr-dev
Module: kamailio
Branch: 5.8
Commit: dbe51dc4ee53f6e4f00450745db709a9d741c481
URL: 
https://github.com/kamailio/kamailio/commit/dbe51dc4ee53f6e4f00450745db709a9d741c481

Author: S-P Chan 
Committer: S-P Chan 
Date: 2024-07-09T13:40:05+08:00

db_mysql: fix check for enum MYSQL_OPT_SSL_CA for CentOS 7/5.5.x

- MYSQL_OPT_SSL_CA is an enum not a macro
- base check on MYSQL_VERSION_ID - 50568  used in CentOS 7

Addresses #3910

(cherry-picked from commit 92cfedaaffb034db536f3bcf68695b433db92706)

---

Modified: src/modules/db_mysql/km_my_con.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/dbe51dc4ee53f6e4f00450745db709a9d741c481.diff
Patch: 
https://github.com/kamailio/kamailio/commit/dbe51dc4ee53f6e4f00450745db709a9d741c481.patch

---

diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c
index 240d3f59a76..37508ce24c0 100644
--- a/src/modules/db_mysql/km_my_con.c
+++ b/src/modules/db_mysql/km_my_con.c
@@ -179,14 +179,14 @@ struct my_con *db_mysql_new_connection(const struct db_id 
*id)
 #endif /* MYSQL_VERSION_ID */
 #endif /* MARIADB_BASE_VERSION */
 
-#ifdef MYSQL_OPT_SSL_CA
+#if(MYSQL_VERSION_ID >= 50600)
if(db_mysql_opt_ssl_ca)
mysql_options(
ptr->con, MYSQL_OPT_SSL_CA, (const void 
*)db_mysql_opt_ssl_ca);
 #else
-   LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - "
+   LM_DBG("opt_ssl_ca option not supported by mysql version (value %d) - "
   "ignoring\n",
-   db_mysql_opt_ssl_ca);
+   MYSQL_VERSION_ID);
 #endif /* MYSQL_OPT_SSL_CA */
 
 #ifdef KSR_MYSQL_OPT_RECONNECT

___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] pkg: Add systemd template for starting multiple kamailio services (PR #3904)

2024-07-08 Thread sergey-safarov via sr-dev
I understand it may not be easy, but is possible to specify control sockets for 
`/var/run/kamailio/kamailio_ctl`, `/var/run/kamailio/kamailio_rpc.sock`, 
`/var/run/kamailio/kamailio_rpc.fifo`?

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3904#issuecomment-2216648879
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org


[sr-dev] Re: [kamailio/kamailio] pkg: RPM packaging add kamailio-tls_wolfssl subpackage (PR #3592)

2024-07-08 Thread sergey-safarov via sr-dev
@guss77 you rebuild wolfssl using srpm package
https://rpm.kamailio.org/centos/9/master/master/x86_64/Packages/w/wolfssl-5.6.6-1.src.rpm

And update wolfssl on your local PC.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3592#issuecomment-2216658002
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org