<!-- Kamailio Pull Request Template --> ims_dialog bugfix for registering dialog callbacks ims_qos bugfix for Rx register dialog callback
<!-- 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 --> 5.3 - [x] Tested changes locally --> Tested locally based on 5.1.6 - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> ims_dialog bugfix for registering dialog callbacks
In Rx scenarios of parallel forking (several INVITEs with same CALLID and FROMTAG sent to PCSCF) and INVITE for orig and term handled in same PCSCF (means also INVITEs with identical CALLID and FROMTAG) the wrong dialog is selected for registering the callback (i.e. the callback for sending STR) when 200OK from terminator is processed. Root cause is that dialog is searched with callid-fromtag-totag but at the time of dialog insertion (processing of INVITE) no totag is available. fix is to get ctx dialog at 200OK processing before suspending the transaction - save dialog until AAA is received - use this dialog for registering the STR callback.
ims_qos bugfix for Rx register dialog callback
In some scenarios like parallel forking several INVITE with identical CALLID and FROMTAG sent to PCSCF which inserts dialogues for each INVITE. When 200OK is received in PCSCF the dialog callback must be registered for the respective dialog. Currently sometimes the wrong dialog is selected by searching with CALLID FROMTAG and TOTAG thus leading to problem no STR is sent at BYE. Fix is to pickup the right dialog before suspending the transaction during AAR/AAA processing and reuse this saved dialog after AAA reception for registering the dialog callback.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2263
-- Commit Summary --
* ims_dialog bugfix for registering dialog callbacks * ims_qos bugfix for Rx register dialog callback
-- File Changes --
M src/modules/ims_dialog/dlg_cb.c (9) M src/modules/ims_dialog/dlg_cb.h (5) M src/modules/ims_dialog/dlg_handlers.c (1) M src/modules/ims_qos/ims_qos_mod.c (7) M src/modules/ims_qos/rx_aar.c (3) M src/modules/ims_qos/rx_aar.h (1)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2263.patch https://github.com/kamailio/kamailio/pull/2263.diff
Just for your info: Annemarie @annema-Kontron is our colleague, who will be responsible for pull requests in the future.
Christoph Valentin
If no there comments, it will be merged soon.
Looks fine to me. The log messages mentions some conflicting files, maybe it makes sense to merge it manually and adapting the log messages.
Hi,
I am very glad to hear you are satisfied and take the changes into consideration.
Best Regards,
Annemarie
Von: Daniel-Constantin Mierla notifications@github.com Gesendet: Samstag, 28. März 2020 08:34 An: kamailio/kamailio kamailio@noreply.github.com Cc: Mandl Annemarie Annemarie.Mandl@kontron.com; Mention mention@noreply.github.com Betreff: Re: [kamailio/kamailio] bugfix IMS_Rx dialog callback (#2263)
If no there comments, it will be merged soon.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fkamailio%2Fkamailio%2Fpull%2F2263%23issuecomment-605408691&data=02%7C01%7CAnnemarie.Mandl%40kontron.com%7C1093a3ce60764477570d08d7d2ea5b61%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637209776770366161&sdata=y9m6rjp5aO6TVr7xjbI5hQS6LZmgmjyip12Dab2ECX8%3D&reserved=0, or unsubscribehttps://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAO556TP3SHZODR7BUHK5AGTRJWR5ZANCNFSM4LTREO7Q&data=02%7C01%7CAnnemarie.Mandl%40kontron.com%7C1093a3ce60764477570d08d7d2ea5b61%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637209776770366161&sdata=%2Fu8J1edCReg%2Bxmck9NwEDHnPGDS3PlBy3S9HW%2FzURVw%3D&reserved=0.
Looks fine to me. The log messages mentions some conflicting files, maybe it makes sense to merge it manually and adapting the log messages.
For manual merge of the PR, do you need any support from our side (kontron), or can that be done by kamailio developers?
It is all fine, thanks. I will do it later today.
Closed #2263.
Merged manually in git master, thanks again. - e2a1b967fd6e - 2768f8ce1cf
backported to 5.2 and 5.3 branches
That’s great, thanks a lot.
Von: Henning Westerholt notifications@github.com Gesendet: Montag, 30. März 2020 19:08 An: kamailio/kamailio kamailio@noreply.github.com Cc: Mandl Annemarie Annemarie.Mandl@kontron.com; Mention mention@noreply.github.com Betreff: Re: [kamailio/kamailio] bugfix IMS_Rx dialog callback (#2263)
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fkamailio%2Fkamailio%2Fpull%2F2263%23event-3179619887&data=02%7C01%7CAnnemarie.Mandl%40kontron.com%7Cb236e6595f5746977e1708d7d4cce9dd%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637211849492779717&sdata=%2Fr49iCYWltknHykbwlwJE11sTL04JC0xha98sfdtSEM%3D&reserved=0, or unsubscribehttps://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAO556TLTZPVXPISWFYT2BSDRKDGXHANCNFSM4LTREO7Q&data=02%7C01%7CAnnemarie.Mandl%40kontron.com%7Cb236e6595f5746977e1708d7d4cce9dd%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637211849492779717&sdata=yI7VJYQU3hXX3EaRfTFcEbrnIbL0NXNkg72GR9pQurY%3D&reserved=0.