sr-dev

sr-dev@lists.kamailio.org

16 participants
45406 discussions

[kamailio/kamailio] TLS Module Regression (ee key too small) (Issue #3737)
by Tyler Moore 02 Feb '24

02 Feb '24

### 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>

2 10

git:master:80214d2f: pkg/kamailio/deb: version set 5.8.0~pre0
by Victor Seva 02 Feb '24

02 Feb '24

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…

1 0

git:master:976670db: pkg/kamailio/deb: remove mono from wheezy
by Victor Seva 02 Feb '24

02 Feb '24

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

1 0

git:master:015da378: pkg/kamailio/deb: no libpcre2-dev on older releases
by Victor Seva 02 Feb '24

02 Feb '24

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…

1 0

git:master:f0e73eab: db_mysql: fix build for older releases
by Victor Seva 02 Feb '24

02 Feb '24

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 */

1 0

[kamailio/kamailio] db_unixodbc: MariaDB partition is a reserved word and not quoted (Issue #3742)
by space88man 02 Feb '24

02 Feb '24

### Description partition is now a reserved word in MariaDB 10. the column name is correctly quoted with native libmysqlclient/libmariadb so works the column name is not quoted with unixodbc+(libmyodbc8|libmaodbc) and so fails ### Troubleshooting try unquoted insert -- fails unixodbc+libmaodbc insert into location (partition) values (1000); -- works native libmysqlclient|libmariadb insert into location (`partition`) values (1000); #### Reproduction 1. config enable usrloc / registrar with unixodbc + MySQL/MariaDB connector #### Debugging Data SQL insert into statement fails -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3742 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3742(a)github.com>

3 5

Development for v5.8.x is frozen
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Hello, the formal notification that the development for the next major version 5.8.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.8 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.8. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added for 5.8. Once the branch 5.8 is created, new features can be pushed again to master branch as usual. From that moment, the v5.8.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.8 is going to be built at: * https://www.kamailio.org/wikidocs/features/new-in-5.8.x/ Upgrade guidelines will be collected at: * https://www.kamailio.org/wikidocs/install/upgrade/5.7.x-to-5.8.0/ Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.7.x to 5.8.x. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, February 20-22, 2024 -- asipto.com Kamailio World Conference, April 18-19, 2024, Berlin -- kamailioworld.com

1 0

git:master:1fcf9981: file_out: make worker sleep period configurable, to allow to adapt performance parameters
by Henning Westerholt 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: 1fcf99817580379d3e7550d1d874050a3e0315bc URL: https://github.com/kamailio/kamailio/commit/1fcf99817580379d3e7550d1d874050… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-02-02T13:16:08Z file_out: make worker sleep period configurable, to allow to adapt performance parameters --- Modified: src/modules/file_out/doc/file_out_admin.xml Modified: src/modules/file_out/file_out.c --- Diff: https://github.com/kamailio/kamailio/commit/1fcf99817580379d3e7550d1d874050… Patch: https://github.com/kamailio/kamailio/commit/1fcf99817580379d3e7550d1d874050… --- diff --git a/src/modules/file_out/doc/file_out_admin.xml b/src/modules/file_out/doc/file_out_admin.xml index 3054af61672..bcb3f5d14e9 100644 --- a/src/modules/file_out/doc/file_out_admin.xml +++ b/src/modules/file_out/doc/file_out_admin.xml @@ -135,6 +135,25 @@ modparam("file_out", "extension", ".txt") <programlisting format="linespecific"> ... modparam("file_out", "interval_seconds", "300") +... + </programlisting> + </example> + + <title> + <varname>worker_usleep</varname> (int)</title> + <para> + The time in microseconds which worker will sleep for until next iteration. + </para> + <para> + <emphasis> + Default value is <quote>10000</quote> (10 ms). + </emphasis> + </para> + <example> + <title>Set <varname>worker_usleep</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("file_out", "worker_usleep", "1000") ... </programlisting> </example> diff --git a/src/modules/file_out/file_out.c b/src/modules/file_out/file_out.c index 1b9bfba7bb0..dada154eb12 100644 --- a/src/modules/file_out/file_out.c +++ b/src/modules/file_out/file_out.c @@ -61,6 +61,7 @@ char *fo_base_folder = "/var/log/kamailio/file_out/"; char *fo_base_filename[FO_MAX_FILES] = {""}; char *fo_extension = ".out"; int fo_interval_seconds = 10 * 60; +int fo_worker_usleep = 10000; /* Shared variables */ fo_queue_t *fo_queue = NULL; @@ -78,7 +79,8 @@ static param_export_t params[] = { {"base_folder", PARAM_STRING, &fo_base_folder}, {"base_filename", PARAM_STRING | PARAM_USE_FUNC, &fo_add_filename}, {"interval_seconds", PARAM_INT, &fo_interval_seconds}, - {"extension", PARAM_STRING, &fo_extension}, {0, 0, 0}}; + {"extension", PARAM_STRING, &fo_extension}, + {"worker_usleep", PARAM_INT, &fo_worker_usleep}, {0, 0, 0}}; struct module_exports exports = { "file_out", /* module name */ @@ -139,7 +141,7 @@ static int child_init(int rank) return 0; } - pid = fork_process(PROC_NOCHLDINIT, "log_writ", 1); + pid = fork_process(PROC_NOCHLDINIT, "fo_writer", 1); if(pid < 0) { LM_ERR("fork failed\n"); return -1; /* error */ @@ -159,7 +161,7 @@ static int child_init(int rank) /* update the local config framework structures */ cfg_update(); - usleep(10000); + usleep(fo_worker_usleep); fo_log_writer_process(rank); } // return 0;

1 0

[kamailio/kamailio] core: Fix check to also work for KEMI framework (PR #3718)
by Xenofon Karamanos 02 Feb '24

02 Feb '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes an issue regarding KEMI framework for onsend_route. KSR.set_drop() in [ksr_onsend_route](https://www.kamailio.org/wikidocs/cookbooks/5.7.x/core/#o… does not make kamailio dropping the message when using kemi (python3) (probably holds true for other engines too): This is exactly the example from [documentation](https://kamailio.org/docs/tutorials/devel/kamailio-kemi-fram…: ``` def ksr_onsend_route(self, msg): KSR.set_drop() exit() ``` The issue arises because we are not setting `ret = 0` when the drop flag is set, but instead check if it's not set to return `ret=1` (The case for native that returns `0` but no `DROP_R_F` was set). **Note**: KEMI Case: `ret = 1` always See [app_python3/apy_kemi.c](https://github.com/kamailio/kamailio/blob/79697b4d5… Native case: `ret` can be `0` for drop, or `1` for success You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3718 -- Commit Summary -- * core: Fix check to also work for KEMI framework -- File Changes -- M src/core/onsend.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3718.patch https://github.com/kamailio/kamailio/pull/3718.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3718 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3718(a)github.com>

2 3

git:master:82593a09: core: properly handle drop() action for kemi engines
by Daniel-Constantin Mierla 02 Feb '24

02 Feb '24

Module: kamailio Branch: master Commit: 82593a09f8ef6d53e7e88238c057bbcdd9ab287b URL: https://github.com/kamailio/kamailio/commit/82593a09f8ef6d53e7e88238c057bbc… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-02-02T10:56:41+01:00 core: properly handle drop() action for kemi engines - GH #3718 --- Modified: src/core/onsend.c --- Diff: https://github.com/kamailio/kamailio/commit/82593a09f8ef6d53e7e88238c057bbc… Patch: https://github.com/kamailio/kamailio/commit/82593a09f8ef6d53e7e88238c057bbc… --- diff --git a/src/core/onsend.c b/src/core/onsend.c index a4d81781de7..84186cd67ed 100644 --- a/src/core/onsend.c +++ b/src/core/onsend.c @@ -87,7 +87,18 @@ int run_onsend(sip_msg_t *orig_msg, dest_info_t *dst, char *buf, int len) orig_msg->fwd_send_flags = fwd_snd_flags_bak; orig_msg->rpl_send_flags = rpl_snd_flags_bak; exec_post_script_cb(orig_msg, ONSEND_CB_TYPE); - if((ret == 0) && !(ra_ctx.run_flags & DROP_R_F)) { + /* - handle drop action with flag DROP_R_F + * KEMI case (python,lua,jsdt) + * ret = 1 always + * Native case: + * ret = 1 success + * ret = 0 drop the message + */ + if(ra_ctx.run_flags & DROP_R_F) { + ret = 0; + } else if(ret == 0) { + /* native case where run_actions return 0 + * but DROP_R_F is not set */ ret = 1; } } else {

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