<!-- 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 --> - [ ] 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 --> cplc: add a configuration route before redirected call (key: redirect_route) same behaviour as proxy_route cplc: deactivate 3XX responses handling (key: ignore3xx) cplc: time based cpl did not work if several are set cplc: add return result to kamcmd commands cplc: documentation update (new keys, new module name, proxy_route modification)
pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within) Generally all these PUBLISH generated are not usefull.
pua_dialoginfo: add new key to really deactivate caller or callee notification when the deactivated party was supervised (key: caller_entity_when_publish_disabled key: callee_entity_when_publish_disabled) If Alice calls Bob with Alice and Bob already supervised by watchers and disable_caller_publish_flag set, PUBLISH generated for Bob will generate NOTIFY for Alice's watchers and Bob's watchers instead of just Bob's watchers. Note that dlginfo_cell structure is updated because flag set for disabling party (disable_caller_publish_flag or disable_callee_publish_flag ) are not always present in subsequent request received by pua_dialoginfo module. So flag set on initial request are stored and used during the dialog. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2676
-- Commit Summary --
* cplc: add a configuration route before redirected call (key: redirect_route) * pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within)
-- File Changes --
M src/modules/cplc/cpl_db.c (2) M src/modules/cplc/cpl_env.h (2) M src/modules/cplc/cpl_loader.c (14) M src/modules/cplc/cpl_proxy.h (5) M src/modules/cplc/cpl_run.c (6) M src/modules/cplc/cpl_switches.h (2) M src/modules/cplc/cplc.c (14) M src/modules/cplc/doc/cplc.xml (9) M src/modules/cplc/doc/cplc_admin.xml (84) M src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml (9) M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (66) M src/modules/pua_dialoginfo/pua_dialoginfo.c (188) M src/modules/pua_dialoginfo/pua_dialoginfo.h (3)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2676.patch https://github.com/kamailio/kamailio/pull/2676.diff
The commit for cplc looks ok, the one for pua_dialoginfo is rather big and requires more time to review and understand what it does. But there is no way to do a partial merge via github (afaik).
Although not a must, it is recommended to make distinct pull requests in such cases, because the two commits are not related one to each other, if you want independent review and merge faster for some of the commits.
Ok sorry, I note it for future commits. However is this validation may be done before 5.5 release?
Existing pull requests can be merged after freezing development for 5.5 as well, should make it in 5.5.x anyhow.
Thanks, merging.
Merged #2676 into master.