#### Pre-Submission Checklist - [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: - [x] PR should be backported to stable branches - [x] Tested changes locally
#### Description Allows to pass unique address part into contact header for REGISTER requests for each uacreg entry If contact_addr wasn't passed into uacreg for a particular entry default reg_contact_addr will be used instead.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2470
-- Commit Summary --
* uacreg contact_addr added into db as configrable parameter for each entry * docs generated * formatting * Merge branch 'uacreg-contact_addr-field-in-db' of https://github.com/ovoshlook/kamailio into uacreg-contact_addr-field-in-db * reverted readme * formatting * formatting
-- File Changes --
M src/modules/uac/doc/uac_admin.xml (11) M src/modules/uac/uac_reg.c (43) M src/modules/uac/uac_reg.h (2) M utils/kamctl/db_berkeley/kamailio/uacreg (4) M utils/kamctl/db_berkeley/kamailio/version (2) M utils/kamctl/db_redis/kamailio/uacreg (2) M utils/kamctl/db_sqlite/uac-create.sql (3) M utils/kamctl/dbtext/kamailio/uacreg (2) M utils/kamctl/mongodb/kamailio/uacreg.json (7) M utils/kamctl/mysql/uac-create.sql (3) M utils/kamctl/oracle/uac-create.sql (3) M utils/kamctl/postgres/uac-create.sql (3) M utils/kamctl/xhttp_pi/uac-mod (3) M utils/kamctl/xhttp_pi/uac-table (1)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2470.patch https://github.com/kamailio/kamailio/pull/2470.diff
The examples show that the contact addr field in database can be `udp:192.168.0.125:5060`, but from the code seems to be concatenated prefixed with `sip:UUID@`, meaning that it can result in `sip:UUID@udp:192.168.0.125:5060`, which is invalid SIP uri. Maybe I failed to notice where conversion is done.
Then, for database updates, you have to update the xml files from `src/lib/srdbb1/schema/` and then do `make dbschema` in the root folder of Kamailio to update the sql/db creation files.
@ovoshlook pushed 1 commit.
a1bde17266e7c75b6bd94c9232ce99b5cde9f22a fixed description of the contact_addr
@ovoshlook pushed 2 commits.
ea36cddcb37e88488979c25ce477670f8483168a dbschema updated 9fbed998e03935193c05186325c188271a9f686e updated vie make dbschema
yes indeed copied description from the socket field and forgot to remove "proto:" part
generated db with the dbschema script as well
@ovoshlook pushed 1 commit.
b3f6e23280e72d790293b80ee752abd0079b7488 revert accidentaly removed empty lines and other formatting
Thanks! I will do another review soon and if all ok, I will merge manually to have the proper commit message format and commits per components.
I pushed your commits manually, then followed up with a few commits making the changes:
* increased the size of contact_addr filed to 255 (it can have parameters and then can become long, e.g., cases for ims or mobile devices) * contact_addr is optional value on RPC add command, `.` can be provided in such case to use the modparam value (to be easier to have the existing mode in the future, when one does not want to add per record value * contact_addr is last parameter in RPC add command, being the last added (you made it the previous last, but existing deployments should be easier to upgrade their cli tools by adding at the end instead of in the middle of cli parameters)
No testing though, should there be any problem after my additions, just open a bug report.
Closed #2470.
-
Daniel-Constantin Mierla -
ovoshlook