sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
298 discussions

[kamailio/kamailio] dialplan: pcre2 migration (PR #3543)

by Victor Seva

#### 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) - [ ] 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 - [ ] Tested changes locally - [x] Related to issue #2946 #### Description migrate dialplan to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3543 -- Commit Summary -- * regex: migration to pcre2 * dialplan: migrate to pcre2 -- File Changes -- M src/modules/dialplan/Makefile (11) M src/modules/dialplan/dialplan.c (5) M src/modules/dialplan/dialplan.h (21) M src/modules/dialplan/dp_db.c (103) M src/modules/dialplan/dp_repl.c (56) M src/modules/regex/Makefile (11) M src/modules/regex/regex_mod.c (240) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3543.patch https://github.com/kamailio/kamailio/pull/3543.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3543 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3543(a)github.com>

1 year, 2 months

git:master:374227b1: dialplan: migrate to pcre2

by Victor Seva

Module: kamailio Branch: master Commit: 374227b15ff7fbed8660beb93d52da15dcb4ba9e URL: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:11:51+02:00 dialplan: migrate to pcre2 --- Modified: src/modules/dialplan/Makefile Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dialplan.h Modified: src/modules/dialplan/dp_db.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1… Patch: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1…

1 year, 2 months

[kamailio/kamailio] smsops: fixes as per static code analyzer report (PR #3551)

by Supreeth Herle

#### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3551 -- Commit Summary -- * smsops: fixes as per static code analyzer report -- File Changes -- M src/modules/smsops/smsops_impl.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3551.patch https://github.com/kamailio/kamailio/pull/3551.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3551 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3551(a)github.com>

1 year, 2 months

git:master:5fe367c0: smsops: fixes as per static code analyzer report

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5fe367c098123bf2dcbef2d81d1ad7ff940cb092 URL: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T09:01:24+02:00 smsops: fixes as per static code analyzer report --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… Patch: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 10700b37db9..485a814774c 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -605,16 +605,18 @@ int utf8_to_ucs2(char *utf8, int utf8_len, char *ucs2, int buffer_len) } else if((utf8_char & 0xF0) == 0xE0) { // Three-byte UTF-8 character codepoint = ((utf8_char & 0x0F) << 12) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index++] & 0x3F); + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 2] & 0x3F); + utf8_index += 2; tmp_buff[ucs2_index++] = (uint8_t)(codepoint >> 8); tmp_buff[ucs2_index++] = (uint8_t)(codepoint & 0xFF); } else if((utf8_char & 0xF8) == 0xF0) { // Four-byte UTF-8 character codepoint = ((utf8_char & 0x07) << 18) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 12) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index++] & 0x3F); + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 12) + | (((unsigned char)utf8[utf8_index + 2] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 3] & 0x3F); + utf8_index += 3; // Convert to UCS-2 surrogate pair codepoint -= 0x10000; high_surrogate = 0xD800 | (codepoint >> 10);

1 year, 2 months

git:master:e0a058b0: misc/ typos (#3559)

by GitHub

Module: kamailio Branch: master Commit: e0a058b08129e615f51e051401a41cfae6ffaf46 URL: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf… Author: �� <git-dpa(a)aegee.org> Committer: GitHub <noreply(a)github.com> Date: 2023-09-12T09:00:44+02:00 misc/ typos (#3559) --- Modified: misc/examples/exec/exec_s5b.cfg Modified: misc/examples/ims/icscf/README.md Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/pcscf/README.md Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/pcscf/pcscf.cfg.sample Modified: misc/examples/ims/pcscf/route/mo.cfg Modified: misc/examples/ims/pcscf/sems/sems.conf Modified: misc/examples/ims/scscf/README.md Modified: misc/examples/ims/scscf/kamailio.cfg Modified: misc/examples/ims/scscf/scscf.cfg.sample Modified: misc/examples/kamailio/acc-mysql.cfg Modified: misc/examples/kamailio/acc.cfg Modified: misc/examples/kamailio/ctd.sh Modified: misc/examples/kamailio/fork.cfg Modified: misc/examples/kamailio/nathelper.cfg Modified: misc/examples/kamailio/replicate.cfg Modified: misc/examples/kamailio/web_im/README Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb Modified: misc/examples/kemi/kamailio-basic-kemi.cfg Modified: misc/examples/mixed/acc.cfg Modified: misc/examples/mixed/kamailio-minimal-anycast.cfg Modified: misc/examples/mixed/kamailio-minimal-proxy.cfg Modified: misc/examples/mixed/nathelper.cfg Modified: misc/examples/mixed/onr.cfg Modified: misc/examples/mixed/replicate.cfg Modified: misc/examples/mixed/sip-router.cfg.m4 Modified: misc/examples/mixed/voicemail.cfg Modified: misc/examples/obsoleted/imgw.cfg Modified: misc/examples/obsoleted/secondary.cfg Modified: misc/examples/obsoleted/sms.cfg Modified: misc/examples/obsoleted/smsgw.cfg Modified: misc/examples/obsoleted/test.cfg Modified: misc/examples/obsoleted/tmtest.cfg Modified: misc/examples/pkg/kamailio-basic.cfg Modified: misc/examples/pkg/kamailio-oob.cfg Modified: misc/examples/pkg/sip-router-basic.cfg Modified: misc/examples/pkg/sip-router-oob.cfg Modified: misc/examples/presence/full-no-failover.cfg Modified: misc/examples/presence/no-db.cfg Modified: misc/examples/scripts/ctd.sh Modified: misc/examples/scripts/serresponse Modified: misc/examples/scripts/web_im/README Modified: misc/examples/webrtc/kamailio-default-websocket.cfg Modified: misc/scripts/dbtext/ser_dbtext.sh Modified: misc/scripts/mysql/sip-router_mysql.sh Modified: misc/scripts/postgres/ser_postgres.sh Modified: misc/scripts/serconf.sh Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py Modified: misc/tools/pike_top/pike_top.c Modified: misc/tools/profile/launch.sh Modified: misc/tools/sipgrep/sipgrep --- Diff: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf… Patch: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf…

1 year, 2 months

[kamailio/kamailio] misc/ typos (PR #3559)

by Дилян Палаузов

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3559 -- Commit Summary -- * misc/ typos -- File Changes -- M misc/examples/exec/exec_s5b.cfg (2) M misc/examples/ims/icscf/README.md (2) M misc/examples/ims/icscf/kamailio.cfg (4) M misc/examples/ims/pcscf/README.md (2) M misc/examples/ims/pcscf/kamailio.cfg (4) M misc/examples/ims/pcscf/pcscf.cfg.sample (2) M misc/examples/ims/pcscf/route/mo.cfg (2) M misc/examples/ims/pcscf/sems/sems.conf (2) M misc/examples/ims/scscf/README.md (2) M misc/examples/ims/scscf/kamailio.cfg (6) M misc/examples/ims/scscf/scscf.cfg.sample (2) M misc/examples/kamailio/acc-mysql.cfg (2) M misc/examples/kamailio/acc.cfg (2) M misc/examples/kamailio/ctd.sh (4) M misc/examples/kamailio/fork.cfg (2) M misc/examples/kamailio/nathelper.cfg (2) M misc/examples/kamailio/replicate.cfg (2) M misc/examples/kamailio/web_im/README (2) M misc/examples/kemi/kamailio-basic-kemi-ruby.rb (4) M misc/examples/kemi/kamailio-basic-kemi.cfg (2) M misc/examples/mixed/acc.cfg (2) M misc/examples/mixed/kamailio-minimal-anycast.cfg (4) M misc/examples/mixed/kamailio-minimal-proxy.cfg (4) M misc/examples/mixed/nathelper.cfg (2) M misc/examples/mixed/onr.cfg (4) M misc/examples/mixed/replicate.cfg (2) M misc/examples/mixed/sip-router.cfg.m4 (14) M misc/examples/mixed/voicemail.cfg (2) M misc/examples/obsoleted/imgw.cfg (4) M misc/examples/obsoleted/secondary.cfg (2) M misc/examples/obsoleted/sms.cfg (2) M misc/examples/obsoleted/smsgw.cfg (2) M misc/examples/obsoleted/test.cfg (2) M misc/examples/obsoleted/tmtest.cfg (4) M misc/examples/pkg/kamailio-basic.cfg (2) M misc/examples/pkg/kamailio-oob.cfg (10) M misc/examples/pkg/sip-router-basic.cfg (2) M misc/examples/pkg/sip-router-oob.cfg (32) M misc/examples/presence/full-no-failover.cfg (6) M misc/examples/presence/no-db.cfg (4) M misc/examples/scripts/ctd.sh (4) M misc/examples/scripts/serresponse (8) M misc/examples/scripts/web_im/README (2) M misc/examples/webrtc/kamailio-default-websocket.cfg (4) M misc/scripts/dbtext/ser_dbtext.sh (2) M misc/scripts/mysql/sip-router_mysql.sh (4) M misc/scripts/postgres/ser_postgres.sh (4) M misc/scripts/serconf.sh (18) M misc/tools/kemi/python_mock/README.md (4) M misc/tools/kemi/python_mock/kemi_mock.py (2) M misc/tools/pike_top/pike_top.c (12) M misc/tools/profile/launch.sh (2) M misc/tools/sipgrep/sipgrep (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3559.patch https://github.com/kamailio/kamailio/pull/3559.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3559 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3559(a)github.com>

1 year, 2 months

[kamailio/kamailio] Path: incorrect path added after the merger of "use snprintf() instead of sprintf()" branch (Issue #3560)

by Harish S

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` in $mb from xlog shows path header as Path: <sip:xx.xxx.xx.xx suffix header part is not getting appended creating malformed packet ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.0-dev1 (x86_64/linux) 99eb1b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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: 99eb1b compiled on 10:38:25 Sep 8 2023 with gcc 11.4.0 ``` * **Operating System**:  ``` Ubuntu 22.04 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3560 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3560(a)github.com>

1 year, 2 months

git:master:d0d6436c: path: fix prepend_path()

by Victor Seva

Module: kamailio Branch: master Commit: d0d6436cfc46ad1d5be485592decee4efe7bcce0 URL: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-11T18:17:14+02:00 path: fix prepend_path() bug introduced at dd04bceb99ba69bd59c67ba103f3c55d47a31dd6 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… Patch: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 2431a985553..8fde991260c 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -183,7 +183,7 @@ static int prepend_path( prefix_len = snprintf( prefix, prefix_len, PATH_PREFIX "%.*s@", user->len, user->s); else - prefix_len = sprintf(prefix, PATH_PREFIX); + prefix_len = snprintf(prefix, prefix_len, PATH_PREFIX); if(parse_headers(_m, HDR_PATH_F, 0) < 0) { LM_ERR("failed to parse message for Path header\n"); @@ -208,7 +208,7 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_SND_ALL_EX : SUBST_SND_ALL, 0); if(!l) goto out2; - l = insert_new_lump_before(l, suffix, cp.s - suffix, 0); + l = insert_new_lump_before(l, suffix, cp.len, 0); if(!l) goto out2; @@ -223,10 +223,10 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_RCV_ALL_EX : SUBST_RCV_ALL, 0); if(!l) goto out1; - dp = path_strzdup(suffix, cp.s - suffix); + dp = path_strzdup(suffix, cp.len); if(dp == NULL) goto out1; - l = insert_new_lump_before(l, dp, cp.s - suffix, 0); + l = insert_new_lump_before(l, dp, cp.len, 0); if(!l) goto out1; }

1 year, 2 months

git:master:ea2babf7: pv: allow via oc param names with dashes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ea2babf79d8b66cbfdccdae51ddf806964b16138 URL: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T16:25:08+02:00 pv: allow via oc param names with dashes --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… Patch: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index dc611de7f1a..4fa8e4677aa 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4519,12 +4519,16 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "ocalgo", 6) == 0) sp->pvp.pvn.u.isname.name.n = 10; + else if(strncmp(in->s, "oc-seq", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; case 7: if(strncmp(in->s, "protoid", 7) == 0) sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "oc-algo", 7) == 0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; @@ -4540,6 +4544,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; + case 11: + if(strncmp(in->s, "oc-validity", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 11; + else + goto error; + break; default: goto error; }

1 year, 2 months

git:master:06b1a35c: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 06b1a35c727155974eb3c10971eaac2606b430ea URL: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-11T14:46:24+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… Patch: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index fa73e19ea32..3979dfdf185 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -104,6 +104,7 @@ Ovidiu Sas 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 2. Developer Guide @@ -175,6 +176,7 @@ Ovidiu Sas 1.60. get_body_part_raw usage 1.61. remove_body_part usage 1.62. _regex_substring usage + 1.63. via_param_rm usage Chapter 1. Admin Guide @@ -252,6 +254,7 @@ Chapter 1. Admin Guide 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 1. Overview @@ -355,6 +358,7 @@ From: medabeda 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 4.1. search(re) @@ -1621,6 +1625,25 @@ msg_apply_changes(); ---- ... +4.62. via_param_rm(name, idx) + + Remove parameter matching by name from Via body at the specified index. + The index starts from 0 (first Via body). Negative index counts from + the end of the list for Via header bodies (-1 is the last Via body). + + Meaning of the parameters is as follows: + * name - name of the parameter + * idx - index of the Via body. + + The parameters can also be variables. + + This function can be used from ANY_ROUTE. + + Example 1.63. via_param_rm usage +... +via_param_rm("p1", "0"); +... + Chapter 2. Developer Guide Table of Contents

1 year, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023