tree: use traddr_is_hostname from fabrics

This function exists in two files with slightly different
implementations. Use a single shared implementation instead.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/meson.build

@@ -50,6 +50,10 @@ if want_fabrics
         'nvme/nbft.h',
         'nvme/accessors-fabrics.h',
     ]
+else
+    sources += [
+        'nvme/no-fabrics.c',
+    ]
 endif
 
 if want_mi

libnvme/src/nvme/fabrics.c

@@ -714,16 +714,21 @@ static int inet_pton_with_scope(struct libnvme_global_ctx *ctx, int af,
 	return ret;
 }
 
-static bool traddr_is_hostname(struct libnvme_global_ctx *ctx, libnvme_ctrl_t c)
+bool traddr_is_hostname(struct libnvme_global_ctx *ctx,
+		const char *transport, const char *traddr)
 {
 	struct sockaddr_storage addr;
 
-	if (!c->traddr)
+	if (!traddr || !transport)
 		return false;
-	if (strcmp(c->transport, "tcp") && strcmp(c->transport, "rdma"))
+	if (!strcmp(traddr, "none"))
 		return false;
-	if (inet_pton_with_scope(ctx, AF_UNSPEC, c->traddr, c->trsvcid, &addr) == 0)
+	if (strcmp(transport, "tcp") && strcmp(transport, "rdma"))
 		return false;
+	if (inet_pton_with_scope(ctx, AF_UNSPEC,
+			traddr, NULL, &addr) == 0)  /* scope-aware */
+		return false;
+
 	return true;
 }
 
@@ -1115,7 +1120,7 @@ __public int libnvmf_add_ctrl(libnvme_host_t h, libnvme_ctrl_t c,
 	}
 
 	libnvme_ctrl_set_discovered(c, true);
-	if (traddr_is_hostname(h->ctx, c)) {
+	if (traddr_is_hostname(h->ctx, c->transport, c->traddr)) {
 		char *traddr = c->traddr;
 
 		if (hostname2traddr(h->ctx, traddr, &c->traddr)) {

libnvme/src/nvme/no-fabrics.c

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ * This file is part of libnvme.
+ * Copyright (c) 2026 SUSE Software Solutions
+ *
+ * Authors: Daniel Wagner <[email protected]>
+ */
+
+#include "private-fabrics.h"
+
+bool traddr_is_hostname(struct libnvme_global_ctx *ctx,
+		const char *transport, const char *traddr)
+{
+	return false;
+}

libnvme/src/nvme/private-fabrics.h

@@ -22,3 +22,6 @@ struct libnvmf_discovery_args { /*!generate-accessors*/
 	int max_retries;
 	__u8 lsp;
 };
+
+bool traddr_is_hostname(struct libnvme_global_ctx *ctx,
+		const char *transport, const char *traddr);

libnvme/src/nvme/tree.c

@@ -34,6 +34,7 @@
 #include "cleanup.h"
 #include "cleanup-linux.h"
 #include "private.h"
+#include "private-fabrics.h"
 #include "util.h"
 #include "compiler-attributes.h"
 
@@ -1069,26 +1070,6 @@ __public void libnvme_free_ctrl(libnvme_ctrl_t c)
 	__libnvme_free_ctrl(c);
 }
 
-static bool traddr_is_hostname(const char *transport, const char *traddr)
-{
-
-	if (!traddr || !transport)
-		return false;
-	if (!strcmp(traddr, "none"))
-		return false;
-#ifdef CONFIG_FABRICS
-	char addrstr[NVMF_TRADDR_SIZE];
-
-	if (strcmp(transport, "tcp") &&
-	    strcmp(transport, "rdma"))
-		return false;
-	if (inet_pton(AF_INET, traddr, addrstr) > 0 ||
-	    inet_pton(AF_INET6, traddr, addrstr) > 0)
-		return false;
-#endif
-	return true;
-}
-
 __public void libnvmf_default_config(struct libnvme_fabrics_config *cfg)
 {
 	memset(cfg, 0, sizeof(*cfg));
@@ -1131,7 +1112,7 @@ int _libnvme_create_ctrl(struct libnvme_global_ctx *ctx,
 	if (fctx->traddr)
 		c->traddr = strdup(fctx->traddr);
 	if (fctx->host_traddr) {
-		if (traddr_is_hostname(fctx->transport, fctx->host_traddr))
+		if (traddr_is_hostname(ctx, fctx->transport, fctx->host_traddr))
 			hostname2traddr(ctx, fctx->host_traddr,
 					&c->host_traddr);
 		if (!c->host_traddr)