refactor fabrics: move discovery and connect logic code to the library

fabrics.h

@@ -2,28 +2,12 @@
 #ifndef _FABRICS_H
 #define _FABRICS_H
 
-struct tr_config {
-	const char *subsysnqn;
-	const char *transport;
-	const char *traddr;
-	const char *host_traddr;
-	const char *host_iface;
-	const char *trsvcid;
-};
-
-extern nvme_ctrl_t lookup_ctrl(nvme_host_t h, struct tr_config *trcfg);
-extern int nvmf_discover(const char *desc, int argc, char **argv, bool connect);
-extern int nvmf_connect(const char *desc, int argc, char **argv);
-extern int nvmf_disconnect(const char *desc, int argc, char **argv);
-extern int nvmf_disconnect_all(const char *desc, int argc, char **argv);
-extern int nvmf_config(const char *desc, int argc, char **argv);
-extern int nvmf_dim(const char *desc, int argc, char **argv);
-extern int nvmf_create_discover_ctrl(struct nvme_global_ctx *ctx, nvme_host_t h,
-				     struct nvme_fabrics_config *cfg,
-				     struct tr_config *trcfg,
-				     nvme_ctrl_t *ctrl);
-extern char *nvmf_get_default_trsvcid(const char *transport,
-				      bool discovery_ctrl);
+int fabrics_discovery(const char *desc, int argc, char **argv, bool connect);
+int fabrics_connect(const char *desc, int argc, char **argv);
+int fabrics_disconnect(const char *desc, int argc, char **argv);
+int fabrics_disconnect_all(const char *desc, int argc, char **argv);
+int fabrics_config(const char *desc, int argc, char **argv);
+int fabrics_dim(const char *desc, int argc, char **argv);
 
 
 #endif

libnvme/libnvme/nvme.i

@@ -110,14 +110,6 @@ PyObject *hostid_from_file();
 	temp.tos = -1;
 	temp.ctrl_loss_tmo = NVMF_DEF_CTRL_LOSS_TMO;
 	while (PyDict_Next($input, &pos, &key, &value)) {
-		if (!PyUnicode_CompareWithASCIIString(key, "host_traddr")) {
-			temp.host_traddr = PyBytes_AsString(value);
-			continue;
-		}
-		if (!PyUnicode_CompareWithASCIIString(key, "host_iface")) {
-			temp.host_iface = PyBytes_AsString(value);
-			continue;
-		}
 		if (!PyUnicode_CompareWithASCIIString(key, "nr_io_queues")) {
 			temp.nr_io_queues = PyLong_AsLong(value);
 			continue;

libnvme/src/libnvme.map

@@ -247,6 +247,7 @@ LIBNVME_2_0 {
 		nvme_skip_namespaces;
 		nvme_status_to_errno;
 		nvme_status_to_string;
+		nvme_strerror;
 		nvme_submit_admin_passthru;
 		nvme_submit_io_passthru;
 		nvme_subsys_filter;
@@ -287,11 +288,52 @@ LIBNVME_2_0 {
 		nvmf_add_ctrl;
 		nvmf_adrfam_str;
 		nvmf_cms_str;
+		nvmf_connect;
+		nvmf_connect_config_json;
 		nvmf_connect_ctrl;
-		nvmf_connect_disc_entry;
+		nvmf_context_create;
+		nvmf_context_set_connection;
+		nvmf_context_set_crypto;
+		nvmf_context_set_device;
+		nvmf_context_set_discovery_cbs;
+		nvmf_context_set_discovery_defaults;
+		nvmf_context_set_fabrics_config;
+		nvmf_context_set_hostnqn;
+		nvmf_context_set_persistent;
 		nvmf_default_config;
+		nvmf_discovery;
+		nvmf_discovery_config_file;
+		nvmf_discovery_config_json;
+		nvmf_discovery_ctx_already_connected_set;
+		nvmf_discovery_ctx_connected_set;
+		nvmf_discovery_ctx_create;
+		nvmf_discovery_ctx_ctrlkey_set;
+		nvmf_discovery_ctx_decide_retry_set;
+		nvmf_discovery_ctx_default_fabrics_config_set;
+		nvmf_discovery_ctx_device_set;
+		nvmf_discovery_ctx_discovery_log_set;
+		nvmf_discovery_ctx_host_iface_set;
+		nvmf_discovery_ctx_host_traddr_set;
+		nvmf_discovery_ctx_hostid_set;
+		nvmf_discovery_ctx_hostkey_set;
+		nvmf_discovery_ctx_hostnqn_set;
+		nvmf_discovery_ctx_keep_alive_timeout;
+		nvmf_discovery_ctx_keyring_set;
+		nvmf_discovery_ctx_max_retries;
+		nvmf_discovery_ctx_parser_cleanup_set;
+		nvmf_discovery_ctx_parser_init_set;
+		nvmf_discovery_ctx_parser_next_line_set;
+		nvmf_discovery_ctx_persistent_set;
+		nvmf_discovery_ctx_subsysnqn_set;
+		nvmf_discovery_ctx_tls_key_identity_set;
+		nvmf_discovery_ctx_tls_key_set;
+		nvmf_discovery_ctx_traddr_set;
+		nvmf_discovery_ctx_transport_set;
+		nvmf_discovery_ctx_trsvcid_set;
+		nvmf_discovery_nbft;
 		nvmf_eflags_str;
 		nvmf_exat_ptr_next;
+		nvmf_get_default_trsvcid;
 		nvmf_get_discovery_log;
 		nvmf_get_discovery_wargs;
 		nvmf_hostid_from_file;
@@ -300,6 +342,8 @@ LIBNVME_2_0 {
 		nvmf_hostnqn_generate;
 		nvmf_hostnqn_generate_from_hostid;
 		nvmf_is_registration_supported;
+		nvmf_nbft_free;
+		nvmf_nbft_read_files;
 		nvmf_prtype_str;
 		nvmf_qptype_str;
 		nvmf_register_ctrl;

libnvme/src/nvme/cleanup.h

@@ -10,6 +10,8 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
+#include "fabrics.h"
+
 #define __cleanup__(fn) __attribute__((cleanup(fn)))
 
 #define DECLARE_CLEANUP_FUNC(name, type) \
@@ -44,4 +46,11 @@ static inline void cleanup_fd(int *fd)
 static inline DEFINE_CLEANUP_FUNC(cleanup_addrinfo, struct addrinfo *, freeaddrinfo)
 #define _cleanup_addrinfo_ __cleanup__(cleanup_addrinfo)
 
+static inline void free_uri(struct nvme_fabrics_uri **uri)
+{
+	if (*uri)
+		nvme_free_uri(*uri);
+}
+#define _cleanup_uri_ __cleanup__(free_uri)
+
 #endif