- Fixes GH #3178. Sets TCP connection id for keepalive based on the value in the database If unset, tcpconn_id will remain 0 and keepalives will work the same as they do today - Update documentation to clarify when it will use received vs AOR for keepalive
<!-- 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) - [ ] New feature (non-breaking change which adds new functionality) - [X] 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 - [X] Related to issue #3178 (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
Updated usrloc module to re-use an active TCP session (if it exists). I marked this breaking only because the current code will use a UDP OPTIONS keepalive method even if the device is registered over TCP. I doubt that's what anyone would be expecting so I think the change is ok.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3219
-- Commit Summary --
* usrloc: re-use TCP connections for keepalive
-- File Changes --
M src/modules/usrloc/dlist.c (4) M src/modules/usrloc/doc/usrloc_admin.xml (9) M src/modules/usrloc/ul_keepalive.c (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3219.patch https://github.com/kamailio/kamailio/pull/3219.diff
Thanks for the PR. You are introducing a new column in the database. For that it would be necessary to extend the XML database scheme at src/lib/srdb1/schema. Its also necessary to increment the usrloc version number in the XML and also the module source code.
There is no new column introduced, the connection id is there for quite some time. As I understand, it just loads the connection id for db-only mode case.
@miconda thanks - wrongly conclusion from my side from the new introduced DB API code in the diff.
Thanks, merging!
Merged #3219 into master.