Merge hostname2traddr()

For some reason we have two versions of hostname2traddr().

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

src/nvme/fabrics.c

@@ -371,49 +371,6 @@ static bool traddr_is_hostname(nvme_ctrl_t c)
 	return true;
 }
 
-static int hostname2traddr(nvme_ctrl_t c)
-{
-	struct addrinfo *host_info, hints = {.ai_family = AF_UNSPEC};
-	char addrstr[NVMF_TRADDR_SIZE];
-	const char *p;
-	int ret;
-
-	ret = getaddrinfo(c->traddr, NULL, &hints, &host_info);
-	if (ret) {
-		nvme_msg(LOG_ERR, "failed to resolve host %s info\n", c->traddr);
-		return -ENVME_CONNECT_RESOLVE;
-	}
-
-	switch (host_info->ai_family) {
-	case AF_INET:
-		p = inet_ntop(host_info->ai_family,
-			&(((struct sockaddr_in *)host_info->ai_addr)->sin_addr),
-			addrstr, NVMF_TRADDR_SIZE);
-		break;
-	case AF_INET6:
-		p = inet_ntop(host_info->ai_family,
-			&(((struct sockaddr_in6 *)host_info->ai_addr)->sin6_addr),
-			addrstr, NVMF_TRADDR_SIZE);
-		break;
-	default:
-		nvme_msg(LOG_ERR, "unrecognized address family (%d) %s\n",
-			host_info->ai_family, c->traddr);
-		ret = -ENVME_CONNECT_ADDRFAM;
-		goto free_addrinfo;
-	}
-
-	if (!p) {
-		nvme_msg(LOG_ERR, "failed to get traddr for %s\n", c->traddr);
-		ret = -ENVME_CONNECT_TRADDR;
-		goto free_addrinfo;
-	}
-	c->traddr = strdup(addrstr);
-
-free_addrinfo:
-	freeaddrinfo(host_info);
-	return ret;
-}
-
 static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
 {
 	struct nvme_fabrics_config *cfg = nvme_ctrl_get_config(c);
@@ -562,11 +519,15 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 	cfg = merge_config(c, cfg);
 	nvme_ctrl_set_discovered(c, true);
 	if (traddr_is_hostname(c)) {
-		ret = hostname2traddr(c);
-		if (ret) {
-			errno = -ret;
+		const char *traddr = c->traddr;
+
+		c->traddr = hostname2traddr(traddr);
+		if (!c->traddr) {
+			c->traddr = (char *)traddr;
+			errno = ENVME_CONNECT_TRADDR;
 			return -1;
 		}
+		free(c->traddr);
 	}
 
 	ret = build_options(h, c, &argstr);

src/nvme/tree.c

@@ -904,49 +904,6 @@ static bool traddr_is_hostname(const char *transport, const char *traddr)
 	return true;
 }
 
-void hostname2traddr(nvme_ctrl_t c, const char *host_traddr)
-{
-	struct addrinfo *host_info, hints = {.ai_family = AF_UNSPEC};
-	char addrstr[NVMF_TRADDR_SIZE];
-	const char *p;
-	int ret;
-
-	ret = getaddrinfo(host_traddr, NULL, &hints, &host_info);
-	if (ret) {
-		nvme_msg(LOG_DEBUG, "failed to resolve host %s info\n",
-			 host_traddr);
-		c->cfg.host_traddr = strdup(host_traddr);
-		return;
-	}
-
-	switch (host_info->ai_family) {
-	case AF_INET:
-		p = inet_ntop(host_info->ai_family,
-			&(((struct sockaddr_in *)host_info->ai_addr)->sin_addr),
-			addrstr, NVMF_TRADDR_SIZE);
-		break;
-	case AF_INET6:
-		p = inet_ntop(host_info->ai_family,
-			&(((struct sockaddr_in6 *)host_info->ai_addr)->sin6_addr),
-			addrstr, NVMF_TRADDR_SIZE);
-		break;
-	default:
-		nvme_msg(LOG_DEBUG, "unrecognized address family (%d) %s\n",
-			 host_info->ai_family, c->traddr);
-		c->cfg.host_traddr = strdup(host_traddr);
-		goto free_addrinfo;
-	}
-	if (!p) {
-		nvme_msg(LOG_DEBUG, "failed to get traddr for %s\n",
-			 c->traddr);
-		c->cfg.host_traddr = strdup(host_traddr);
-	} else
-		c->cfg.host_traddr = strdup(addrstr);
-
-free_addrinfo:
-	freeaddrinfo(host_info);
-}
-
 struct nvme_ctrl *nvme_create_ctrl(const char *subsysnqn, const char *transport,
 				   const char *traddr, const char *host_traddr,
 				   const char *host_iface, const char *trsvcid)
@@ -987,8 +944,8 @@ struct nvme_ctrl *nvme_create_ctrl(const char *subsysnqn, const char *transport,
 		c->traddr = strdup(traddr);
 	if (host_traddr) {
 		if (traddr_is_hostname(transport, host_traddr))
-			hostname2traddr(c, host_traddr);
-		else
+			c->cfg.host_traddr = hostname2traddr(host_traddr);
+		if (!c->cfg.host_traddr)
 			c->cfg.host_traddr = strdup(host_traddr);
 	}
 	if (host_iface)

src/nvme/util.c

@@ -11,11 +11,13 @@
 #include <errno.h>
 
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 
 #include <ccan/endian/endian.h>
 
 #include "util.h"
-
+#include "log.h"
 static inline __u8 nvme_generic_status_to_errno(__u16 status)
 {
 	switch (status) {
@@ -500,3 +502,47 @@ const char *nvme_errno_to_string(int status)
 
 	return s;
 }
+
+char *hostname2traddr(const char *traddr)
+{
+	struct addrinfo *host_info, hints = {.ai_family = AF_UNSPEC};
+	char addrstr[NVMF_TRADDR_SIZE];
+	const char *p;
+	char *ret_traddr = NULL;
+	int ret;
+
+	ret = getaddrinfo(traddr, NULL, &hints, &host_info);
+	if (ret) {
+		nvme_msg(LOG_ERR, "failed to resolve host %s info\n",
+			 traddr);
+		return NULL;
+	}
+
+	switch (host_info->ai_family) {
+	case AF_INET:
+		p = inet_ntop(host_info->ai_family,
+			&(((struct sockaddr_in *)host_info->ai_addr)->sin_addr),
+			addrstr, NVMF_TRADDR_SIZE);
+		break;
+	case AF_INET6:
+		p = inet_ntop(host_info->ai_family,
+			&(((struct sockaddr_in6 *)host_info->ai_addr)->sin6_addr),
+			addrstr, NVMF_TRADDR_SIZE);
+		break;
+	default:
+		nvme_msg(LOG_ERR, "unrecognized address family (%d) %s\n",
+			 host_info->ai_family, traddr);
+		goto free_addrinfo;
+	}
+
+	if (!p) {
+		nvme_msg(LOG_ERR, "failed to get traddr for %s\n",
+			 traddr);
+		goto free_addrinfo;
+	}
+	ret_traddr = strdup(addrstr);
+
+free_addrinfo:
+	freeaddrinfo(host_info);
+	return ret_traddr;
+}

src/nvme/util.h

@@ -391,4 +391,6 @@ static inline void nvme_id_ns_flbas_to_lbaf_inuse(__u8 flbas, __u8 *lbaf_inuse)
 	*lbaf_inuse = (((flbas & NVME_NS_FLBAS_HIGHER_MASK) >> 1) \
 		| (flbas & NVME_NS_FLBAS_LOWER_MASK));
 }
+
+char *hostname2traddr(const char *traddr);
 #endif /* _LIBNVME_UTIL_H */