fabrics: use uuid from hostnqn for hostid

In the case the configuration only provides an hostnqn which is using
the second valid format, extract the uuid from it and set the hostid
explicitly.

Extract hostid from the hostnqn when at the place we set the values
instead at build_option time, where the context is lost.

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

Author: igaw

libnvme/src/nvme/fabrics.c

@@ -274,11 +274,28 @@ __public int nvmf_context_set_connection(struct nvmf_context *fctx,
 	return 0;
 }
 
+static const char *hostid_from_hostnqn(const char *hostnqn)
+{
+	const char *match;
+
+	if (!hostnqn)
+		return NULL;
+
+	match = strstr(hostnqn, "uuid:");
+	if (!match)
+		return NULL;
+
+	return match + strlen("uuid:");
+}
+
 __public int nvmf_context_set_hostnqn(struct nvmf_context *fctx,
 		const char *hostnqn, const char *hostid)
 {
 	fctx->hostnqn = hostnqn;
-	fctx->hostid = hostid;
+	if (!hostid)
+		fctx->hostid = hostid_from_hostnqn(hostnqn);
+	else
+		fctx->hostid = hostid;
 
 	return 0;
 }

libnvme/src/nvme/tree.c

@@ -631,8 +631,10 @@ static int nvme_create_host(struct nvme_global_ctx *ctx, const char *hostnqn,
 		return -ENOMEM;
 
 	h->hostnqn = strdup(hostnqn);
-	if (hostid)
-		h->hostid = strdup(hostid);
+	if (!hostid)
+		h->hostid = nvme_hostid_from_hostnqn(hostnqn);
+	else
+ 		h->hostid = strdup(hostid);
 	list_head_init(&h->subsystems);
 	list_node_init(&h->entry);
 	h->ctx = ctx;