<!-- 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 - [ ] Tested changes locally - [x] Related to issue #4100
#### Description
db_schema for ims_dialog module
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4101
-- Commit Summary --
* lib/srdb1/schema: ims_dialog definitions * utils/kamctl: regenerate db table definitions
-- File Changes --
A src/lib/srdb1/schema/dialog_in.xml (180) A src/lib/srdb1/schema/dialog_out.xml (116) A src/lib/srdb1/schema/kamailio-ims_dialog.xml (14) A utils/kamctl/db_berkeley/kamailio/dialog_in (10) A utils/kamctl/db_berkeley/kamailio/dialog_out (10) M utils/kamctl/db_berkeley/kamailio/version (6) A utils/kamctl/db_redis/kamailio/dialog_in (2) A utils/kamctl/db_redis/kamailio/dialog_out (2) A utils/kamctl/db_sqlite/ims_dialog-create.sql (55) A utils/kamctl/dbtext/kamailio/dialog_in (1) A utils/kamctl/dbtext/kamailio/dialog_out (1) M utils/kamctl/dbtext/kamailio/version (4) A utils/kamctl/mongodb/kamailio/dialog_in.json (101) A utils/kamctl/mongodb/kamailio/dialog_out.json (61) M utils/kamctl/mongodb/kamailio/version-create.mongo (2) M utils/kamctl/mysql/ims_dialog-create.sql (87) A utils/kamctl/oracle/ims_dialog-create.sql (79) A utils/kamctl/postgres/ims_dialog-create.sql (55) A utils/kamctl/xhttp_pi/ims_dialog-mod (192) A utils/kamctl/xhttp_pi/ims_dialog-table (50) M utils/kamctl/xhttp_pi/pi_framework.xml (242)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4101.patch https://github.com/kamailio/kamailio/pull/4101.diff
@henningw commented on this pull request.
Thanks for the PR. I did a quick review for the differences. The general standardisation regarding the column sizes is great, the re-ordering of some colums is also fine of course. I have added two remarks that in my opinion should be addressed.
<type>string</type>
+ <size>&uri_len;</size> + <description>The URI of the FROM header (as per INVITE)</description> + </column> + + <column> + <name>from_tag</name> + <type>string</type> + <size>&from_tag_len;</size> + <description>The tag parameter serves as a general mechanism to + identify a dialog, which is the combination of the Call-ID along + with two tags, one from participant in the dialog.</description> + </column> + + <column> + <name>caller_cseq</name>
This column was called "caller_original_cseq" previously, and its also like this in the code. We can change it, but then we also need to adapt the module code I think.
<column>
+ <name>caller_contact</name> + <type>string</type> + <size>&uri_len;</size> + <description>Caller's contact uri.</description> + </column> + + <column> + <name>caller_sock</name> + <type>string</type> + <size>&domain_len;</size> + <description>Local socket used to communicate with caller</description> + </column> + + <column> + <name>callee_sock</name>
This is not needed for the dialog_in table, it was also not in the previous scheme.
@linuxmaniac pushed 2 commits.
89419ed49bf4d762220a02abd6ae69a9967314f2 lib/srdb1/schema: ims_dialog definitions 00029ce941173c01240dc99a82efebf96ab8dc31 utils/kamctl: regenerate db table definitions
@linuxmaniac commented on this pull request.
<type>string</type>
+ <size>&uri_len;</size> + <description>The URI of the FROM header (as per INVITE)</description> + </column> + + <column> + <name>from_tag</name> + <type>string</type> + <size>&from_tag_len;</size> + <description>The tag parameter serves as a general mechanism to + identify a dialog, which is the combination of the Call-ID along + with two tags, one from participant in the dialog.</description> + </column> + + <column> + <name>caller_cseq</name>
yes, correct. Fixed.
@linuxmaniac commented on this pull request.
<column>
+ <name>caller_contact</name> + <type>string</type> + <size>&uri_len;</size> + <description>Caller's contact uri.</description> + </column> + + <column> + <name>caller_sock</name> + <type>string</type> + <size>&domain_len;</size> + <description>Local socket used to communicate with caller</description> + </column> + + <column> + <name>callee_sock</name>
indeed, fixed
Thanks, I think its ready for merging then. We might want to merge it after 6.0, to not cause eventual other issues for the packaging.
Packaging? I think this is something missing and 6.0 will be better with the fix
Sure, nothing against merging it.
Merged #4101 into master.
-
Henning Westerholt -
Victor Seva