CVS commit: src/external/bsd/iscsi/dist/src/initiator

2013-10-19 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Oct 20 03:10:45 UTC 2013

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.c

Log Message:
remove unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.9 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.10
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.9	Thu Oct  6 09:05:28 2011
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c	Sat Oct 19 23:10:45 2013
@@ -542,7 +542,6 @@ main(int argc, char **argv)
 	char			name[1024];
 	char			*colon;
 	char		   *host;
-	char		   *user;
 	char			buf[32];
 	char			devtype;
 	int			discover;
@@ -552,7 +551,6 @@ main(int argc, char **argv)
 
 	(void) memset(tinfo, 0x0, sizeof(tinfo));
 	iscsi_initiator_set_defaults(ini);
-	user = NULL;
 	(void) gethostname(host = hostname, sizeof(hostname));
 	discover = 0;
 	(void) stat(/etc/hosts, sti.st);

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2011-02-22 Thread Stephen Borrill 
Module Name:src
Committed By:   sborrill
Date:   Tue Feb 22 13:04:31 UTC 2011

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.c

Log Message:
Retry read capacity. Device may not be ready on first access, so need to
wait and re-issue. From Daisuke Aoyama (author of istgt).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.6 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.7
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.6	Mon Feb 21 17:48:43 2011
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c	Tue Feb 22 13:04:31 2011
@@ -701,8 +701,22 @@
 		}
 
 		/* stuff size into st.st_size */
-		(void) read_capacity(u, 0, lbac, blocksize);
-		sti.st.st_size = ((uint64_t)lbac + 1) * blocksize;
+		{
+			int retry = 5;
+			while (retry  0) {
+if (read_capacity(u, 0, lbac, blocksize) == 0)
+	break;
+retry--;
+iscsi_warn(__FILE__, __LINE__,
+read_capacity failed - retrying %d\n, retry);
+sleep(1);
+			}
+			if (retry == 0) {
+iscsi_err(__FILE__, __LINE__, read_capacity failed - giving up\n);
+break;
+			}
+		}
+		sti.st.st_size = (off_t)(((uint64_t)lbac + 1) * blocksize);
 		sti.target = u;
 
 		tv.v[tv.c].host = strdup(tinfo.name);

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2011-02-22 Thread Stephen Borrill 
Module Name:src
Committed By:   sborrill
Date:   Tue Feb 22 13:17:20 UTC 2011

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.8

Log Message:
Note limitations of CHAP implementation in BUGS section.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.5 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.6
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.5	Tue Feb 22 10:34:12 2011
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8	Tue Feb 22 13:17:20 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: iscsi-initiator.8,v 1.5 2011/02/22 10:34:12 sborrill Exp $
+.\ $NetBSD: iscsi-initiator.8,v 1.6 2011/02/22 13:17:20 sborrill Exp $
 .\
 .\ Copyright © 2007 Alistair Crooks.  All rights reserved.
 .\
@@ -150,3 +150,13 @@
 utility was written by
 .An Alistair Crooks
 .Aq a...@netbsd.org .
+.Sh BUGS
+.Nm
+currently only supports a CHAP challenge length of 16 octets.
+Other initiators support up to 1024 and thus it is expected that most targets
+will also support such lengths.
+This means that CHAP compatibility with other targets apart from
+.Xr iscsi-target 8
+is likely to be poor.
+To workaround this, please use authentication type none by not specifying a
+username with the -u option.

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2011-02-22 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Tue Feb 22 14:23:37 UTC 2011

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.8

Log Message:
Markup fix.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.6 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.7
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.6	Tue Feb 22 13:17:20 2011
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8	Tue Feb 22 14:23:37 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: iscsi-initiator.8,v 1.6 2011/02/22 13:17:20 sborrill Exp $
+.\ $NetBSD: iscsi-initiator.8,v 1.7 2011/02/22 14:23:37 wiz Exp $
 .\
 .\ Copyright © 2007 Alistair Crooks.  All rights reserved.
 .\
@@ -159,4 +159,6 @@
 .Xr iscsi-target 8
 is likely to be poor.
 To workaround this, please use authentication type none by not specifying a
-username with the -u option.
+username with the
+.Fl u
+option.

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2011-02-22 Thread Stephen Borrill 
Module Name:src
Committed By:   sborrill
Date:   Tue Feb 22 17:15:55 UTC 2011

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.8

Log Message:
Update HISTORY to show that iscsifs was in NetBSD 5.0


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.7 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.8
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.7	Tue Feb 22 14:23:37 2011
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8	Tue Feb 22 17:15:55 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: iscsi-initiator.8,v 1.7 2011/02/22 14:23:37 wiz Exp $
+.\ $NetBSD: iscsi-initiator.8,v 1.8 2011/02/22 17:15:55 sborrill Exp $
 .\
 .\ Copyright © 2007 Alistair Crooks.  All rights reserved.
 .\
@@ -144,6 +144,9 @@
 .Nm
 utility first appeared in
 .Nx 6.0 .
+An earlier version called iscsifs was available in
+.Nx 5.0
+in source format only.
 .Sh AUTHORS
 The
 .Nm

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2011-02-21 Thread Stephen Borrill 
Module Name:src
Committed By:   sborrill
Date:   Mon Feb 21 17:24:20 UTC 2011

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.8
iscsi-initiator.c

Log Message:
Remove hostname from pathname to storage in mount point.
This means /mnt/mytarget.domain.local/target0/storage is now
/mnt/target0/storage.

Rationale is as follows:
- The hostname used may vary (i.e. name vs FQDN vs IP) which can mess up
  mountpoints (especially across multiple hosts e.g. in a shared xen pool)
- Target name is given in the mount anyway so it is redundant

OK agc@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.3 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.4
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.3	Tue Aug  3 10:24:39 2010
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8	Mon Feb 21 17:24:19 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: iscsi-initiator.8,v 1.3 2010/08/03 10:24:39 sborrill Exp $
+.\ $NetBSD: iscsi-initiator.8,v 1.4 2011/02/21 17:24:19 sborrill Exp $
 .\
 .\ Copyright © 2007 Alistair Crooks.  All rights reserved.
 .\
@@ -26,7 +26,7 @@
 .\ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 .\ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd August 3, 2010
+.Dd February 21, 2011
 .Dt ISCSI-INITIATOR 8
 .Os
 .Sh NAME
@@ -120,7 +120,7 @@
 .Sh EXAMPLES
 .Bd -literal
 # ./iscsi-initiator -u agc -h iscsi-target0.alistaircrooks.co.uk /mnt
-# ls -al /mnt/iscsi-target0.alistaircrooks.co.uk/target0
+# ls -al /mnt/target0
 total 576
 drwxr-xr-x  2 agc  agc512 May 11 22:24 .
 drwxr-xr-x  2 agc  agc512 May 11 22:24 ..

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.4 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.5
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.4	Sun Nov  8 15:33:21 2009
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c	Mon Feb 21 17:24:19 2011
@@ -718,36 +718,31 @@
 		tv.v[tv.c].serial = strdup((char *)data[4]);
 
 		/* create the tree using virtdir routines */
-		cc = snprintf(name, sizeof(name), /%s/%s, host, colon);
+		cc = snprintf(name, sizeof(name), /%s, colon);
 		virtdir_add(iscsi, name, cc, 'd', name, cc);
-		cc = snprintf(name, sizeof(name), /%s/%s/storage, host,
-colon);
+		cc = snprintf(name, sizeof(name), /%s/storage, colon);
 		virtdir_add(iscsi, name, cc, devtype, (void *)sti,
 sizeof(sti));
-		cc = snprintf(name, sizeof(name), /%s/%s/hostname, host,
-colon);
+		cc = snprintf(name, sizeof(name), /%s/hostname, colon);
 		virtdir_add(iscsi, name, cc, 'l', tinfo.name,
 strlen(tinfo.name));
-		cc = snprintf(name, sizeof(name), /%s/%s/ip, host, colon);
+		cc = snprintf(name, sizeof(name), /%s/ip, colon);
 		virtdir_add(iscsi, name, cc, 'l', tinfo.ip, strlen(tinfo.ip));
-		cc = snprintf(name, sizeof(name), /%s/%s/targetname, host,
-colon);
+		cc = snprintf(name, sizeof(name), /%s/targetname, colon);
 		virtdir_add(iscsi, name, cc, 'l', tinfo.TargetName,
 strlen(tinfo.TargetName));
-		cc = snprintf(name, sizeof(name), /%s/%s/vendor, host, colon);
+		cc = snprintf(name, sizeof(name), /%s/vendor, colon);
 		virtdir_add(iscsi, name, cc, 'l', tv.v[tv.c].vendor,
 strlen(tv.v[tv.c].vendor));
-		cc = snprintf(name, sizeof(name), /%s/%s/product, host,
-colon);
+		cc = snprintf(name, sizeof(name), /%s/product, colon);
 		virtdir_add(iscsi, name, cc, 'l', tv.v[tv.c].product,
 strlen(tv.v[tv.c].product));
-		cc = snprintf(name, sizeof(name), /%s/%s/version, host,
-colon);
+		cc = snprintf(name, sizeof(name), /%s/version, colon);
 		virtdir_add(iscsi, name, cc, 'l', tv.v[tv.c].version,
 strlen(tv.v[tv.c].version));
 		if (tv.v[tv.c].serial[0]  tv.v[tv.c].serial[0] != ' ') {
-			cc = snprintf(name, sizeof(name), /%s/%s/serial,
-host, colon);
+			cc = snprintf(name, sizeof(name), /%s/serial,
+colon);
 			virtdir_add(iscsi, name, cc, 'l', tv.v[tv.c].serial,
 strlen(tv.v[tv.c].serial));
 		}

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2010-08-03 Thread Stephen Borrill 
Module Name:src
Committed By:   sborrill
Date:   Tue Aug  3 10:24:39 UTC 2010

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.8

Log Message:
Add missing -h flag to example


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.2 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.3
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8:1.2	Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.8	Tue Aug  3 10:24:39 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: iscsi-initiator.8,v 1.2 2009/06/30 02:44:52 agc Exp $
+.\ $NetBSD: iscsi-initiator.8,v 1.3 2010/08/03 10:24:39 sborrill Exp $
 .\
 .\ Copyright © 2007 Alistair Crooks.  All rights reserved.
 .\
@@ -26,7 +26,7 @@
 .\ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 .\ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd September 20, 2007
+.Dd August 3, 2010
 .Dt ISCSI-INITIATOR 8
 .Os
 .Sh NAME
@@ -119,7 +119,7 @@
 to operate.
 .Sh EXAMPLES
 .Bd -literal
-# ./iscsi-initiator -u agc iscsi-target0.alistaircrooks.co.uk /mnt
+# ./iscsi-initiator -u agc -h iscsi-target0.alistaircrooks.co.uk /mnt
 # ls -al /mnt/iscsi-target0.alistaircrooks.co.uk/target0
 total 576
 drwxr-xr-x  2 agc  agc512 May 11 22:24 .

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2009-11-08 Thread Geert Hendrickx 
Module Name:src
Committed By:   ghen
Date:   Sun Nov  8 15:33:21 UTC 2009

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.c

Log Message:
Add missing newline.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.3 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.4
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.3	Thu Jul 23 04:32:13 2009
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c	Sun Nov  8 15:33:21 2009
@@ -619,7 +619,7 @@
 		}
 	}
 	if (iscsi_initiator_getvar(ini, user) == NULL) {
-		iscsi_err(__FILE__, __LINE__, user must be specified with -u);
+		iscsi_err(__FILE__, __LINE__, user must be specified with -u\n);
 		exit(EXIT_FAILURE);
 	}

CVS commit: src/external/bsd/iscsi/dist/src/initiator

2009-07-22 Thread Alistair G. Crooks 
Module Name:src
Committed By:   agc
Date:   Thu Jul 23 04:32:13 UTC 2009

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.c

Log Message:
Fix from Bert Kiers, also noted by jak - be consistent in naming the
key for the target hostname variable - it's target hostname, not
target host.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.2 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.3
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.2	Tue Jun 30 02:44:52 2009
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c	Thu Jul 23 04:32:13 2009
@@ -582,7 +582,7 @@
 			devtype = 'f';
 			break;
 		case 'h':
-			iscsi_initiator_setvar(ini, target host, optarg);
+			iscsi_initiator_setvar(ini, target hostname, optarg);
 			break;
 		case 'p':
 			iscsi_initiator_setvar(ini, target port, optarg);