Author: jpaetzel
Date: Fri Apr 13 18:21:56 2012
New Revision: 234233
URL: http://svn.freebsd.org/changeset/base/234233
Log:
Update to version 2.3.1.0
Obtained from:Daniel Braniss da...@cs.huji.ac.il
Modified:
head/sbin/iscontrol/Makefile
head/sbin/iscontrol/iscontrol.8
head/sbin/iscontrol/iscontrol.c
head/sbin/iscontrol/iscsi.conf.5
head/share/man/man4/iscsi_initiator.4
head/sys/dev/iscsi/initiator/isc_subr.c
head/sys/dev/iscsi/initiator/iscsi.c
head/sys/dev/iscsi/initiator/iscsi_subr.c
head/sys/dev/iscsi/initiator/iscsivar.h
head/sys/modules/iscsi/initiator/Makefile
Modified: head/sbin/iscontrol/Makefile
==
--- head/sbin/iscontrol/MakefileFri Apr 13 18:01:53 2012
(r234232)
+++ head/sbin/iscontrol/MakefileFri Apr 13 18:21:56 2012
(r234233)
@@ -8,7 +8,7 @@ S= ${.CURDIR}/../../sys
WARNS?=3
CFLAGS += -I$S
-#CFLAGS += -g -DDEBUG
+CFLAGS += -g -DDEBUG
MAN= iscsi.conf.5 iscontrol.8
Modified: head/sbin/iscontrol/iscontrol.8
==
--- head/sbin/iscontrol/iscontrol.8 Fri Apr 13 18:01:53 2012
(r234232)
+++ head/sbin/iscontrol/iscontrol.8 Fri Apr 13 18:21:56 2012
(r234233)
@@ -24,7 +24,7 @@
.\
.\ $FreeBSD$
.\
-.Dd February 22, 2007
+.Dd August 9, 2010
.Dt ISCONTROL 8
.Os
.Sh NAME
Modified: head/sbin/iscontrol/iscontrol.c
==
--- head/sbin/iscontrol/iscontrol.c Fri Apr 13 18:01:53 2012
(r234232)
+++ head/sbin/iscontrol/iscontrol.c Fri Apr 13 18:21:56 2012
(r234233)
@@ -56,6 +56,8 @@ __FBSDID($FreeBSD$);
#include dev/iscsi/initiator/iscsi.h
#include iscontrol.h
+static char version[] = 2.3.1; // keep in sync with iscsi_initiator
+
#define USAGE [-v] [-d] [-c config] [-n name] [-t target] [-p pidfile]
#define OPTIONSvdc:t:n:p:
@@ -124,9 +126,10 @@ int
main(int cc, char **vv)
{
int ch, disco;
- char *pname, *pidfile, *p, *q, *ta, *kw;
+ char *pname, *pidfile, *p, *q, *ta, *kw, *v;
isc_opt_t *op;
FILE *fd;
+ size_tn;
op = opvals;
iscsidev = /dev/ISCSIDEV;
@@ -138,6 +141,21 @@ main(int cc, char **vv)
kw = ta = 0;
disco = 0;
pidfile = NULL;
+ /*
+ | check for driver controller version match
+ */
+ n = 0;
+ if(sysctlbyname(net.iscsi_initiator.driver_version, 0, n, 0, 0) != 0)
+ perror(sysctlbyname);
+ v = malloc(n+1);
+ if(sysctlbyname(net.iscsi_initiator.driver_version, v, n, 0, 0) != 0)
+ perror(sysctlbyname);
+
+ if(strncmp(version, v, 3)) {
+ fprintf(stderr, versions missmatch\n);
+ exit(1);
+ }
+
while((ch = getopt(cc, vv, OPTIONS)) != -1) {
switch(ch) {
Modified: head/sbin/iscontrol/iscsi.conf.5
==
--- head/sbin/iscontrol/iscsi.conf.5Fri Apr 13 18:01:53 2012
(r234232)
+++ head/sbin/iscontrol/iscsi.conf.5Fri Apr 13 18:21:56 2012
(r234233)
@@ -24,7 +24,7 @@
.\
.\ $FreeBSD$
.\
-.Dd February 25, 2012
+.Dd June 5, 2007
.Dt ISCSI.CONF 5
.Os
.Sh NAME
Modified: head/share/man/man4/iscsi_initiator.4
==
--- head/share/man/man4/iscsi_initiator.4 Fri Apr 13 18:01:53 2012
(r234232)
+++ head/share/man/man4/iscsi_initiator.4 Fri Apr 13 18:21:56 2012
(r234233)
@@ -1,4 +1,4 @@
-.\ Copyright (c) 2007 Daniel Braniss da...@cs.huji.ac.il
+.\ Copyright (c) 2007-2010 Daniel Braniss da...@cs.huji.ac.il
.\ All rights reserved.
.\
.\ Redistribution and use in source and binary forms, with or without
@@ -24,9 +24,9 @@
.\
.\ $FreeBSD$
.\
-.Dd May 9, 2010
-.Dt ISCSI_INITIATOR 4
+.Dd August 3, 2010
.Os
+.Dt ISCSI_INITIATOR 4
.Sh NAME
.Nm iscsi_initiator
.Nd kernel driver for the iSCSI protocol
@@ -48,38 +48,36 @@ iscsi_initiator_load=YES
The
.Nm
implements the kernel side of the Internet SCSI (iSCSI) network
-protocol standard.
-The userland companion is
+protocol standard, the user land companion is
.Xr iscontrol 8 ,
and permits access to remote
.Em virtual
SCSI devices via
.Xr cam 4 .
.Sh SYSCTL VARIABLES
-.Bl -tag -width net.iscsi.n.targedaddress
+.Bl -tag -width .Va net.iscsi.n.targeaddress
.It Va debug.iscsi_initiator
set the debug-level, 0 means no debugging, 9 for maximum.
.It Va net.iscsi.isid
the initiator part of the Session Identifier.
-.El
-.Pp
-The following are informative only:
-.Bl -tag -width net.iscsi.n.targedaddress
+.It Va kern.cam.cam_srch_hi=1
+allow search above LUN 7 for SCSI3 and greater devices.
+.It the following are informative only:
.It Va net.iscsi.driver_version
the current version of the driver.
.It Va net.iscsi.sessions
the number
