<!-- 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) - [X] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description - added a worker_id for timer routines. when using rtimer in script with mode=4 there's no way to know which of the workers is in use. this is useful for db queries based on slot - fixed {uri.tosocket} transformation - added t_release_transaction to tm api - fixed xavp_clone_level_nodata - add sockinfo to $subs - increase `MAX_DEFINES` as we run out of `defines` Note: please use rebase instead of merge for this PR to backport: - https://github.com/kamailio/kamailio/commit/eea9c5f72b73df9c3d898cff18dced6… - https://github.com/kamailio/kamailio/commit/e3ed896d80171feba78d3292484a09f… - https://github.com/kamailio/kamailio/commit/b4696169e8b464da01774b1e40af677… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1882 -- Commit Summary -- * core: allow a worker id in timer routines * rtimer: use timer worker id * pv: use parsed uri to compute tosocket * tm: add t_release_transaction to api * core: free resources in xavp_clone_level_nodata * presence: add sockinfo to $subs * core: increase max_defines from 256 to 512 -- File Changes -- M src/core/cfg.lex (4) M src/core/timer.h (2) M src/core/timer_proc.c (43) M src/core/timer_proc.h (4) M src/core/xavp.c (11) M src/modules/presence/subscribe.c (6) M src/modules/pv/pv_trans.c (37) M src/modules/rtimer/rtimer_mod.c (34) M src/modules/tm/t_funcs.h (1) M src/modules/tm/tm_load.c (1) M src/modules/tm/tm_load.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1882.patch https://github.com/kamailio/kamailio/pull/1882.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/1882