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

iscsi-ls: add --url parameter

Browse Source 
Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2013-07-18 11:33:35 +02:00
parent cc02faabb0
commit bb2aca580c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/iscsi-ls.c
View File

@@ -39,6 +39,7 @@
#endif #endif
int showluns; int showluns;
int useurls;
const char *initiator = "iqn.2007-10.com.github:sahlberg:libiscsi:iscsi-ls"; const char *initiator = "iqn.2007-10.com.github:sahlberg:libiscsi:iscsi-ls";
struct client_state { struct client_state {
@@ -254,8 +255,12 @@ void discovery_cb(struct iscsi_context *iscsi, int status, void *command_data, v
exit(10); exit(10);
} }
for(addr=command_data; addr; addr=addr->next) { for(addr=command_data; addr; addr=addr->next) {
printf("Target:%s Portal:%s\n", addr->target_name, addr->target_address); if (useurls == 1 && showluns == 0) {
printf("iscsi://%s/%s/0\n", addr->target_address, addr->target_name);
} else {
printf("Target:%s Portal:%s\n", addr->target_name, addr->target_address);
}
if (showluns != 0) { if (showluns != 0) {
list_luns(private_data, addr->target_name, addr->target_address); list_luns(private_data, addr->target_name, addr->target_address);
} }
@@ -305,6 +310,8 @@ void print_help(void)
fprintf(stderr, "Usage: iscsi-ls [OPTION...] <iscsi-url>\n"); fprintf(stderr, "Usage: iscsi-ls [OPTION...] <iscsi-url>\n");
fprintf(stderr, " -i, --initiator-name=iqn-name Initiatorname to use\n"); fprintf(stderr, " -i, --initiator-name=iqn-name Initiatorname to use\n");
fprintf(stderr, " -s, --show-luns Show the luns for each target\n"); fprintf(stderr, " -s, --show-luns Show the luns for each target\n");
fprintf(stderr, " --url Output targets in URL format\n");
fprintf(stderr, " (does not work with -s)\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "Help options:\n"); fprintf(stderr, "Help options:\n");
fprintf(stderr, " -?, --help Show this help message\n"); fprintf(stderr, " -?, --help Show this help message\n");
@@ -332,12 +339,13 @@ int main(int argc, char *argv[])
{"usage", no_argument, NULL, 'u'}, {"usage", no_argument, NULL, 'u'},
{"debug", no_argument, NULL, 'd'}, {"debug", no_argument, NULL, 'd'},
{"show-luns", no_argument, NULL, 's'}, {"show-luns", no_argument, NULL, 's'},
{"url", no_argument, NULL, 'U'},
{"initiator_name", required_argument, NULL, 'i'}, {"initiator_name", required_argument, NULL, 'i'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
int option_index; int option_index;
while ((c = getopt_long(argc, argv, "h?udi:s", long_options, while ((c = getopt_long(argc, argv, "h?uUdi:s", long_options,
&option_index)) != -1) { &option_index)) != -1) {
switch (c) { switch (c) {
case 'h': case 'h':
@@ -347,6 +355,9 @@ int main(int argc, char *argv[])
case 'u': case 'u':
show_usage = 1; show_usage = 1;
break; break;
case 'U':
useurls = 1;
break;
case 'd': case 'd':
debug = 1; debug = 1;
break; break;