[sr-dev] [kamailio/kamailio] dispatcher: don't reset load table when adding/removing a destination… (#2342)

Federico Cabiddu notifications at github.com
Mon Jun 1 12:28:10 CEST 2020


… or reloading the list

<!-- 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

When a destination is added/removed or the whole list is reloaded, the calls that are being routed to another destination will fail.
This because ds_load_replace is returning an error not finding in the table the entry for the call being rerouted.
Another side effect of this is that when adding/removing destinations the actual load of the endpoints will be wrong since the current calls will never be deleted.
I've removed the calls to ds_clean_slots and modified ds_load_replace to not exit when the old destination is not found (the endpoint could have been removed after the failover list had been created) and to return a new error code (-2) when the new destination is not found (for the same reason).
Finally I've modified ds_update_dst to skip the current selected destination and select the next if ds_load_replace returns -2.

You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/2342

-- Commit Summary --

  * dispatcher: don't reset load table when adding/removing a destination or reloading the list

-- File Changes --

    M src/modules/dispatcher/dispatch.c (37)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/2342.patch
https://github.com/kamailio/kamailio/pull/2342.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/2342
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.kamailio.org/pipermail/sr-dev/attachments/20200601/d99a2e3e/attachment.html>


More information about the sr-dev mailing list