[kamailio/kamailio] tm: add support for dropping messages in local-request event route (#2147)
<!-- 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 - [ ] 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 --> - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> Currently it is not possible to drop a local generated message in tm:local-request event route because there is no context associated when running the event route. With this PR I tried to solve this introducing a new returned error (E_DROP) and a context into t_run_local_req. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2147
-- Commit Summary --
* tm: add support for dropping messages in local-request event route
-- File Changes --
M src/core/error.h (1) M src/modules/tm/uac.c (36)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2147.patch https://github.com/kamailio/kamailio/pull/2147.diff
Thanks!
I couldn't spot quickly the initialization of the context, something like:
``` init_run_actions_ctx(&ra_ctx); ```
@grumvalski pushed 1 commit.
b58bfec2413a09568343fa1e2b2e199cfaa2e1fa tm: initialize the context before running event route
@grumvalski pushed 1 commit.
2ad6023432ae37b1709638ead2c77e1e4130678a tm: initialize the context before running event route
right, added now.
OK, fine for me.
One remark - the E_DROP error is planned to be used for all kinds of drop() or only for the local request event route type? If the latter - maybe making the name a bit more specific to highlight that is only used for this particular case.
I haven't spotted any other usage for the moment. I could rename it like E_LOCAL_DROP.
Ok, this might be better understandable in the years to come. :-) Good addition, thanks.
If you keep it in core, then E_DROP is fine, it can be used in the future for similar purposes. If you rename it and make it specific to tm usage for local request route, then place the define in the tm module. We should not populate core with module specific needs.
I did put it in the core to avoid conflicts with other returned codes and for beeing used in the future (in case). I'll leave it in the core.
Merged #2147 into master.
-
Daniel-Constantin Mierla -
Federico Cabiddu
-
Henning Westerholt