admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update iscsi-ls and iscsi-inq

Browse Source 
to take the URLs in the form
iscsi://<host>[:<port>]
and
iscsi://<host>[:<port>]/<target-iqn>/<lun>

instead of specifying the values as --portal/--target/--lun
This commit is contained in:
Ronnie Sahlberg
2010-12-05 08:57:10 +11:00
parent b76c7acb25
commit 32b39f62bd
2 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/iscsi-inq.c
View File

@@ -155,17 +155,17 @@ int main(int argc, const char *argv[])
{ {
poptContext pc; poptContext pc;
struct iscsi_context *iscsi; struct iscsi_context *iscsi;
const char **extra_argv;
int extra_argc = 0;
char *portal = NULL; char *portal = NULL;
char *target = NULL; char *target = NULL;
int lun = -1, evpd = 0, pagecode = 0; char *lun = NULL;
int evpd = 0, pagecode = 0;
int res; int res;
struct poptOption popt_options[] = { struct poptOption popt_options[] = {
POPT_AUTOHELP POPT_AUTOHELP
{ "initiator-name", 'i', POPT_ARG_STRING, &initiator, 0, "Initiatorname to use", "iqn-name" }, { "initiator-name", 'i', POPT_ARG_STRING, &initiator, 0, "Initiatorname to use", "iqn-name" },
{ "portal", 'p', POPT_ARG_STRING, &portal, 0, "Target portal", "address[:port]" },
{ "target", 't', POPT_ARG_STRING, &target, 0, "Target name", "iqn-name" },
{ "lun", 'l', POPT_ARG_INT, &lun, 0, "LUN", "integer" },
{ "evpd", 'e', POPT_ARG_INT, &evpd, 0, "evpd", "integer" }, { "evpd", 'e', POPT_ARG_INT, &evpd, 0, "evpd", "integer" },
{ "pagecode", 'c', POPT_ARG_INT, &pagecode, 0, "page code", "integer" }, { "pagecode", 'c', POPT_ARG_INT, &pagecode, 0, "page code", "integer" },
POPT_TABLEEND POPT_TABLEEND
@@ -177,22 +177,43 @@ int main(int argc, const char *argv[])
poptBadOption(pc, 0), poptStrerror(res)); poptBadOption(pc, 0), poptStrerror(res));
exit(10); exit(10);
} }
extra_argv = poptGetArgs(pc);
if (extra_argv) {
portal = strdup(*extra_argv);
extra_argv++;
while (extra_argv[extra_argc]) {
extra_argc++;
}
}
poptFreeContext(pc); poptFreeContext(pc);
if (portal == NULL) { if (portal == NULL) {
fprintf(stderr, "You must specify target portal\n"); fprintf(stderr, "You must specify target portal\n");
fprintf(stderr, "%s [options] iscsi://<host>[:<port>]/<target-iqn>/<lun>\n", argv[0]);
exit(10); exit(10);
} }
if (strncmp(portal, "iscsi://", 8)) {
fprintf(stderr, "Incorrect portal specified\n");
fprintf(stderr, "Portal is specified as \"iscsi://<host>[:<port>]/<target-iqn>/<lun>\"\n");
exit(10);
}
portal += 8;
target = index(portal, '/');
if (target == NULL) { if (target == NULL) {
fprintf(stderr, "You must specify target name\n"); fprintf(stderr, "You must specify target-iqn name\n");
fprintf(stderr, "Portal is specified as \"iscsi://<host>[:<port>]/<target-iqn>/<lun>\"\n");
exit(10); exit(10);
} }
*target++ = 0;
if (lun == -1) { lun = index(target, '/');
fprintf(stderr, "You must specify LUN\n"); if (lun == NULL) {
fprintf(stderr, "You must specify target-iqn name\n");
fprintf(stderr, "Portal is specified as \"iscsi://<host>[:<port>]/<target-iqn>/<lun>\"\n");
exit(10); exit(10);
} }
*lun++ = 0;
iscsi = iscsi_create_context(initiator); iscsi = iscsi_create_context(initiator);
if (iscsi == NULL) { if (iscsi == NULL) {
@@ -204,12 +225,12 @@ int main(int argc, const char *argv[])
iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL); iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL);
iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C); iscsi_set_header_digest(iscsi, ISCSI_HEADER_DIGEST_NONE_CRC32C);
if (iscsi_full_connect_sync(iscsi, portal, lun) != 0) { if (iscsi_full_connect_sync(iscsi, portal, atoi(lun)) != 0) {
fprintf(stderr, "Failed to log in to target %s\n", iscsi_get_error(iscsi)); fprintf(stderr, "Failed to log in to target %s\n", iscsi_get_error(iscsi));
exit(10); exit(10);
} }
do_inquiry(iscsi, lun, evpd, pagecode); do_inquiry(iscsi, atoi(lun), evpd, pagecode);
iscsi_logout_sync(iscsi); iscsi_logout_sync(iscsi);
iscsi_destroy_context(iscsi); iscsi_destroy_context(iscsi);

20
src/iscsi-ls.c
View File

@@ -267,6 +267,8 @@ int main(int argc, const char *argv[])
{ {
struct iscsi_context *iscsi; struct iscsi_context *iscsi;
struct client_state state; struct client_state state;
const char **extra_argv;
int extra_argc = 0;
char *portal = NULL; char *portal = NULL;
poptContext pc; poptContext pc;
int res; int res;
@@ -274,7 +276,6 @@ int main(int argc, const char *argv[])
struct poptOption popt_options[] = { struct poptOption popt_options[] = {
POPT_AUTOHELP POPT_AUTOHELP
{ "initiator-name", 'i', POPT_ARG_STRING, &initiator, 0, "Initiatorname to use", "iqn-name" }, { "initiator-name", 'i', POPT_ARG_STRING, &initiator, 0, "Initiatorname to use", "iqn-name" },
{ "portal", 'p', POPT_ARG_STRING, &portal, 0, "Target portal", "address[:port]" },
{ "show-luns", 's', POPT_ARG_NONE, &showluns, 0, "Show the luns for each target", NULL }, { "show-luns", 's', POPT_ARG_NONE, &showluns, 0, "Show the luns for each target", NULL },
POPT_TABLEEND POPT_TABLEEND
}; };
@@ -287,12 +288,27 @@ int main(int argc, const char *argv[])
poptBadOption(pc, 0), poptStrerror(res)); poptBadOption(pc, 0), poptStrerror(res));
exit(10); exit(10);
} }
extra_argv = poptGetArgs(pc);
if (extra_argv) {
portal = strdup(*extra_argv);
extra_argv++;
while (extra_argv[extra_argc]) {
extra_argc++;
}
}
poptFreeContext(pc); poptFreeContext(pc);
if (portal == NULL) { if (portal == NULL) {
fprintf(stderr, "You must specify target portal\n"); fprintf(stderr, "You must specify iscsi target portal.\n");
fprintf(stderr, "%s [options] iscsi://<host>[:<port>]\n", argv[0]);
exit(10); exit(10);
} }
if (strncmp(portal, "iscsi://", 8)) {
fprintf(stderr, "Incorrect portal specified\n");
fprintf(stderr, "Portal is specified as \"iscsi://<host>[:<port>]\"\n");
exit(10);
}
portal += 8;
iscsi = iscsi_create_context(initiator); iscsi = iscsi_create_context(initiator);
if (iscsi == NULL) { if (iscsi == NULL) {