Callback function might do an operation which creates a new transaction, which will result in a deadlock.
<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [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 - [x] 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: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3641
#### Description Problem in detail described in ticket.
Summary is that the lock used to iterate expired transactions is also needed when creating a new transaction. If the callback function (directly or indirectly) do something that creates a new transaction, it will result in a deadlock.
In my case, this was the ims_charging module where a start charging request times out. The callback does t_continue() where the routing logic then rejects the call. This will create a stop request to the charging server, and it will block.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3643
-- Commit Summary --
* cdp: Avoid deadlock for callback on diameter timeout
-- File Changes --
M src/modules/cdp/transaction.c (35)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3643.patch https://github.com/kamailio/kamailio/pull/3643.diff
I am not familiar with the code of the module for a proper review, but if no other comments, the PR could be merged soon.
Merged #3643 into master.