sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
302 discussions

git:master:ad7df67c: pdt: added mode parameter to allow ignoring duplicated prefixes
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: ad7df67cfd58713fc0993e2d2365a86d9d6068e1 URL: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:23:55+02:00 pdt: added mode parameter to allow ignoring duplicated prefixes --- Modified: src/modules/pdt/pdt.c Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… Patch: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index 22d5f663067..ae28aa1a552 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -57,6 +57,7 @@ int pdt_fetch_rows = 1000; /** structures containing prefix-domain pairs */ pdt_tree_t **_ptree = NULL; +int _pdt_mode = 0; /** database connection */ static db1_con_t *db_con = NULL; @@ -118,6 +119,7 @@ static param_export_t params[] = { {"char_list", PARAM_STR, &pdt_char_list}, {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, {"check_domain", INT_PARAM, &pdt_check_domain}, + {"mode", PARAM_INT, &_pdt_mode}, {0, 0, 0} }; diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index 7f83132cd40..b211ca6611d 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -35,6 +35,7 @@ //extern str pdt_char_list = {"1234567890*",11}; extern str pdt_char_list; +extern int _pdt_mode; /** * */ @@ -117,9 +118,15 @@ int add_to_tree(pdt_tree_t *pt, str *sp, str *sd) if(itn0[strpos(pdt_char_list.s, sp->s[l]) % PDT_NODE_SIZE].domain.s != NULL) { - LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, - sd->len, sd->s); - return -1; + if(_pdt_mode & 1) { + LM_DBG("prefix already allocated [%.*s/[%.*s] - ignoring\n", + sp->len, sp->s, sd->len, sd->s); + return -1; + } else { + LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, + sd->len, sd->s); + return -1; + } } itn0[strpos(pdt_char_list.s, sp->s[l]) % PDT_NODE_SIZE].domain.s =

1 0

git:master:2a10c158: pkg/kamailio/deb: remove pcre3 dependency [skip ci]
by Victor Seva 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 2a10c158cbdc6b654aca328b4bdc42e9a88018ba URL: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:54:16+02:00 pkg/kamailio/deb: remove pcre3 dependency [skip ci] --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e… Patch: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e…

1 0

git:master:ef8d7119: pdf: reformat export structures
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: ef8d71197442ffd130a6e80ca147b5feb6c316a4 URL: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T09:33:17+02:00 pdf: reformat export structures --- Modified: src/modules/pdt/pdt.c --- Diff: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… Patch: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index 252a275917c..22d5f663067 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -95,40 +95,46 @@ static int fixup_translate(void **param, int param_no); static int update_new_uri(struct sip_msg *msg, int plen, str *d, int mode); static int pdt_init_rpc(void); -static cmd_export_t cmds[] = {{"prefix2domain", (cmd_function)w_prefix2domain, - 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"prefix2domain", (cmd_function)w_prefix2domain_1, 1, fixup_igp_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"prefix2domain", (cmd_function)w_prefix2domain_2, 2, fixup_igp_igp, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"pd_translate", (cmd_function)w_pd_translate, 2, fixup_translate, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_table", PARAM_STR, &db_table}, - {"sdomain_column", PARAM_STR, &sdomain_column}, - {"prefix_column", PARAM_STR, &prefix_column}, - {"domain_column", PARAM_STR, &domain_column}, - {"prefix", PARAM_STR, &pdt_prefix}, - {"char_list", PARAM_STR, &pdt_char_list}, - {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, - {"check_domain", INT_PARAM, &pdt_check_domain}, {0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"prefix2domain", (cmd_function)w_prefix2domain, + 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"prefix2domain", (cmd_function)w_prefix2domain_1, 1, fixup_igp_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"prefix2domain", (cmd_function)w_prefix2domain_2, 2, fixup_igp_igp, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"pd_translate", (cmd_function)w_pd_translate, 2, fixup_translate, 0, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_table", PARAM_STR, &db_table}, + {"sdomain_column", PARAM_STR, &sdomain_column}, + {"prefix_column", PARAM_STR, &prefix_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"prefix", PARAM_STR, &pdt_prefix}, + {"char_list", PARAM_STR, &pdt_char_list}, + {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, + {"check_domain", INT_PARAM, &pdt_check_domain}, + {0, 0, 0} +}; struct module_exports exports = { - "pdt", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "pdt", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /** * init module function @@ -846,9 +852,13 @@ static void pdt_rpc_list(rpc_t *rpc, void *ctx) } +/* clang-format off */ rpc_export_t pdt_rpc_cmds[] = { - {"pdt.reload", pdt_rpc_reload, pdt_rpc_reload_doc, 0}, - {"pdt.list", pdt_rpc_list, pdt_rpc_list_doc, 0}, {0, 0, 0, 0}}; + {"pdt.reload", pdt_rpc_reload, pdt_rpc_reload_doc, 0}, + {"pdt.list", pdt_rpc_list, pdt_rpc_list_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ /**

1 0

[kamailio/kamailio] lcr: pcre2 migration (PR #3545)
by Victor Seva 12 Sep '23

12 Sep '23

#### 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 lcr to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3545 -- Commit Summary -- * lcr: pcre2 migration -- File Changes -- M src/modules/lcr/Makefile (12) M src/modules/lcr/hash.c (24) M src/modules/lcr/hash.h (10) M src/modules/lcr/lcr_mod.c (187) M src/modules/lcr/lcr_mod.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3545.patch https://github.com/kamailio/kamailio/pull/3545.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3545 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3545(a)github.com>

2 2

git:master:e3e2c41e: lcr: pcre2 migration
by Victor Seva 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: e3e2c41e8c46a13bad18dd40fd9e3540020dd5eb URL: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:12:09+02:00 lcr: pcre2 migration --- Modified: src/modules/lcr/Makefile Modified: src/modules/lcr/hash.c Modified: src/modules/lcr/hash.h Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354… Patch: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354…

1 0

[kamailio/kamailio] dialplan: pcre2 migration (PR #3543)
by Victor Seva 12 Sep '23

12 Sep '23

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

2 4

git:master:374227b1: dialplan: migrate to pcre2
by Victor Seva 12 Sep '23

12 Sep '23

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 0

[kamailio/kamailio] smsops: fixes as per static code analyzer report (PR #3551)
by Supreeth Herle 12 Sep '23

12 Sep '23

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

2 3

git:master:5fe367c0: smsops: fixes as per static code analyzer report
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

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 0

git:master:e0a058b0: misc/ typos (#3559)
by GitHub 12 Sep '23

12 Sep '23

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 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023