- The new methods are used in usrloc pscscf module, but they are universal and can be used anywhere.
core: Added debug messages in grep_sock_info.
<!-- 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/1962
-- Commit Summary --
* core: Added methods for ip conversation.
-- File Changes --
M src/core/resolve.c (138) M src/core/resolve.h (3) M src/core/socket_info.c (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1962.patch https://github.com/kamailio/kamailio/pull/1962.diff
There are already functions to parse a string to ip struct for ipv4 and ipv4, see str2ip() and str2ip6() in `src/core/resolve.h `. In that struct you have the `af` field. In most of the code, the two functions were used one after the other to parse ip addresses, if str2ip() fails, then try str2ip6().
We can add a new function str2ipx() as a wrapper to this logic, but otherwise, I see no reason to add the new functions proposed by your pull request.
Also, the one for trimming `[ ]` for ipv6 with copy over is not that useful in a global scope from my point of view. Moreover, there are no safety checks over the size of the target pointer, nor comments requesting a minimum value for that. This can be in the module that needs it.
I am closing this PR without merge. If people want to discuss more, then keep adding comments and if it is decided, it can be reopened.
Closed #1962.
-
alexyosifov -
Daniel-Constantin Mierla