Determine dialog event types for dialog callback on module initialization, since these will not change.
<!-- 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 --> - [ ] 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 -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3079
-- Commit Summary --
* pua_dialoginfo: Determine dialog event types in mod_init
-- File Changes --
M src/modules/pua_dialoginfo/pua_dialoginfo.c (29)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3079.patch https://github.com/kamailio/kamailio/pull/3079.diff
Thanks for the pull-request. I have not followed the complete code path yet, but I am not 100% sure this is the correct way to go.
In the existing code we are registering the DLGCB_REQ_WITHIN conditionally for the register_dlgcb(..) call. This will allocate new memory and copy the call back types to the new allocated structure. If you later change the callback types (as in your new code), it will be not synchronized with the structure inside the dialog module, or I am wrong?
@btriller any comment regarding my previous question?
In mod_init, pua_dialoginfo registers a dialog callback for newly created dialogs. When this callback runs, it registers another callback for this newly created dialog, w/ the interesting dialog event types. modparam `publish_dialog_req_within` is checked whether DLGCB_REQ_WITHIN should be included. IMHO this check can be moved to mod_init, since event types aren't going to change.
Sorry for missing that out in the PR description.
@henningw commented on this pull request.
I was probably not clear in my previous comment. I have added it to the appropriate places in your patch, maybe its more clear this way.
__dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) {
- LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } else { - if (dlg_api.register_dlgcb(dlg, - DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED - | DLGCB_EXPIRED | DLGCB_EARLY, - __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { - LM_ERR("cannot register callback for interesting dialog types\n"); - free_dlginfo_cell(dlginfo); - return NULL; - } - } + if (dlg_api.register_dlgcb(dlg, dialog_event_types,
This will allocate new memory and copy the call back types to the new allocated structure.
@@ -856,6 +844,9 @@ static int mod_init(void)
LM_DBG("configured to use headers for uri values\n"); }
+ if(publish_dialog_req_within) + dialog_event_types |= DLGCB_REQ_WITHIN;
This will change the callback types, it will be not synchronized with the structure inside the dialog module.
You are right, there are multiple callbacks and the one that you've added is done in mod_init. So it should be fine. Lets wait a bit for other feedback, otherwise I will merge it.
Merged #3079 into master.
-
Bastian Triller -
Henning Westerholt