[6.0] a7f46d149 Extract the resolution logic to vss_resolve

[Dridi Boukelmoune]

commit a7f46d149a8ffd20adfb6d2004904b6e6168fed4
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu May 9 10:35:17 2019 +0200

    Extract the resolution logic to vss_resolve
    
    It can now be shared by established callback-based resolvers and the new
    VSS_ResolveOne. This also changes the semantics of VSS_ResolveOne in the
    sense that the port is now a default port, overriden by the address if
    it contains one.
    
    Also make it clear that VTCP was already relying on a VSS function that
    didn't and still doesn't allow a null errp argument, while conversely
    all VTCP_open call sites provide a valid errp argument.

diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index dac5a5840..d0962e5bc 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -110,6 +110,8 @@ client_tcp_connect(struct vtclog *vl, const char *addr, double tmo,
 	int fd;
 	char mabuf[32], mpbuf[32];
 
+	AN(addr);
+	AN(errp);
 	fd = VTCP_open(addr, NULL, tmo, errp);
 	if (fd < 0)
 		return fd;
diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c
index 22f5eb2fe..bd37aadb7 100644
--- a/bin/varnishtest/vtc_haproxy.c
+++ b/bin/varnishtest/vtc_haproxy.c
@@ -120,6 +120,8 @@ haproxy_cli_tcp_connect(struct vtclog *vl, const char *addr, vtim_dur tmo,
 	int fd;
 	char mabuf[32], mpbuf[32];
 
+	AN(addr);
+	AN(errp);
 	fd = VTCP_open(addr, NULL, tmo, errp);
 	if (fd < 0)
 		return fd;
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index ebbdf4f2b..206b5acb3 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -98,6 +98,43 @@ vss_parse(char *str, char **addr, char **port)
 	return (NULL);
 }
 
+static int
+vss_resolve(const char *addr, const char *def_port, int family, int socktype,
+    int flags, struct addrinfo **res, const char **errp)
+{
+	struct addrinfo hints;
+	char *p = NULL, *hp, *pp;
+	int ret;
+
+	AN(addr);
+	AN(res);
+	AZ(*res);
+	AN(errp);
+	*errp = NULL;
+
+	memset(&hints, 0, sizeof hints);
+	hints.ai_family = family;
+	hints.ai_socktype = socktype;
+	hints.ai_flags = flags;
+
+	p = strdup(addr);
+	AN(p);
+	*errp = vss_parse(p, &hp, &pp);
+	if (*errp != NULL) {
+		free(p);
+		return (-1);
+	}
+	if (pp != NULL)
+		def_port = pp;
+	ret = getaddrinfo(hp, def_port, &hints, res);
+	free(p);
+
+	if (ret != 0)
+		*errp = gai_strerror(ret);
+
+	return (ret);
+}
+
 /*
  * Look up an address, using a default port if provided, and call
  * the callback function with the suckaddrs we find.
@@ -107,34 +144,21 @@ vss_parse(char *str, char **addr, char **port)
 
 int
 VSS_resolver_socktype(const char *addr, const char *def_port,
-    vss_resolved_f *func, void *priv, const char **err, int socktype)
+    vss_resolved_f *func, void *priv, const char **errp, int socktype)
 {
-	struct addrinfo hints, *res0, *res;
+	struct addrinfo *res0 = NULL, *res;
 	struct suckaddr *vsa;
-	char *h;
-	char *adp, *hop;
 	int ret;
 
-	*err = NULL;
-	h = strdup(addr);
-	AN(h);
-	*err = vss_parse(h, &hop, &adp);
-	if (*err != NULL) {
-		free(h);
-		return (-1);
-	}
-	if (adp != NULL)
-		def_port = adp;
+	AN(addr);
+	AN(func);
+	AN(errp);
 
-	memset(&hints, 0, sizeof hints);
-	hints.ai_socktype = socktype;
-	hints.ai_flags = AI_PASSIVE;
-	ret = getaddrinfo(hop, def_port, &hints, &res0);
-	free(h);
-	if (ret != 0) {
-		*err = gai_strerror(ret);
+	ret = vss_resolve(addr, def_port, AF_UNSPEC, socktype, AI_PASSIVE,
+	    &res0, errp);
+	if (ret != 0)
 		return (-1);
-	}
+
 	for (res = res0; res != NULL; res = res->ai_next) {
 		vsa = VSA_Malloc(res->ai_addr, res->ai_addrlen);
 		if (vsa != NULL) {
@@ -150,40 +174,25 @@ VSS_resolver_socktype(const char *addr, const char *def_port,
 
 int
 VSS_resolver(const char *addr, const char *def_port, vss_resolved_f *func,
-    void *priv, const char **err)
+    void *priv, const char **errp)
 {
 	return (VSS_resolver_socktype(
-	    addr, def_port, func, priv, err, SOCK_STREAM));
+	    addr, def_port, func, priv, errp, SOCK_STREAM));
 }
 
 struct suckaddr *
-VSS_ResolveOne(void *dst, const char *addr, const char *port,
+VSS_ResolveOne(void *dst, const char *addr, const char *def_port,
     int family, int socktype, int flags)
 {
-	struct addrinfo hints, *res = NULL;
+	struct addrinfo *res = NULL;
 	struct suckaddr *retval = NULL;
-	char *p = NULL, *hp, *pp;
-	int error;
-
-	memset(&hints, 0, sizeof hints);
-	hints.ai_family = family;
-	hints.ai_socktype = socktype;
-	hints.ai_flags = flags;
+	const char *err;
+	int ret;
 
 	AN(addr);
-	if (port != NULL) {
-		error = getaddrinfo(addr, port, &hints, &res);
-	} else {
-		p = strdup(addr);
-		AN(p);
-		if (vss_parse(p, &hp, &pp) != NULL || pp == NULL) {
-			free(p);
-			return (NULL);
-		}
-		error = getaddrinfo(hp, pp, &hints, &res);
-		free(p);
-	}
-	if (!error && res != NULL && res->ai_next == NULL) {
+	ret = vss_resolve(addr, def_port, family, socktype, flags, &res, &err);
+	if (ret == 0 && res != NULL && res->ai_next == NULL) {
+		AZ(err);
 		if (dst == NULL)
 			retval = VSA_Malloc(res->ai_addr, res->ai_addrlen);
 		else
diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c
index 00f7f63af..696753b00 100644
--- a/lib/libvarnish/vtcp.c
+++ b/lib/libvarnish/vtcp.c
@@ -381,20 +381,12 @@ int
 VTCP_open(const char *addr, const char *def_port, vtim_dur timeout,
     const char **errp)
 {
-	int error;
-	const char *err;
 
-	if (errp != NULL)
-		*errp = NULL;
+	AN(errp);
 	assert(timeout >= 0);
-	error = VSS_resolver(addr, def_port, vtcp_open_callback,
-	    &timeout, &err);
-	if (err != NULL) {
-		if (errp != NULL)
-			*errp = err;
-		return (-1);
-	}
-	return (error);
+
+	return (VSS_resolver(addr, def_port, vtcp_open_callback,
+	    &timeout, errp));
 }
 
 /*--------------------------------------------------------------------
@@ -513,6 +505,7 @@ VTCP_listen_on(const char *addr, const char *def_port, int depth,
 	struct helper h;
 	int sock;
 
+	AN(errp);
 	h.depth = depth;
 	h.errp = errp;