private: make fabrics parts optional in global context

In the first step mark all fabrics parts global context optional. After
all fabrics related functions are clearly identified, it's possible to
move them to the right place later.

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

Author: igaw

libnvme/src/nvme/lib.c

@@ -11,6 +11,12 @@
 #include <libgen.h>
 #include <strings.h>
 
+#ifdef CONFIG_FABRICS
+#include <sys/types.h>
+
+#include <ifaddrs.h>
+#endif
+
 #include <sys/ioctl.h>
 
 #include <libnvme.h>
@@ -72,10 +78,12 @@ __public void libnvme_free_global_ctx(struct libnvme_global_ctx *ctx)
 	if (!ctx)
 		return;
 
+#ifdef CONFIG_FABRICS
 	freeifaddrs(ctx->ifaddrs_cache); /* NULL-safe */
 	ctx->ifaddrs_cache = NULL;
-
 	free(ctx->options);
+#endif
+
 	libnvme_for_each_host_safe(ctx, h, _h)
 		__libnvme_free_host(h);
 	libnvme_mi_for_each_endpoint_safe(ctx, ep, tmp)

libnvme/src/nvme/private.h

@@ -7,7 +7,6 @@
  */
 #pragma once
 
-#include <ifaddrs.h>
 #include <poll.h>
 
 #include <sys/ioctl.h>
@@ -295,8 +294,10 @@ struct libnvme_global_ctx {
 	bool ioctl_probing;
 	bool create_only;
 	bool dry_run;
+#ifdef CONFIG_FABRICS
 	struct libnvme_fabric_options *options;
 	struct ifaddrs *ifaddrs_cache; /* init with libnvme_getifaddrs() */
+#endif
 
 	enum libnvme_io_uring_state uring_state;
 #ifdef CONFIG_LIBURING

libnvme/src/nvme/tree.c

@@ -9,19 +9,23 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <ifaddrs.h>
 #include <libgen.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#ifdef CONFIG_FABRICS
+#include <ifaddrs.h>
+#include <netdb.h>
+
+#include <arpa/inet.h>
+#endif
+
 #include <ccan/endian/endian.h>
 #include <ccan/list/list.h>
 
@@ -1067,18 +1071,21 @@ __public void libnvme_free_ctrl(libnvme_ctrl_t c)
 
 static bool traddr_is_hostname(const char *transport, const char *traddr)
 {
-	char addrstr[NVMF_TRADDR_SIZE];
 
 	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;
 }
 
@@ -1157,6 +1164,7 @@ __public int libnvme_create_ctrl(struct libnvme_global_ctx *ctx,
 	return _libnvme_create_ctrl(ctx, &fctx, cp);
 }
 
+#ifdef CONFIG_FABRICS
 /**
  * _tcp_ctrl_match_host_traddr_no_src_addr() - Match host_traddr w/o src_addr
  * @c:	An existing controller instance
@@ -1383,6 +1391,7 @@ static bool _tcp_match_ctrl(struct libnvme_ctrl *c,
 
 	return true;
 }
+#endif
 
 /**
  * _match_ctrl() - Check if controller matches candidate (non TCP transport)
@@ -1425,6 +1434,7 @@ static bool _match_ctrl(struct libnvme_ctrl *c,
 
 	return true;
 }
+
 /**
  * _candidate_init() - Init candidate and get the matching function
  *
@@ -1469,6 +1479,7 @@ static ctrl_match_t _candidate_init(struct libnvme_global_ctx *ctx,
 		candidate->well_known_nqn = true;
 	}
 
+#ifdef CONFIG_FABRICS
 	if (streq0(fctx->transport, "tcp")) {
 		candidate->iface_list = libnvme_getifaddrs(ctx); /* TCP only */
 		candidate->addreq = libnvme_ipaddrs_eq;
@@ -1479,6 +1490,7 @@ static ctrl_match_t _candidate_init(struct libnvme_global_ctx *ctx,
 		candidate->addreq = libnvme_ipaddrs_eq;
 		return _match_ctrl;
 	}
+#endif
 
 	/* All other transport types */
 	candidate->addreq = streqcase0;

libnvme/src/nvme/util.c

@@ -16,6 +16,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#if defined(HAVE_NETDB) || defined(CONFIG_FABRICS)
+#include <sys/types.h>
+#include <ifaddrs.h>
+#endif
+
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/param.h>
@@ -981,6 +986,7 @@ void *__libnvme_realloc(void *p, size_t len)
 	return result;
 }
 
+#ifdef CONFIG_FABRICS
 const struct ifaddrs *libnvme_getifaddrs(struct libnvme_global_ctx *ctx)
 {
 	if (!ctx->ifaddrs_cache) {
@@ -992,6 +998,7 @@ const struct ifaddrs *libnvme_getifaddrs(struct libnvme_global_ctx *ctx)
 
 	return ctx->ifaddrs_cache;
 }
+#endif
 
 /* This used instead of basename() due to behavioral differences between
  * the POSIX and the GNU version. This is the glibc implementation.