MFC r257379:

Rename '-h' option to '-p', and use "portal" instead of "host" or "address",
in order to be consistent with iSCSI terminology.  Besides, calling the
option '-h' was just wrong.

This changes usage for newly added iscsictl(8), and two newly added
subcommands to ctladm(8).  This breaks POLA between CURRENT and 10,
but since 10.0 has not been released yet, it's still ok to do.

MFC r257380:

Bump .Dd after r257379.

Approved by:	re (glebius)
Sponsored by:	The FreeBSD Foundation

2 files changed, 39 insertions, 39 deletions

diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8
index b9d4e61..005225c 100644
--- a/usr.sbin/ctladm/ctladm.8
+++ b/usr.sbin/ctladm/ctladm.8
@@ -34,7 +34,7 @@
 .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2013
+.Dd October 30, 2013
 .Dt CTLADM 8
 .Os
 .Sh NAME
@@ -202,10 +202,10 @@
 .Op Fl x
 .Nm
 .Ic islogout
-.Aq Fl a | Fl h Ar host | Fl c Ar connection-id | Fl i Ar name
+.Aq Fl a | Fl c Ar connection-id | Fl i Ar name | Fl p Ar portal
 .Nm
 .Ic isterminate
-.Aq Fl a | Fl h Ar host | Fl c Ar connection-id | Fl i Ar name
+.Aq Fl a | Fl c Ar connection-id | Fl i Ar name | Fl p Ar portal
 .Nm
 .Ic help
 .Sh DESCRIPTION
@@ -909,24 +909,24 @@ Ask the initiator to log out iSCSI connections matching criteria.
 .Bl -tag -width 11n
 .It Fl a
 Log out all connections.
-.It Fl h
-Specify initiator IP address.
 .It Fl c
 Specify connection ID.
 .It Fl i
 Specify initiator name.
+.It Fl p
+Specify initiator portal (hostname or IP address).
 .El
 .It Ic isterminate
 Forcibly terminate iSCSI connections matching criteria.
 .Bl -tag -width 11n
 .It Fl a
 Terminate all connections.
-.It Fl h
-Specify initiator IP address.
 .It Fl c
 Specify connection ID.
 .It Fl i
 Specify initiator name.
+.It Fl p
+Specify initiator portal (hostname or IP address).
 .El
 .It Ic help
 Display
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index 6f03de0..7833155 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -184,8 +184,8 @@ static struct ctladm_opts option_table[] = {
 	{"inject", CTLADM_CMD_ERR_INJECT, CTLADM_ARG_NEED_TL, "cd:i:p:r:s:"},
 	{"inquiry", CTLADM_CMD_INQUIRY, CTLADM_ARG_NEED_TL, NULL},
 	{"islist", CTLADM_CMD_ISLIST, CTLADM_ARG_NONE, "vx"},
-	{"islogout", CTLADM_CMD_ISLOGOUT, CTLADM_ARG_NONE, "ah:c:i:"},
-	{"isterminate", CTLADM_CMD_ISTERMINATE, CTLADM_ARG_NONE, "ah:c:i:"},
+	{"islogout", CTLADM_CMD_ISLOGOUT, CTLADM_ARG_NONE, "ac:i:p:"},
+	{"isterminate", CTLADM_CMD_ISTERMINATE, CTLADM_ARG_NONE, "ac:i:p:"},
 	{"lunlist", CTLADM_CMD_LUNLIST, CTLADM_ARG_NONE, NULL},
 	{"modesense", CTLADM_CMD_MODESENSE, CTLADM_ARG_NEED_TL, "P:S:dlm:c:"},
 	{"modify", CTLADM_CMD_MODIFY, CTLADM_ARG_NONE, "b:l:s:"},
@@ -3633,21 +3633,21 @@ retry:
 
 	if (verbose != 0) {
 		STAILQ_FOREACH(conn, &islist.conn_list, links) {
-			printf("Session ID:      %d\n", conn->connection_id);
-			printf("Initiator name:  %s\n", conn->initiator);
-			printf("Initiator addr:  %s\n", conn->initiator_addr);
-			printf("Initiator alias: %s\n", conn->initiator_alias);
-			printf("Target name:     %s\n", conn->target);
-			printf("Target alias:    %s\n", conn->target_alias);
-			printf("Header digest:   %s\n", conn->header_digest);
-			printf("Data digest:     %s\n", conn->data_digest);
-			printf("DataSegmentLen:  %s\n", conn->max_data_segment_length);
-			printf("ImmediateData:   %s\n", conn->immediate_data ? "Yes" : "No");
-			printf("iSER (RDMA):     %s\n", conn->iser ? "Yes" : "No");
+			printf("Session ID:       %d\n", conn->connection_id);
+			printf("Initiator name:   %s\n", conn->initiator);
+			printf("Initiator portal: %s\n", conn->initiator_addr);
+			printf("Initiator alias:  %s\n", conn->initiator_alias);
+			printf("Target name:      %s\n", conn->target);
+			printf("Target alias:     %s\n", conn->target_alias);
+			printf("Header digest:    %s\n", conn->header_digest);
+			printf("Data digest:      %s\n", conn->data_digest);
+			printf("DataSegmentLen:   %s\n", conn->max_data_segment_length);
+			printf("ImmediateData:    %s\n", conn->immediate_data ? "Yes" : "No");
+			printf("iSER (RDMA):      %s\n", conn->iser ? "Yes" : "No");
 			printf("\n");
 		}
 	} else {
-		printf("%4s %-16s %-36s %-36s\n", "ID", "Address", "Initiator name",
+		printf("%4s %-16s %-36s %-36s\n", "ID", "Portal", "Initiator name",
 		    "Target name");
 		STAILQ_FOREACH(conn, &islist.conn_list, links) {
 			printf("%4u %-16s %-36s %-36s\n",
@@ -3675,12 +3675,6 @@ cctl_islogout(int fd, int argc, char **argv, char *combinedopt)
 			all = 1;
 			nargs++;
 			break;
-		case 'h':
-			initiator_addr = strdup(optarg);
-			if (initiator_addr == NULL)
-				err(1, "%s: strdup", __func__);
-			nargs++;
-			break;
 		case 'c':
 			connection_id = strtoul(optarg, NULL, 0);
 			nargs++;
@@ -3691,16 +3685,22 @@ cctl_islogout(int fd, int argc, char **argv, char *combinedopt)
 				err(1, "%s: strdup", __func__);
 			nargs++;
 			break;
+		case 'p':
+			initiator_addr = strdup(optarg);
+			if (initiator_addr == NULL)
+				err(1, "%s: strdup", __func__);
+			nargs++;
+			break;
 		default:
 			break;
 		}
 	}
 
 	if (nargs == 0)
-		errx(1, "%s: either -a, -h, -c, or -i must be specified",
+		errx(1, "%s: either -a, -c, -i, or -p must be specified",
 		    __func__);
 	if (nargs > 1)
-		errx(1, "%s: only one of -a, -h, -c, or -i may be specified",
+		errx(1, "%s: only one of -a, -c, -i, or -p may be specified",
 		    __func__);
 
 	bzero(&req, sizeof(req));
@@ -3748,12 +3748,6 @@ cctl_isterminate(int fd, int argc, char **argv, char *combinedopt)
 			all = 1;
 			nargs++;
 			break;
-		case 'h':
-			initiator_addr = strdup(optarg);
-			if (initiator_addr == NULL)
-				err(1, "%s: strdup", __func__);
-			nargs++;
-			break;
 		case 'c':
 			connection_id = strtoul(optarg, NULL, 0);
 			nargs++;
@@ -3764,16 +3758,22 @@ cctl_isterminate(int fd, int argc, char **argv, char *combinedopt)
 				err(1, "%s: strdup", __func__);
 			nargs++;
 			break;
+		case 'p':
+			initiator_addr = strdup(optarg);
+			if (initiator_addr == NULL)
+				err(1, "%s: strdup", __func__);
+			nargs++;
+			break;
 		default:
 			break;
 		}
 	}
 
 	if (nargs == 0)
-		errx(1, "%s: either -a, -h, -c, or -i must be specified",
+		errx(1, "%s: either -a, -c, -i, or -p must be specified",
 		    __func__);
 	if (nargs > 1)
-		errx(1, "%s: only one of -a, -h, -c, or -i may be specified",
+		errx(1, "%s: only one of -a, -c, -i, or -p may be specified",
 		    __func__);
 
 	bzero(&req, sizeof(req));
@@ -4121,8 +4121,8 @@ usage(int error)
 "         ctladm port        <-l | -o <on|off> | [-w wwnn][-W wwpn]>\n"
 "                            [-p targ_port] [-t port_type] [-q] [-x]\n"
 "         ctladm islist      [-v | -x]\n"
-"         ctladm islogout    <-A | -a addr | -c connection-id | -n name>\n"
-"         ctladm isterminate <-A | -a addr | -c connection-id | -n name>\n"
+"         ctladm islogout    <-a | -c connection-id | -i name | -p portal>\n"
+"         ctladm isterminate <-a | -c connection-id | -i name | -p portal>\n"
 "         ctladm dumpooa\n"
 "         ctladm dumpstructs\n"
 "         ctladm help\n"