sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
488 discussions

[kamailio/kamailio] Adds initial fuzzer for integration with oss-fuzz. (#2660)

by DavidKorczynski

#### 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  Hi Maintainers, I have worked a bit on setting fuzzing up for Kamailio by way of OSS-Fuzz. Essentially, OSS-Fuzz is a free service run by Google that performs continuous fuzzing of important open source projects, and it would be great to have Kamailio integrated. The only expectation of integrating into OSS-Fuzz is that bugs will be fixed. This is not a "hard" requirement in that no one enforces this and the main point is if bugs are not fixed then it is a waste of resources to run the fuzzers, which we would like to avoid. In this PR https://github.com/google/oss-fuzz/pull/5279 I have done exactly that, namely created the necessary logic from an OSS-Fuzz perspective to integrate Kamailio. If you would like to integrate, could you please provide a set of email(s) that will get access to the data produced by OSS-Fuzz, such as bug reports, coverage reports and more stats. The emails should be linked to a Google account in order to view the detailed reports and notice the emails affiliated with the project will be public in the OSS-Fuzz repo, as they will be part of a configuration file. At the moment I stored the fuzzers in the Google OSS-Fuzz repository, but we can move them up here to make maintenance easier. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2660 -- Commit Summary -- * Adds initial fuzzer for integration with oss-fuzz. -- File Changes -- A fuzz/fuzz_uri.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2660.patch https://github.com/kamailio/kamailio/pull/2660.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2660

3 years, 1 month

[kamailio/kamailio] Kamailio 5.0.4 extremely slow carrierroute preloading (#2653)

by NiteCrwlr

### Description Carrierroute module takes now 16 minutes to load about 50'000 entries from postgres-db. In version 5.0.3 it was 10 seconds from the same db. ### Troubleshooting #### Reproduction Install kamailio 5.0.3 and fill your carrierroute table with thousands of entries. See how fast its loaded. Then install 5.0.4 and see how long it takes now. You can observe the query "SELECT * FROM carrierroute WHERE carrier=1 and domain=1 and prob>0" multiple times in the postgres-db log. #### Debugging Data none. #### Log Messages not needed. #### SIP Traffic not needed. ### Possible Solutions Perhaps try to do the check "in-memory" instead generate a new sql-query. ### Additional Information This bug exists in Kamilio versions >=5.0.4 and is (potentially) introduced by: commit 9800aba65146b72623bb512049300d1beb8c8ec4 Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: Tue Sep 12 15:37:17 2017 +0200 carrierroute: warning for the same carrier/domain having routes with only 0 probability - While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. (cherry picked from commit 9741bee7af8136b35af8e6279e530aa0ad54f574) * **Operating System**: Ubuntu 20.04.2 LTS Linux 5.4.0-66-generic #74-Ubuntu SMP Wed Jan 27 22:54:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2653

3 years, 1 month

git:master:5a96993e: topos: use context for sruid

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a96993efd6cff7677a5c49fee15c30715903ea0 URL: https://github.com/kamailio/kamailio/commit/5a96993efd6cff7677a5c49fee15c30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-01T00:01:22+02:00 topos: use context for sruid --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5a96993efd6cff7677a5c49fee15c30… Patch: https://github.com/kamailio/kamailio/commit/5a96993efd6cff7677a5c49fee15c30… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 9ce19dd1a0..5efe57b0e4 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -64,6 +64,9 @@ extern pv_spec_t _tps_bcontact_spec; extern str _tps_contact_host_avp; extern pv_spec_t _tps_contact_host_avp_spec; +extern str _tps_context_param; +extern str _tps_context_value; + #define TPS_STORAGE_LOCK_SIZE 1<<9 static gen_lock_set_t *_tps_storage_lock_set = NULL; @@ -546,9 +549,16 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir) { int ret = -1; /* error if dialog == 0 */ str suid; + str *sx = NULL; + + if(_tps_context_value.len>0) { + sx = &_tps_context_value; + } else if(_tps_context_param.len>0) { + sx = &_tps_context_param; + } if(dialog==0) { - sruid_next(&_tps_sruid); + sruid_nextx(&_tps_sruid, sx); suid = _tps_sruid.uid; } else { if(td->a_uuid.len>0) {

3 years, 1 month

git:master:5c2699c4: core: sruid - use specific prefix for global variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c2699c4f6a9e8a24057b754e6510433129f509d URL: https://github.com/kamailio/kamailio/commit/5c2699c4f6a9e8a24057b754e651043… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T23:55:51+02:00 core: sruid - use specific prefix for global variables - declare static functions used only local - functions to append a value to sruid --- Modified: src/core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/kamailio/kamailio/commit/5c2699c4f6a9e8a24057b754e651043… Patch: https://github.com/kamailio/kamailio/commit/5c2699c4f6a9e8a24057b754e651043…

3 years, 1 month

git:master:858fab6b: topos: ability to execute event routes when messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 858fab6bbf0c26f22bb9411e9385c10d654a6da5 URL: https://github.com/kamailio/kamailio/commit/858fab6bbf0c26f22bb9411e9385c10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T21:59:51+02:00 topos: ability to execute event routes when messages --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/858fab6bbf0c26f22bb9411e9385c10… Patch: https://github.com/kamailio/kamailio/commit/858fab6bbf0c26f22bb9411e9385c10… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 15f9678560..dd2741a126 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -89,12 +89,20 @@ int _tps_clean_interval = 60; #define TPS_EVENTRT_OUTGOING 1 #define TPS_EVENTRT_SENDING 2 -static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING; +#define TPS_EVENTRT_INCOMING 4 +#define TPS_EVENTRT_RECEIVING 8 +static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING + | TPS_EVENTRT_INCOMING | TPS_EVENTRT_RECEIVING; static int _tps_eventrt_outgoing = -1; static str _tps_eventrt_callback = STR_NULL; static str _tps_eventrt_outgoing_name = str_init("topos:msg-outgoing"); static int _tps_eventrt_sending = -1; static str _tps_eventrt_sending_name = str_init("topos:msg-sending"); +static int _tps_eventrt_incoming = -1; +static str _tps_eventrt_incoming_name = str_init("topos:msg-incoming"); +static int _tps_eventrt_receiving = -1; +static str _tps_eventrt_receiving_name = str_init("topos:msg-receiving"); + str _tps_contact_host = str_init(""); int _tps_contact_mode = 0; str _tps_contact_host_avp = str_init(""); @@ -130,7 +138,8 @@ int bind_topos(topos_api_t *api); static cmd_export_t cmds[]={ {"tps_set_context", (cmd_function)w_tps_set_context, - 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, {"bind_topos", (cmd_function)bind_topos, 0, 0, 0, 0}, @@ -189,6 +198,16 @@ static int mod_init(void) || event_rt.rlist[_tps_eventrt_sending]==NULL) { _tps_eventrt_sending = -1; } + _tps_eventrt_incoming = route_lookup(&event_rt, _tps_eventrt_incoming_name.s); + if(_tps_eventrt_incoming<0 + || event_rt.rlist[_tps_eventrt_incoming]==NULL) { + _tps_eventrt_incoming = -1; + } + _tps_eventrt_receiving = route_lookup(&event_rt, _tps_eventrt_receiving_name.s); + if(_tps_eventrt_receiving<0 + || event_rt.rlist[_tps_eventrt_receiving]==NULL) { + _tps_eventrt_receiving = -1; + } if(faked_msg_init()<0) { LM_ERR("failed to init fmsg\n"); @@ -436,6 +455,12 @@ int tps_msg_received(sr_event_param_t *evp) int ret; obuf = (str*)evp->data; + + if(tps_execute_event_route(NULL, evp, TPS_EVENTRT_INCOMING, + _tps_eventrt_incoming, &_tps_eventrt_incoming_name)==1) { + return 0; + } + memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = obuf->s; msg.len = obuf->len; @@ -449,6 +474,11 @@ int tps_msg_received(sr_event_param_t *evp) goto done; } + if(tps_execute_event_route(&msg, evp, TPS_EVENTRT_RECEIVING, + _tps_eventrt_receiving, &_tps_eventrt_receiving_name)==1) { + goto done; + } + if(msg.first_line.type==SIP_REQUEST) { if(_tps_sanity_checks!=0) { if(scb.check_defaults(&msg)<1) {

3 years, 1 month

git:master:4eae7ee7: topos: option to set a context value via modparam or function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4eae7ee7819c528297e24778ae480d3a2e0a8188 URL: https://github.com/kamailio/kamailio/commit/4eae7ee7819c528297e24778ae480d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T21:46:14+02:00 topos: option to set a context value via modparam or function - ability to group records --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/4eae7ee7819c528297e24778ae480d3… Patch: https://github.com/kamailio/kamailio/commit/4eae7ee7819c528297e24778ae480d3…

3 years, 1 month

git:master:3363d467: kamctl: db schema regenerated - updates to userblocklist and topos modules

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3363d4671e9dcb888868bf182f9eae708ca55c71 URL: https://github.com/kamailio/kamailio/commit/3363d4671e9dcb888868bf182f9eae7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T21:45:14+02:00 kamctl: db schema regenerated - updates to userblocklist and topos modules --- Modified: utils/kamctl/db_berkeley/kamailio/globalblocklist Modified: utils/kamctl/db_berkeley/kamailio/topos_d Modified: utils/kamctl/db_berkeley/kamailio/topos_t Modified: utils/kamctl/db_berkeley/kamailio/userblocklist Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_redis/kamailio/topos_d Modified: utils/kamctl/db_redis/kamailio/topos_t Modified: utils/kamctl/db_sqlite/topos-create.sql Modified: utils/kamctl/dbtext/kamailio/globalblocklist Modified: utils/kamctl/dbtext/kamailio/topos_d Modified: utils/kamctl/dbtext/kamailio/topos_t Modified: utils/kamctl/dbtext/kamailio/userblocklist Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/topos_d.json Modified: utils/kamctl/mongodb/kamailio/topos_t.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/topos-create.sql Modified: utils/kamctl/oracle/topos-create.sql Modified: utils/kamctl/postgres/topos-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/topos-mod Modified: utils/kamctl/xhttp_pi/topos-table --- Diff: https://github.com/kamailio/kamailio/commit/3363d4671e9dcb888868bf182f9eae7… Patch: https://github.com/kamailio/kamailio/commit/3363d4671e9dcb888868bf182f9eae7…

3 years, 1 month

git:master:e6609d40: lib: srdb1 - added x_context column to topos tables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e6609d4041f9bc74b68fe83b67ba4499e8fb1924 URL: https://github.com/kamailio/kamailio/commit/e6609d4041f9bc74b68fe83b67ba449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-31T21:44:12+02:00 lib: srdb1 - added x_context column to topos tables --- Modified: src/lib/srdb1/schema/topos_d.xml Modified: src/lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/e6609d4041f9bc74b68fe83b67ba449… Patch: https://github.com/kamailio/kamailio/commit/e6609d4041f9bc74b68fe83b67ba449… --- diff --git a/src/lib/srdb1/schema/topos_d.xml b/src/lib/srdb1/schema/topos_d.xml index f0ee77473f..ea7d3b9895 100644 --- a/src/lib/srdb1/schema/topos_d.xml +++ b/src/lib/srdb1/schema/topos_d.xml @@ -9,7 +9,7 @@ <table id="topos_d" xmlns:db="http://docbook.org/ns/docbook"> <name>topos_d</name> - <version>1</version> + <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used to store topos structures in database. More @@ -38,6 +38,14 @@ <description>Date and time when this record was written.</description> </column> + <column id="x_context"> + <name>x_context</name> + <type>string</type> + <size>64</size> + <default/> + <description>Context value</description> + </column> + <column id="s_method"> <name>s_method</name> <type>string</type> diff --git a/src/lib/srdb1/schema/topos_t.xml b/src/lib/srdb1/schema/topos_t.xml index 0fdda01590..0d32b14881 100644 --- a/src/lib/srdb1/schema/topos_t.xml +++ b/src/lib/srdb1/schema/topos_t.xml @@ -9,7 +9,7 @@ <table id="topos_t" xmlns:db="http://docbook.org/ns/docbook"> <name>topos_t</name> - <version>1</version> + <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used to store topos structures in database. More @@ -38,6 +38,14 @@ <description>Date and time when this record was written.</description> </column> + <column id="x_context"> + <name>x_context</name> + <type>string</type> + <size>64</size> + <default/> + <description>Context value</description> + </column> + <column id="s_method"> <name>s_method</name> <type>string</type>

3 years, 1 month

[kamailio/kamailio] import_file - wildcard support (#2125)

by sergey-safarov

### Description Could you extend `import_file` directive to support wildcards like ``` import_file "/run/kamailio/cfg/*" ``` This will allow place runtime config files with public IP of VM. Useful for cloud installation. ``` listen=udp:eth0 advertise 52.24.72.57:5060 listen=tcp:eth0 advertise 52.24.72.57:5060 ``` ### Expected behavior All files matched to wildcard included into config #### Actual observed behavior wildcard ignored -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2125

3 years, 1 month

[kamailio/kamailio] $(hdr(foo)[idx]) is 0-based, textopsx.remove_hf_value("foo[idx]") is 1-based, they should be the same (#2387)

by Sebastian Damm

### Description We have some JS code looping over all P-Asserted-Identity headers removing some of the entries: ``` let headerIndex = 0; const telUriMatcher = new RegExp("tel:"); let paiValue = ksr.pv .gete("$(hdr(P-Asserted-Identity)[" + headerIndex + "])") .toString(); while (paiValue.length > 0) { ksr.info( `${ksr.pv.getw("$ci")}: Found P-A-I header with content <${ksr.pv.getw( "$(hdr(P-Asserted-Identity)[" + headerIndex + "])" )}> at index ${headerIndex}\n` ); if (telUriMatcher.test(paiValue)) { ksr.info( `${ksr.pv.getw("$ci")}: Removed P-A-I header ${ksr.pv.getw( "$(hdr(P-Asserted-Identity)[" + headerIndex + "])" )}\n` ); ksr.textopsx.remove_hf_value( "P-Asserted-Identity[" + headerIndex + "]" ); } headerIndex++; paiValue = ksr.pv .gete("$(hdr(P-Asserted-Identity)[" + headerIndex + "])") .toString(); } ``` In our tests, we wanted to remove the second header, but the first one got removed instead. The pseudovars docs say, the index of a header is 0-based. In textopsx docs it doesn't explicitly say, it's 1-based, but the first example shows it actually is. ### Possible Solutions Right now, we replaced the line ``` ksr.textopsx.remove_hf_value("P-Asserted-Identity[" + headerIndex + "]"); ``` with this one: ``` ksr.textopsx.remove_hf_value("P-Asserted-Identity[" + (headerIndex + 1) + "]"); ``` This solves the problem, but it is not what we would expect. Both header access methods should use the same index base. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.5 (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_BLACKLIST, 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 8.3.0 ``` * **Operating System**:  ``` Linux hostname 4.19.0-9-amd64 #1 SMP Debian 4.19.118-2+deb10u1 (2020-06-07) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2387

3 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021