Hello community,
here is the log from the commit of package open-isns for openSUSE:Factory
checked in at 2017-09-07 22:08:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/open-isns (Old)
and /work/SRC/openSUSE:Factory/.open-isns.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-isns"
Thu Sep 7 22:08:47 2017 rev:6 rq:520026 version:0.98
Changes:
--------
--- /work/SRC/openSUSE:Factory/open-isns/open-isns.changes 2017-08-21
11:33:54.260656358 +0200
+++ /work/SRC/openSUSE:Factory/.open-isns.new/open-isns.changes 2017-09-07
22:08:48.984165593 +0200
@@ -1,0 +2,7 @@
+Thu Aug 31 20:14:06 UTC 2017 - ldun...@suse.com
+
+- Update from version 0.97 to 0.98, which includes some
+ testing and openssl fixes, updating the SPEC file and
+ replacing the release tarball (bsc#1056696)
+
+-------------------------------------------------------------------
Old:
----
open-isns-0.97.tar.gz
New:
----
open-isns-0.98.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ open-isns.spec ++++++
--- /var/tmp/diff_new_pack.kICbdi/_old 2017-09-07 22:08:49.596079341 +0200
+++ /var/tmp/diff_new_pack.kICbdi/_new 2017-09-07 22:08:49.596079341 +0200
@@ -20,7 +20,7 @@
Summary: Partial Implementation of iSNS iSCSI registration
License: LGPL-2.1+
Group: System/Kernel
-Version: 0.97
+Version: 0.98
Release: 0
Source: %{name}-%{version}.tar.gz
Url: https://github.com/open-iscsi/%{name}
++++++ open-isns-0.97.tar.gz -> open-isns-0.98.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/Makefile.in
new/open-isns-0.98/Makefile.in
--- old/open-isns-0.97/Makefile.in 2016-10-29 03:28:30.000000000 +0200
+++ new/open-isns-0.98/Makefile.in 2017-08-21 02:14:40.000000000 +0200
@@ -1,3 +1,4 @@
+srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
sbindir = @sbindir@
@@ -9,6 +10,7 @@
datarootdir = @datarootdir@
includedir = @includedir@
+VPATH = $(srcdir)
SBINDIR = $(DESTDIR)$(sbindir)
CFGDIR = $(DESTDIR)$(etcdir)/isns
MANDIR = $(DESTDIR)$(mandir)
@@ -26,14 +28,14 @@
BUILD_STATIC = $(ENABLE_STATIC)
endif
ifeq ($(HAVE_LD_VERSION_SCRIPT),1)
-SOLIB_VERSION_OPTS = -Wl,--version-script=libisns.vers
+SOLIB_VERSION_OPTS = -Wl,--version-script=$(srcdir)/libisns.vers
else
SOLIB_VERSION_OPTS =
endif
CC = @CC@
CPPFLAGS= @CPPFLAGS@
-CFLAGS = @CFLAGS@ -I. -Iinclude
+CFLAGS = @CFLAGS@ -I. -Iinclude -I$(srcdir) -I$(srcdir)/include
LDFLAGS = @LDFLAGS@
INSTALL = @INSTALL@
@@ -84,15 +86,15 @@
bitvector.o \
mdebug.o
SOLIBOBJS = $(patsubst %.o,solib-%.o,$(LIBOBJS))
-HDRS = include/libisns/attrs.h \
- include/libisns/buffer.h \
- include/libisns/isns.h \
- include/libisns/isns-proto.h \
- include/libisns/message.h \
+HDRS = $(srcdir)/include/libisns/attrs.h \
+ $(srcdir)/include/libisns/buffer.h \
+ $(srcdir)/include/libisns/isns.h \
+ $(srcdir)/include/libisns/isns-proto.h \
+ $(srcdir)/include/libisns/message.h \
include/libisns/paths.h \
- include/libisns/source.h \
- include/libisns/types.h \
- include/libisns/util.h
+ $(srcdir)/include/libisns/source.h \
+ $(srcdir)/include/libisns/types.h \
+ $(srcdir)/include/libisns/util.h
SECLINK = @SECLIBS@
SLPLINK = @SLPLIBS@
@@ -110,15 +112,15 @@
$(INSTALL) -m 755 -d $(CFGDIR) $(MANDIR)/man8 $(MANDIR)/man5 $(SBINDIR)
$(SYSTEMDDIR)
$(INSTALL) -m 700 -d $(VARDIR)
$(INSTALL) -m 555 isnsd isnsadm isnsdd $(SBINDIR)
- $(INSTALL) -m 644 etc/isnsd.conf $(CFGDIR)
- $(INSTALL) -m 644 etc/isnsdd.conf $(CFGDIR)
- $(INSTALL) -m 644 etc/isnsadm.conf $(CFGDIR)
- $(INSTALL) -m 644 doc/isnsd.8 $(MANDIR)/man8
- $(INSTALL) -m 644 doc/isnsdd.8 $(MANDIR)/man8
- $(INSTALL) -m 644 doc/isnsadm.8 $(MANDIR)/man8
- $(INSTALL) -m 644 doc/isns_config.5 $(MANDIR)/man5
- $(INSTALL) -m 644 isnsd.service $(SYSTEMDDIR)
- $(INSTALL) -m 644 isnsd.socket $(SYSTEMDDIR)
+ $(INSTALL) -m 644 $(srcdir)/etc/isnsd.conf $(CFGDIR)
+ $(INSTALL) -m 644 $(srcdir)/etc/isnsdd.conf $(CFGDIR)
+ $(INSTALL) -m 644 $(srcdir)/etc/isnsadm.conf $(CFGDIR)
+ $(INSTALL) -m 644 $(srcdir)/doc/isnsd.8 $(MANDIR)/man8
+ $(INSTALL) -m 644 $(srcdir)/doc/isnsdd.8 $(MANDIR)/man8
+ $(INSTALL) -m 644 $(srcdir)/doc/isnsadm.8 $(MANDIR)/man8
+ $(INSTALL) -m 644 $(srcdir)/doc/isns_config.5 $(MANDIR)/man5
+ $(INSTALL) -m 644 $(srcdir)/isnsd.service $(SYSTEMDDIR)
+ $(INSTALL) -m 644 $(srcdir)/isnsd.socket $(SYSTEMDDIR)
install_hdrs:
@echo '*** Installing Open-iSNS header files ***'
@@ -144,14 +146,18 @@
rm -f config.h Makefile config.status config.log include/libisns/paths.h
rm -rf autom4te.cache
-$(filter-out solib-message.o, $(SOLIBOBJS)): $(patsubst solib-%.o,%.c,$@)
- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $(patsubst solib-%.o,%.c,$@)
+%.o: %.c
+ @mkdir -p $(@D)
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $^
+
+solib-%.o: %.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c -o $@ $<
message.o: message.c
- $(CC) $(CFLAGS) $(CPPFLAGS) $(IQNFLAGS) -c -o $@ message.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(IQNFLAGS) -c -o $@ $<
solib-message.o: message.c
- $(CC) $(CFLAGS) $(CPPFLAGS) $(IQNFLAGS) -fPIC -c -o $@ message.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(IQNFLAGS) -fPIC -c -o $@ $<
ifeq ($(BUILD_STATIC),1)
$(LIB): $(LIBOBJS)
@@ -178,6 +184,7 @@
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ADMOBJS) -L. -lisns -Wl,--as-needed
$(SECLINK) $(SLPLINK)
tests/%: tests/%.o $(LIB) $(SOLIB)
+ @mkdir -p $(@D)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o -L. -lisns -Wl,--as-needed
$(SECLINK) $(SLPLINK)
bitvector: bitvector.c $(LIB) $(SOLIB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/db.c new/open-isns-0.98/db.c
--- old/open-isns-0.97/db.c 2016-10-29 03:28:30.000000000 +0200
+++ new/open-isns-0.98/db.c 2017-08-21 02:14:40.000000000 +0200
@@ -929,7 +929,7 @@
isns_db_print(isns_db_t *db, isns_print_fn_t *fn)
{
const isns_object_list_t *list = db->id_objects;
- unsigned int i;
+ unsigned int i, j;
fn("Dumping database contents\n"
"Backend: %s\n"
@@ -940,22 +940,26 @@
db->id_last_eid,
db->id_last_index);
- for (i = 0; i < list->iol_count; ++i) {
- isns_object_t *obj = list->iol_data[i];
-
- fn("--------------\n"
- "Object: index=%u type=<%s> state=%s",
- obj->ie_index,
- obj->ie_template->iot_name,
- isns_object_state_string(obj->ie_state));
- if (obj->ie_container)
- fn(" parent=%u", obj->ie_container->ie_index);
- if (obj->ie_flags & ISNS_OBJECT_DIRTY)
- fn(" DIRTY");
- if (obj->ie_flags & ISNS_OBJECT_PRIVATE)
- fn(" PRIVATE");
- fn("\n");
- isns_attr_list_print(&obj->ie_attrs, fn);
+ for (i = 0; i < db->id_last_index; ++i) {
+ for (j = 0; j < list->iol_count; ++j) {
+ isns_object_t *obj = list->iol_data[j];
+ if (obj->ie_index != i) {
+ continue;
+ }
+ fn("--------------\n"
+ "Object: index=%u type=<%s> state=%s",
+ obj->ie_index,
+ obj->ie_template->iot_name,
+ isns_object_state_string(obj->ie_state));
+ if (obj->ie_container)
+ fn(" parent=%u", obj->ie_container->ie_index);
+ if (obj->ie_flags & ISNS_OBJECT_DIRTY)
+ fn(" DIRTY");
+ if (obj->ie_flags & ISNS_OBJECT_PRIVATE)
+ fn(" PRIVATE");
+ fn("\n");
+ isns_attr_list_print(&obj->ie_attrs, fn);
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/dd.c new/open-isns-0.98/dd.c
--- old/open-isns-0.97/dd.c 2016-10-29 03:28:30.000000000 +0200
+++ new/open-isns-0.98/dd.c 2017-08-21 02:14:40.000000000 +0200
@@ -1043,6 +1043,10 @@
isns_db_insert_limbo(db, obj);
mp->ddm_index = obj->ie_index;
+ /* Record the fact that the object is a member of
+ this DD */
+ isns_object_mark_membership(obj, dd->dd_id);
+
switch (mp->ddm_type) {
case ISNS_DD_MEMBER_ISCSI_NODE:
if (isns_object_get_string(obj, ISNS_TAG_ISCSI_NAME,
&node_name))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/include/libisns/util.h
new/open-isns-0.98/include/libisns/util.h
--- old/open-isns-0.97/include/libisns/util.h 2016-10-29 03:28:30.000000000
+0200
+++ new/open-isns-0.98/include/libisns/util.h 2017-08-21 02:14:40.000000000
+0200
@@ -111,7 +111,11 @@
# define ntohll(x) __bswap_64(x)
# endif
# else
-# include <sys/endian.h>
+# if defined(__FreeBSD__)
+# include <sys/endian.h>
+# else
+# include <endian.h>
+# endif
# define htonll(x) htobe64(x)
# define ntohll(x) be64toh(x)
# endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/pki.c new/open-isns-0.98/pki.c
--- old/open-isns-0.97/pki.c 2016-10-29 03:28:30.000000000 +0200
+++ new/open-isns-0.98/pki.c 2017-08-21 02:14:40.000000000 +0200
@@ -67,7 +67,9 @@
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
static int isns_openssl_init = 0;
+#endif
static int isns_dsasig_verify(isns_security_t *ctx,
isns_principal_t *peer,
@@ -92,6 +94,7 @@
{
isns_security_t *ctx;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (!isns_openssl_init) {
ERR_load_crypto_strings();
OpenSSL_add_all_algorithms();
@@ -99,6 +102,7 @@
OpenSSL_add_all_digests();
isns_openssl_init = 1;
}
+#endif
ctx = isns_calloc(1, sizeof(*ctx));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/data/test06/06-registration
new/open-isns-0.98/tests/data/test06/06-registration
--- old/open-isns-0.97/tests/data/test06/06-registration 2016-10-29
03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/data/test06/06-registration 2017-08-21
02:14:40.000000000 +0200
@@ -17,6 +17,18 @@
0021 uint32 : iSCSI node type = <NIL>
0024 uint32 : iSCSI node index = 3
--------------
+Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
+ 0020 string : iSCSI name = "isns.client1"
+ 0021 uint32 : iSCSI node type = Initiator
+ 0024 uint32 : iSCSI node index = 13
+--------------
+Object: index=16 type=<Discovery Domain> state=mature
+ 0811 uint32 : DD ID = 1
+ 0812 string : DD name = "isns.dd1"
+ 081e uint32 : DD features = <NIL>
+ 0813 uint32 : DD member iSCSI index = 13
+ 0814 string : DD member iSCSI name = "isns.client1"
+--------------
Object: index=17 type=<Network Entity> state=mature
0001 string : Entity identifier = "client1.isns-test.eu"
0002 uint32 : Entity protocol = iSCSI (2)
@@ -24,11 +36,6 @@
0004 uint64 : Timestamp = Fri Sep 14 13:41:52 2007
0007 uint32 : Entity index = 17
--------------
-Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
- 0020 string : iSCSI name = "isns.client1"
- 0021 uint32 : iSCSI node type = Initiator
- 0024 uint32 : iSCSI node index = 13
---------------
Object: index=18 type=<Portal> state=mature parent=17
0010 ipaddr : Portal IP address = 192.168.1.1
0011 uint32 : Portal TCP/UDP port = 860/tcp
@@ -40,10 +47,3 @@
0032 uint32 : Portal group port = 860/tcp
0033 uint32 : Portal group tag = 1
0034 uint32 : Portal group index = 19
---------------
-Object: index=16 type=<Discovery Domain> state=mature
- 0811 uint32 : DD ID = 1
- 0812 string : DD name = "isns.dd1"
- 081e uint32 : DD features = <NIL>
- 0813 uint32 : DD member iSCSI index = 13
- 0814 string : DD member iSCSI name = "isns.client1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/data/test06/07-dd-registration
new/open-isns-0.98/tests/data/test06/07-dd-registration
--- old/open-isns-0.97/tests/data/test06/07-dd-registration 2016-10-29
03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/data/test06/07-dd-registration 2017-08-21
02:14:40.000000000 +0200
@@ -17,6 +17,21 @@
0021 uint32 : iSCSI node type = <NIL>
0024 uint32 : iSCSI node index = 3
--------------
+Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
+ 0020 string : iSCSI name = "isns.client1"
+ 0021 uint32 : iSCSI node type = Initiator
+ 0024 uint32 : iSCSI node index = 13
+--------------
+Object: index=16 type=<Discovery Domain> state=mature
+ 0811 uint32 : DD ID = 1
+ 0812 string : DD name = "isns.dd1"
+ 081e uint32 : DD features = <NIL>
+ 0813 uint32 : DD member iSCSI index = 13
+ 0814 string : DD member iSCSI name = "isns.client1"
+ 0816 uint32 : DD member portal index = 18
+ 0817 ipaddr : DD member portal addr = 192.168.1.1
+ 0818 uint32 : DD member portal port = 860/tcp
+--------------
Object: index=17 type=<Network Entity> state=mature
0001 string : Entity identifier = "client1.isns-test.eu"
0002 uint32 : Entity protocol = iSCSI (2)
@@ -24,11 +39,6 @@
0004 uint64 : Timestamp = Fri Sep 14 13:41:52 2007
0007 uint32 : Entity index = 17
--------------
-Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
- 0020 string : iSCSI name = "isns.client1"
- 0021 uint32 : iSCSI node type = Initiator
- 0024 uint32 : iSCSI node index = 13
---------------
Object: index=18 type=<Portal> state=mature parent=17
0010 ipaddr : Portal IP address = 192.168.1.1
0011 uint32 : Portal TCP/UDP port = 860/tcp
@@ -40,13 +50,3 @@
0032 uint32 : Portal group port = 860/tcp
0033 uint32 : Portal group tag = 1
0034 uint32 : Portal group index = 19
---------------
-Object: index=16 type=<Discovery Domain> state=mature
- 0811 uint32 : DD ID = 1
- 0812 string : DD name = "isns.dd1"
- 081e uint32 : DD features = <NIL>
- 0813 uint32 : DD member iSCSI index = 13
- 0814 string : DD member iSCSI name = "isns.client1"
- 0816 uint32 : DD member portal index = 18
- 0817 ipaddr : DD member portal addr = 192.168.1.1
- 0818 uint32 : DD member portal port = 860/tcp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/data/test06/08-registration
new/open-isns-0.98/tests/data/test06/08-registration
--- old/open-isns-0.97/tests/data/test06/08-registration 2016-10-29
03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/data/test06/08-registration 2017-08-21
02:14:40.000000000 +0200
@@ -17,6 +17,21 @@
0021 uint32 : iSCSI node type = <NIL>
0024 uint32 : iSCSI node index = 3
--------------
+Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
+ 0020 string : iSCSI name = "isns.client1"
+ 0021 uint32 : iSCSI node type = Initiator
+ 0024 uint32 : iSCSI node index = 13
+--------------
+Object: index=16 type=<Discovery Domain> state=mature
+ 0811 uint32 : DD ID = 1
+ 0812 string : DD name = "isns.dd1"
+ 081e uint32 : DD features = <NIL>
+ 0813 uint32 : DD member iSCSI index = 13
+ 0814 string : DD member iSCSI name = "isns.client1"
+ 0816 uint32 : DD member portal index = 18
+ 0817 ipaddr : DD member portal addr = 192.168.1.1
+ 0818 uint32 : DD member portal port = 860/tcp
+--------------
Object: index=17 type=<Network Entity> state=mature
0001 string : Entity identifier = "client1.isns-test.eu"
0002 uint32 : Entity protocol = iSCSI (2)
@@ -24,11 +39,6 @@
0004 uint64 : Timestamp = Fri Sep 14 13:41:52 2007
0007 uint32 : Entity index = 17
--------------
-Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
- 0020 string : iSCSI name = "isns.client1"
- 0021 uint32 : iSCSI node type = Initiator
- 0024 uint32 : iSCSI node index = 13
---------------
Object: index=18 type=<Portal> state=limbo
0010 ipaddr : Portal IP address = 192.168.1.1
0011 uint32 : Portal TCP/UDP port = 860/tcp
@@ -41,16 +51,6 @@
0033 uint32 : Portal group tag = 1
0034 uint32 : Portal group index = 19
--------------
-Object: index=16 type=<Discovery Domain> state=mature
- 0811 uint32 : DD ID = 1
- 0812 string : DD name = "isns.dd1"
- 081e uint32 : DD features = <NIL>
- 0813 uint32 : DD member iSCSI index = 13
- 0814 string : DD member iSCSI name = "isns.client1"
- 0816 uint32 : DD member portal index = 18
- 0817 ipaddr : DD member portal addr = 192.168.1.1
- 0818 uint32 : DD member portal port = 860/tcp
---------------
Object: index=20 type=<Portal> state=mature parent=17
0010 ipaddr : Portal IP address = 192.168.1.2
0011 uint32 : Portal TCP/UDP port = 860/tcp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/data/test06/09-registration
new/open-isns-0.98/tests/data/test06/09-registration
--- old/open-isns-0.97/tests/data/test06/09-registration 2016-10-29
03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/data/test06/09-registration 2017-08-21
02:14:40.000000000 +0200
@@ -17,6 +17,21 @@
0021 uint32 : iSCSI node type = <NIL>
0024 uint32 : iSCSI node index = 3
--------------
+Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
+ 0020 string : iSCSI name = "isns.client1"
+ 0021 uint32 : iSCSI node type = Initiator
+ 0024 uint32 : iSCSI node index = 13
+--------------
+Object: index=16 type=<Discovery Domain> state=mature
+ 0811 uint32 : DD ID = 1
+ 0812 string : DD name = "isns.dd1"
+ 081e uint32 : DD features = <NIL>
+ 0813 uint32 : DD member iSCSI index = 13
+ 0814 string : DD member iSCSI name = "isns.client1"
+ 0816 uint32 : DD member portal index = 18
+ 0817 ipaddr : DD member portal addr = 192.168.1.1
+ 0818 uint32 : DD member portal port = 860/tcp
+--------------
Object: index=17 type=<Network Entity> state=mature
0001 string : Entity identifier = "client1.isns-test.eu"
0002 uint32 : Entity protocol = iSCSI (2)
@@ -24,11 +39,6 @@
0004 uint64 : Timestamp = Fri Sep 14 13:41:52 2007
0007 uint32 : Entity index = 17
--------------
-Object: index=13 type=<iSCSI Storage Node> state=mature parent=17
- 0020 string : iSCSI name = "isns.client1"
- 0021 uint32 : iSCSI node type = Initiator
- 0024 uint32 : iSCSI node index = 13
---------------
Object: index=18 type=<Portal> state=mature parent=17
0010 ipaddr : Portal IP address = 192.168.1.1
0011 uint32 : Portal TCP/UDP port = 860/tcp
@@ -41,16 +51,6 @@
0033 uint32 : Portal group tag = 1
0034 uint32 : Portal group index = 19
--------------
-Object: index=16 type=<Discovery Domain> state=mature
- 0811 uint32 : DD ID = 1
- 0812 string : DD name = "isns.dd1"
- 081e uint32 : DD features = <NIL>
- 0813 uint32 : DD member iSCSI index = 13
- 0814 string : DD member iSCSI name = "isns.client1"
- 0816 uint32 : DD member portal index = 18
- 0817 ipaddr : DD member portal addr = 192.168.1.1
- 0818 uint32 : DD member portal port = 860/tcp
---------------
Object: index=20 type=<Portal> state=limbo
0010 ipaddr : Portal IP address = 192.168.1.2
0011 uint32 : Portal TCP/UDP port = 860/tcp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/data/test06/10-unregistration
new/open-isns-0.98/tests/data/test06/10-unregistration
--- old/open-isns-0.97/tests/data/test06/10-unregistration 2016-10-29
03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/data/test06/10-unregistration 2017-08-21
02:14:40.000000000 +0200
@@ -21,11 +21,6 @@
0020 string : iSCSI name = "isns.client1"
0024 uint32 : iSCSI node index = 13
--------------
-Object: index=18 type=<Portal> state=limbo
- 0010 ipaddr : Portal IP address = 192.168.1.1
- 0011 uint32 : Portal TCP/UDP port = 860/tcp
- 0016 uint32 : Portal index = 18
---------------
Object: index=16 type=<Discovery Domain> state=mature
0811 uint32 : DD ID = 1
0812 string : DD name = "isns.dd1"
@@ -35,3 +30,8 @@
0816 uint32 : DD member portal index = 18
0817 ipaddr : DD member portal addr = 192.168.1.1
0818 uint32 : DD member portal port = 860/tcp
+--------------
+Object: index=18 type=<Portal> state=limbo
+ 0010 ipaddr : Portal IP address = 192.168.1.1
+ 0011 uint32 : Portal TCP/UDP port = 860/tcp
+ 0016 uint32 : Portal index = 18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/data/test06/11-registration
new/open-isns-0.98/tests/data/test06/11-registration
--- old/open-isns-0.97/tests/data/test06/11-registration 2016-10-29
03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/data/test06/11-registration 2017-08-21
02:14:40.000000000 +0200
@@ -17,36 +17,36 @@
0021 uint32 : iSCSI node type = <NIL>
0024 uint32 : iSCSI node index = 3
--------------
-Object: index=22 type=<Network Entity> state=mature
- 0001 string : Entity identifier = "client1.isns-test.eu"
- 0002 uint32 : Entity protocol = iSCSI (2)
- 0006 uint32 : Registration Period = 7200
- 0004 uint64 : Timestamp = Fri Sep 21 11:23:54 2007
- 0007 uint32 : Entity index = 22
---------------
Object: index=13 type=<iSCSI Storage Node> state=mature parent=22
0020 string : iSCSI name = "isns.client1"
0024 uint32 : iSCSI node index = 13
0021 uint32 : iSCSI node type = Initiator
--------------
+Object: index=16 type=<Discovery Domain> state=mature
+ 0811 uint32 : DD ID = 1
+ 0812 string : DD name = "isns.dd1"
+ 081e uint32 : DD features = <NIL>
+ 0813 uint32 : DD member iSCSI index = 13
+ 0814 string : DD member iSCSI name = "isns.client1"
+ 0816 uint32 : DD member portal index = 18
+ 0817 ipaddr : DD member portal addr = 192.168.1.1
+ 0818 uint32 : DD member portal port = 860/tcp
+--------------
Object: index=18 type=<Portal> state=mature parent=22
0010 ipaddr : Portal IP address = 192.168.1.1
0011 uint32 : Portal TCP/UDP port = 860/tcp
0016 uint32 : Portal index = 18
--------------
+Object: index=22 type=<Network Entity> state=mature
+ 0001 string : Entity identifier = "client1.isns-test.eu"
+ 0002 uint32 : Entity protocol = iSCSI (2)
+ 0006 uint32 : Registration Period = 7200
+ 0004 uint64 : Timestamp = Fri Sep 21 11:23:54 2007
+ 0007 uint32 : Entity index = 22
+--------------
Object: index=23 type=<iSCSI Portal Group> state=mature parent=22
0030 string : Portal group name = "isns.client1"
0031 ipaddr : Portal group address = 192.168.1.1
0032 uint32 : Portal group port = 860/tcp
0033 uint32 : Portal group tag = 1
0034 uint32 : Portal group index = 23
---------------
-Object: index=16 type=<Discovery Domain> state=mature
- 0811 uint32 : DD ID = 1
- 0812 string : DD name = "isns.dd1"
- 081e uint32 : DD features = <NIL>
- 0813 uint32 : DD member iSCSI index = 13
- 0814 string : DD member iSCSI name = "isns.client1"
- 0816 uint32 : DD member portal index = 18
- 0817 ipaddr : DD member portal addr = 192.168.1.1
- 0818 uint32 : DD member portal port = 860/tcp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/harness.pl
new/open-isns-0.98/tests/harness.pl
--- old/open-isns-0.97/tests/harness.pl 2016-10-29 03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/harness.pl 2017-08-21 02:14:40.000000000 +0200
@@ -365,7 +365,7 @@
die "Test case forgot to call test_prep" unless($__isns_test_data);
$dump_file = "$__isns_test_dump/$stage";
- unless (&run_command("${__isns_bin}/isnsd -c $server_config --dump-db >
$dump_file")) {
+ unless (&run_command("${__isns_bin}isnsd -c $server_config --dump-db >
$dump_file")) {
&isns_fail;
return 0;
}
@@ -609,7 +609,7 @@
$logfile = &get_logfile($config);
- $cmd = "${__isns_bin}/isnsadm -c $client_config " . join(' ', @args);
+ $cmd = "${__isns_bin}isnsadm -c $client_config " . join(' ', @args);
if (&run_command("$cmd >$logfile")) {
return $logfile;
}
@@ -838,7 +838,7 @@
$stage = $cmd;
$stage =~ s:.*/::o;
- $cmd = "${__isns_bin}/$cmd -c $client " . join(' ', @args);
+ $cmd = "${__isns_bin}$cmd -c $client " . join(' ', @args);
&isns_stage($stage, "Running external $cmd " . join(' ', @args));
unless (&run_command("$cmd >$logfile")) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/open-isns-0.97/tests/test06.pl
new/open-isns-0.98/tests/test06.pl
--- old/open-isns-0.97/tests/test06.pl 2016-10-29 03:28:30.000000000 +0200
+++ new/open-isns-0.98/tests/test06.pl 2017-08-21 02:14:40.000000000 +0200
@@ -26,25 +26,25 @@
}
# Now replace the portal with different values
-&isns_register_client($client, "--replace entity=$eid initiator
portal=192.168.1.1:iscsi");
-&isns_register_client($client, "--replace entity=$eid initiator
portal=192.168.1.2:iscsi");
+&isns_register_client($client, "--replace entity=$eid initiator
portal=192.168.1.1:860");
+&isns_register_client($client, "--replace entity=$eid initiator
portal=192.168.1.2:860");
&isns_register_domain($client, "member-name=isns.client1");
# Replace our registration once more. Now the object index of the
# initiator should not change, since it's a domain member now.
-&isns_register_client($client, "--replace entity=$eid initiator
portal=192.168.1.1:iscsi");
+&isns_register_client($client, "--replace entity=$eid initiator
portal=192.168.1.1:860");
# Make the portal a domain member too. Now even the portal index should stay
# the same. Note that we do not replace the whole entity now, but just the
# portal
&isns_register_domain($client, "dd-id=1 member-addr=192.168.1.1
member-port=860");
-&isns_register_client($client, "--replace --key portal=192.168.1.1:iscsi
portal=192.168.1.2:iscsi");
-&isns_register_client($client, "--replace --key portal=192.168.1.2:iscsi
portal=192.168.1.1:iscsi");
+&isns_register_client($client, "--replace --key portal=192.168.1.1:860
portal=192.168.1.2:860");
+&isns_register_client($client, "--replace --key portal=192.168.1.2:860
portal=192.168.1.1:860");
# Now unregister the whole client, and re-register.
# Portal and client index should remain the same
&isns_unregister_client($client, "eid=$eid");
-&isns_register_client($client, "initiator portal=192.168.1.1:iscsi");
+&isns_register_client($client, "initiator portal=192.168.1.1:860");
&isns_finish;
