diff options
| author | Josh Paetzel <jpaetzel@FreeBSD.org> | 2012-04-13 18:21:56 +0000 |
|---|---|---|
| committer | Josh Paetzel <jpaetzel@FreeBSD.org> | 2012-04-13 18:21:56 +0000 |
| commit | c4d87335a8ac1e3af208e479a8da623516686f90 (patch) | |
| tree | 62e3c7f1c99bf951f572cc624d4f4cc98863ed91 /sbin/iscontrol | |
| parent | d591b27dbc987772f31950bb2b490bf72192a923 (diff) | |
| download | src-test2-c4d87335a8ac1e3af208e479a8da623516686f90.tar.gz src-test2-c4d87335a8ac1e3af208e479a8da623516686f90.zip | |
Update to version 2.3.1.0
Obtained from: Daniel Braniss <danny@cs.huji.ac.il>
Notes
Notes:
svn path=/head/; revision=234233
Diffstat (limited to 'sbin/iscontrol')
| -rw-r--r-- | sbin/iscontrol/Makefile | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/iscontrol.8 | 2 | ||||
| -rw-r--r-- | sbin/iscontrol/iscontrol.c | 20 | ||||
| -rw-r--r-- | sbin/iscontrol/iscsi.conf.5 | 2 |
4 files changed, 22 insertions, 4 deletions
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile index 1830ad935a7a..05085b97cba7 100644 --- a/sbin/iscontrol/Makefile +++ b/sbin/iscontrol/Makefile @@ -8,7 +8,7 @@ S= ${.CURDIR}/../../sys WARNS?= 3 CFLAGS += -I$S -#CFLAGS += -g -DDEBUG +CFLAGS += -g -DDEBUG MAN= iscsi.conf.5 iscontrol.8 diff --git a/sbin/iscontrol/iscontrol.8 b/sbin/iscontrol/iscontrol.8 index d2e8bdddd3d0..f68381571df7 100644 --- a/sbin/iscontrol/iscontrol.8 +++ b/sbin/iscontrol/iscontrol.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 22, 2007 +.Dd August 9, 2010 .Dt ISCONTROL 8 .Os .Sh NAME diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c index c7bda0e13fc1..96f2cbf8e6a8 100644 --- a/sbin/iscontrol/iscontrol.c +++ b/sbin/iscontrol/iscontrol.c @@ -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 OPTIONS "vdc: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_t n; 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) { diff --git a/sbin/iscontrol/iscsi.conf.5 b/sbin/iscontrol/iscsi.conf.5 index c1f320fbf1bb..751a594c52ee 100644 --- a/sbin/iscontrol/iscsi.conf.5 +++ b/sbin/iscontrol/iscsi.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 25, 2012 +.Dd June 5, 2007 .Dt ISCSI.CONF 5 .Os .Sh NAME |