summaryrefslogtreecommitdiffstats
path: root/fabrics.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-08-15 12:32:15 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-08-15 12:32:15 +0000
commitfd268d35cbddff04fc0b27a8af2c97185c8a97ba (patch)
tree9c180a60597c0c8cb9eebc7c1c6841787c856f42 /fabrics.c
parentReleasing debian version 2.1~rc0-1. (diff)
downloadnvme-cli-fd268d35cbddff04fc0b27a8af2c97185c8a97ba.tar.xz
nvme-cli-fd268d35cbddff04fc0b27a8af2c97185c8a97ba.zip
Merging upstream version 2.1.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--fabrics.c29
1 files changed, 23 insertions, 6 deletions
diff --git a/fabrics.c b/fabrics.c
index 58a7c31..43ca5f4 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -90,7 +90,6 @@ static const char *nvmf_config_file = "Use specified JSON configuration file or
OPT_STRING("hostid", 'I', "STR", &hostid, nvmf_hostid), \
OPT_STRING("nqn", 'n', "STR", &subsysnqn, nvmf_nqn), \
OPT_STRING("dhchap-secret", 'S', "STR", &hostkey, nvmf_hostkey), \
- OPT_STRING("dhchap-ctrl-secret", 'C', "STR", &ctrlkey, nvmf_ctrlkey), \
OPT_INT("nr-io-queues", 'i', &c.nr_io_queues, nvmf_nr_io_queues), \
OPT_INT("nr-write-queues", 'W', &c.nr_write_queues, nvmf_nr_write_queues),\
OPT_INT("nr-poll-queues", 'P', &c.nr_poll_queues, nvmf_nr_poll_queues), \
@@ -506,7 +505,7 @@ static int discover_from_conf_file(nvme_root_t r, nvme_host_t h,
const struct nvme_fabrics_config *defcfg)
{
char *transport = NULL, *traddr = NULL, *trsvcid = NULL;
- char *hostnqn = NULL, *hostid = NULL, *hostkey = NULL, *ctrlkey = NULL;
+ char *hostnqn = NULL, *hostid = NULL, *hostkey = NULL;
char *subsysnqn = NULL;
char *ptr, **argv, *p, line[4096];
int argc, ret = 0;
@@ -611,7 +610,7 @@ out:
int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
{
char *subsysnqn = NVME_DISC_SUBSYS_NAME;
- char *hostnqn = NULL, *hostid = NULL, *hostkey = NULL, *ctrlkey = NULL;
+ char *hostnqn = NULL, *hostid = NULL, *hostkey = NULL;
char *transport = NULL, *traddr = NULL, *trsvcid = NULL;
char *config_file = PATH_NVMF_CONFIG;
char *hnqn = NULL, *hid = NULL;
@@ -796,6 +795,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
OPT_ARGS(opts) = {
NVMF_OPTS(cfg),
+ OPT_STRING("dhchap-ctrl-secret", 'C', "STR", &ctrlkey, nvmf_ctrlkey),
OPT_STRING("config", 'J', "FILE", &config_file, nvmf_config_file),
OPT_INCR("verbose", 'v', &verbose, "Increase logging verbosity"),
OPT_FLAG("dump-config", 'O', &dump_config, "Dump JSON configuration to stdout"),
@@ -903,6 +903,23 @@ out_free:
return errno;
}
+static nvme_ctrl_t lookup_nvme_ctrl(nvme_root_t r, const char *name)
+{
+ nvme_host_t h;
+ nvme_subsystem_t s;
+ nvme_ctrl_t c;
+
+ nvme_for_each_host(r, h) {
+ nvme_for_each_subsystem(h, s) {
+ nvme_subsystem_for_each_ctrl(s, c) {
+ if (!strcmp(nvme_ctrl_get_name(c), name))
+ return c;
+ }
+ }
+ }
+ return NULL;
+}
+
int nvmf_disconnect(const char *desc, int argc, char **argv)
{
const char *device = "nvme device handle";
@@ -980,11 +997,10 @@ int nvmf_disconnect(const char *desc, int argc, char **argv)
while ((p = strsep(&d, ",")) != NULL) {
if (!strncmp(p, "/dev/", 5))
p += 5;
- c = nvme_scan_ctrl(r, p);
+ c = lookup_nvme_ctrl(r, p);
if (!c) {
fprintf(stderr,
- "Did not find device %s: %s\n",
- p, nvme_strerror(errno));
+ "Did not find device %s\n", p);
nvme_free_tree(r);
return errno;
}
@@ -1077,6 +1093,7 @@ int nvmf_config(const char *desc, int argc, char **argv)
OPT_ARGS(opts) = {
NVMF_OPTS(cfg),
+ OPT_STRING("dhchap-ctrl-secret", 'C', "STR", &ctrlkey, nvmf_ctrlkey),
OPT_STRING("config", 'J', "FILE", &config_file, nvmf_config_file),
OPT_INCR("verbose", 'v', &verbose, "Increase logging verbosity"),
OPT_FLAG("scan", 'R', &scan_tree, "Scan current NVMeoF topology"),