sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
322 discussions

git:5.6:24989241: rtpengine: fix unaligned memory access

by Stefan Mititelu

Module: kamailio Branch: 5.6 Commit: 24989241cfc58c6ba47d48c9a86921251f4ba235 URL: https://github.com/kamailio/kamailio/commit/24989241cfc58c6ba47d48c9a869212… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-05-10T11:07:02+03:00 rtpengine: fix unaligned memory access Make sure the pointers we return from our continuous memory buffer is always 64-bit aligned as it's used not only for strings, but also for structs/objects, and such unaligned memory access is undefined on some archs and flagged as such by ASAN. From https://github.com/sipwise/rtpengine/commit/ade8100d3b10308f1ff63f8cb06fdf2… fixes #3444 (cherry-picked from commit 43ac6b27d7ca7bc522f362c25ebb3c22ab918280) --- Modified: src/modules/rtpengine/bencode.c --- Diff: https://github.com/kamailio/kamailio/commit/24989241cfc58c6ba47d48c9a869212… Patch: https://github.com/kamailio/kamailio/commit/24989241cfc58c6ba47d48c9a869212… --- diff --git a/src/modules/rtpengine/bencode.c b/src/modules/rtpengine/bencode.c index 7a4b2ed0da..cca1732624 100644 --- a/src/modules/rtpengine/bencode.c +++ b/src/modules/rtpengine/bencode.c @@ -12,6 +12,8 @@ #define BENCODE_HASH_BUCKETS 31 /* prime numbers work best */ +#define BENCODE_ALLOC_ALIGN 8 + struct __bencode_buffer_piece { char *tail; unsigned int left; @@ -76,7 +78,7 @@ static struct __bencode_buffer_piece *__bencode_piece_new(unsigned int size) { if (size < BENCODE_MIN_BUFFER_PIECE_LEN) size = BENCODE_MIN_BUFFER_PIECE_LEN; - ret = BENCODE_MALLOC(sizeof(*ret) + size); + ret = BENCODE_MALLOC(sizeof(*ret) + size + BENCODE_ALLOC_ALIGN); if (!ret) return NULL; @@ -99,6 +101,7 @@ int bencode_buffer_init(bencode_buffer_t *buf) { static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { struct __bencode_buffer_piece *piece; void *ret; + unsigned int align_size = ((size + BENCODE_ALLOC_ALIGN - 1) / BENCODE_ALLOC_ALIGN) * BENCODE_ALLOC_ALIGN; if (!buf) return NULL; @@ -121,9 +124,12 @@ static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { assert(size <= piece->left); alloc: - piece->left -= size; + if (piece->left >= align_size) + piece->left -= align_size; + else + piece->left = 0; ret = piece->tail; - piece->tail += size; + piece->tail += align_size; return ret; }

1 year, 7 months

git:5.7:04b49bb8: rtpengine: fix unaligned memory access

by Stefan Mititelu

Module: kamailio Branch: 5.7 Commit: 04b49bb89fe6482a351a06ed08a9e9db5e934faf URL: https://github.com/kamailio/kamailio/commit/04b49bb89fe6482a351a06ed08a9e9d… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-05-10T11:05:18+03:00 rtpengine: fix unaligned memory access Make sure the pointers we return from our continuous memory buffer is always 64-bit aligned as it's used not only for strings, but also for structs/objects, and such unaligned memory access is undefined on some archs and flagged as such by ASAN. From https://github.com/sipwise/rtpengine/commit/ade8100d3b10308f1ff63f8cb06fdf2… fixes #3444 (cherry-picked from commit 43ac6b27d7ca7bc522f362c25ebb3c22ab918280) --- Modified: src/modules/rtpengine/bencode.c --- Diff: https://github.com/kamailio/kamailio/commit/04b49bb89fe6482a351a06ed08a9e9d… Patch: https://github.com/kamailio/kamailio/commit/04b49bb89fe6482a351a06ed08a9e9d… --- diff --git a/src/modules/rtpengine/bencode.c b/src/modules/rtpengine/bencode.c index 7a4b2ed0da2..cca17326242 100644 --- a/src/modules/rtpengine/bencode.c +++ b/src/modules/rtpengine/bencode.c @@ -12,6 +12,8 @@ #define BENCODE_HASH_BUCKETS 31 /* prime numbers work best */ +#define BENCODE_ALLOC_ALIGN 8 + struct __bencode_buffer_piece { char *tail; unsigned int left; @@ -76,7 +78,7 @@ static struct __bencode_buffer_piece *__bencode_piece_new(unsigned int size) { if (size < BENCODE_MIN_BUFFER_PIECE_LEN) size = BENCODE_MIN_BUFFER_PIECE_LEN; - ret = BENCODE_MALLOC(sizeof(*ret) + size); + ret = BENCODE_MALLOC(sizeof(*ret) + size + BENCODE_ALLOC_ALIGN); if (!ret) return NULL; @@ -99,6 +101,7 @@ int bencode_buffer_init(bencode_buffer_t *buf) { static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { struct __bencode_buffer_piece *piece; void *ret; + unsigned int align_size = ((size + BENCODE_ALLOC_ALIGN - 1) / BENCODE_ALLOC_ALIGN) * BENCODE_ALLOC_ALIGN; if (!buf) return NULL; @@ -121,9 +124,12 @@ static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { assert(size <= piece->left); alloc: - piece->left -= size; + if (piece->left >= align_size) + piece->left -= align_size; + else + piece->left = 0; ret = piece->tail; - piece->tail += size; + piece->tail += align_size; return ret; }

1 year, 7 months

[kamailio/kamailio] 5.7 crash due to rtpengine module bencode, on aarch64 (raspberry pi) (Issue #3444)

by Stefan Mititelu

Hi, I've built today the 5.7 debs for kamailio together with latest rtpengine master branch debs (commit 13a7e1d), for raspberry pi and tried to give it a try: ``` root@pisip:~# sudo dpkg -l | grep kama ii kamailio 5.7.0~rc0 armhf very fast, dynamic and configurable SIP server ii kamailio-dbg:armhf 5.7.0~rc0 armhf very fast and configurable SIP server [debug symbols] ii kamailio-presence-modules:armhf 5.7.0~rc0 armhf SIP presence modules for Kamailio ii kamailio-tls-modules:armhf 5.7.0~rc0 armhf TLS support for the Kamailio SIP server (authentication, transport) ii kamailio-websocket-modules:armhf 5.7.0~rc0 armhf WebSocket module for the Kamailio SIP server root@pisip:~# sudo dpkg -l | grep rtpe ii ngcp-rtpengine 11.4.0.0+0~mr11.4.0.0 all NGCP RTP/media proxy - meta package ii ngcp-rtpengine-daemon 11.4.0.0+0~mr11.4.0.0 armhf proxy for RTP and media streams used in NGCP, userspace part ii ngcp-rtpengine-iptables 11.4.0.0+0~mr11.4.0.0 armhf IPtables extension module for the kernel-space NGCP media proxy ii ngcp-rtpengine-kernel-dkms 11.4.0.0+0~mr11.4.0.0 all IPtables kernel module for the NGCP media proxy - DKMS ii ngcp-rtpengine-recording-daemon 11.4.0.0+0~mr11.4.0.0 armhf recording daemon for RTP and media streams ii ngcp-rtpengine-utils 11.4.0.0+0~mr11.4.0.0 all scripts and Perl modules for NGCP rtpengine root@pisip:~# sudo dpkg -l | grep bencode ii libbencode-perl 1.501-1.1 all Perl module for BitTorrent serialisation format root@pisip:~# uname -a Linux ... 6.1.25-v8+ #1647 SMP PREEMPT Wed Apr 26 17:39:08 BST 2023 aarch64 GNU/Linux root@pisip:~# cat /etc/issue Raspbian GNU/Linux 11 \n \l ``` Kamailio crashes on startup, only when rtpengine module is loaded and rtp proxies are queried: ``` GNU gdb (Raspbian 10.1-1.7) 10.1.90.20210103-git Copyright (C) 2021 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "arm-linux-gnueabihf". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from kamailio... Reading symbols from /usr/lib/debug/.build-id/b1/3b2e37e49071a519b33ce95a0b555c21a2d8f4.debug... warning: Can't open file /dev/zero (deleted) during file-backed mapping note processing [New LWP 5455] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/arm-linux-gnueabihf/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio_pid -f /etc/kamailio/kamailio_'. Program terminated with signal SIGBUS, Bus error. #0 0xf3237de8 in __bencode_decode_dictionary (end=0xf3294859 <buf+25> "", s=0xf329484a <buf+10> "6:result4:ponge", buf=0xffd06608) at bencode.c:464 464 bencode.c: No such file or directory. (gdb) bt #0 0xf3237de8 in __bencode_decode_dictionary (end=0xf3294859 <buf+25> "", s=0xf329484a <buf+10> "6:result4:ponge", buf=0xffd06608) at bencode.c:464 #1 __bencode_decode (buf=buf@entry=0xffd06608, s=0xf3294849 <buf+9> "d6:result4:ponge", end=0xf3294859 <buf+25> "") at bencode.c:613 #2 0xf3238a98 in bencode_decode (buf=buf@entry=0xffd06608, s=<optimized out>, len=<optimized out>) at bencode.c:638 #3 0xf32469dc in bencode_decode_expect (expect=BENCODE_DICTIONARY, len=<optimized out>, s=<optimized out>, buf=0xffd06600) at bencode.h:490 #4 rtpp_test (node=node@entry=0xb31464d0, isdisabled=isdisabled@entry=0, force=force@entry=1) at rtpengine.c:2954 #5 0xf324ef5c in build_rtpp_socks (lmode=lmode@entry=0, rtest=-1968410368, rtest@entry=1) at rtpengine.c:2021 #6 0xf32516d4 in child_init (rank=1) at rtpengine.c:2105 #7 child_init (rank=1) at rtpengine.c:2082 #8 0x0019fe08 in init_mod_child (m=0xf5cbbb54, rank=rank@entry=1) at core/sr_module.c:899 #9 0x0019fdd4 in init_mod_child (m=0xf5cbc2dc, rank=rank@entry=1) at core/sr_module.c:892 #10 0x0019fdd4 in init_mod_child (m=0xf5cbdbe4, rank=rank@entry=1) at core/sr_module.c:892 #11 0x0019fdd4 in init_mod_child (m=0xf5cbe46c, rank=rank@entry=1) at core/sr_module.c:892 #12 0x0019fdd4 in init_mod_child (m=0xf5cbe6fc, rank=rank@entry=1) at core/sr_module.c:892 #13 0x0019fdd4 in init_mod_child (m=0xf5cbea70, rank=rank@entry=1) at core/sr_module.c:892 #14 0x0019fdd4 in init_mod_child (m=0xf5cc4d64, rank=rank@entry=1) at core/sr_module.c:892 #15 0x0019fdd4 in init_mod_child (m=0xf5cc5558, rank=rank@entry=1) at core/sr_module.c:892 #16 0x0019fdd4 in init_mod_child (m=0xf5cc6670, rank=rank@entry=1) at core/sr_module.c:892 #17 0x0019fdd4 in init_mod_child (m=0xf5cc7630, rank=rank@entry=1) at core/sr_module.c:892 #18 0x001a486c in init_child (rank=rank@entry=1) at core/sr_module.c:953 #19 0x001117b0 in fork_process (child_id=1, desc=desc@entry=0xffd06f44 "\230I\244\001\214:\323\365udp receiver child=0 sock=192.168.100.57:50060 (86.123.193.247:50060)", make_sock=make_sock@entry=1) at core/pt.c:337 #20 0x000369c8 in main_loop () at main.c:1708 #21 0x0002c21c in main (argc=<optimized out>, argv=0xffd074a4) at main.c:3086 ``` Looks like some bencode issue I'm having but lib bencode version looks ok. So far couldn't figure it out. Note that I also had a kernel bump to 6.1.25-v8+ recently. Any opinions on this? Thank you, Stefan -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3444 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3444(a)github.com>

1 year, 7 months

git:master:6b4e3b4b: modules: readme files regenerated - p_usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 6b4e3b4b227381bfe896b23af5c4ce996c95f6e8 URL: https://github.com/kamailio/kamailio/commit/6b4e3b4b227381bfe896b23af5c4ce9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-10T09:46:21+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/6b4e3b4b227381bfe896b23af5c4ce9… Patch: https://github.com/kamailio/kamailio/commit/6b4e3b4b227381bfe896b23af5c4ce9… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 351aedd766..ae0702db5b 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -54,6 +54,7 @@ Patric Marschall 3.27. default_db_url(str) 3.28. matching_mode(int) 3.29. UTC_timestamps(int) + 3.30. use_domain_crc32(str) 4. Changes from usrloc module @@ -126,8 +127,9 @@ Patric Marschall 1.27. Set default_db_type parameter 1.28. Set matching_mode parameter 1.29. Set UTC_timestamps parameter - 1.30. Set db_mode parameter - 1.31. Example database content - reg_table (locdb) table + 1.30. Set use_domain_crc32 parameter + 1.31. Set db_mode parameter + 1.32. Example database content - reg_table (locdb) table Chapter 1. User's Guide @@ -170,6 +172,7 @@ Chapter 1. User's Guide 3.27. default_db_url(str) 3.28. matching_mode(int) 3.29. UTC_timestamps(int) + 3.30. use_domain_crc32(str) 4. Changes from usrloc module @@ -289,6 +292,7 @@ Warning 3.27. default_db_url(str) 3.28. matching_mode(int) 3.29. UTC_timestamps(int) + 3.30. use_domain_crc32(str) 3.1. write_db_url (string) @@ -696,6 +700,18 @@ kamcmd cfg.get p_usrloc matching_mode modparam("p_usrloc", "UTC_timestamps", 1) ... +3.30. use_domain_crc32(str) + + Enables or disables the crc32 of domain part for user@domain. If + disabled, will calculate crc32 only for user part. + + Default value is ��1�� (enabled). + + Example 1.30. Set use_domain_crc32 parameter +... +modparam("p_usrloc", "use_domain_crc32", "0") +... + 4. Changes from usrloc module 4.1. db_mode (integer) @@ -718,7 +734,7 @@ modparam("p_usrloc", "UTC_timestamps", 1) Default value is 3. - Example 1.30. Set db_mode parameter + Example 1.31. Set db_mode parameter ... modparam("p_usrloc", "db_mode", 2) ... @@ -752,7 +768,7 @@ modparam("p_usrloc", "db_mode", 2) complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. - Example 1.31. Example database content - reg_table (locdb) table + Example 1.32. Example database content - reg_table (locdb) table ... +----+----+------+--------+--------+---------------------+-------+----+ | id | no | url | status | errors | failover | spare | rg |

1 year, 7 months

git:master:81d33005: p_usrloc: Add use_domain_crc32 modparam

by Stefan Mititelu

Module: kamailio Branch: master Commit: 81d33005df808699a7e8068883ab76e30a299d0f URL: https://github.com/kamailio/kamailio/commit/81d33005df808699a7e8068883ab76e… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-05-10T10:41:02+03:00 p_usrloc: Add use_domain_crc32 modparam --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db_handle.c --- Diff: https://github.com/kamailio/kamailio/commit/81d33005df808699a7e8068883ab76e… Patch: https://github.com/kamailio/kamailio/commit/81d33005df808699a7e8068883ab76e… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 37c84bf20b1..0a8ba7be487 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -779,6 +779,27 @@ modparam("p_usrloc", "UTC_timestamps", 1) </example> </section> + <section> + <title><varname>use_domain_crc32</varname>(str)</title> + <para> + Enables or disables the crc32 of domain part for user@domain. + If disabled, will calculate crc32 only for user part. + </para> + <para> + <emphasis> + Default value is <quote>1</quote> (enabled). + </emphasis> + </para> + <example> + <title>Set <varname>use_domain_crc32</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("p_usrloc", "use_domain_crc32", "0") +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/p_usrloc/p_usrloc_mod.c b/src/modules/p_usrloc/p_usrloc_mod.c index ac3c34775a7..20d4b13f7fb 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.c +++ b/src/modules/p_usrloc/p_usrloc_mod.c @@ -147,6 +147,7 @@ str last_mod_col = str_init(LAST_MOD_COL); /*!< Name of column containing t str uniq_col = str_init(UNIQ_COL); /*!< Name of column containing the uniq value*/ int db_mode = 3; /*!< Database sync scheme: 1-write through, 2-write back, 3-only db */ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ +int use_domain_crc32 = 1; /*!< Whether usrloc should use domain part of aor when calculating crc32 */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ @@ -212,6 +213,7 @@ static param_export_t params[] = { {"cflags_column", PARAM_STR, &cflags_col }, {"db_mode", INT_PARAM, &db_mode }, {"use_domain", INT_PARAM, &use_domain }, + {"use_domain_crc32", INT_PARAM, &use_domain_crc32 }, {"desc_time_order", INT_PARAM, &desc_time_order }, {"user_agent_column", PARAM_STR, &user_agent_col}, {"received_column", PARAM_STR, &received_col }, diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index 800a71851a8..a8b8c74dd98 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -88,6 +88,7 @@ extern str uniq_col; extern int db_mode; extern int use_domain; +extern int use_domain_crc32; extern int desc_time_order; extern int cseq_delay; extern int ul_fetch_rows; diff --git a/src/modules/p_usrloc/ul_db_handle.c b/src/modules/p_usrloc/ul_db_handle.c index 134dc32e599..4e4eab0848e 100644 --- a/src/modules/p_usrloc/ul_db_handle.c +++ b/src/modules/p_usrloc/ul_db_handle.c @@ -461,7 +461,7 @@ static int compute_id(str* first, str* second){ return -1; } - if(use_domain){ + if(use_domain && use_domain_crc32) { //compute crc32(user@domain) LM_DBG("XDBGX: compute_id HAS second key : %.*s", first->len, first->s); if(!second){

1 year, 7 months

[kamailio/kamailio] p_usrloc: Add use_domain_crc32 modparam (PR #3427)

by Stefan Mititelu

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  Needed a way to use_domain but calculate crc32 for user part only. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3427 -- Commit Summary -- * p_usrloc: Add use_domain_crc32 modparam -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (21) M src/modules/p_usrloc/p_usrloc_mod.c (2) M src/modules/p_usrloc/p_usrloc_mod.h (1) M src/modules/p_usrloc/ul_db_handle.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3427.patch https://github.com/kamailio/kamailio/pull/3427.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3427 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3427(a)github.com>

1 year, 7 months

git:5.6:2d7b6c32: dialplan: fix ki_dp_translate() checks for input/output parameters

by Victor Seva

Module: kamailio Branch: 5.6 Commit: 2d7b6c32552b1e2a8b095192bb22e0f776e18100 URL: https://github.com/kamailio/kamailio/commit/2d7b6c32552b1e2a8b095192bb22e0f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-10T00:59:39+02:00 dialplan: fix ki_dp_translate() checks for input/output parameters fixes #3447 (cherry picked from commit ab0a2be6b522c1b48a2442447c24e7ab156e3d4e) (cherry picked from commit 5f3ed08b5e234465d4fb909460367a63ed63a550) --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/2d7b6c32552b1e2a8b095192bb22e0f… Patch: https://github.com/kamailio/kamailio/commit/2d7b6c32552b1e2a8b095192bb22e0f… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index fb57faa55d1..26c68f777fd 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -872,9 +872,12 @@ static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_s if (!msg) return -1; - if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || - output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { - LM_ERR("invalid destination var name for input or output\n"); + if (input_spv != NULL && (input_spv->s == NULL || input_spv->len <= 0)) { + LM_ERR("invalid destination var name for input\n"); + return -1; + } + if (output_spv != NULL && (output_spv->s == NULL || output_spv->len <= 0)) { + LM_ERR("invalid destination var name for output\n"); return -1; }

1 year, 7 months

git:5.7:5f3ed08b: dialplan: fix ki_dp_translate() checks for input/output parameters

by Victor Seva

Module: kamailio Branch: 5.7 Commit: 5f3ed08b5e234465d4fb909460367a63ed63a550 URL: https://github.com/kamailio/kamailio/commit/5f3ed08b5e234465d4fb909460367a6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-10T00:59:18+02:00 dialplan: fix ki_dp_translate() checks for input/output parameters fixes #3447 (cherry picked from commit ab0a2be6b522c1b48a2442447c24e7ab156e3d4e) --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/5f3ed08b5e234465d4fb909460367a6… Patch: https://github.com/kamailio/kamailio/commit/5f3ed08b5e234465d4fb909460367a6… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index fb57faa55d1..26c68f777fd 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -872,9 +872,12 @@ static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_s if (!msg) return -1; - if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || - output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { - LM_ERR("invalid destination var name for input or output\n"); + if (input_spv != NULL && (input_spv->s == NULL || input_spv->len <= 0)) { + LM_ERR("invalid destination var name for input\n"); + return -1; + } + if (output_spv != NULL && (output_spv->s == NULL || output_spv->len <= 0)) { + LM_ERR("invalid destination var name for output\n"); return -1; }

1 year, 7 months

[kamailio/kamailio] dialplan: KSR.dialplan.dp_translate produces ERROR (Issue #3447)

by Victor Seva

### Description Calling ``KSR.dialplan.dp_translate(<id>)`` always produces ERROR in parameters since the default ones are not used in KEMI function ``ki_dp_translate_id()`` #### Log Messages ``` dialplan [dialplan.c:877]: ki_dp_translate(): invalid destination var name for input or output ``` ### Possible Solutions use default "$rU/$rU" as documented https://kamailio.org/docs/modules/5.6.x/modules/dialplan.html#dialplan.p.dp… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3447 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3447(a)github.com>

1 year, 7 months

git:master:ab0a2be6: dialplan: fix ki_dp_translate() checks for input/output parameters

by Victor Seva

Module: kamailio Branch: master Commit: ab0a2be6b522c1b48a2442447c24e7ab156e3d4e URL: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-09T23:28:04+02:00 dialplan: fix ki_dp_translate() checks for input/output parameters fixes #3447 --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… Patch: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index fb57faa55d1..26c68f777fd 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -872,9 +872,12 @@ static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_s if (!msg) return -1; - if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || - output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { - LM_ERR("invalid destination var name for input or output\n"); + if (input_spv != NULL && (input_spv->s == NULL || input_spv->len <= 0)) { + LM_ERR("invalid destination var name for input\n"); + return -1; + } + if (output_spv != NULL && (output_spv->s == NULL || output_spv->len <= 0)) { + LM_ERR("invalid destination var name for output\n"); return -1; }

1 year, 7 months

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023