<!-- 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) - [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 -->
This new feature provides a way to have multiple users sharing the same speed dial number, if they belong to the same group.
A new function is add: "sd_lookup_group". It finds the URI for a specific sd_username and group_id (and sd_domain if is_domain value is defined) in the database, returning its URI. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3255
-- Commit Summary --
* speeddial: allow search uri of speed dial by group
-- File Changes --
M src/modules/speeddial/doc/speeddial_admin.xml (35) M src/modules/speeddial/sdlookup.h (2) M src/modules/speeddial/speeddial.c (8) M src/modules/speeddial/speeddial.h (15)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3255.patch https://github.com/kamailio/kamailio/pull/3255.diff
Thanks for the pull requests. Maybe I missed something, but it seems that the actual implementation of the new functions is missing? if its still work in progress, no problem just let us known.
@Tomohare pushed 1 commit.
1a2122c875995f3be6939f38d555838a6f234605 speeddial: allow search uri of speed dial by group
Ok, thanks - now its more clear. There might be more review comments from people more familiar about this module. One remark about the SQL changes - this needs to be done not in the actual SQL files, but in the XML template available in lib/srdb1/schema. You should probably also increment the table version as you are adding a new field to the table.
@Tomohare pushed 2 commits.
92836699af2949ff9181d3a99d838099667cf654 speeddial: allow search uri of speed dial by group f8a15c42bc21990966aeb47c1ac2345d199b163a kamctl: update speeddial schema
Ok, thanks - now its more clear. There might be more review comments from people more familiar about this module. One remark about the SQL changes - this needs to be done not in the actual SQL files, but in the XML template available in lib/srdb1/schema. You should probably also increment the table version as you are adding a new field to the table.
Yes, updated the commit and added a new one for the generated files.
Wouldn't it work in the old version by providing `sip:group_id@domain` as the second parameter of `sl_lookup()`, with the `username` set to `group_id` inside database table?
Wouldn't it work in the old version by providing `sip:group_id@domain` as the second parameter of `sl_lookup()`, with the `username` set to `group_id` inside database table?
Yes, I failed to communicate the idea: that a group could have multiple domains. For example: group A has speed dial 123@domain1 (returning sip:999999@domain1) while 123@domain2 from the same group returns a different URI.
If I am not misunderstanding something, i see no problem for such situation: the domain can also be set to a certain value `domainA`, it is not required to be the same to sd_domain
If I am not misunderstanding something, i see no problem for such situation: the domain can also be set to a certain value `domainA`, it is not required to be the same to sd_domain
Sorry for the delay, I finally understood what you meant, but as I see it, passing `sip:group_id@domain` as the second parameter could have clashes with other users, and that was my concern.
However, having the domain fixed to be used only to speed dial in the system, something like `sip:group_id@local.sd.domain`, would work making this modification useless. With this in mind I close this PR. Thanks and, again, sorry for the time wasted.
Closed #3255.
@Tomohare thanks for the feedback!
@Tomohare: maybe, if it suits your use case better, you can try another approach to make the query only on user column even when the `use_domain` is set, via new function `sd_lookup_group()` or a new optional parameter to `sd_lookup()`. So there will be one function to do the query on both user/domain and the other one only on user column.
The function take the db table name as a parameter, so you can use two db tables to separate the group and user-specific records (`sd_lookup_group(groupdial)` and `sd_lookup(speedial)`) . You can also set the name of the column to something that suits better both cases (e.g., `owner`).
From my point of view it felt that the module offers what you need, but it is fine to add new function/functionality for more flexibility, but I didn't want to change the database structure unless really needed, because that has impact on upgrades (even on major release upgrade, but better to avoid when possible).
-
Daniel-Constantin Mierla -
Henning Westerholt
-
Tomohare