summaryrefslogtreecommitdiff
path: root/lib/asyn-ares.c
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2020-01-06 12:56:44 +0100
committerMarcel Raad <Marcel.Raad@teamviewer.com>2020-01-10 17:57:16 +0100
commit875314ed0bf3b7c156e8762f30e1a2c11fb301ba (patch)
tree7bef5ef432dd5cd66f35d68b452e4e59a8301ea8 /lib/asyn-ares.c
parent062eaa63b57fb30d893ee718015eae277ec5e300 (diff)
downloadcurl-875314ed0bf3b7c156e8762f30e1a2c11fb301ba.tar.gz
hostip: move code to resolve IP address literals to `Curl_resolv`
The code was duplicated in the various resolver backends. Also, it was called after the call to `Curl_ipvalid`, which matters in case of `CURLRES_IPV4` when called from `connect.c:bindlocal`. This caused test 1048 to fail on classic MinGW. The code ignores `conn->ip_version` as done previously in the individual resolver backends. Move the call to the `resolver_start` callback up to appease test 655, which wants it to be called also for literal addresses. Closes https://github.com/curl/curl/pull/4798
Diffstat (limited to 'lib/asyn-ares.c')
-rw-r--r--lib/asyn-ares.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 835cfa48f..afa039c6b 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -626,26 +626,11 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn,
{
char *bufp;
struct Curl_easy *data = conn->data;
- struct in_addr in;
int family = PF_INET;
-#ifdef ENABLE_IPV6 /* CURLRES_IPV6 */
- struct in6_addr in6;
-#endif /* CURLRES_IPV6 */
*waitp = 0; /* default to synchronous response */
- /* First check if this is an IPv4 address string */
- if(Curl_inet_pton(AF_INET, hostname, &in) > 0) {
- /* This is a dotted IP address 123.123.123.123-style */
- return Curl_ip2addr(AF_INET, &in, hostname, port);
- }
-
#ifdef ENABLE_IPV6 /* CURLRES_IPV6 */
- /* Otherwise, check if this is an IPv6 address string */
- if(Curl_inet_pton (AF_INET6, hostname, &in6) > 0)
- /* This must be an IPv6 address literal. */
- return Curl_ip2addr(AF_INET6, &in6, hostname, port);
-
switch(conn->ip_version) {
default:
#if ARES_VERSION >= 0x010601