<!-- 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)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [x] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #2539
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2541
-- Commit Summary --
* core: DNS stop resolving NAPTR for IP addresses
-- File Changes --
M src/core/dns_cache.c (3)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2541.patch https://github.com/kamailio/kamailio/pull/2541.diff
@jchavanton pushed 1 commit.
bbcd28d7c0cc7f03b60fdaa4b4e5577b9bc35b64 core: DNS stop resolving NAPTR for IP addresses
@sem32 commented on this pull request.
@@ -3292,6 +3292,9 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name,
} try_lookup_naptr = 1; } + /* check if it's an ip address, dns_srv_sip_resolve will return the right failure */
@jchavanton, can you give an example for your case? I suppose that your check will never work, because we have the same check in line 3279 for first call of dns_naptr_sip_resolve
@jchavanton commented on this pull request.
In the issue I am sharing a simple ACK with an IP in the RURI, I am guessing this is taking place everytime, since there is no NAPTR record for the IP address, maybe you need more than one DNS server or something, I wanted to avoid getting dragged in spending to much time since just by looking at the code I can see we are now accepting to do `dns_get_entry` on IP addresses.
However if this is raising more concerns, I can help to troubleshoot further.
@@ -3292,6 +3292,9 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name,
} try_lookup_naptr = 1; } + /* check if it's an ip address, dns_srv_sip_resolve will return the right failure */
Hi, thanks for having a look.
Since you moved `dns_get_entry` outside of the following check, it can now be executed without checking for IP.
``` if (((h->srv==0) && (h->a==0)) && /* first call */ proto && port && (*proto==0) && (*port==0)){ ```
@sem32 approved this pull request.
Merged #2541 into master.
-
Julien Chavanton -
Semen Darienko