sr-dev February 2024

sr-dev@lists.kamailio.org

19 participants
234 discussions

git:master:b8c0a375: db_mysql: fix build for stretch

by Victor Seva

Module: kamailio Branch: master Commit: b8c0a3757eb282ddb9e4878deb7120c4efd7f571 URL: https://github.com/kamailio/kamailio/commit/b8c0a3757eb282ddb9e4878deb7120c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-03T10:41:43+01:00 db_mysql: fix build for stretch * mysql_optionsv is not there. We still use the deprecated flavour * MYSQL_OPT_SSL_ENFORCE is not there --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/b8c0a3757eb282ddb9e4878deb7120c… Patch: https://github.com/kamailio/kamailio/commit/b8c0a3757eb282ddb9e4878deb7120c… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 88c950417a6..b4c4dca33b0 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -129,10 +129,14 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) case 2: /* SSL_MODE_PREFERRED */ case 3: /* SSL_MODE_REQUIRED */ case 4: /* SSL_MODE_VERIFY_CA */ - mysql_optionsv(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); +#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); +#endif break; case 5: /* SSL_MODE_VERIFY_IDENTITY */ - mysql_optionsv(ptr->con, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + mysql_options(ptr->con, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (void *)&(int){1}); break; default:

3 months, 2 weeks

git:master:2cb2e5c9: Revert "db_mysql: fix build for older releases"

by Victor Seva

Module: kamailio Branch: master Commit: 2cb2e5c99c3e565762820ef702404ae5ec59a6c9 URL: https://github.com/kamailio/kamailio/commit/2cb2e5c99c3e565762820ef702404ae… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-03T09:47:46+01:00 Revert "db_mysql: fix build for older releases" it doesn't fix anything This reverts commit f0e73eabee3be198dbad2e50752d9889e4aa8e5f. --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/2cb2e5c99c3e565762820ef702404ae… Patch: https://github.com/kamailio/kamailio/commit/2cb2e5c99c3e565762820ef702404ae… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 7a5d090352d..88c950417a6 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -117,7 +117,6 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void *)&db_mysql_timeout_interval); -#if MYSQL_VERSION_ID > 50710 #ifdef MARIADB_BASE_VERSION /* * emulate SSL_MODE_XXXX from MySQL @@ -142,6 +141,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) break; } #else +#if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode != 0) { unsigned int optuint = 0; if(db_mysql_opt_ssl_mode == 1) { @@ -155,7 +155,6 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) } mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void *)&optuint); } -#endif /* MARIADB_BASE_VERSION */ #else if(db_mysql_opt_ssl_mode != 0) { LM_WARN("ssl mode not supported by mysql version (value %u) - " @@ -163,6 +162,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) (unsigned int)db_mysql_opt_ssl_mode); } #endif /* MYSQL_VERSION_ID */ +#endif /* MARIADB_BASE_VERSION */ #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */

3 months, 2 weeks

[kamailio/kamailio] callout from event_route [tm:local-response] only occurs once (Issue #3064)

by dpaape

version: kamailio 5.5.2 (arm6/linux) 55e232 raspberry pi 3b I initially stated that I was running on 5.5.3 but I was mistaken. However I checked the 5.5.3 source and it appears to be the same. I think that there is a bug in the tm module with respect to the "tm:local-response" event route. In the "t_reply.c" file, there is a static variable called '_tm_local_response_set_lookup'. This variable is initialized at load time to zero. It is checked in the '_reply_light()' routine and will initiate a local callback from the config script if "armed". The problem as I see it is that if the callback is readied, the variable is set to one. But it is never reset. So the observed behavior is as follows. A REGISTER is received and the request_route arms the callback. The REGISTER requires an authorization (local database sqlite). After the 401 is sent back, the callback via the event route is called as expected. All good except that the event route script fragment is never executed again after the first call... ever, even if it's a new REGISTER request. I would think that somewhere in the tm module, the variable should be reset to zero so that subsequent transactions can initiate the event route again. Or maybe the variable ought to live somewhere in the transaction cell??? . . . t_on_reply ("MY_FRAG"); t_on_failure ("MY_FRAG"); . . . event_route [tm:local-response] { xlog ("L_NOTICE", IN tm:local-response\n"); my_function(); } . . . So 'my_function()' is only called once. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3064 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3064(a)github.com>

3 months, 2 weeks

git:5.7:53ce7590: tls_wolfssl: enable building with external package

by S-P Chan

Module: kamailio Branch: 5.7 Commit: 53ce759091f78ffecc6b4047ff3e8885329d718f URL: https://github.com/kamailio/kamailio/commit/53ce759091f78ffecc6b4047ff3e888… Author: SPChan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-02-03T10:32:34+08:00 tls_wolfssl: enable building with external package Re-enable this feature as backward compatibility has been restored for Debian bookworm and Ubuntu jammy - build with git submodule: make ...WOLFSSL_INTERNAL=yes... - the default - build with external package: make ...WOLFSSL_INTERNAL=no... Internal: - v5.6.6-stable Debian: - trixie: libwolfssl42 - bookworm / bullseye-backports: libwofssl35 Ubuntu: - noble: libwolfssl42 - jammy: libwolfssl32 --- Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/53ce759091f78ffecc6b4047ff3e888… Patch: https://github.com/kamailio/kamailio/commit/53ce759091f78ffecc6b4047ff3e888… --- diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 5ef95d697b6..98239c43183 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,6 +8,13 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so +# make WOLFSSL_INTERNAL=yes... for internal submodule +# make WOLFSSL_INTERNAL=no... for system package +# default: yes + +WOLFSSL_INTERNAL ?= yes + +ifeq ($(WOLFSSL_INTERNAL),yes) WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl @@ -34,6 +41,15 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: $(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a +else +WOLFSSL_LIBS ?= $(shell pkg-config wolfssl --libs) +WOLFSSL_INCLUDES ?= $(shell pkg-config wolfssl --cflags) + +LIBS += $(WOLFSSL_LIBS) +INCLUDES += $(WOLFSSL_INCLUDES) +include ../../Makefile.modules +endif + clean-wolfssl: @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \ (cd $(WOLFSSL_SRC); make distclean) || /bin/true

3 months, 2 weeks

[kamailio/kamailio] when enabled haproxy protocol required use kamailio server haproxy IP (Issue #3666)

by sergey-safarov

### Description I have enabled `tcp_accept_haproxy=yes`, inbound TCP connection received on IPv6 kamailio socket but client real IP is IPv4. When kamailio add `Record-Route` header then added IPv6 header and not added IPv4. Example ``` INVITE sip:xxxx@example.com SIP/2.0 Record-Route: <sip:9sovfn2oP7ozLQID7BkFxBNt/CfE+wc=@[2600::6]:5060;r2=on;lr=on> Record-Route: <sip:9sovfn2oP7ozLQID7BkFxBNt/CfE+wc=@[2600::6]:5060;transport=tcp;r2=on;lr=on> ``` From client perspective Kamailio make protocol conversion from the IPv4 to IPv6, and expected to see IPv4 in the IPv4 address in the received 'Record-Route' headers to use in the future requests. Because client receiving IPv6 only and client does not have IPv6 address, then `ACK` message cannot be send to Kamailio. ### Expected behavior Kamailio will use Kamailio server load balancer address to generate `Record-Route` headers. Load balancer IP address can be received from the HAPROXY protocol. #### Actual observed behavior Kamailio use listeneer socket IP to generate `Record-Route` headers. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3666 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3666(a)github.com>

3 months, 2 weeks

[kamailio/kamailio] TLS Module Regression (ee key too small) (Issue #3737)

by Tyler Moore

### Description The TLS module seems to have some regression from 5.7.3 to 5.7.4 causing `tls.reload` to fail loading certificates. ### Troubleshooting #### System Info - kamailio version: 5.7.4 (from official kamailio repos) - distro version: debian 12 - OS/kernel version: Linux ip-172-31-30-183 6.1.0-17-cloud-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.69-1 (2023-12-30) x86_64 GNU/Linux - openssl version: 3.0.11 (from official debian repos) #### Reproduction On a fresh install of debian 12: - install openssl from debian repos - install kamailio 5.7.4 from kamailio repos - install kamailio-tls-modules from kamailio repos - create a self signed cert with 4096 bit rsa key - create a basic tls.cfg to load those files on the client/server default domain - reload kamailio - try running `kamcmd tls.reload` #### Debugging Data Example tls.cfg ``` [server:default] method = TLSv1.2+ verify_certificate = yes require_certificate = yes private_key = /etc/dsiprouter/certs/dsiprouter-key.pem certificate = /etc/dsiprouter/certs/dsiprouter-cert.pem ca_list = /etc/dsiprouter/certs/ca-list.pem ca_path = /etc/dsiprouter/certs/ca [client:default] method = TLSv1.2+ verify_certificate = yes require_certificate = yes private_key = /etc/dsiprouter/certs/dsiprouter-key.pem certificate = /etc/dsiprouter/certs/dsiprouter-cert.pem ca_list = /etc/dsiprouter/certs/ca-list.pem ca_path = /etc/dsiprouter/certs/ca ``` Example tls cert: ``` Certificate: Data: Version: 3 (0x2) Serial Number: 7a:43:b8:fa:df:c9:ed:a7:d6:ab:bb:9a:89:c0:8e:95:fd:62:de:26 Signature Algorithm: sha256WithRSAEncryption Issuer: C = US, ST = MI, L = Detroit, O = dSIPRouter, CN = ec2-34-224-90-100.compute-1.amazonaws.com Validity Not Before: Jan 30 15:28:11 2024 GMT Not After : Jan 29 15:28:11 2025 GMT Subject: C = US, ST = MI, L = Detroit, O = dSIPRouter, CN = ec2-34-224-90-100.compute-1.amazonaws.com Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (4096 bit) ... ``` Example tls key: ``` Private-Key: (4096 bit, 2 primes) modulus: ... ``` #### Log Messages ``` Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:345]: ksr_tls_fill_missing(): TLSs<default>: tls_method=25 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:357]: ksr_tls_fill_missing(): TLSs<default>: certificate='/etc/dsiprouter/certs/dsiprouter-cert.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:364]: ksr_tls_fill_missing(): TLSs<default>: ca_list='/etc/dsiprouter/certs/ca-list.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:371]: ksr_tls_fill_missing(): TLSs<default>: ca_path='/etc/dsiprouter/certs/ca' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:378]: ksr_tls_fill_missing(): TLSs<default>: crl='(null)' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:382]: ksr_tls_fill_missing(): TLSs<default>: require_certificate=1 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:390]: ksr_tls_fill_missing(): TLSs<default>: cipher_list='(null)' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:397]: ksr_tls_fill_missing(): TLSs<default>: private_key='/etc/dsiprouter/certs/dsiprouter-key.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:401]: ksr_tls_fill_missing(): TLSs<default>: verify_certificate=1 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:406]: ksr_tls_fill_missing(): TLSs<default>: verify_depth=9 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: INFO: tls [tls_domain.c:410]: ksr_tls_fill_missing(): TLSs<default>: verify_client=0 Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: NOTICE: tls [tls_domain.c:1168]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: ERROR: tls [tls_domain.c:590]: load_cert(): TLSs<default>: Unable to load certificate file '/etc/dsiprouter/certs/dsiprouter-cert.pem' Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:03000072:digital envelope routines::decode error (sni: unknown) Jan 31 14:46:16 ip-172-31-30-183 /usr/sbin/kamailio[3620]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:0A00018F:SSL routines::ee key too small (sni: unknown) ``` #### SIP Traffic N/A -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3737 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3737(a)github.com>

3 months, 2 weeks

git:master:80214d2f: pkg/kamailio/deb: version set 5.8.0~pre0

by Victor Seva

Module: kamailio Branch: master Commit: 80214d2f878b3f2d7547060c9d4bd578a9e1a837 URL: https://github.com/kamailio/kamailio/commit/80214d2f878b3f2d7547060c9d4bd57… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-02T15:21:39+01:00 pkg/kamailio/deb: version set 5.8.0~pre0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/80214d2f878b3f2d7547060c9d4bd57… Patch: https://github.com/kamailio/kamailio/commit/80214d2f878b3f2d7547060c9d4bd57…

3 months, 2 weeks

git:master:976670db: pkg/kamailio/deb: remove mono from wheezy

by Victor Seva

Module: kamailio Branch: master Commit: 976670db1313e96a859009288abbf1ea97583357 URL: https://github.com/kamailio/kamailio/commit/976670db1313e96a859009288abbf1e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-02T15:21:39+01:00 pkg/kamailio/deb: remove mono from wheezy --- Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules --- Diff: https://github.com/kamailio/kamailio/commit/976670db1313e96a859009288abbf1e… Patch: https://github.com/kamailio/kamailio/commit/976670db1313e96a859009288abbf1e… --- diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 611883fbe46..4afb1f3dfea 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -121,6 +121,12 @@ sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += nats' ${DIST}/rules # no libpcre2-dev sed -i -e 's/libpcre2-dev/libpcre3-dev/' ${DIST}/control +# no libmono-2.0-dev +sed -i -e '/libmono-2.0-dev/d' -e '/^Package: kamailio-mono-modules/,/^$/d' \ + ${DIST}/control +sed -i -e '/^PACKAGE_GROUPS += mono/d' ${DIST}/rules +sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += mono' ${DIST}/rules + # libwolfssl-dev < 5.2 sed -i -e '/^ libwolfssl-dev,/d' \ -e '/^Package: kamailio-wolftls-modules/,/^$/d' \ diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 16719f80988..ed5f1aa50d0 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -26,7 +26,6 @@ Build-Depends: libmemcached-dev, libmicrohttpd-dev, libmnl-dev, - libmono-2.0-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmysqlclient-dev, libncurses5-dev, libpcre3-dev, @@ -219,23 +218,6 @@ Description: The app_lua module for Kamailio Lua support execute embedded Lua applications within the configuration file as well as writing the entire configuration file in Lua. -Package: kamailio-mono-modules -Architecture: any -Multi-Arch: same -Pre-Depends: - ${misc:Pre-Depends}, -Depends: - kamailio (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, -Description: The app_mono module for the Kamailio SIP server - Kamailio is a very fast and flexible SIP (RFC3261) - server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the app_mono module, an extension allowing to - execute embedded Mono applications within the Kamailio SIP routing script. - Package: kamailio-python-modules Architecture: any Multi-Arch: same diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 6bd8a12ab2b..e30d2b13810 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -49,6 +49,7 @@ EXTRA_EXCLUDED_MODULES += mqtt EXTRA_EXCLUDED_MODULES += secsipid EXTRA_EXCLUDED_MODULES += lwsc EXTRA_EXCLUDED_MODULES += nats +EXTRA_EXCLUDED_MODULES += mono EXTRA_EXCLUDED_MODULES += tls_wolfssl ## --EXCLUDED-- @@ -78,7 +79,6 @@ PACKAGE_GROUPS += python PACKAGE_GROUPS += geoip PACKAGE_GROUPS += sqlite PACKAGE_GROUPS += json -PACKAGE_GROUPS += mono PACKAGE_GROUPS += ims PACKAGE_GROUPS += sctp PACKAGE_GROUPS += java

3 months, 2 weeks

git:master:015da378: pkg/kamailio/deb: no libpcre2-dev on older releases

by Victor Seva

Module: kamailio Branch: master Commit: 015da378ab8b4ce5ced8b05f9c51e809ec11e53e URL: https://github.com/kamailio/kamailio/commit/015da378ab8b4ce5ced8b05f9c51e80… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-02T15:21:39+01:00 pkg/kamailio/deb: no libpcre2-dev on older releases --- Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control --- Diff: https://github.com/kamailio/kamailio/commit/015da378ab8b4ce5ced8b05f9c51e80… Patch: https://github.com/kamailio/kamailio/commit/015da378ab8b4ce5ced8b05f9c51e80…

3 months, 2 weeks

git:master:f0e73eab: db_mysql: fix build for older releases

by Victor Seva

Module: kamailio Branch: master Commit: f0e73eabee3be198dbad2e50752d9889e4aa8e5f URL: https://github.com/kamailio/kamailio/commit/f0e73eabee3be198dbad2e50752d988… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-02-02T15:21:39+01:00 db_mysql: fix build for older releases > km_my_con.c: In function 'db_mysql_new_connection': > km_my_con.c:132:4: warning: implicit declaration of function 'mysql_optionsv' [-Wimplicit-function-declaration] > mysql_optionsv(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); > ^~~~~~~~~~~~~~ > km_my_con.c:132:29: error: 'MYSQL_OPT_SSL_ENFORCE' undeclared (first use in this function) > mysql_optionsv(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); > ^~~~~~~~~~~~~~~~~~~~~ > km_my_con.c:132:29: note: each undeclared identifier is reported only once for each function it appears in > ../../Makefile.rules:100: recipe for target 'km_my_con.o' failed --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/f0e73eabee3be198dbad2e50752d988… Patch: https://github.com/kamailio/kamailio/commit/f0e73eabee3be198dbad2e50752d988… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 88c950417a6..7a5d090352d 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -117,6 +117,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void *)&db_mysql_timeout_interval); +#if MYSQL_VERSION_ID > 50710 #ifdef MARIADB_BASE_VERSION /* * emulate SSL_MODE_XXXX from MySQL @@ -141,7 +142,6 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) break; } #else -#if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode != 0) { unsigned int optuint = 0; if(db_mysql_opt_ssl_mode == 1) { @@ -155,6 +155,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) } mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void *)&optuint); } +#endif /* MARIADB_BASE_VERSION */ #else if(db_mysql_opt_ssl_mode != 0) { LM_WARN("ssl mode not supported by mysql version (value %u) - " @@ -162,7 +163,6 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) (unsigned int)db_mysql_opt_ssl_mode); } #endif /* MYSQL_VERSION_ID */ -#endif /* MARIADB_BASE_VERSION */ #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */

3 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2024