[kamailio/kamailio] allow address 'grd' 'mask' 'port' fields to be a mysql BIGINT (PR #3923)
<!-- 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 --> - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3923
-- Commit Summary --
* allow address 'grd' 'mask' 'port' fields to be a mysql BIGINT
-- File Changes --
M src/modules/permissions/address.c (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3923.patch https://github.com/kamailio/kamailio/pull/3923.diff
@miconda commented on this pull request.
@@ -208,12 +208,12 @@ int reload_address_db_table(address_tables_group_t *atg)
"address table - NULL value not permitted\n"); goto dberror; } - if((VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2)) { + if((VAL_TYPE(val + 2) != DB1_INT) || (VAL_TYPE(val + 2) != DB1_BIGINT) || VAL_NULL(val + 2)) {
This condition does not seem right, if `VAL_TYPE(val + 2)` is `DB1_INT` (as it is expected to be till now), then `VAL_TYPE(val + 2) != DB1_BIGINT` is true, so the IF expression is going to be true and go to error.
Same seems to be for the other IF expressions that were changed.
Note also that the git commit message has to follow the format detailed at:
- https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md#com...
@mariahyang pushed 1 commit.
7604f2501f2fe9088dee9e3dfde0a1f9a6be6eda allow address 'grp' 'mask' 'port' fields to be a mysql BIGINT
@mariahyang commented on this pull request.
@@ -208,12 +208,12 @@ int reload_address_db_table(address_tables_group_t *atg)
"address table - NULL value not permitted\n"); goto dberror; } - if((VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2)) { + if((VAL_TYPE(val + 2) != DB1_INT) || (VAL_TYPE(val + 2) != DB1_BIGINT) || VAL_NULL(val + 2)) {
sorry, it's my careless, i pushed again.
https://github.com/kamailio/kamailio/commit/6b413cc8c7f9c6db019c98a28ab07cf9...
so pr is no need.
Closed #3923.
-
Daniel-Constantin Mierla -
Mariah Yang