sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
310 discussions

[kamailio/kamailio] Possible deadlock bug in the method acquire_spi and release_spi? (Issue #2939)

by ryancaicse

In the method `acquire_spi`, the condition of acquiring and releasing is not aligned. It seems the lock would be acquired but released only when `spi_data->spi_val == initial_val`, Would it lead to missing lock release? https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… In the method `release_spi`, the lock may be re-acquired so missing lock release in the method `acquire_spi` could lead to a deadlock. https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… -- 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/2939

3 years

git:master:b5cf0796: Merge pull request #2879 from ErhanOnur/fix_ims_usrloc_pcscf_protocol

by GitHub

Module: kamailio Branch: master Commit: b5cf0796ffc308fdd8bf63d1f446608d63c7cac9 URL: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… Author: carstenbock <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-19T10:26:20+01:00 Merge pull request #2879 from ErhanOnur/fix_ims_usrloc_pcscf_protocol ims_usrloc_pcscf: fix on saving protocol info into DB --- Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… Patch: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… --- diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ca57a2b4b3..5f0df126fa 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -341,7 +341,7 @@ int db_insert_pcontact(struct pcontact* _c) return -1; } - if (ul_dbf.insert(ul_dbh, keys, values, 15) < 0) { + if (ul_dbf.insert(ul_dbh, keys, values, 16) < 0) { LM_ERR("inserting contact in db failed\n"); return -1; } diff --git a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql index cf978df1f5..2a18c59601 100644 --- a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql @@ -17,7 +17,7 @@ CREATE TABLE `location` ( `socket` varchar(64) DEFAULT NULL, `public_ids` varchar(2048) DEFAULT NULL, `security_type` int(11) DEFAULT NULL, - `protocol` char(5) DEFAULT NULL, + `protocol` int(10) DEFAULT NULL, `mode` char(10) DEFAULT NULL, `ck` varchar(100) DEFAULT NULL, `ik` varchar(100) DEFAULT NULL,

3 years

git:master:c7cf1937: Fix on saving protocol info for ims_usrloc_pcscf

by 67456745

Module: kamailio Branch: master Commit: c7cf1937bfc9a36e70865fed8cf704f34f17685f URL: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… Author: 67456745 <erhan.sendag(a)i2i-systems.com> Committer: 67456745 <erhan.sendag(a)i2i-systems.com> Date: 2021-10-11T11:51:33+03:00 Fix on saving protocol info for ims_usrloc_pcscf --- Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… Patch: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… --- diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ca57a2b4b33..5f0df126fa2 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -341,7 +341,7 @@ int db_insert_pcontact(struct pcontact* _c) return -1; } - if (ul_dbf.insert(ul_dbh, keys, values, 15) < 0) { + if (ul_dbf.insert(ul_dbh, keys, values, 16) < 0) { LM_ERR("inserting contact in db failed\n"); return -1; } diff --git a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql index cf978df1f58..2a18c59601b 100644 --- a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql @@ -17,7 +17,7 @@ CREATE TABLE `location` ( `socket` varchar(64) DEFAULT NULL, `public_ids` varchar(2048) DEFAULT NULL, `security_type` int(11) DEFAULT NULL, - `protocol` char(5) DEFAULT NULL, + `protocol` int(10) DEFAULT NULL, `mode` char(10) DEFAULT NULL, `ck` varchar(100) DEFAULT NULL, `ik` varchar(100) DEFAULT NULL,

3 years

[kamailio/kamailio] Fix a possible deadlock bug due to unreleased lock (PR #2941)

by ryancaicse

In acquire_spi, making condition of acquiring the releasing lock aligned. Fixes #2939 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2941 -- Commit Summary -- * Fix a possible deadlock bug due to unreleased lock -- File Changes -- M src/modules/ims_ipsec_pcscf/spi_gen.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2941.patch https://github.com/kamailio/kamailio/pull/2941.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/2941

3 years

git:master:5affee3b: modules: readme files regenerated - tsilo ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 5affee3bcbf5b4a4cad5acfee1c24c0def1ad58c URL: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-19T09:31:15+01:00 modules: readme files regenerated - tsilo ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… Patch: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 47c14ce1bb..c93fa0ebef 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -10,6 +10,10 @@ Federico Cabiddu <federico.cabiddu(a)gmail.com> +Donat Zenichev + + <dzenichev(a)sipwise.com> + Copyright © 2015 Federico Cabiddu __________________________________________________________________ @@ -32,7 +36,8 @@ Federico Cabiddu 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 5. RPC Commands @@ -53,7 +58,8 @@ Federico Cabiddu 1.2. Set use_domain parameter 1.3. ts_store usage 1.4. ts_append usage - 1.5. ts_append_to usage + 1.5. ts_append_by_contact usage + 1.6. ts_append_to usage Chapter 1. Admin Guide @@ -74,7 +80,8 @@ Chapter 1. Admin Guide 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 5. RPC Commands @@ -157,7 +164,8 @@ modparam("tsilo", "use_domain", 1) 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 4.1. ts_store([uri]) @@ -200,7 +208,40 @@ if (is_method("REGISTER")) { } ... -4.3. ts_append_to(tindex, tlabel, domain, [uri]) +4.3. ts_append_by_contact(domain, ruri [, contact]) + + Has almost the same intention as the ts_append(), but gives a + possibility to append branches only for a specific location record + (Contact URI). The contact's URI value can be either taken from the + currently processed REGISTER or (optionally) given as a third + parameter. If the Contact URI for a lookup is given as the parameter, + it is possible to provide it as a pseudo-variable. The contact lookup + is performed on the table specified by the domain parameter. The method + should be called when a REGISTER request is received. + + Meaning of the parameters is as follows: + * domain - Name of table that should be used for looking up new + contacts for r-uri. + * ruri - The r-uri for which we want to check existing transactions + and add them new branches. Can be a static string value or a + dynamic string with pseudo-variables. + * contact - Optional, a value of the location record (contact URI) + based on which to perform the branch appending. If not given, the + value will be taken from the currently processed REGISTER. If a + location lookup based on this Contact URI fails (no location record + found), then the branch append will not happen. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + + Example 1.5. ts_append_by_contact usage +... +if (is_method("REGISTER")) { + $var(formated_ct) = $(x_hdr(Contact){nameaddr.uri}); + ts_append_by_contact("location", "$tu", "$var(formated_ct)"); +} +... + +4.4. ts_append_to(tindex, tlabel, domain, [uri]) The method add branches to the transaction identified by tindex and tlabel, performing a contacts lookup on the table specified by the @@ -218,7 +259,7 @@ if (is_method("REGISTER")) { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.5. ts_append_to usage + Example 1.6. ts_append_to usage ... if (is_method("REGISTER")) { $var(tindex) = ...

3 years

[kamailio/kamailio] TSILO / TM. Lookup and branch creating by contact (location record). (PR #2931)

by zenichev

#### 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 Two separate commits per component: TSILO and TM. Important, this implementation has been tested internally and is in use by us already. Contributions to both TSILO and TM are made so, that they save full back-compatibility and do not affect existing implementation. --- TSILO: Add support of a lookup and branch creating by contact Improvement of the TSILO module, which allows to run a lookup using the provided RURI, but only to create a new branch for the Contact, which is set in the currently processed REGISTER. Or optionally a Contact URI value given as a parameter to the function. If the Contact URI for a lookup, is given as a parameter, it is possible to provide it as a pseudo-variable. Hence it is now possible to append new branch(es) for only UAC(s) getting REGISTERED at the moment of calling 'ts_append_by_contact()'. Previously it was only possible to call 'ts_append()' and create new branches for all previously present location records (for this specific URI), which was in some circumstsances undersired. New script functions introduced: - ts_append_by_contact(table, ruri [, contact]) New module functions introduced: - w_ts_append_by_contact2() / ki_ts_append_by_contact() - w_ts_append_by_contact3 / ki_ts_append_by_contact_uri() - ts_append_by_contact() / ts_append_by_contact_to() Backwards compatibility is saved, the new functionality is not overlapping with the previously existing implementation, hence it only acts when the new script function ts_append_by_contact() is used. The documentation has been updated accordingly. --- TM: API improvement, new function introduced: t_append_branch_by_contact() New module functions introduced: - t_append_branch_by_contact() This commit introduces a possibility of TM's API to append a branch based on specific location (Contact's URI). Indeed the 't_append_branch_by_contact()' is a corrected copy of the 't_append_branches()', which instead takes Contact as a parameter of str type and takes care to append a branch only for it. The separate function has been introduced, in order to save full back-compatibility, and not affect existing implementation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2931 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2931/commits/6bdb1dbdd9726b1b45c0…">tsilo: Add support of a lookup and branch creating by contact</a> * <a href="https://github.com/kamailio/kamailio/pull/2931/commits/7d0f21edde6a816a75fd…">tm: API improvement, new function introduced: t_append_branch_by_contact()</a> -- File Changes -- M src/modules/tm/t_append_branches.c (206) M src/modules/tm/t_append_branches.h (4) M src/modules/tm/tm_load.c (1) M src/modules/tm/tm_load.h (1) M src/modules/tsilo/doc/tsilo.xml (5) M src/modules/tsilo/doc/tsilo_admin.xml (54) M src/modules/tsilo/ts_append.c (116) M src/modules/tsilo/ts_append.h (2) M src/modules/tsilo/tsilo.c (269) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2931.patch https://github.com/kamailio/kamailio/pull/2931.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/2931

3 years

git:master:c1fd9eba: tsilo: Merge similar functions in ts_append.c

by Victor Seva

Module: kamailio Branch: master Commit: c1fd9ebaa0fe0eb7457ea74e8a22444b855af9cd URL: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Merge similar functions in ts_append.c We need to merge similar functions in ts_append.c implementation to give less work for maintaining similar code. Furthermore the purpose of them is quite the same, but differes just in some details (usage of TM's API). Merged functions are: - ts_append() and ts_append_by_contact() - ts_append_to() and ts_append_by_contact_to() Now all appending in TSILO happens only through ts_append() / ts_append_to() An implementation in tsilo.c has been updated accordingly. Usage. In case we do not want to append based on specific Contact (location), the contact parameter being passed to either ts_append() or ts_append_to() must be set to zero. In case we do want to append by a specific Contact, then we must set the Contact parameter of str type beforehand calling ts_append() / ts_append_to(). --- Modified: src/modules/tsilo/ts_append.c Modified: src/modules/tsilo/ts_append.h Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444… Patch: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444…

3 years

git:master:47464917: tsilo: Be compliant with changes in TM, now only t_append_branches()

by Victor Seva

Module: kamailio Branch: master Commit: 474649171d3c269e2fcfb00c7b1dbd318a952f51 URL: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Be compliant with changes in TM, now only t_append_branches() Since of changes in TM's module, where 't_append_branches()' and 't_append_branch_by_contact()' have been merged into one function, we need to edit all the occurences where TM's API is called in TSILO. No logic changes. --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… Patch: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 1847ac1c1b..e4967f8167 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -89,6 +89,10 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * int ret; str stable; + str contact; /* needed for usage of TM's API, t_append_branches() */ + contact.s = NULL; /* must be emptied */ + contact.len = 0; + orig_t = _tmb.t_gett(); if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) @@ -129,7 +133,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * goto done; } - ret = _tmb.t_append_branches(); + ret = _tmb.t_append_branches(&contact); done: /* unref the transaction which had been referred by t_lookup_ident() call. @@ -245,7 +249,7 @@ int ts_append_by_contact_to(struct sip_msg* msg, int tindex, int tlabel, char *t /* start the transaction only for the desired contact contact must be of syntax: sip:<user>@<host>:<port> with no parameters list*/ - ret = _tmb.t_append_branch_by_contact(contact); + ret = _tmb.t_append_branches(contact); done: /* unref the transaction which had been referred by t_lookup_ident() call.

3 years

git:master:cb1b78e7: tm: merge t_append_branches() and t_append_branch_by_contact()

by Victor Seva

Module: kamailio Branch: master Commit: cb1b78e7bc8d61261e429664c6deb8bb1b4b53d0 URL: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tm: merge t_append_branches() and t_append_branch_by_contact() Because the implementation of the functions 't_append_branches()' and 't_append_branch_by_contact()' is pretty much the same, it's proposed to merge them into one: 't_append_branches()' The way how the function acts now depends on if the contact parameter of str type is given or not (empty or not). If the contact parameter is given, then only a desired location is meant for appending. If not found in the location table, an append will not happen for this AOR. Otherwise create branches for all existing location records of this particular AOR. Search for locations is done in the location table. --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_append_branches.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b… Patch: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b…

3 years

git:master:f564c0d3: tm: API improvement, new function introduced: t_append_branch_by_contact()

by Victor Seva

Module: kamailio Branch: master Commit: f564c0d33974eeaa1833abeb7972f5d207c5663f URL: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tm: API improvement, new function introduced: t_append_branch_by_contact() New module functions introduced: - t_append_branch_by_contact() This commit introduces a possibility of TM's API to append a branch based on specific location (Contact's URI). Indeed the 't_append_branch_by_contact()' is a corrected copy of the 't_append_branches()', which instead takes Contact as a parameter of str type. The separate function has been introduced, in order to save full back-compatibility, and not affect existing implementation. --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_append_branches.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d… Patch: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d…

3 years

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021