File open-iscsi-add-discovery-ops of Package open-iscsi

Overview Repositories Revisions Requests Users Attributes Meta

File open-iscsi-add-discovery-ops of Package open-iscsi (Revision 45268e4d4efa62fee3f332d6539916e5)

Currently displaying revision 45268e4d4efa62fee3f332d6539916e5 , Show latest

From: Mike Christie <michaelc@cs.wisc.edu>
Subject: Don't overwrite other nodes on discovery
References: 365259

The open-iscsi initiator will overwrite/delete old nodes whenever
we're doing a discovery. This is already fixes upstream, so we're
just pulling in the latest git fixes.

This patch is based on git commit
6bd2e30b9a835cb54d4fd539c97f79efe9d70a7a

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff -pur open-iscsi-2.0-865/doc/iscsiadm.8 open-iscsi.git/doc/iscsiadm.8
--- open-iscsi-2.0-865/doc/iscsiadm.8	2008-03-05 11:43:19.268973000 +0100
+++ open-iscsi.git/doc/iscsiadm.8	2008-03-05 11:29:21.060588250 +0100
@@ -12,7 +12,7 @@ iscsiadm \- open-iscsi administration ut
 
 \fBiscsiadm\fR -m iface [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -I ifacename ] [ [ -o  operation  ] [ -n name ] [ -v value ] ]
 
-\fBiscsiadm\fR -m fw
+\fBiscsiadm\fR -m fw [-l]
 
 \fBiscsiadm\fR -k priority
 
@@ -90,7 +90,7 @@ This command and iscsid's SIGTERM handli
 
 .TP
 \fB\-l\fR, \fB\-\-login\fR
-For node mode, login to a specified record. For discovery mode, login to
+For node and fw mode, login to a specified record. For discovery mode, login to
 all discovered targets.
 .IP
 This option is only valid for discovery and node modes.
@@ -125,16 +125,14 @@ operator.
 Specifies a database operator \fIop\fR. \fIop\fR must be one of
 \fInew\fR, \fIdelete\fR, \fIupdate\fR or \fIshow\fR.
 .IP
-This option is only valid for all modes, but delete should not be used on a running session.
+This option is valid for all modes except fw. Delete should not be used on a running session. If it is iscsiadm will stop the session and then delete the
+record.
 .IP
-\fInew\fR is currently valid only for node, session and iface mode. It creates
-a new database record for a given \fIportal\fR (IP address and port number).
+\fInew\fR creates a new database record for a given \fIportal\fR (IP address and port number). In discovery mode, iscsiadm will create new records for portals returned by the target.
 .IP
-\fIdelete\fR deletes a specified \fIrecid\fR.
+\fIdelete\fR deletes a specified \fIrecid\fR. In discovery node, iscsiadm will delete records for portals that are no longer returned.
 .IP
-\fIupdate\fR is currently valid only for node, session, and iface mode.
-It updates a specified
-\fIrecid\fR with \fIname\fR to the specified \fIvalue\fR.
+\fIupdate\fR will update the \fIrecid\fR with \fIname\fR to the specified \fIvalue\fR. In discovery node the \fIrecid\fR, \fIname\fR  and \fIvalue\fR arguments are not needed. The update operation will operate on the portals returned by the target, and will update the record with info from the config file and command line.
 .IP
 \fIshow\fR is the default behaviour for node, discovery and iface mode. It is
 also used when there are no commands passed into session mode and a running
diff -pur open-iscsi-2.0-865/etc/initd/initd.debian open-iscsi.git/etc/initd/initd.debian
--- open-iscsi-2.0-865/etc/initd/initd.debian	2007-06-13 17:56:49.000000000 +0200
+++ open-iscsi.git/etc/initd/initd.debian	2008-02-06 08:24:28.884820000 +0100
@@ -54,9 +54,16 @@ stop() {
 	log_daemon_msg "Stopping iSCSI initiator service"
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
 	rm -f $PIDFILE
+	status=0
 	modprobe -r ib_iser 2>/dev/null
+	if [ "$?" -ne "0" -a "$?" -ne "1" ]; then
+		status=1
+	fi
 	modprobe -r iscsi_tcp 2>/dev/null
-	log_end_msg 0
+	if [ "$?" -ne "0" -a "$?" -ne "1" ]; then
+		status=1
+	fi
+	log_end_msg $status
 }
 
 restart() {
diff -pur open-iscsi-2.0-865/etc/initd/initd.redhat open-iscsi.git/etc/initd/initd.redhat
--- open-iscsi-2.0-865/etc/initd/initd.redhat	2008-03-05 11:28:52.590809000 +0100
+++ open-iscsi.git/etc/initd/initd.redhat	2008-02-06 08:24:28.908821500 +0100
@@ -42,9 +42,20 @@ stop()
 	killproc iscsid
 	rm -f /var/run/iscsid.pid
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/open-iscsi
+	status=0
 	modprobe -r iscsi_tcp 2>/dev/null
+	if [ "$?" -ne "0" -a "$?" -ne "1" ]; then
+		status=1
+	fi
 	modprobe -r ib_iser 2>/dev/null
-	success
+	if [ "$?" -ne "0" -a "$?" -ne "1" ]; then
+		status=1
+	fi
+	if [ "$status" -eq "0" ]; then
+		success
+	else
+		failure
+	fi
 	echo
 
 }
diff -pur open-iscsi-2.0-865/etc/initd/initd.suse open-iscsi.git/etc/initd/initd.suse
--- open-iscsi-2.0-865/etc/initd/initd.suse	2008-03-05 11:43:19.632995750 +0100
+++ open-iscsi.git/etc/initd/initd.suse	2008-02-06 08:24:29.564862500 +0100
@@ -5,7 +5,7 @@
 ### BEGIN INIT INFO
 # Provides:          iscsi
 # Required-Start:    $network
-# Should-Start:
+# Should-Start:      iscsitarget
 # Required-Stop:     
 # Should-Stop:
 # Default-Start:     3 5
@@ -88,9 +88,16 @@ case "$1" in
 	echo -n "Stopping iSCSI initiator service: "
 	if [ "$RETVAL" == "0" ]; then
 	    rm -f $PID_FILE
+	    status=0
 	    modprobe -r iscsi_tcp
+	    if [ "$?" -ne "0" -a "$?" -ne "1" ]; then
+	    	status=1
+	    fi
 	    modprobe -q -r ib_iser
-	    rc_failed 0
+            if [ "$?" -ne "0" -a "$?" -ne "1" ]; then
+	        status=1 
+            fi
+	    rc_failed $status
 	else
 	    rc_failed 1
 	fi
Only in open-iscsi.git/etc/initd: initd.suse~
diff -pur open-iscsi-2.0-865/etc/iscsid.conf open-iscsi.git/etc/iscsid.conf
--- open-iscsi-2.0-865/etc/iscsid.conf	2008-03-05 11:28:52.622811000 +0100
+++ open-iscsi.git/etc/iscsid.conf	2008-02-06 08:24:28.924822500 +0100
@@ -126,7 +126,7 @@ node.session.initial_login_retry_max = 4
 node.session.cmds_max = 128
 
 # To control the device's queue depth set node.session.queue_depth
-# to a value between 1 and 128. The default is 128.
+# to a value between 1 and 128. The default is 32.
 node.session.queue_depth = 32
 
 #***************
Only in open-iscsi.git: .git
diff -pur open-iscsi-2.0-865/include/iscsi_proto.h open-iscsi.git/include/iscsi_proto.h
--- open-iscsi-2.0-865/include/iscsi_proto.h	2008-03-05 11:28:52.742818500 +0100
+++ open-iscsi.git/include/iscsi_proto.h	2008-03-05 11:29:21.096590500 +0100
@@ -60,8 +60,8 @@
 /* initiator tags; opaque for target */
 typedef uint32_t __bitwise__ itt_t;
 /* below makes sense only for initiator that created this tag */
-#define build_itt(itt, id, age) ((__force itt_t)\
-	((itt) | ((id) << ISCSI_CID_SHIFT) | ((age) << ISCSI_AGE_SHIFT)))
+#define build_itt(itt, age) ((__force itt_t)\
+	((itt) | ((age) << ISCSI_AGE_SHIFT)))
 #define get_itt(itt) ((__force uint32_t)(itt_t)(itt) & ISCSI_ITT_MASK)
 #define RESERVED_ITT ((__force itt_t)0xffffffff)
 
Only in open-iscsi.git: initd.patch
Only in open-iscsi.git: initd.patch~
diff -pur open-iscsi-2.0-865/kernel/2.6.14-19_compat.patch open-iscsi.git/kernel/2.6.14-19_compat.patch
--- open-iscsi-2.0-865/kernel/2.6.14-19_compat.patch	2008-03-05 11:28:52.782821000 +0100
+++ open-iscsi.git/kernel/2.6.14-19_compat.patch	2008-02-06 08:24:28.952824250 +0100
@@ -1,9 +1,9 @@
 diff --git a/iscsi_compat.h b/iscsi_compat.h
 new file mode 100644
-index 0000000..22e7c44
+index 0000000..965157a
 --- /dev/null
 +++ b/iscsi_compat.h
-@@ -0,0 +1,181 @@
+@@ -0,0 +1,192 @@
 +#include <linux/version.h>
 +#include <linux/kernel.h>
 +#include <scsi/scsi.h>
@@ -135,6 +135,14 @@ index 0000000..22e7c44
 +
 +#endif
 +
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++
++static inline int is_power_of_2(unsigned long n)
++{
++	return (n != 0 && ((n & (n - 1)) == 0));
++}
++#endif
++
 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
 +#define netlink_kernel_create(net, uint, groups, input, cb_mutex, mod) \
 +	netlink_kernel_create(uint, groups, input, mod)
@@ -150,6 +158,9 @@ index 0000000..22e7c44
 +	return sg + 1;
 +}
 +
++#define for_each_sg(sglist, sg, nr, __i)        \
++	for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg))
++
 +#define sg_page(_sg) _sg->page
 +
 +static inline void sg_set_page(struct scatterlist *sg, struct page *page,
@@ -186,7 +197,7 @@ index 0000000..22e7c44
 +
 +#endif
 diff --git a/iscsi_tcp.c b/iscsi_tcp.c
-index cc075bc..af93a6c 100644
+index 4472b23..46d3005 100644
 --- a/iscsi_tcp.c
 +++ b/iscsi_tcp.c
 @@ -43,6 +43,7 @@
@@ -197,7 +208,7 @@ index cc075bc..af93a6c 100644
  
  MODULE_AUTHOR("Dmitry Yusupov <dmitry_yus@yahoo.com>, "
  	      "Alex Aizman <itn780@yahoo.com>");
-@@ -421,6 +422,17 @@ iscsi_segment_seek_sg(struct iscsi_segment *segment,
+@@ -422,6 +423,17 @@ iscsi_segment_seek_sg(struct iscsi_segment *segment,
  
  	debug_scsi("iscsi_segment_seek_sg offset %u size %llu\n",
  		  offset, size);
@@ -207,15 +218,15 @@ index cc075bc..af93a6c 100644
 +	 * or scsi-ml commands.
 +	 */
 +	if (!sg_count) {
-+		iscsi_segment_init_linear(segment, (void *)sg + offset,
++		iscsi_segment_init_linear(segment, (void *)sg_list + offset,
 +					  size, done, hash);
 +		return 0;
 +	}
 +
  	__iscsi_segment_init(segment, size, done, hash);
- 	for (i = 0; i < sg_count; i++, sg = sg_next(sg)) {
+ 	for_each_sg(sg_list, sg, sg_count, i) {
  		debug_scsi("sg %d, len %u offset %u\n", i, sg->length,
-@@ -1934,7 +1946,9 @@ static struct scsi_host_template iscsi_sht = {
+@@ -1936,7 +1948,9 @@ static struct scsi_host_template iscsi_sht = {
  	.eh_device_reset_handler= iscsi_eh_device_reset,
  	.eh_host_reset_handler	= iscsi_eh_host_reset,
  	.use_clustering         = DISABLE_CLUSTERING,
@@ -226,30 +237,33 @@ index cc075bc..af93a6c 100644
  	.proc_name		= "iscsi_tcp",
  	.this_id		= -1,
 diff --git a/iscsi_tcp.h b/iscsi_tcp.h
-index 57c2317..783e448 100644
+index 950d75f..662ddab 100644
 --- a/iscsi_tcp.h
 +++ b/iscsi_tcp.h
-@@ -27,6 +27,7 @@
- #define ISCSI_SG_TABLESIZE		SG_ALL
- #define ISCSI_TCP_MAX_CMD_LEN		16
+@@ -24,6 +24,7 @@
+ 
+ #include "libiscsi.h"
  
 +#include "iscsi_compat.h"
  struct crypto_hash;
  struct socket;
  struct iscsi_tcp_conn;
 diff --git a/libiscsi.c b/libiscsi.c
-index d175f14..da0dd4e 100644
+index 20fa67e..2bc9bb2 100644
 --- a/libiscsi.c
 +++ b/libiscsi.c
-@@ -24,6 +24,7 @@
+@@ -24,7 +24,10 @@
  #include <linux/types.h>
  #include <linux/kfifo.h>
  #include <linux/delay.h>
 +#include <linux/version.h>
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+ #include <linux/log2.h>
++#endif
  #include <asm/unaligned.h>
  #include <net/tcp.h>
  #include <scsi/scsi_cmnd.h>
-@@ -976,10 +977,9 @@ again:
+@@ -980,10 +983,9 @@ again:
  	return rc;
  }
  
@@ -262,7 +276,7 @@ index d175f14..da0dd4e 100644
  	int rc;
  	/*
  	 * serialize Xmit worker on a per-connection basis.
-@@ -1727,7 +1727,9 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
+@@ -1741,7 +1743,9 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
  	shost->max_cmd_len = iscsit->max_cmd_len;
  	shost->transportt = scsit;
  	shost->transportt->create_work_queue = 1;
@@ -272,7 +286,7 @@ index d175f14..da0dd4e 100644
  	*hostno = shost->host_no;
  
  	session = iscsi_hostdata(shost->hostdata);
-@@ -1877,7 +1879,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
+@@ -1891,7 +1895,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
  	INIT_LIST_HEAD(&conn->mgmtqueue);
  	INIT_LIST_HEAD(&conn->xmitqueue);
  	INIT_LIST_HEAD(&conn->requeue);
@@ -282,7 +296,7 @@ index d175f14..da0dd4e 100644
  	/* allocate login_mtask used for the login/text sequences */
  	spin_lock_bh(&session->lock);
 diff --git a/libiscsi.h b/libiscsi.h
-index 8328bc7..028b5df 100644
+index b7a9b08..134a05b 100644
 --- a/libiscsi.h
 +++ b/libiscsi.h
 @@ -24,12 +24,14 @@
@@ -303,7 +317,7 @@ index 8328bc7..028b5df 100644
  struct scsi_device;
  struct Scsi_Host;
 diff --git a/scsi_transport_iscsi.c b/scsi_transport_iscsi.c
-index 7e5e168..65541bb 100644
+index 22c947d..a5aa8a4 100644
 --- a/scsi_transport_iscsi.c
 +++ b/scsi_transport_iscsi.c
 @@ -21,7 +21,10 @@
@@ -323,12 +337,25 @@ index 7e5e168..65541bb 100644
  #include "iscsi_if.h"
 +#include "iscsi_compat.h"
  
- #define ISCSI_SESSION_ATTRS 18
- #define ISCSI_CONN_ATTRS 11
-@@ -254,11 +258,9 @@ static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,
+ #define ISCSI_SESSION_ATTRS 19
+ #define ISCSI_CONN_ATTRS 13
+@@ -322,10 +326,9 @@ static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,
  	return 0;
  }
  
+-static void iscsi_scan_session(struct work_struct *work)
++static void iscsi_scan_session(void *data)
+ {
+-	struct iscsi_cls_session *session =
+-			container_of(work, struct iscsi_cls_session, scan_work);
++	struct iscsi_cls_session *session = data;
+ 	struct Scsi_Host *shost = iscsi_session_to_shost(session);
+ 	struct iscsi_host *ihost = shost->shost_data;
+ 	unsigned long flags;
+@@ -343,11 +346,9 @@ done:
+ 	atomic_dec(&ihost->nr_scans);
+ }
+ 
 -static void session_recovery_timedout(struct work_struct *work)
 +static void session_recovery_timedout(void *data)
  {
@@ -336,10 +363,23 @@ index 7e5e168..65541bb 100644
 -		container_of(work, struct iscsi_cls_session,
 -			     recovery_work.work);
 +	struct iscsi_cls_session *session = data;
+ 	unsigned long flags;
  
- 	dev_printk(KERN_INFO, &session->dev, "iscsi: session recovery timed "
- 		  "out after %d secs\n", session->recovery_tmo);
-@@ -285,11 +287,9 @@ void iscsi_block_session(struct iscsi_cls_session *session)
+ 	iscsi_cls_session_printk(KERN_INFO, session,
+@@ -396,10 +397,12 @@ void iscsi_unblock_session(struct iscsi_cls_session *session)
+ 	 * the async scanning code (drivers like iscsi_tcp do login and
+ 	 * scanning from userspace).
+ 	 */
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+ 	if (shost->hostt->scan_finished) {
+ 		if (queue_work(ihost->scan_workq, &session->scan_work))
+ 			atomic_inc(&ihost->nr_scans);
+ 	}
++#endif
+ }
+ EXPORT_SYMBOL_GPL(iscsi_unblock_session);
+ 
+@@ -417,11 +420,9 @@ void iscsi_block_session(struct iscsi_cls_session *session)
  }
  EXPORT_SYMBOL_GPL(iscsi_block_session);
  
@@ -353,20 +393,31 @@ index 7e5e168..65541bb 100644
  	struct Scsi_Host *shost = iscsi_session_to_shost(session);
  	struct iscsi_host *ihost = shost->shost_data;
  
-@@ -327,10 +327,10 @@ iscsi_alloc_session(struct Scsi_Host *shost,
- 
+@@ -460,11 +461,11 @@ iscsi_alloc_session(struct Scsi_Host *shost,
  	session->transport = transport;
  	session->recovery_tmo = 120;
+ 	session->state = ISCSI_SESSION_FREE;
 -	INIT_DELAYED_WORK(&session->recovery_work, session_recovery_timedout);
 +	INIT_WORK(&session->recovery_work, session_recovery_timedout, session);
  	INIT_LIST_HEAD(&session->host_list);
  	INIT_LIST_HEAD(&session->sess_list);
 -	INIT_WORK(&session->unbind_work, __iscsi_unbind_session);
+-	INIT_WORK(&session->scan_work, iscsi_scan_session);
 +	INIT_WORK(&session->unbind_work, __iscsi_unbind_session, session);
++	INIT_WORK(&session->scan_work, iscsi_scan_session, session);
+ 	spin_lock_init(&session->lock);
  
  	/* this is released in the dev's release function */
- 	scsi_host_get(shost);
-@@ -1123,45 +1123,56 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -582,7 +583,7 @@ void iscsi_remove_session(struct iscsi_cls_session *session)
+ 	session->state = ISCSI_SESSION_FREE;
+ 	spin_unlock_irqrestore(&session->lock, flags);
+ 	__iscsi_unblock_session(session);
+-	__iscsi_unbind_session(&session->unbind_work);
++	__iscsi_unbind_session(session);
+ 
+ 	/* flush running scans */
+ 	flush_workqueue(ihost->scan_workq);
+@@ -1273,45 +1274,56 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
   * Malformed skbs with wrong lengths or invalid creds are not processed.
   */
  static void
@@ -456,7 +507,7 @@ index 7e5e168..65541bb 100644
  	}
  	mutex_unlock(&rx_queue_mutex);
  }
-@@ -1396,7 +1407,10 @@ iscsi_register_transport(struct iscsi_transport *tt)
+@@ -1555,7 +1567,10 @@ iscsi_register_transport(struct iscsi_transport *tt)
  	INIT_LIST_HEAD(&priv->list);
  	priv->daemon_pid = -1;
  	priv->iscsi_transport = tt;
@@ -468,7 +519,7 @@ index 7e5e168..65541bb 100644
  	priv->cdev.class = &iscsi_transport_class;
  	snprintf(priv->cdev.class_id, BUS_ID_SIZE, "%s", tt->name);
 diff --git a/scsi_transport_iscsi.h b/scsi_transport_iscsi.h
-index 6bda9b9..deaa582 100644
+index 2a287c2..d2a0036 100644
 --- a/scsi_transport_iscsi.h
 +++ b/scsi_transport_iscsi.h
 @@ -25,8 +25,12 @@
@@ -484,15 +535,15 @@ index 6bda9b9..deaa582 100644
  
  struct scsi_transport_template;
  struct iscsi_transport;
-@@ -185,7 +189,7 @@ struct iscsi_cls_session {
+@@ -182,7 +186,7 @@ struct iscsi_cls_session {
  
  	/* recovery fields */
  	int recovery_tmo;
 -	struct delayed_work recovery_work;
 +	struct work_struct recovery_work;
- 	struct work_struct unbind_work;
  
  	int target_id;
+ 
 -- 
 1.5.1.2
 
diff -pur open-iscsi-2.0-865/kernel/2.6.20-21_compat.patch open-iscsi.git/kernel/2.6.20-21_compat.patch
--- open-iscsi-2.0-865/kernel/2.6.20-21_compat.patch	2008-03-05 11:28:52.834824250 +0100
+++ open-iscsi.git/kernel/2.6.20-21_compat.patch	2008-02-06 08:24:28.976825750 +0100
@@ -1,15 +1,24 @@
 diff --git a/iscsi_2.6.22_compat.h b/iscsi_2.6.22_compat.h
 new file mode 100644
-index 0000000..f2693f1
+index 0000000..2ba7deb
 --- /dev/null
 +++ b/iscsi_2.6.22_compat.h
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,85 @@
 +#include <linux/version.h>
 +#include <scsi/scsi_cmnd.h>
 +
 +#ifndef ISCSI_2622_COMPAT_H
 +#define ISCSI_2622_COMPAT_H
 +
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20)
++
++static inline __attribute__((const))
++bool is_power_of_2(unsigned long n)
++{
++        return (n != 0 && ((n & (n - 1)) == 0));
++}
++#endif
++
 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
 +
 +#define netlink_kernel_create(net, uint, groups, input, cb_mutex, mod) \
@@ -44,6 +53,9 @@ index 0000000..f2693f1
 +	return sg + 1;
 +}
 +
++#define for_each_sg(sglist, sg, nr, __i)        \
++	for (__i = 0, sg = (sglist); __i < (nr); __i++, sg = sg_next(sg))
++
 +#define sg_page(_sg) _sg->page
 +
 +static inline void sg_set_page(struct scatterlist *sg, struct page *page,
@@ -78,10 +90,10 @@ index 0000000..f2693f1
 +
 +#endif
 diff --git a/iscsi_tcp.c b/iscsi_tcp.c
-index cc075bc..156f87e 100644
+index ce1fdf1..ad46009 100644
 --- a/iscsi_tcp.c
 +++ b/iscsi_tcp.c
-@@ -421,6 +421,17 @@ iscsi_segment_seek_sg(struct iscsi_segment *segment,
+@@ -422,6 +422,17 @@ iscsi_segment_seek_sg(struct iscsi_segment *segment,
  
  	debug_scsi("iscsi_segment_seek_sg offset %u size %llu\n",
  		  offset, size);
@@ -91,15 +103,15 @@ index cc075bc..156f87e 100644
 +	 * or scsi-ml commands.
 +	 */
 +	if (!sg_count) {
-+		iscsi_segment_init_linear(segment, (void *)sg + offset,
++		iscsi_segment_init_linear(segment, (void *)sg_list + offset,
 +					  size, done, hash);
 +		return 0;
 +	}
 +
  	__iscsi_segment_init(segment, size, done, hash);
- 	for (i = 0; i < sg_count; i++, sg = sg_next(sg)) {
+ 	for_each_sg(sg_list, sg, sg_count, i) {
  		debug_scsi("sg %d, len %u offset %u\n", i, sg->length,
-@@ -1934,7 +1945,9 @@ static struct scsi_host_template iscsi_sht = {
+@@ -1933,7 +1944,9 @@ static struct scsi_host_template iscsi_sht = {
  	.eh_device_reset_handler= iscsi_eh_device_reset,
  	.eh_host_reset_handler	= iscsi_eh_host_reset,
  	.use_clustering         = DISABLE_CLUSTERING,
@@ -110,19 +122,19 @@ index cc075bc..156f87e 100644
  	.proc_name		= "iscsi_tcp",
  	.this_id		= -1,
 diff --git a/iscsi_tcp.h b/iscsi_tcp.h
-index 57c2317..0b706a3 100644
+index 950d75f..a7bc56f 100644
 --- a/iscsi_tcp.h
 +++ b/iscsi_tcp.h
-@@ -27,6 +27,7 @@
- #define ISCSI_SG_TABLESIZE		SG_ALL
- #define ISCSI_TCP_MAX_CMD_LEN		16
+@@ -24,6 +24,7 @@
+ 
+ #include "libiscsi.h"
  
 +#include "iscsi_2.6.22_compat.h"
  struct crypto_hash;
  struct socket;
  struct iscsi_tcp_conn;
 diff --git a/libiscsi.h b/libiscsi.h
-index 8328bc7..fbe14c0 100644
+index 72f6fc6..fb98306 100644
 --- a/libiscsi.h
 +++ b/libiscsi.h
 @@ -30,6 +30,8 @@
@@ -135,7 +147,7 @@ index 8328bc7..fbe14c0 100644
  struct scsi_device;
  struct Scsi_Host;
 diff --git a/scsi_transport_iscsi.c b/scsi_transport_iscsi.c
-index 7e5e168..dbe94cc 100644
+index 4686f3a..0cd18a0 100644
 --- a/scsi_transport_iscsi.c
 +++ b/scsi_transport_iscsi.c
 @@ -29,6 +29,7 @@
@@ -144,9 +156,9 @@ index 7e5e168..dbe94cc 100644
  #include "iscsi_if.h"
 +#include "iscsi_2.6.22_compat.h"
  
- #define ISCSI_SESSION_ATTRS 18
- #define ISCSI_CONN_ATTRS 11
-@@ -1119,49 +1120,61 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ #define ISCSI_SESSION_ATTRS 19
+ #define ISCSI_CONN_ATTRS 13
+@@ -1265,49 +1266,61 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
  }
  
  /*
Only in open-iscsi.git/kernel: iscsi_compat.h
diff -pur open-iscsi-2.0-865/kernel/iscsi_tcp.c open-iscsi.git/kernel/iscsi_tcp.c
--- open-iscsi-2.0-865/kernel/iscsi_tcp.c	2008-03-05 11:28:52.906828750 +0100
+++ open-iscsi.git/kernel/iscsi_tcp.c	2008-02-06 08:24:29.000827250 +0100
@@ -413,16 +413,17 @@ iscsi_segment_init_linear(struct iscsi_s
 
 static inline int
 iscsi_segment_seek_sg(struct iscsi_segment *segment,
-		      struct scatterlist *sg, unsigned int sg_count,
+		      struct scatterlist *sg_list, unsigned int sg_count,
 		      unsigned int offset, size_t size,
 		      iscsi_segment_done_fn_t *done, struct hash_desc *hash)
 {
+	struct scatterlist *sg;
 	unsigned int i;
 
 	debug_scsi("iscsi_segment_seek_sg offset %u size %llu\n",
 		  offset, size);
 	__iscsi_segment_init(segment, size, done, hash);
-	for (i = 0; i < sg_count; i++, sg = sg_next(sg)) {
+	for_each_sg(sg_list, sg, sg_count, i) {
 		debug_scsi("sg %d, len %u offset %u\n", i, sg->length,
 			   sg->offset);
 		if (offset < sg->length) {
@@ -628,8 +629,9 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
 	int rc;
 
 	if (tcp_conn->in.datalen) {
-		printk(KERN_ERR "iscsi_tcp: invalid R2t with datalen %d\n",
-		       tcp_conn->in.datalen);
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "invalid R2t with datalen %d\n",
+				  tcp_conn->in.datalen);
 		return ISCSI_ERR_DATALEN;
 	}
 
@@ -640,13 +642,12 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
 	}
 
 	/* fill-in new R2T associated with the task */
-	spin_lock(&session->lock);
 	iscsi_update_cmdsn(session, (struct iscsi_nopin*)rhdr);
 
 	if (!ctask->sc || session->state != ISCSI_STATE_LOGGED_IN) {
-		printk(KERN_INFO "iscsi_tcp: dropping R2T itt %d in "
-		       "recovery...\n", ctask->itt);
-		spin_unlock(&session->lock);
+		iscsi_conn_printk(KERN_INFO, conn,
+				  "dropping R2T itt %d in recovery.\n",
+				  ctask->itt);
 		return 0;
 	}
 
@@ -656,10 +657,10 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
 	r2t->exp_statsn = rhdr->statsn;
 	r2t->data_length = be32_to_cpu(rhdr->data_length);
 	if (r2t->data_length == 0) {
-		printk(KERN_ERR "iscsi_tcp: invalid R2T with zero data len\n");
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "invalid R2T with zero data len\n");
 		__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
 			    sizeof(void*));
-		spin_unlock(&session->lock);
 		return ISCSI_ERR_DATALEN;
 	}
 
@@ -670,12 +671,12 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
 
 	r2t->data_offset = be32_to_cpu(rhdr->data_offset);
 	if (r2t->data_offset + r2t->data_length > scsi_bufflen(ctask->sc)) {
-		printk(KERN_ERR "iscsi_tcp: invalid R2T with data len %u at "
-		       "offset %u and total length %d\n", r2t->data_length,
-		       r2t->data_offset, scsi_bufflen(ctask->sc));
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "invalid R2T with data len %u at offset %u "
+				  "and total length %d\n", r2t->data_length,
+				  r2t->data_offset, scsi_bufflen(ctask->sc));
 		__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
 			    sizeof(void*));
-		spin_unlock(&session->lock);
 		return ISCSI_ERR_DATALEN;
 	}
 
@@ -689,8 +690,6 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
 	conn->r2t_pdus_cnt++;
 
 	iscsi_requeue_ctask(ctask);
-	spin_unlock(&session->lock);
-
 	return 0;
 }
 
@@ -741,8 +740,9 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn 
 	/* verify PDU length */
 	tcp_conn->in.datalen = ntoh24(hdr->dlength);
 	if (tcp_conn->in.datalen > conn->max_recv_dlength) {
-		printk(KERN_ERR "iscsi_tcp: datalen %d > %d\n",
-		       tcp_conn->in.datalen, conn->max_recv_dlength);
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "iscsi_tcp: datalen %d > %d\n",
+				  tcp_conn->in.datalen, conn->max_recv_dlength);
 		return ISCSI_ERR_DATALEN;
 	}
 
@@ -763,7 +763,9 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn 
 	switch(opcode) {
 	case ISCSI_OP_SCSI_DATA_IN:
 		ctask = session->cmds[itt];
+		spin_lock(&conn->session->lock);
 		rc = iscsi_data_rsp(conn, ctask);
+		spin_unlock(&conn->session->lock);
 		if (rc)
 			return rc;
 		if (tcp_conn->in.datalen) {
@@ -805,9 +807,11 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn 
 		ctask = session->cmds[itt];
 		if (ahslen)
 			rc = ISCSI_ERR_AHSLEN;
-		else if (ctask->sc->sc_data_direction == DMA_TO_DEVICE)
+		else if (ctask->sc->sc_data_direction == DMA_TO_DEVICE) {
+			spin_lock(&session->lock);
 			rc = iscsi_r2t_rsp(conn, ctask);
-		else
+			spin_unlock(&session->lock);
+		} else
 			rc = ISCSI_ERR_PROTO;
 		break;
 	case ISCSI_OP_LOGIN_RSP:
@@ -820,10 +824,12 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn 
 		 * For now we fail until we find a vendor that needs it
 		 */
 		if (ISCSI_DEF_MAX_RECV_SEG_LEN < tcp_conn->in.datalen) {
-			printk(KERN_ERR "iscsi_tcp: received buffer of len %u "
-			      "but conn buffer is only %u (opcode %0x)\n",
-			      tcp_conn->in.datalen,
-			      ISCSI_DEF_MAX_RECV_SEG_LEN, opcode);
+			iscsi_conn_printk(KERN_ERR, conn,
+					  "iscsi_tcp: received buffer of "
+					  "len %u but conn buffer is only %u "
+					  "(opcode %0x)\n",
+					  tcp_conn->in.datalen,
+					  ISCSI_DEF_MAX_RECV_SEG_LEN, opcode);
 			rc = ISCSI_ERR_PROTO;
 			break;
 		}
@@ -1497,30 +1503,25 @@ iscsi_tcp_conn_create(struct iscsi_cls_s
 	tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
 						  CRYPTO_ALG_ASYNC);
 	tcp_conn->tx_hash.flags = 0;
-	if (IS_ERR(tcp_conn->tx_hash.tfm)) {
-		printk(KERN_ERR "Could not create connection due to crc32c "
-		       "loading error %ld. Make sure the crc32c module is "
-		       "built as a module or into the kernel\n",
-			PTR_ERR(tcp_conn->tx_hash.tfm));
+	if (IS_ERR(tcp_conn->tx_hash.tfm))
 		goto free_tcp_conn;
-	}
 
 	tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
 						  CRYPTO_ALG_ASYNC);
 	tcp_conn->rx_hash.flags = 0;
-	if (IS_ERR(tcp_conn->rx_hash.tfm)) {
-		printk(KERN_ERR "Could not create connection due to crc32c "
-		       "loading error %ld. Make sure the crc32c module is "
-		       "built as a module or into the kernel\n",
-			PTR_ERR(tcp_conn->rx_hash.tfm));
+	if (IS_ERR(tcp_conn->rx_hash.tfm))
 		goto free_tx_tfm;
-	}
 
 	return cls_conn;
 
 free_tx_tfm:
 	crypto_free_hash(tcp_conn->tx_hash.tfm);
 free_tcp_conn:
+	iscsi_conn_printk(KERN_ERR, conn,
+			  "Could not create connection due to crc32c "
+			  "loading error. Make sure the crc32c "
+			  "module is built as a module or into the "
+			  "kernel\n");
 	kfree(tcp_conn);
 tcp_conn_alloc_fail:
 	iscsi_conn_teardown(cls_conn);
@@ -1628,7 +1629,8 @@ iscsi_tcp_conn_bind(struct iscsi_cls_ses
 	/* lookup for existing socket */
 	sock = sockfd_lookup((int)transport_eph, &err);
 	if (!sock) {
-		printk(KERN_ERR "iscsi_tcp: sockfd_lookup failed %d\n", err);
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "sockfd_lookup failed %d\n", err);
 		return -EEXIST;
 	}
 	/*
@@ -1775,12 +1777,12 @@ iscsi_conn_set_param(struct iscsi_cls_co
 		break;
 	case ISCSI_PARAM_MAX_R2T:
 		sscanf(buf, "%d", &value);
-		if (session->max_r2t == roundup_pow_of_two(value))
+		if (value <= 0 || !is_power_of_2(value))
+			return -EINVAL;
+		if (session->max_r2t == value)
 			break;
 		iscsi_r2tpool_free(session);
 		iscsi_set_param(cls_conn, param, buf, buflen);
-		if (session->max_r2t & (session->max_r2t - 1))
-			session->max_r2t = roundup_pow_of_two(session->max_r2t);
 		if (iscsi_r2tpool_alloc(session))
 			return -ENOMEM;
 		break;
@@ -1927,7 +1929,7 @@ static struct scsi_host_template iscsi_s
 	.queuecommand           = iscsi_queuecommand,
 	.change_queue_depth	= iscsi_change_queue_depth,
 	.can_queue		= ISCSI_DEF_XMIT_CMDS_MAX - 1,
-	.sg_tablesize		= ISCSI_SG_TABLESIZE,
+	.sg_tablesize		= 4096,
 	.max_sectors		= 0xFFFF,
 	.cmd_per_lun		= ISCSI_DEF_CMD_PER_LUN,
 	.eh_abort_handler       = iscsi_eh_abort,
@@ -1974,7 +1976,7 @@ static struct iscsi_transport iscsi_tcp_
 	.host_template		= &iscsi_sht,
 	.conndata_size		= sizeof(struct iscsi_conn),
 	.max_conn		= 1,
-	.max_cmd_len		= ISCSI_TCP_MAX_CMD_LEN,
+	.max_cmd_len		= 16,
 	/* session management */
 	.create_session		= iscsi_tcp_session_create,
 	.destroy_session	= iscsi_tcp_session_destroy,
diff -pur open-iscsi-2.0-865/kernel/iscsi_tcp.h open-iscsi.git/kernel/iscsi_tcp.h
--- open-iscsi-2.0-865/kernel/iscsi_tcp.h	2008-03-05 11:28:52.942831000 +0100
+++ open-iscsi.git/kernel/iscsi_tcp.h	2008-02-06 08:24:29.044830000 +0100
@@ -24,9 +24,6 @@
 
 #include "libiscsi.h"
 
-#define ISCSI_SG_TABLESIZE		SG_ALL
-#define ISCSI_TCP_MAX_CMD_LEN		16
-
 struct crypto_hash;
 struct socket;
 struct iscsi_tcp_conn;
diff -pur open-iscsi-2.0-865/kernel/libiscsi.c open-iscsi.git/kernel/libiscsi.c
--- open-iscsi-2.0-865/kernel/libiscsi.c	2008-03-05 11:28:52.986833750 +0100
+++ open-iscsi.git/kernel/libiscsi.c	2008-03-05 11:29:21.132592750 +0100
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/kfifo.h>
 #include <linux/delay.h>
+#include <linux/log2.h>
 #include <asm/unaligned.h>
 #include <net/tcp.h>
 #include <scsi/scsi_cmnd.h>
@@ -159,7 +160,7 @@ static int iscsi_prep_scsi_cmd_pdu(struc
 	hdr->opcode = ISCSI_OP_SCSI_CMD;
 	hdr->flags = ISCSI_ATTR_SIMPLE;
 	int_to_scsilun(sc->device->lun, (struct scsi_lun *)hdr->lun);
-	hdr->itt = build_itt(ctask->itt, conn->id, session->age);
+	hdr->itt = build_itt(ctask->itt, session->age);
 	hdr->data_length = cpu_to_be32(scsi_bufflen(sc));
 	hdr->cmdsn = cpu_to_be32(session->cmdsn);
 	session->cmdsn++;
@@ -415,8 +416,9 @@ static void iscsi_scsi_cmd_rsp(struct is
 
 		if (datalen < 2) {
 invalid_datalen:
-			printk(KERN_ERR "iscsi: Got CHECK_CONDITION but "
-			       "invalid data buffer size of %d\n", datalen);
+			iscsi_conn_printk(KERN_ERR,  conn,
+					 "Got CHECK_CONDITION but invalid data "
+					 "buffer size of %d\n", datalen);
 			sc->result = DID_BAD_TARGET << 16;
 			goto out;
 		}
@@ -431,9 +433,6 @@ invalid_datalen:
 			   min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));
 	}
 
-	if (sc->sc_data_direction == DMA_TO_DEVICE)
-		goto out;
-
 	if (rhdr->flags & (ISCSI_FLAG_CMD_UNDERFLOW |
 	                   ISCSI_FLAG_CMD_OVERFLOW)) {
 		int res_count = be32_to_cpu(rhdr->residual_count);
@@ -496,7 +495,7 @@ static void iscsi_send_nopout(struct isc
 
 	mtask = __iscsi_conn_send_pdu(conn, (struct iscsi_hdr *)&hdr, NULL, 0);
 	if (!mtask) {
-		printk(KERN_ERR "Could not send nopout\n");
+		iscsi_conn_printk(KERN_ERR, conn, "Could not send nopout\n");
 		return;
 	}
 
@@ -524,9 +523,10 @@ static int iscsi_handle_reject(struct is
 		if (ntoh24(reject->dlength) >= sizeof(struct iscsi_hdr)) {
 			memcpy(&rejected_pdu, data, sizeof(struct iscsi_hdr));
 			itt = get_itt(rejected_pdu.itt);
-			printk(KERN_ERR "itt 0x%x had pdu (op 0x%x) rejected "
-				"due to DataDigest error.\n", itt,
-				rejected_pdu.opcode);
+			iscsi_conn_printk(KERN_ERR, conn,
+					  "itt 0x%x had pdu (op 0x%x) rejected "
+					  "due to DataDigest error.\n", itt,
+					  rejected_pdu.opcode);
 		}
 	}
 	return 0;
@@ -699,18 +699,13 @@ int iscsi_verify_itt(struct iscsi_conn *
 	if (hdr->itt != RESERVED_ITT) {
 		if (((__force u32)hdr->itt & ISCSI_AGE_MASK) !=
 		    (session->age << ISCSI_AGE_SHIFT)) {
-			printk(KERN_ERR "iscsi: received itt %x expected "
-				"session age (%x)\n", (__force u32)hdr->itt,
-				session->age & ISCSI_AGE_MASK);
+			iscsi_conn_printk(KERN_ERR, conn,
+					  "received itt %x expected session "
+					  "age (%x)\n", (__force u32)hdr->itt,
+					  session->age & ISCSI_AGE_MASK);
 			return ISCSI_ERR_BAD_ITT;
 		}
 
-		if (((__force u32)hdr->itt & ISCSI_CID_MASK) !=
-		    (conn->id << ISCSI_CID_SHIFT)) {
-			printk(KERN_ERR "iscsi: received itt %x, expected "
-				"CID (%x)\n", (__force u32)hdr->itt, conn->id);
-			return ISCSI_ERR_BAD_ITT;
-		}
 		itt = get_itt(hdr->itt);
 	} else
 		itt = ~0U;
@@ -719,16 +714,17 @@ int iscsi_verify_itt(struct iscsi_conn *
 		ctask = session->cmds[itt];
 
 		if (!ctask->sc) {
-			printk(KERN_INFO "iscsi: dropping ctask with "
-			       "itt 0x%x\n", ctask->itt);
+			iscsi_conn_printk(KERN_INFO, conn, "dropping ctask "
+					  "with itt 0x%x\n", ctask->itt);
 			/* force drop */
 			return ISCSI_ERR_NO_SCSI_CMD;
 		}
 
 		if (ctask->sc->SCp.phase != session->age) {
-			printk(KERN_ERR "iscsi: ctask's session age %d, "
-				"expected %d\n", ctask->sc->SCp.phase,
-				session->age);
+			iscsi_conn_printk(KERN_ERR, conn,
+					  "iscsi: ctask's session age %d, "
+					  "expected %d\n", ctask->sc->SCp.phase,
+					  session->age);
 			return ISCSI_ERR_SESSION_FAILED;
 		}
 	}
@@ -773,7 +769,7 @@ static void iscsi_prep_mtask(struct iscs
 	 */
 	nop->cmdsn = cpu_to_be32(session->cmdsn);
 	if (hdr->itt != RESERVED_ITT) {
-		hdr->itt = build_itt(mtask->itt, conn->id, session->age);
+		hdr->itt = build_itt(mtask->itt, session->age);
 		/*
 		 * TODO: We always use immediate, so we never hit this.
 		 * If we start to send tmfs or nops as non-immediate then
@@ -999,6 +995,7 @@ enum {
 	FAILURE_SESSION_IN_RECOVERY,
 	FAILURE_SESSION_RECOVERY_TIMEOUT,
 	FAILURE_SESSION_LOGGING_OUT,
+	FAILURE_SESSION_NOT_READY,
 };
 
 int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
@@ -1019,6 +1016,12 @@ int iscsi_queuecommand(struct scsi_cmnd 
 	session = iscsi_hostdata(host->hostdata);
 	spin_lock(&session->lock);
 
+	reason = iscsi_session_chkready(session_to_cls(session));
+	if (reason) {
+		sc->result = reason;
+		goto fault;
+	}
+
 	/*
 	 * ISCSI_STATE_FAILED is a temp. state. The recovery
 	 * code will decide what is best to do with command queued
@@ -1035,18 +1038,23 @@ int iscsi_queuecommand(struct scsi_cmnd 
 		switch (session->state) {
 		case ISCSI_STATE_IN_RECOVERY:
 			reason = FAILURE_SESSION_IN_RECOVERY;
-			goto reject;
+			sc->result = DID_IMM_RETRY << 16;
+			break;
 		case ISCSI_STATE_LOGGING_OUT:
 			reason = FAILURE_SESSION_LOGGING_OUT;
-			goto reject;
+			sc->result = DID_IMM_RETRY << 16;
+			break;
 		case ISCSI_STATE_RECOVERY_FAILED:
 			reason = FAILURE_SESSION_RECOVERY_TIMEOUT;
+			sc->result = DID_NO_CONNECT << 16;
 			break;
 		case ISCSI_STATE_TERMINATE:
 			reason = FAILURE_SESSION_TERMINATE;
+			sc->result = DID_NO_CONNECT << 16;
 			break;
 		default:
 			reason = FAILURE_SESSION_FREED;
+			sc->result = DID_NO_CONNECT << 16;
 		}
 		goto fault;
 	}
@@ -1054,6 +1062,7 @@ int iscsi_queuecommand(struct scsi_cmnd 
 	conn = session->leadconn;
 	if (!conn) {
 		reason = FAILURE_SESSION_FREED;
+		sc->result = DID_NO_CONNECT << 16;
 		goto fault;
 	}
 
@@ -1093,9 +1102,7 @@ reject:
 
 fault:
 	spin_unlock(&session->lock);
-	printk(KERN_ERR "iscsi: cmd 0x%x is not queued (%d)\n",
-	       sc->cmnd[0], reason);
-	sc->result = (DID_NO_CONNECT << 16);
+	debug_scsi("iscsi: cmd 0x%x is not queued (%d)\n", sc->cmnd[0], reason);
 	scsi_set_resid(sc, scsi_bufflen(sc));
 	sc->scsi_done(sc);
 	spin_lock(host->host_lock);
@@ -1162,7 +1169,8 @@ failed:
 	mutex_lock(&session->eh_mutex);
 	spin_lock_bh(&session->lock);
 	if (session->state == ISCSI_STATE_LOGGED_IN)
-		printk(KERN_INFO "iscsi: host reset succeeded\n");
+		iscsi_session_printk(KERN_INFO, session,
+				     "host reset succeeded\n");
 	else
 		goto failed;
 	spin_unlock_bh(&session->lock);
@@ -1241,7 +1249,8 @@ static int iscsi_exec_task_mgmt_fn(struc
  * Fail commands. session lock held and recv side suspended and xmit
  * thread flushed
  */
-static void fail_all_commands(struct iscsi_conn *conn, unsigned lun)
+static void fail_all_commands(struct iscsi_conn *conn, unsigned lun,
+			      int error)
 {
 	struct iscsi_cmd_task *ctask, *tmp;
 
@@ -1253,7 +1262,7 @@ static void fail_all_commands(struct isc
 		if (lun == ctask->sc->device->lun || lun == -1) {
 			debug_scsi("failing pending sc %p itt 0x%x\n",
 				   ctask->sc, ctask->itt);
-			fail_command(conn, ctask, DID_BUS_BUSY << 16);
+			fail_command(conn, ctask, error << 16);
 		}
 	}
 
@@ -1261,7 +1270,7 @@ static void fail_all_commands(struct isc
 		if (lun == ctask->sc->device->lun || lun == -1) {
 			debug_scsi("failing requeued sc %p itt 0x%x\n",
 				   ctask->sc, ctask->itt);
-			fail_command(conn, ctask, DID_BUS_BUSY << 16);
+			fail_command(conn, ctask, error << 16);
 		}
 	}
 
@@ -1359,10 +1368,10 @@ static void iscsi_check_transport_timeou
 	last_recv = conn->last_recv;
 	if (time_before_eq(last_recv + timeout + (conn->ping_timeout * HZ),
 			   jiffies)) {
-		printk(KERN_ERR "ping timeout of %d secs expired, "
-		       "last rx %lu, last ping %lu, now %lu\n",
-		       conn->ping_timeout, last_recv,
-		       conn->last_ping, jiffies);
+		iscsi_conn_printk(KERN_ERR, conn, "ping timeout of %d secs "
+				  "expired, last rx %lu, last ping %lu, "
+				  "now %lu\n", conn->ping_timeout, last_recv,
+				  conn->last_ping, jiffies);
 		spin_unlock(&session->lock);
 		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
 		return;
@@ -1375,14 +1384,11 @@ static void iscsi_check_transport_timeou
 			iscsi_send_nopout(conn, NULL);
 		}
 		next_timeout = last_recv + timeout + (conn->ping_timeout * HZ);
-	} else {
+	} else
 		next_timeout = last_recv + timeout;
-	}
 
-	if (next_timeout) {
-		debug_scsi("Setting next tmo %lu\n", next_timeout);
-		mod_timer(&conn->transport_timer, next_timeout);
-	}
+	debug_scsi("Setting next tmo %lu\n", next_timeout);
+	mod_timer(&conn->transport_timer, next_timeout);
 done:
 	spin_unlock(&session->lock);
 }
@@ -1575,7 +1581,7 @@ int iscsi_eh_device_reset(struct scsi_cm
 	/* need to grab the recv lock then session lock */
 	write_lock_bh(conn->recv_lock);
 	spin_lock(&session->lock);
-	fail_all_commands(conn, sc->device->lun);
+	fail_all_commands(conn, sc->device->lun, DID_ERROR);
 	conn->tmf_state = TMF_INITIAL;
 	spin_unlock(&session->lock);
 	write_unlock_bh(conn->recv_lock);
@@ -1703,7 +1709,7 @@ iscsi_session_setup(struct iscsi_transpo
 		qdepth = ISCSI_DEF_CMD_PER_LUN;
 	}
 
-	if (cmds_max < 2 || (cmds_max & (cmds_max - 1)) ||
+	if (!is_power_of_2(cmds_max) ||
 	    cmds_max >= ISCSI_MGMT_ITT_OFFSET) {
 		if (cmds_max != 0)
 			printk(KERN_ERR "iscsi: invalid can_queue of %d. "
@@ -1946,9 +1952,10 @@ void iscsi_conn_teardown(struct iscsi_cl
 		}
 		spin_unlock_irqrestore(session->host->host_lock, flags);
 		msleep_interruptible(500);
-		printk(KERN_INFO "iscsi: scsi conn_destroy(): host_busy %d "
-		       "host_failed %d\n", session->host->host_busy,
-		       session->host->host_failed);
+		iscsi_conn_printk(KERN_INFO, conn, "iscsi conn_destroy(): "
+				  "host_busy %d host_failed %d\n",
+				  session->host->host_busy,
+				  session->host->host_failed);
 		/*
 		 * force eh_abort() to unblock
 		 */
@@ -1977,27 +1984,28 @@ int iscsi_conn_start(struct iscsi_cls_co
 	struct iscsi_session *session = conn->session;
 
 	if (!session) {
-		printk(KERN_ERR "iscsi: can't start unbound connection\n");
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "can't start unbound connection\n");
 		return -EPERM;
 	}
 
 	if ((session->imm_data_en || !session->initial_r2t_en) &&
 	     session->first_burst > session->max_burst) {
-		printk("iscsi: invalid burst lengths: "
-		       "first_burst %d max_burst %d\n",
-		       session->first_burst, session->max_burst);
+		iscsi_conn_printk(KERN_INFO, conn, "invalid burst lengths: "
+				  "first_burst %d max_burst %d\n",
+				  session->first_burst, session->max_burst);
 		return -EINVAL;
 	}
 
 	if (conn->ping_timeout && !conn->recv_timeout) {
-		printk(KERN_ERR "iscsi: invalid recv timeout of zero "
-		      "Using 5 seconds\n.");
+		iscsi_conn_printk(KERN_ERR, conn, "invalid recv timeout of "
+				  "zero. Using 5 seconds\n.");
 		conn->recv_timeout = 5;
 	}
 
 	if (conn->recv_timeout && !conn->ping_timeout) {
-		printk(KERN_ERR "iscsi: invalid ping timeout of zero "
-		      "Using 5 seconds.\n");
+		iscsi_conn_printk(KERN_ERR, conn, "invalid ping timeout of "
+				  "zero. Using 5 seconds.\n");
 		conn->ping_timeout = 5;
 	}
 
@@ -2021,11 +2029,9 @@ int iscsi_conn_start(struct iscsi_cls_co
 		conn->stop_stage = 0;
 		conn->tmf_state = TMF_INITIAL;
 		session->age++;
-		spin_unlock_bh(&session->lock);
-
-		iscsi_unblock_session(session_to_cls(session));
-		wake_up(&conn->ehwait);
-		return 0;
+		if (session->age == 16)
+			session->age = 0;
+		break;
 	case STOP_CONN_TERM:
 		conn->stop_stage = 0;
 		break;
@@ -2034,6 +2040,8 @@ int iscsi_conn_start(struct iscsi_cls_co
 	}
 	spin_unlock_bh(&session->lock);
 
+	iscsi_unblock_session(session_to_cls(session));
+	wake_up(&conn->ehwait);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(iscsi_conn_start);
@@ -2125,7 +2133,8 @@ static void iscsi_start_session_recovery
 	 * flush queues.
 	 */
 	spin_lock_bh(&session->lock);
-	fail_all_commands(conn, -1);
+	fail_all_commands(conn, -1,
+			STOP_CONN_RECOVER ? DID_BUS_BUSY : DID_ERROR);
 	flush_control_queues(session, conn);
 	spin_unlock_bh(&session->lock);
 	mutex_unlock(&session->eh_mutex);
@@ -2142,7 +2151,8 @@ void iscsi_conn_stop(struct iscsi_cls_co
 		iscsi_start_session_recovery(session, conn, flag);
 		break;
 	default:
-		printk(KERN_ERR "iscsi: invalid stop flag %d\n", flag);
+		iscsi_conn_printk(KERN_ERR, conn,
+				  "invalid stop flag %d\n", flag);
 	}
 }
 EXPORT_SYMBOL_GPL(iscsi_conn_stop);
Only in open-iscsi.git/kernel: libiscsi.c~
diff -pur open-iscsi-2.0-865/kernel/libiscsi.h open-iscsi.git/kernel/libiscsi.h
--- open-iscsi-2.0-865/kernel/libiscsi.h	2008-03-05 11:28:53.310854000 +0100
+++ open-iscsi.git/kernel/libiscsi.h	2008-03-05 11:29:21.160594500 +0100
@@ -70,8 +70,6 @@ enum {
 #define ISCSI_SUSPEND_BIT		1
 
 #define ISCSI_ITT_MASK			(0xfff)
-#define ISCSI_CID_SHIFT			12
-#define ISCSI_CID_MASK			(0xffff << ISCSI_CID_SHIFT)
 #define ISCSI_AGE_SHIFT			28
 #define ISCSI_AGE_MASK			(0xf << ISCSI_AGE_SHIFT)
 
@@ -135,6 +133,14 @@ static inline void* iscsi_next_hdr(struc
 	return (void*)ctask->hdr + ctask->hdr_len;
 }
 
+/* Connection's states */
+enum {
+	ISCSI_CONN_INITIAL_STAGE,
+	ISCSI_CONN_STARTED,
+	ISCSI_CONN_STOPPED,
+	ISCSI_CONN_CLEANUP_WAIT,
+};
+
 struct iscsi_conn {
 	struct iscsi_cls_conn	*cls_conn;	/* ptr to class connection */
 	void			*dd_data;	/* iscsi_transport data */
@@ -227,6 +233,17 @@ struct iscsi_pool {
 	int			max;		/* Max number of elements */
 };
 
+/* Session's states */
+enum {
+	ISCSI_STATE_FREE = 1,
+	ISCSI_STATE_LOGGED_IN,
+	ISCSI_STATE_FAILED,
+	ISCSI_STATE_TERMINATE,
+	ISCSI_STATE_IN_RECOVERY,
+	ISCSI_STATE_RECOVERY_FAILED,
+	ISCSI_STATE_LOGGING_OUT,
+};
+
 struct iscsi_session {
 	/*
 	 * Syncs up the scsi eh thread with the iscsi eh thread when sending
@@ -325,6 +342,10 @@ extern int iscsi_session_get_param(struc
 #define session_to_cls(_sess) \
 	hostdata_session(_sess->host->hostdata)
 
+#define iscsi_session_printk(prefix, _sess, fmt, a...)	\
+	iscsi_cls_session_printk(prefix,		\
+		(struct iscsi_cls_session *)session_to_cls(_sess), fmt, ##a)
+
 /*
  * connection management
  */
@@ -339,6 +360,9 @@ extern void iscsi_conn_failure(struct is
 extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
 				enum iscsi_param param, char *buf);
 
+#define iscsi_conn_printk(prefix, _c, fmt, a...) \
+	iscsi_cls_conn_printk(prefix, _c->cls_conn, fmt, ##a)
+
 /*
  * pdu and task processing
  */
diff -pur open-iscsi-2.0-865/kernel/scsi_transport_iscsi.c open-iscsi.git/kernel/scsi_transport_iscsi.c
--- open-iscsi-2.0-865/kernel/scsi_transport_iscsi.c	2008-03-05 11:28:53.374858000 +0100
+++ open-iscsi.git/kernel/scsi_transport_iscsi.c	2008-03-05 11:29:21.212597750 +0100
@@ -30,10 +30,10 @@
 #include "scsi_transport_iscsi.h"
 #include "iscsi_if.h"
 
-#define ISCSI_SESSION_ATTRS 18
-#define ISCSI_CONN_ATTRS 11
+#define ISCSI_SESSION_ATTRS 19
+#define ISCSI_CONN_ATTRS 13
 #define ISCSI_HOST_ATTRS 4
-#define ISCSI_TRANSPORT_VERSION "2.0-724"
+#define ISCSI_TRANSPORT_VERSION "2.0-868"
 
 struct iscsi_internal {
 	int daemon_pid;
@@ -127,12 +127,13 @@ static int iscsi_setup_host(struct trans
 	memset(ihost, 0, sizeof(*ihost));
 	INIT_LIST_HEAD(&ihost->sessions);
 	mutex_init(&ihost->mutex);
+	atomic_set(&ihost->nr_scans, 0);
 
-	snprintf(ihost->unbind_workq_name, KOBJ_NAME_LEN, "iscsi_unbind_%d",
+	snprintf(ihost->scan_workq_name, KOBJ_NAME_LEN, "iscsi_scan_%d",
 		shost->host_no);
-	ihost->unbind_workq = create_singlethread_workqueue(
-						ihost->unbind_workq_name);
-	if (!ihost->unbind_workq)
+	ihost->scan_workq = create_singlethread_workqueue(
+						ihost->scan_workq_name);
+	if (!ihost->scan_workq)
 		return -ENOMEM;
 	return 0;
 }
@@ -143,7 +144,7 @@ static int iscsi_remove_host(struct tran
 	struct Scsi_Host *shost = dev_to_shost(dev);
 	struct iscsi_host *ihost = shost->shost_data;
 
-	destroy_workqueue(ihost->unbind_workq);
+	destroy_workqueue(ihost->scan_workq);
 	return 0;
 }
 
@@ -221,6 +222,54 @@ static struct iscsi_cls_conn *iscsi_conn
  * The following functions can be used by LLDs that allocate
  * their own scsi_hosts or by software iscsi LLDs
  */
+static struct {
+	int value;
+	char *name;
+} iscsi_session_state_names[] = {
+	{ ISCSI_SESSION_LOGGED_IN,	"LOGGED_IN" },
+	{ ISCSI_SESSION_FAILED,		"FAILED" },
+	{ ISCSI_SESSION_FREE,		"FREE" },
+};
+
+const char *iscsi_session_state_name(int state)
+{
+	int i;
+	char *name = NULL;
+
+	for (i = 0; i < ARRAY_SIZE(iscsi_session_state_names); i++) {
+		if (iscsi_session_state_names[i].value == state) {
+			name = iscsi_session_state_names[i].name;
+			break;
+		}
+	}
+	return name;
+}
+
+int iscsi_session_chkready(struct iscsi_cls_session *session)
+{
+	unsigned long flags;
+	int err;
+
+	spin_lock_irqsave(&session->lock, flags);
+	switch (session->state) {
+	case ISCSI_SESSION_LOGGED_IN:
+		err = 0;
+		break;
+	case ISCSI_SESSION_FAILED:
+		err = DID_IMM_RETRY << 16;
+		break;
+	case ISCSI_SESSION_FREE:
+		err = DID_NO_CONNECT << 16;
+		break;
+	default:
+		err = DID_NO_CONNECT << 16;
+		break;
+	}
+	spin_unlock_irqrestore(&session->lock, flags);
+	return err;
+}
+EXPORT_SYMBOL_GPL(iscsi_session_chkready);
+
 static void iscsi_session_release(struct device *dev)
 {
 	struct iscsi_cls_session *session = iscsi_dev_to_session(dev);
@@ -236,6 +285,25 @@ static int iscsi_is_session_dev(const st
 	return dev->release == iscsi_session_release;
 }
 
+/**
+ * iscsi_scan_finished - helper to report when running scans are done
+ * @shost: scsi host
+ * @time: scan run time
+ *
+ * This function can be used by drives like qla4xxx to report to the scsi
+ * layer when the scans it kicked off at module load time are done.
+ */
+int iscsi_scan_finished(struct Scsi_Host *shost, unsigned long time)
+{
+	struct iscsi_host *ihost = shost->shost_data;
+	/*
+	 * qla4xxx will have kicked off some session unblocks before calling
+	 * scsi_scan_host, so just wait for them to complete.
+	 */
+	return !atomic_read(&ihost->nr_scans);
+}
+EXPORT_SYMBOL_GPL(iscsi_scan_finished);
+
 static int iscsi_user_scan(struct Scsi_Host *shost, uint channel,
 			   uint id, uint lun)
 {
@@ -254,14 +322,50 @@ static int iscsi_user_scan(struct Scsi_H
 	return 0;
 }
 
+static void iscsi_scan_session(struct work_struct *work)
+{
+	struct iscsi_cls_session *session =
+			container_of(work, struct iscsi_cls_session, scan_work);
+	struct Scsi_Host *shost = iscsi_session_to_shost(session);
+	struct iscsi_host *ihost = shost->shost_data;
+	unsigned long flags;
+
+	spin_lock_irqsave(&session->lock, flags);
+	if (session->state != ISCSI_SESSION_LOGGED_IN) {
+		spin_unlock_irqrestore(&session->lock, flags);
+		goto done;
+	}
+	spin_unlock_irqrestore(&session->lock, flags);
+
+	scsi_scan_target(&session->dev, 0, session->target_id,
+			 SCAN_WILD_CARD, 1);
+done:
+	atomic_dec(&ihost->nr_scans);
+}
+
 static void session_recovery_timedout(struct work_struct *work)
 {
 	struct iscsi_cls_session *session =
 		container_of(work, struct iscsi_cls_session,
 			     recovery_work.work);
+	unsigned long flags;
 
-	dev_printk(KERN_INFO, &session->dev, "iscsi: session recovery timed "
-		  "out after %d secs\n", session->recovery_tmo);
+	iscsi_cls_session_printk(KERN_INFO, session,
+				 "session recovery timed out after %d secs\n",
+				 session->recovery_tmo);
+
+	spin_lock_irqsave(&session->lock, flags);
+	switch (session->state) {
+	case ISCSI_SESSION_FAILED:
+		session->state = ISCSI_SESSION_FREE;
+		break;
+	case ISCSI_SESSION_LOGGED_IN:
+	case ISCSI_SESSION_FREE:
+		/* we raced with the unblock's flush */
+		spin_unlock_irqrestore(&session->lock, flags);
+		return;
+	}
+	spin_unlock_irqrestore(&session->lock, flags);
 
 	if (session->transport->session_recovery_timedout)
 		session->transport->session_recovery_timedout(session);
@@ -269,16 +373,44 @@ static void session_recovery_timedout(st
 	scsi_target_unblock(&session->dev);
 }
 
-void iscsi_unblock_session(struct iscsi_cls_session *session)
+void __iscsi_unblock_session(struct iscsi_cls_session *session)
 {
 	if (!cancel_delayed_work(&session->recovery_work))
 		flush_workqueue(iscsi_eh_timer_workq);
 	scsi_target_unblock(&session->dev);
 }
+
+void iscsi_unblock_session(struct iscsi_cls_session *session)
+{
+	struct Scsi_Host *shost = iscsi_session_to_shost(session);
+	struct iscsi_host *ihost = shost->shost_data;
+	unsigned long flags;
+
+	spin_lock_irqsave(&session->lock, flags);
+	session->state = ISCSI_SESSION_LOGGED_IN;
+	spin_unlock_irqrestore(&session->lock, flags);
+
+	__iscsi_unblock_session(session);
+	/*
+	 * Only do kernel scanning if the driver is properly hooked into
+	 * the async scanning code (drivers like iscsi_tcp do login and
+	 * scanning from userspace).
+	 */
+	if (shost->hostt->scan_finished) {
+		if (queue_work(ihost->scan_workq, &session->scan_work))
+			atomic_inc(&ihost->nr_scans);
+	}
+}
 EXPORT_SYMBOL_GPL(iscsi_unblock_session);
 
 void iscsi_block_session(struct iscsi_cls_session *session)
 {
+	unsigned long flags;
+
+	spin_lock_irqsave(&session->lock, flags);
+	session->state = ISCSI_SESSION_FAILED;
+	spin_unlock_irqrestore(&session->lock, flags);
+
 	scsi_target_block(&session->dev);
 	queue_delayed_work(iscsi_eh_timer_workq, &session->recovery_work,
 			   session->recovery_tmo * HZ);
@@ -311,7 +443,7 @@ static int iscsi_unbind_session(struct i
 	struct Scsi_Host *shost = iscsi_session_to_shost(session);
 	struct iscsi_host *ihost = shost->shost_data;
 
-	return queue_work(ihost->unbind_workq, &session->unbind_work);
+	return queue_work(ihost->scan_workq, &session->unbind_work);
 }
 
 struct iscsi_cls_session *
@@ -327,10 +459,13 @@ iscsi_alloc_session(struct Scsi_Host *sh
 
 	session->transport = transport;
 	session->recovery_tmo = 120;
+	session->state = ISCSI_SESSION_FREE;
 	INIT_DELAYED_WORK(&session->recovery_work, session_recovery_timedout);
 	INIT_LIST_HEAD(&session->host_list);
 	INIT_LIST_HEAD(&session->sess_list);
 	INIT_WORK(&session->unbind_work, __iscsi_unbind_session);
+	INIT_WORK(&session->scan_work, iscsi_scan_session);
+	spin_lock_init(&session->lock);
 
 	/* this is released in the dev's release function */
 	scsi_host_get(shost);
@@ -358,8 +493,8 @@ int iscsi_add_session(struct iscsi_cls_s
 		 session->sid);
 	err = device_add(&session->dev);
 	if (err) {
-		dev_printk(KERN_ERR, &session->dev, "iscsi: could not "
-			   "register session's dev\n");
+		iscsi_cls_session_printk(KERN_ERR, session,
+					 "could not register session's dev\n");
 		goto release_host;
 	}
 	transport_register_device(&session->dev);
@@ -443,22 +578,28 @@ void iscsi_remove_session(struct iscsi_c
 	 * If we are blocked let commands flow again. The lld or iscsi
 	 * layer should set up the queuecommand to fail commands.
 	 */
-	iscsi_unblock_session(session);
-	iscsi_unbind_session(session);
+	spin_lock_irqsave(&session->lock, flags);
+	session->state = ISCSI_SESSION_FREE;
+	spin_unlock_irqrestore(&session->lock, flags);
+	__iscsi_unblock_session(session);
+	__iscsi_unbind_session(&session->unbind_work);
+
+	/* flush running scans */
+	flush_workqueue(ihost->scan_workq);
 	/*
 	 * If the session dropped while removing devices then we need to make
 	 * sure it is not blocked
 	 */
 	if (!cancel_delayed_work(&session->recovery_work))
 		flush_workqueue(iscsi_eh_timer_workq);
-	flush_workqueue(ihost->unbind_workq);
 
 	/* hw iscsi may not have removed all connections from session */
 	err = device_for_each_child(&session->dev, NULL,
 				    iscsi_iter_destroy_conn_fn);
 	if (err)
-		dev_printk(KERN_ERR, &session->dev, "iscsi: Could not delete "
-			   "all connections for session. Error %d.\n", err);
+		iscsi_cls_session_printk(KERN_ERR, session,
+					 "Could not delete all connections "
+					 "for session. Error %d.\n", err);
 
 	transport_unregister_device(&session->dev);
 	device_del(&session->dev);
@@ -530,8 +671,8 @@ iscsi_create_conn(struct iscsi_cls_sessi
 	conn->dev.release = iscsi_conn_release;
 	err = device_register(&conn->dev);
 	if (err) {
-		dev_printk(KERN_ERR, &conn->dev, "iscsi: could not register "
-			   "connection's dev\n");
+		iscsi_cls_session_printk(KERN_ERR, session, "could not "
+					 "register connection's dev\n");
 		goto release_parent_ref;
 	}
 	transport_register_device(&conn->dev);
@@ -638,8 +779,8 @@ int iscsi_recv_pdu(struct iscsi_cls_conn
 	skb = alloc_skb(len, GFP_ATOMIC);
 	if (!skb) {
 		iscsi_conn_error(conn, ISCSI_ERR_CONN_FAILED);
-		dev_printk(KERN_ERR, &conn->dev, "iscsi: can not deliver "
-			   "control PDU: OOM\n");
+		iscsi_cls_conn_printk(KERN_ERR, conn, "can not deliver "
+				      "control PDU: OOM\n");
 		return -ENOMEM;
 	}
 
@@ -660,20 +801,27 @@ EXPORT_SYMBOL_GPL(iscsi_recv_pdu);
 
 void iscsi_conn_error(struct iscsi_cls_conn *conn, enum iscsi_err error)
 {
+	struct iscsi_cls_session *session = iscsi_conn_to_session(conn);
 	struct nlmsghdr	*nlh;
 	struct sk_buff	*skb;
 	struct iscsi_uevent *ev;
 	struct iscsi_internal *priv;
 	int len = NLMSG_SPACE(sizeof(*ev));
+	unsigned long flags;
 
 	priv = iscsi_if_transport_lookup(conn->transport);
 	if (!priv)
 		return;
 
+	spin_lock_irqsave(&session->lock, flags);
+	if (session->state == ISCSI_SESSION_LOGGED_IN)
+		session->state = ISCSI_SESSION_FAILED;
+	spin_unlock_irqrestore(&session->lock, flags);
+
 	skb = alloc_skb(len, GFP_ATOMIC);
 	if (!skb) {
-		dev_printk(KERN_ERR, &conn->dev, "iscsi: gracefully ignored "
-			  "conn error (%d)\n", error);
+		iscsi_cls_conn_printk(KERN_ERR, conn, "gracefully ignored "
+				      "conn error (%d)\n", error);
 		return;
 	}
 
@@ -687,8 +835,8 @@ void iscsi_conn_error(struct iscsi_cls_c
 
 	iscsi_broadcast_skb(skb, GFP_ATOMIC);
 
-	dev_printk(KERN_INFO, &conn->dev, "iscsi: detected conn error (%d)\n",
-		   error);
+	iscsi_cls_conn_printk(KERN_INFO, conn, "detected conn error (%d)\n",
+			      error);
 }
 EXPORT_SYMBOL_GPL(iscsi_conn_error);
 
@@ -743,8 +891,8 @@ iscsi_if_get_stats(struct iscsi_transpor
 
 		skbstat = alloc_skb(len, GFP_ATOMIC);
 		if (!skbstat) {
-			dev_printk(KERN_ERR, &conn->dev, "iscsi: can not "
-				   "deliver stats: OOM\n");
+			iscsi_cls_conn_printk(KERN_ERR, conn, "can not "
+					      "deliver stats: OOM\n");
 			return -ENOMEM;
 		}
 
@@ -800,8 +948,9 @@ int iscsi_session_event(struct iscsi_cls
 
 	skb = alloc_skb(len, GFP_KERNEL);
 	if (!skb) {
-		dev_printk(KERN_ERR, &session->dev, "Cannot notify userspace "
-			  "of session event %u\n", event);
+		iscsi_cls_session_printk(KERN_ERR, session,
+					 "Cannot notify userspace of session "
+					 "event %u\n", event);
 		return -ENOMEM;
 	}
 
@@ -824,8 +973,8 @@ int iscsi_session_event(struct iscsi_cls
 		ev->r.unbind_session.sid = session->sid;
 		break;
 	default:
-		dev_printk(KERN_ERR, &session->dev, "Invalid event %u.\n",
-			   event);
+		iscsi_cls_session_printk(KERN_ERR, session, "Invalid event "
+					 "%u.\n", event);
 		kfree_skb(skb);
 		return -EINVAL;
 	}
@@ -836,8 +985,10 @@ int iscsi_session_event(struct iscsi_cls
 	 */
 	rc = iscsi_broadcast_skb(skb, GFP_KERNEL);
 	if (rc < 0)
-		dev_printk(KERN_ERR, &session->dev, "Cannot notify userspace "
-			  "of session event %u. Check iscsi daemon\n", event);
+		iscsi_cls_session_printk(KERN_ERR, session,
+					 "Cannot notify userspace of session "
+					 "event %u. Check iscsi daemon\n",
+					 event);
 	return rc;
 }
 EXPORT_SYMBOL_GPL(iscsi_session_event);
@@ -870,16 +1021,15 @@ iscsi_if_create_conn(struct iscsi_transp
 
 	session = iscsi_session_lookup(ev->u.c_conn.sid);
 	if (!session) {
-		printk(KERN_ERR "iscsi: invalid session %d\n",
+		printk(KERN_ERR "iscsi: invalid session %d.\n",
 		       ev->u.c_conn.sid);
 		return -EINVAL;
 	}
 
 	conn = transport->create_conn(session, ev->u.c_conn.cid);
 	if (!conn) {
-		printk(KERN_ERR "iscsi: couldn't create a new "
-			   "connection for session %d\n",
-			   session->sid);
+		iscsi_cls_session_printk(KERN_ERR, session,
+					 "couldn't create a new connection.");
 		return -ENOMEM;
 	}
 
@@ -1245,6 +1395,15 @@ iscsi_session_attr(fast_abort, ISCSI_PAR
 iscsi_session_attr(abort_tmo, ISCSI_PARAM_ABORT_TMO, 0);
 iscsi_session_attr(lu_reset_tmo, ISCSI_PARAM_LU_RESET_TMO, 0);
 
+static ssize_t
+show_priv_session_state(struct class_device *cdev, char *buf)
+{
+	struct iscsi_cls_session *session = iscsi_cdev_to_session(cdev);
+	return sprintf(buf, "%s\n", iscsi_session_state_name(session->state));
+}
+static ISCSI_CLASS_ATTR(priv_sess, state, S_IRUGO, show_priv_session_state,
+			NULL);
+
 #define iscsi_priv_session_attr_show(field, format)			\
 static ssize_t								\
 show_priv_session_##field(struct class_device *cdev, char *buf)		\
@@ -1471,6 +1630,7 @@ iscsi_register_transport(struct iscsi_tr
 	SETUP_SESSION_RD_ATTR(abort_tmo, ISCSI_ABORT_TMO);
 	SETUP_SESSION_RD_ATTR(lu_reset_tmo,ISCSI_LU_RESET_TMO);
 	SETUP_PRIV_SESSION_RD_ATTR(recovery_tmo);
+	SETUP_PRIV_SESSION_RD_ATTR(state);
 
 	BUG_ON(count > ISCSI_SESSION_ATTRS);
 	priv->session_attrs[count] = NULL;
diff -pur open-iscsi-2.0-865/kernel/scsi_transport_iscsi.h open-iscsi.git/kernel/scsi_transport_iscsi.h
--- open-iscsi-2.0-865/kernel/scsi_transport_iscsi.h	2008-03-05 11:28:53.654875500 +0100
+++ open-iscsi.git/kernel/scsi_transport_iscsi.h	2008-02-06 08:24:29.168837750 +0100
@@ -149,13 +149,6 @@ extern void iscsi_conn_error(struct iscs
 extern int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
 			  char *data, uint32_t data_size);
 
-
-/* Connection's states */
-#define ISCSI_CONN_INITIAL_STAGE	0
-#define ISCSI_CONN_STARTED		1
-#define ISCSI_CONN_STOPPED		2
-#define ISCSI_CONN_CLEANUP_WAIT		3
-
 struct iscsi_cls_conn {
 	struct list_head conn_list;	/* item in connlist */
 	void *dd_data;			/* LLD private data */
@@ -169,27 +162,31 @@ struct iscsi_cls_conn {
 #define iscsi_dev_to_conn(_dev) \
 	container_of(_dev, struct iscsi_cls_conn, dev)
 
-/* Session's states */
-#define ISCSI_STATE_FREE		1
-#define ISCSI_STATE_LOGGED_IN		2
-#define ISCSI_STATE_FAILED		3
-#define ISCSI_STATE_TERMINATE		4
-#define ISCSI_STATE_IN_RECOVERY		5
-#define ISCSI_STATE_RECOVERY_FAILED	6
-#define ISCSI_STATE_LOGGING_OUT		7
+#define iscsi_conn_to_session(_conn) \
+	iscsi_dev_to_session(_conn->dev.parent)
+
+/* iscsi class session state */
+enum {
+	ISCSI_SESSION_LOGGED_IN,
+	ISCSI_SESSION_FAILED,
+	ISCSI_SESSION_FREE,
+};
 
 struct iscsi_cls_session {
 	struct list_head sess_list;		/* item in session_list */
 	struct list_head host_list;
 	struct iscsi_transport *transport;
+	spinlock_t lock;
+	struct work_struct scan_work;
+	struct work_struct unbind_work;
 
 	/* recovery fields */
 	int recovery_tmo;
 	struct delayed_work recovery_work;
-	struct work_struct unbind_work;
 
 	int target_id;
 
+	int state;
 	int sid;				/* session id */
 	void *dd_data;				/* LLD private data */
 	struct device dev;	/* sysfs transport/container device */
@@ -206,14 +203,22 @@ struct iscsi_cls_session {
 
 struct iscsi_host {
 	struct list_head sessions;
+	atomic_t nr_scans;
 	struct mutex mutex;
-	struct workqueue_struct *unbind_workq;
-	char unbind_workq_name[KOBJ_NAME_LEN];
+	struct workqueue_struct *scan_workq;
+	char scan_workq_name[KOBJ_NAME_LEN];
 };
 
 /*
  * session and connection functions that can be used by HW iSCSI LLDs
  */
+#define iscsi_cls_session_printk(prefix, _cls_session, fmt, a...) \
+	dev_printk(prefix, &(_cls_session)->dev, fmt, ##a)
+
+#define iscsi_cls_conn_printk(prefix, _cls_conn, fmt, a...) \
+	dev_printk(prefix, &(_cls_conn)->dev, fmt, ##a)
+
+extern int iscsi_session_chkready(struct iscsi_cls_session *session);
 extern struct iscsi_cls_session *iscsi_alloc_session(struct Scsi_Host *shost,
 					struct iscsi_transport *transport);
 extern int iscsi_add_session(struct iscsi_cls_session *session,
@@ -231,6 +236,6 @@ extern struct iscsi_cls_conn *iscsi_crea
 extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
 extern void iscsi_unblock_session(struct iscsi_cls_session *session);
 extern void iscsi_block_session(struct iscsi_cls_session *session);
-
+extern int iscsi_scan_finished(struct Scsi_Host *shost, unsigned long time);
 
 #endif
diff -pur open-iscsi-2.0-865/Makefile open-iscsi.git/Makefile
--- open-iscsi-2.0-865/Makefile	2008-03-05 11:28:52.450800250 +0100
+++ open-iscsi.git/Makefile	2008-02-06 08:24:28.816815750 +0100
@@ -95,8 +95,10 @@ install_iface: $(IFACEFILES)
 	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
 
 install_etc: $(ETCFILES)
-	$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi
-	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi
+	if [ ! -f /etc/iscsi/iscsid.conf ]; then \
+		$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
+		$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
+	fi
 
 install_doc: $(MANPAGES)
 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
Only in open-iscsi.git: Makefile~
Only in open-iscsi.git: open-iscsi-adjust-can_queue
Only in open-iscsi.git: open-iscsi-dont-overwrite-nodes-on-discovery
Only in open-iscsi.git: open-iscsi-fwparam_ppc
Only in open-iscsi.git: open-iscsi-fwparam-scan-in-blocks
Only in open-iscsi.git: open-iscsi-git-update
Only in open-iscsi.git: open-iscsi-suse-init-fixes
Only in open-iscsi-2.0-865: patches
Only in open-iscsi-2.0-865: .pc
diff -pur open-iscsi-2.0-865/README open-iscsi.git/README
--- open-iscsi-2.0-865/README	2008-03-05 11:43:19.248971750 +0100
+++ open-iscsi.git/README	2008-03-05 11:29:21.020585750 +0100
@@ -4,7 +4,7 @@
 
 =================================================================
 
-                                                     Jan 26, 2007
+                                                     Feb 21, 2008
 
 Contents
 ========
@@ -174,10 +174,36 @@ Usage: iscsiadm [OPTION]
 
   -m, --mode <op>         specify operational mode op = <discovery|node>
   -m discovery --type=[type] --interface=iscsi_ifacename \
-			--portal=[ip:port] --login --print=[N]
+			--portal=[ip:port] --login --print=[N] \
+			--op=[op]=[NEW | UPDATE | DELETE]
                           perform [type] discovery for target portal with
                           ip-address [ip] and port [port].
 
+			  By default this command will remove records
+			  for portals no longer returned. And, if a portal is
+			  returned by the target, then the discovery command
+			  will create a new record or modify an existing one
+			  with values from iscsi.conf and the command line.
+
+			  [op] can be passed in multiple times to this
+			  command, and it will alter the DB manipulation.
+
+			  If [op] is passed in and the value is
+			  "new", iscsiadm will add records for portals that do
+			  not yet have records in the db.
+
+			  If [op] is passed in and the value is
+			  "update", iscsiadm will update records using info
+			  from iscsi.conf and the command line for portals
+			  that are returned during discovery and have
+			  a record in the db.
+
+			  if [op] is passed in and the value is "delete",
+			  iscsiadm will delete records for portals that
+			  were not returned during discovery.
+
+			  See the example section for more info.
+
 			  See below for how to setup iscsi ifaces for
 			  software iscsi or override the system defaults.
 
@@ -220,7 +246,10 @@ Usage: iscsiadm [OPTION]
 			  op could be one of:
                           [new], [delete], [update] or [show]. In case of
                           [update], you have to provide [name] and [value]
-                          you wish to update
+                          you wish to update.
+			  [delete] - Note that if a session is using the
+			  node record, the session will be logged out then
+			  the record will be deleted.
 
 			  Print level can be 0 to 1.
 
@@ -346,7 +375,7 @@ with the name "iface0" this command will
 (This will set the hwaddress.)
 # iscsiadm -m iface -I iface0 --op=update -n iface.hwaddress -v 00:0F:1F:92:6B:BF
 
-If you had sessions logged in iscsiadm will not update, delete or overwrite
+If you had sessions logged in iscsiadm will not update, overwrite
 a iface. You must log out first. If you have a iface bound to a node/portal
 but you have not logged in then, iscsiadm will update the config and
 all existing bindings.
@@ -406,7 +435,49 @@ iscsiadm -m node -p ip:port -I iface0 --
 	discovery will be setup so that they can logged in through
 	those interfaces.
 
-    - SendTargets iSCSI Discovery with a specific interface. If you
+    - SendTargets iSCSI Discovery updating existing records:
+
+	    ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \
+		-o update
+
+	If there a record for targetX and portalY exists in the DB, and
+	is returned during discovery, it will be updated with the info
+	from the iscsi.conf. No new portals will be added and stale
+	portals will not be removed.
+ 
+    - SendTargets iSCSI Discovery deleting existing records:
+
+	    ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \
+		-o delete
+
+	If there a record for targetX and portalY exists in the DB, but
+	is not returned during discovery it will be removed from the DB.
+	No new portals will be added and existing portal records will not
+	be changed.
+
+	Note: If a session is logged into portal we are going to delete
+	a record for, it will be logged out then the record will be
+	deleted.
+
+     - SendTargets iSCSI Discovery adding new records:
+
+	    ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \
+		-o new
+
+	If there targetX and portalY is returned during discovery and does
+	not have a record, it will be added. Existing records are not
+	modified.
+
+     - SendTargets iSCSI Discovery using multiple ops:
+
+	    ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 \
+		-o new -o delete
+
+	This command will add new portals and delete records for portals
+	no longer returned. It will not change the record information for
+	existing portals.
+
+  - SendTargets iSCSI Discovery with a specific interface. If you
 	wish to only use a subset of the interfaces in /etc/iscsi/ifaces
 	then you can pass them in during discovery:
 
@@ -866,6 +937,25 @@ Host Number: X State: Recovery
 When the SCSI EH is running, commands will not be failed until
 node.session.timeo.replacement_timeout seconds.
 
+To modify the the timer that starts the SCSI EH, you can either write
+directly to the devices's sysfs file:
+
+echo X > /sys/block/sdX/device/timeout
+
+where X is in seconds or on most distros you can modify the udev rule.
+
+To modify the udev rule open /etc/udev/rules.d/50-udev.rules, and find the
+following lines:
+
+ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="0|7|14", \
+        RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
+
+And change the echo 60 part of the line to the value that you want.
+
+The default timeout for normal File System commands is 30 seconds when udev
+is not being used. If udev is used the default is the above value which
+is normally 60 seconds.
+
 
 8.1.2.2 Pending Commands and replacement_timeout
 ------------------------------------------------
@@ -889,13 +979,13 @@ dm-multipath.
 ---------------------------------------
 
 The default value for replacement_timeout is 120 seconds, but because
-multipath's queue if no path setting can prevent IO errors from being propogated
-to the application, replacement_timeout can be set to a shorter value like
-15 to 30 seconds. By setting it lower pending IO is quickly sent to a new path
-and executed while the iSCSI layer attempts to re-establishment the session.
-If all paths end up being failed, then the multipath and device mapper layer
-will internally queue IO based on the multipath.conf settings, instead of the
-iSCSI layer.
+multipath's queue_if_no_path and no_path_retyr setting can prevent IO errors
+from being propogated to the application, replacement_timeout can be set to a
+shorter value like 5 to 15 seconds. By setting it lower pending IO is quickly
+sent to a new path and executed while the iSCSI layer attempts
+re-establishment of the session. If all paths end up being failed, then the
+multipath and device mapper layer will internally queue IO based on the
+multipath.conf settings, instead of the iSCSI layer.
 
 
 8.2 iSCSI settings for iSCSI root
Only in open-iscsi-2.0-865: series
Only in open-iscsi.git: tmp
Only in open-iscsi.git: tmp~
Only in open-iscsi.git/usr: actor.o
Only in open-iscsi.git/usr: auth.o
diff -pur open-iscsi-2.0-865/usr/discovery.c open-iscsi.git/usr/discovery.c
--- open-iscsi-2.0-865/usr/discovery.c	2008-03-05 11:43:19.280973750 +0100
+++ open-iscsi.git/usr/discovery.c	2008-03-05 11:29:21.256600500 +0100
@@ -183,12 +183,13 @@ iterate_targets(iscsi_session_t *session
 	return 1;
 }
 
-static int add_portal(idbm_t *db, discovery_rec_t *drec,
-		      struct list_head *ifaces, node_rec_t *rec,
-		      char *address, char *port, char *tag)
+static int add_portal(idbm_t *db, struct list_head *rec_list,
+		      discovery_rec_t *drec, char *targetname, char *address,
+		      char *port, char *tag)
 {
 	struct sockaddr_storage ss;
 	char host[NI_MAXHOST];
+	struct node_rec *rec;
 
 	/* resolve the address, in case it was a DNS name */
 	if (resolve_address(address, port, &ss)) {
@@ -200,6 +201,16 @@ static int add_portal(idbm_t *db, discov
 	getnameinfo((struct sockaddr *) &ss, sizeof(ss),
 		    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
 
+	rec = calloc(1, sizeof(*rec));
+	if (!rec)
+		return 0;
+
+	idbm_node_setup_from_conf(db, rec);
+	rec->disc_type = drec->type;
+	rec->disc_port = drec->port;
+	strcpy(rec->disc_address, drec->address);
+
+	strncpy(rec->name, targetname, TARGET_NAME_MAXLEN);
 	if (tag && *tag)
 		rec->tpgt = atoi(tag);
 	else
@@ -210,21 +221,18 @@ static int add_portal(idbm_t *db, discov
 		rec->conn[0].port = ISCSI_LISTEN_PORT;
 	strncpy(rec->conn[0].address, address, NI_MAXHOST);
 
-	if (idbm_add_nodes(db, rec, drec, ifaces))
-		log_error("Could not add record for %s %s,%d,%d\n",
-			  rec->name, address, rec->conn[0].port, rec->tpgt);
+	list_add_tail(&rec->list, rec_list);
 	return 1;
 }
 
 static int
 add_target_record(idbm_t *db, char *name, char *end,
-		  discovery_rec_t *drec, struct list_head *ifaces,
+		  discovery_rec_t *drec, struct list_head *rec_list,
 		  char *default_port)
 {
 	char *text = NULL;
 	char *nul = name;
 	size_t length;
-	node_rec_t rec;
 
 	/* address = IPv4
 	 * address = [IPv6]
@@ -251,10 +259,6 @@ add_target_record(idbm_t *db, char *name
 		log_error("TargetName %s too long, ignoring", name);
 		return 0;
 	}
-
-	idbm_node_setup_from_conf(db, &rec);
-	strncpy(rec.name, name, TARGET_NAME_MAXLEN);
-
 	text = name + length;
 
 	/* skip NULs after the name */
@@ -267,7 +271,7 @@ add_target_record(idbm_t *db, char *name
 			log_error("no default address known for target %s",
 				  name);
 			return 0;
-		} else if (!add_portal(db, drec, ifaces, &rec, drec->address,
+		} else if (!add_portal(db, rec_list, drec, name, drec->address,
 				       default_port, NULL)) {
 			log_error("failed to add default portal, ignoring "
 				  "target %s", name);
@@ -305,7 +309,7 @@ add_target_record(idbm_t *db, char *name
 					*temp = '\0';
 			}
 
-			if (!add_portal(db, drec, ifaces, &rec, address, port,
+			if (!add_portal(db, rec_list, drec, name, address, port,
 					tag)) {
 				log_error("failed to add default portal, "
 					 "ignoring target %s", name);
@@ -323,7 +327,7 @@ add_target_record(idbm_t *db, char *name
 static int
 process_sendtargets_response(idbm_t *db, struct string_buffer *sendtargets,
 			     int final, discovery_rec_t *drec,
-			     struct list_head *ifaces,
+			     struct list_head *rec_list,
 			     char *default_port)
 {
 	char *start = buffer_data(sendtargets);
@@ -375,7 +379,7 @@ process_sendtargets_response(idbm_t *db,
 				 * "TargetName=" prefix.
 				 */
 				if (!add_target_record(db, record + 11, text,
-							drec, ifaces,
+							drec, rec_list,
 							default_port)) {
 					log_error(
 					       "failed to add target record");
@@ -404,7 +408,7 @@ process_sendtargets_response(idbm_t *db,
 				 "line %s",
 				 record, record);
 			if (add_target_record (db, record + 11, text,
-					       drec, ifaces, default_port)) {
+					       drec, rec_list, default_port)) {
 				num_targets++;
 				record = NULL;
 				truncate_buffer(sendtargets, 0);
@@ -684,7 +688,7 @@ setup_authentication(iscsi_session_t *se
 static int
 process_recvd_pdu(idbm_t *db, struct iscsi_hdr *pdu,
 		  discovery_rec_t *drec,
-		  struct list_head *ifaces,
+		  struct list_head *rec_list,
 		  iscsi_session_t *session,
 		  struct string_buffer *sendtargets,
 		  char *default_port,
@@ -721,22 +725,12 @@ process_recvd_pdu(idbm_t *db, struct isc
 			memcpy(buffer_data(sendtargets) + curr_data_length,
 			       data, dlength);
 
-			/*
-			 * we got a response so clear out the current
-			 * db values
-			 *
-			 * TODO: should we make whether rm the current
-			 * values configurable (maybe a --clear option)
-			 */
-			if (!*valid_text)
-				idbm_new_discovery(db, drec);
 			*valid_text = 1;
-
 			/* process as much as we can right now */
 			process_sendtargets_response(db, sendtargets,
 						     final,
 						     drec,
-						     ifaces,
+						     rec_list,
 						     default_port);
 
 			if (final) {
@@ -828,7 +822,7 @@ done:
 }
 
 int discovery_sendtargets(idbm_t *db, discovery_rec_t *drec,
-			  struct list_head *ifaces)
+			  struct list_head *rec_list)
 {
 	iscsi_session_t *session;
 	struct pollfd pfd;
@@ -981,7 +975,6 @@ redirect_reconnect:
 		break;
 
 	case LOGIN_IO_ERROR:
-	case LOGIN_WRONG_PORTAL_GROUP:
 	case LOGIN_REDIRECTION_FAILED:
 		/* try again */
 		log_warning("retrying discovery login to %s", host);
@@ -1126,7 +1119,7 @@ repoll:
 			/*
 			 * process iSCSI PDU received
 			 */
-			rc = process_recvd_pdu(db, pdu, drec, ifaces,
+			rc = process_recvd_pdu(db, pdu, drec, rec_list,
 					       session, &sendtargets,
 					       default_port,
 					       &active, &valid_text, data);
Only in open-iscsi.git/usr: discovery.c.orig
Only in open-iscsi.git/usr: discovery.c.rej
Only in open-iscsi.git/usr: discovery.o
diff -pur open-iscsi-2.0-865/usr/idbm.c open-iscsi.git/usr/idbm.c
--- open-iscsi-2.0-865/usr/idbm.c	2008-03-05 11:43:19.296974750 +0100
+++ open-iscsi.git/usr/idbm.c	2008-03-05 11:29:21.300603250 +0100
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <errno.h>
 #include <dirent.h>
+#include <limits.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 
@@ -40,7 +41,7 @@
 #define IDBM_SHOW	1    /* Show parameter when print. */
 #define IDBM_MASKED	2    /* Show "stars" instead of real value when print */
 
-#define __recinfo_str(_key, _info, _rec, _name, _show, _n) do { \
+#define __recinfo_str(_key, _info, _rec, _name, _show, _n, _mod) do { \
 	_info[_n].type = TYPE_STR; \
 	strncpy(_info[_n].name, _key, NAME_MAXVAL); \
 	if (strlen((char*)_rec->_name)) \
@@ -49,20 +50,22 @@
 	_info[_n].data = &_rec->_name; \
 	_info[_n].data_len = sizeof(_rec->_name); \
 	_info[_n].visible = _show; \
+	_info[_n].can_modify = _mod; \
 	_n++; \
 } while(0)
 
-#define __recinfo_int(_key, _info, _rec, _name, _show, _n) do { \
+#define __recinfo_int(_key, _info, _rec, _name, _show, _n, _mod) do { \
 	_info[_n].type = TYPE_INT; \
 	strncpy(_info[_n].name, _key, NAME_MAXVAL); \
 	snprintf(_info[_n].value, VALUE_MAXVAL, "%d", _rec->_name); \
 	_info[_n].data = &_rec->_name; \
 	_info[_n].data_len = sizeof(_rec->_name); \
 	_info[_n].visible = _show; \
+	_info[_n].can_modify = _mod; \
 	_n++; \
 } while(0)
 
-#define __recinfo_int_o2(_key,_info,_rec,_name,_show,_op0,_op1,_n) do { \
+#define __recinfo_int_o2(_key,_info,_rec,_name,_show,_op0,_op1,_n, _mod) do { \
 	_info[_n].type = TYPE_INT_O; \
 	strncpy(_info[_n].name, _key, NAME_MAXVAL); \
 	if (_rec->_name == 0) strncpy(_info[_n].value, _op0, VALUE_MAXVAL); \
@@ -73,38 +76,46 @@
 	_info[_n].opts[0] = _op0; \
 	_info[_n].opts[1] = _op1; \
 	_info[_n].numopts = 2; \
+	_info[_n].can_modify = _mod; \
 	_n++; \
 } while(0)
 
-#define __recinfo_int_o3(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_n)do{ \
-	__recinfo_int_o2(_key,_info,_rec,_name,_show,_op0,_op1,_n); _n--; \
-	if (_rec->_name == 2) strncpy(_info[_n].value, _op2, VALUE_MAXVAL); \
+#define __recinfo_int_o3(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_n,	\
+			 _mod) do { \
+	__recinfo_int_o2(_key,_info,_rec,_name,_show,_op0,_op1,_n, _mod); \
+	_n--; \
+	if (_rec->_name == 2) strncpy(_info[_n].value, _op2, VALUE_MAXVAL);\
 	_info[_n].opts[2] = _op2; \
 	_info[_n].numopts = 3; \
 	_n++; \
 } while(0)
 
-#define __recinfo_int_o4(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3,_n)do{\
-	__recinfo_int_o3(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_n); _n--; \
+#define __recinfo_int_o4(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3,_n, \
+			 _mod) do { \
+	__recinfo_int_o3(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_n, _mod); \
+	_n--; \
 	if (_rec->_name == 3) strncpy(_info[_n].value, _op3, VALUE_MAXVAL); \
 	_info[_n].opts[3] = _op3; \
 	_info[_n].numopts = 4; \
 	_n++; \
 } while(0)
 
-#define __recinfo_int_o5(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3,_op4,_n)do{\
-	__recinfo_int_o4(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3,_n); _n--; \
+#define __recinfo_int_o5(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3, \
+			 _op4,_n, _mod) do { \
+	__recinfo_int_o4(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3, \
+			  _n,_mod); \
+	_n--; \
 	if (_rec->_name == 4) strncpy(_info[_n].value, _op4, VALUE_MAXVAL); \
 	_info[_n].opts[4] = _op4; \
 	_info[_n].numopts = 5; \
 	_n++; \
 } while(0)
 
-#define __recinfo_int_o6(_key,_info,_rec,_name,_show,_op0,_op1,_op2,\
-			 _op3,_op4,_op5,_n)\
-do{\
-	__recinfo_int_o5(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3,\
-			 _op4,_n); _n--; \
+#define __recinfo_int_o6(_key,_info,_rec,_name,_show,_op0,_op1,_op2, \
+			 _op3,_op4,_op5,_n,_mod) do { \
+	__recinfo_int_o5(_key,_info,_rec,_name,_show,_op0,_op1,_op2,_op3, \
+			 _op4,_n,_mod); \
+	_n--; \
 	if (_rec->_name == 5) strncpy(_info[_n].value, _op5, VALUE_MAXVAL); \
 	_info[_n].opts[5] = _op5; \
 	_info[_n].numopts = 6; \
@@ -194,47 +205,47 @@ idbm_recinfo_discovery(discovery_rec_t *
 	int num = 0;
 
 	__recinfo_int_o2("discovery.startup", ri, r, startup, IDBM_SHOW,
-			"manual", "automatic", num);
+			"manual", "automatic", num, 1);
 	__recinfo_int_o6("discovery.type", ri, r, type, IDBM_SHOW,
 			"sendtargets", "offload_send_targets", "slp", "isns",
-			"static", "fw", num);
+			"static", "fw", num, 0);
 	if (r->type == DISCOVERY_TYPE_SENDTARGETS) {
 		__recinfo_str("discovery.sendtargets.address", ri, r,
-			address, IDBM_SHOW, num);
+			address, IDBM_SHOW, num, 0);
 		__recinfo_int("discovery.sendtargets.port", ri, r,
-			port, IDBM_SHOW, num);
+			port, IDBM_SHOW, num, 0);
 		__recinfo_int_o2("discovery.sendtargets.auth.authmethod", ri, r,
 			u.sendtargets.auth.authmethod,
-			IDBM_SHOW, "None", "CHAP", num);
+			IDBM_SHOW, "None", "CHAP", num, 1);
 		__recinfo_str("discovery.sendtargets.auth.username", ri, r,
-			u.sendtargets.auth.username, IDBM_SHOW, num);
+			u.sendtargets.auth.username, IDBM_SHOW, num, 1);
 		__recinfo_str("discovery.sendtargets.auth.password", ri, r,
-			u.sendtargets.auth.password, IDBM_MASKED, num);
+			u.sendtargets.auth.password, IDBM_MASKED, num, 1);
 		__recinfo_int("discovery.sendtargets.auth.password_length",
 			ri, r, u.sendtargets.auth.password_length,
-			IDBM_HIDE, num);
+			IDBM_HIDE, num, 1);
 		__recinfo_str("discovery.sendtargets.auth.username_in", ri, r,
-			u.sendtargets.auth.username_in, IDBM_SHOW, num);
+			u.sendtargets.auth.username_in, IDBM_SHOW, num, 1);
 		__recinfo_str("discovery.sendtargets.auth.password_in", ri, r,
-			u.sendtargets.auth.password_in, IDBM_MASKED, num);
+			u.sendtargets.auth.password_in, IDBM_MASKED, num, 1);
 		__recinfo_int("discovery.sendtargets.auth.password_in_length",
 			ri, r, u.sendtargets.auth.password_in_length,
-			IDBM_HIDE, num);
+			IDBM_HIDE, num, 1);
 		__recinfo_int("discovery.sendtargets.timeo.login_timeout",ri, r,
 			u.sendtargets.conn_timeo.login_timeout,
-			IDBM_SHOW, num);
+			IDBM_SHOW, num, 1);
 		__recinfo_int("discovery.sendtargets.reopen_max",ri, r,
 			u.sendtargets.reopen_max,
-			IDBM_SHOW, num);
+			IDBM_SHOW, num, 1);
 		__recinfo_int("discovery.sendtargets.timeo.auth_timeout", ri, r,
 			u.sendtargets.conn_timeo.auth_timeout,
-			IDBM_SHOW, num);
+			IDBM_SHOW, num, 1);
 		__recinfo_int("discovery.sendtargets.timeo.active_timeout",ri,r,
 			      u.sendtargets.conn_timeo.active_timeout,
-			      IDBM_SHOW, num);
+			      IDBM_SHOW, num, 1);
 		__recinfo_int("discovery.sendtargets.iscsi.MaxRecvDataSegmentLength",
 			ri, r, u.sendtargets.iscsi.MaxRecvDataSegmentLength,
-			IDBM_SHOW, num);
+			IDBM_SHOW, num, 1);
 	}
 }
 
@@ -243,137 +254,151 @@ idbm_recinfo_node(node_rec_t *r, recinfo
 {
 	int num = 0, i;
 
-	__recinfo_str("node.name", ri, r, name, IDBM_SHOW, num);
-	__recinfo_int("node.tpgt", ri, r, tpgt, IDBM_SHOW, num);
+	__recinfo_str("node.name", ri, r, name, IDBM_SHOW, num, 0);
+	__recinfo_int("node.tpgt", ri, r, tpgt, IDBM_SHOW, num, 0);
 	__recinfo_int_o3("node.startup", ri, r, startup,
-			IDBM_SHOW, "manual", "automatic", "onboot", num);
+			IDBM_SHOW, "manual", "automatic", "onboot", num, 1);
+	/*
+	 * Note: because we do not add the iface.iscsi_ifacename to
+	 * sysfs iscsiadm does some weird matching. We can change the iface
+	 * values if a session is not running, but node record ifaces values
+	 * have to be changed and so do the iface record ones.
+	 *
+	 * Users should nornmally not want to change the iface ones
+	 * in the node record directly and instead do it through
+	 * the iface mode which will do the right thing (althought that
+	 * needs some locking).
+	 */
 	__recinfo_str("iface.hwaddress", ri, r, iface.hwaddress, IDBM_SHOW,
-		      num);
+		      num, 1);
 //	__recinfo_str("iface.ipaddress", ri, r, iface.ipaddress,
 //		     IDBM_SHOW, num);
 	__recinfo_str("iface.iscsi_ifacename", ri, r, iface.name, IDBM_SHOW,
-		      num);
+		      num, 1);
 	__recinfo_str("iface.net_ifacename", ri, r, iface.netdev, IDBM_SHOW,
-		      num);
+		      num, 1);
 	/*
 	 * svn 780 compat: older versions used node.transport_name and
 	 * rec->transport_name
 	 */
 	__recinfo_str("iface.transport_name", ri, r, iface.transport_name,
-		      IDBM_SHOW, num);
+		      IDBM_SHOW, num, 1);
 	__recinfo_str("node.discovery_address", ri, r, disc_address, IDBM_SHOW,
-		      num);
-	__recinfo_int("node.discovery_port", ri, r, disc_port, IDBM_SHOW, num);
+		      num, 0);
+	__recinfo_int("node.discovery_port", ri, r, disc_port, IDBM_SHOW,
+		      num, 0);
 	__recinfo_int_o6("node.discovery_type", ri, r, disc_type,
 			 IDBM_SHOW, "send_targets", "offload_send_targets",
-			 "slp", "isns", "static", "fw", num);
+			 "slp", "isns", "static", "fw", num, 0);
 	__recinfo_int("node.session.initial_cmdsn", ri, r,
-		      session.initial_cmdsn, IDBM_SHOW, num);
+		      session.initial_cmdsn, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.initial_login_retry_max", ri, r,
-		      session.initial_login_retry_max, IDBM_SHOW, num);
+		      session.initial_login_retry_max, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.cmds_max", ri, r,
-		      session.cmds_max, IDBM_SHOW, num);
+		      session.cmds_max, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.queue_depth", ri, r,
-		       session.queue_depth, IDBM_SHOW, num);
+		       session.queue_depth, IDBM_SHOW, num, 1);
 	__recinfo_int_o2("node.session.auth.authmethod", ri, r,
-		session.auth.authmethod, IDBM_SHOW, "None", "CHAP", num);
+		session.auth.authmethod, IDBM_SHOW, "None", "CHAP", num, 1);
 	__recinfo_str("node.session.auth.username", ri, r,
-		      session.auth.username, IDBM_SHOW, num);
+		      session.auth.username, IDBM_SHOW, num, 1);
 	__recinfo_str("node.session.auth.password", ri, r,
-		      session.auth.password, IDBM_MASKED, num);
+		      session.auth.password, IDBM_MASKED, num, 1);
 	__recinfo_int("node.session.auth.password_length", ri, r,
-		      session.auth.password_length, IDBM_HIDE, num);
+		      session.auth.password_length, IDBM_HIDE, num, 1);
 	__recinfo_str("node.session.auth.username_in", ri, r,
-		      session.auth.username_in, IDBM_SHOW, num);
+		      session.auth.username_in, IDBM_SHOW, num, 1);
 	__recinfo_str("node.session.auth.password_in", ri, r,
-		      session.auth.password_in, IDBM_MASKED, num);
+		      session.auth.password_in, IDBM_MASKED, num, 1);
 	__recinfo_int("node.session.auth.password_in_length", ri, r,
-		      session.auth.password_in_length, IDBM_HIDE, num);
+		      session.auth.password_in_length, IDBM_HIDE, num, 1);
 	__recinfo_int("node.session.timeo.replacement_timeout", ri, r,
 		      session.timeo.replacement_timeout,
-		      IDBM_SHOW, num);
+		      IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.err_timeo.abort_timeout", ri, r,
 		      session.err_timeo.abort_timeout,
-		      IDBM_SHOW, num);
+		      IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.err_timeo.lu_reset_timeout", ri, r,
 		      session.err_timeo.lu_reset_timeout,
-		      IDBM_SHOW, num);
+		      IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.err_timeo.host_reset_timeout", ri, r,
 		      session.err_timeo.host_reset_timeout,
-		      IDBM_SHOW, num);
+		      IDBM_SHOW, num, 1);
 	__recinfo_int_o2("node.session.iscsi.FastAbort", ri, r,
-			 session.iscsi.FastAbort, IDBM_SHOW, "No", "Yes", num);
+			 session.iscsi.FastAbort, IDBM_SHOW, "No", "Yes",
+			 num, 1);
 	__recinfo_int_o2("node.session.iscsi.InitialR2T", ri, r,
 			 session.iscsi.InitialR2T, IDBM_SHOW,
-			"No", "Yes", num);
+			"No", "Yes", num, 1);
 	__recinfo_int_o2("node.session.iscsi.ImmediateData",
 			 ri, r, session.iscsi.ImmediateData, IDBM_SHOW,
-			"No", "Yes", num);
+			"No", "Yes", num, 1);
 	__recinfo_int("node.session.iscsi.FirstBurstLength", ri, r,
-		      session.iscsi.FirstBurstLength, IDBM_SHOW, num);
+		      session.iscsi.FirstBurstLength, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.iscsi.MaxBurstLength", ri, r,
-		      session.iscsi.MaxBurstLength, IDBM_SHOW, num);
+		      session.iscsi.MaxBurstLength, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.iscsi.DefaultTime2Retain", ri, r,
-		      session.iscsi.DefaultTime2Retain, IDBM_SHOW, num);
+		      session.iscsi.DefaultTime2Retain, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.iscsi.DefaultTime2Wait", ri, r,
-		      session.iscsi.DefaultTime2Wait, IDBM_SHOW, num);
+		      session.iscsi.DefaultTime2Wait, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.iscsi.MaxConnections", ri, r,
-		      session.iscsi.MaxConnections, IDBM_SHOW, num);
+		      session.iscsi.MaxConnections, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.iscsi.MaxOutstandingR2T", ri, r,
-		      session.iscsi.MaxOutstandingR2T, IDBM_SHOW, num);
+		      session.iscsi.MaxOutstandingR2T, IDBM_SHOW, num, 1);
 	__recinfo_int("node.session.iscsi.ERL", ri, r,
-		      session.iscsi.ERL, IDBM_SHOW, num);
+		      session.iscsi.ERL, IDBM_SHOW, num, 1);
 
 	for (i = 0; i < ISCSI_CONN_MAX; i++) {
 		char key[NAME_MAXVAL];
 
 		sprintf(key, "node.conn[%d].address", i);
-		__recinfo_str(key, ri, r, conn[i].address, IDBM_SHOW, num);
+		__recinfo_str(key, ri, r, conn[i].address, IDBM_SHOW, num, 0);
 		sprintf(key, "node.conn[%d].port", i);
-		__recinfo_int(key, ri, r, conn[i].port, IDBM_SHOW, num);
+		__recinfo_int(key, ri, r, conn[i].port, IDBM_SHOW, num, 0);
 		sprintf(key, "node.conn[%d].startup", i);
 		__recinfo_int_o3(key, ri, r, conn[i].startup, IDBM_SHOW,
-				 "manual", "automatic", "onboot", num);
+				 "manual", "automatic", "onboot", num, 1);
 		sprintf(key, "node.conn[%d].tcp.window_size", i);
 		__recinfo_int(key, ri, r, conn[i].tcp.window_size,
-			      IDBM_SHOW, num);
+			      IDBM_SHOW, num, 1);
 		sprintf(key, "node.conn[%d].tcp.type_of_service", i);
 		__recinfo_int(key, ri, r, conn[i].tcp.type_of_service,
-				IDBM_SHOW, num);
+				IDBM_SHOW, num, 1);
 		sprintf(key, "node.conn[%d].timeo.logout_timeout", i);
 		__recinfo_int(key, ri, r, conn[i].timeo.logout_timeout,
-				IDBM_SHOW, num);
+				IDBM_SHOW, num, 1);
 		sprintf(key, "node.conn[%d].timeo.login_timeout", i);
 		__recinfo_int(key, ri, r, conn[i].timeo.login_timeout,
-				IDBM_SHOW, num);
+				IDBM_SHOW, num, 1);
 		sprintf(key, "node.conn[%d].timeo.auth_timeout", i);
 		__recinfo_int(key, ri, r, conn[i].timeo.auth_timeout,
-				IDBM_SHOW, num);
+				IDBM_SHOW, num, 1);
 
 		sprintf(key, "node.conn[%d].timeo.noop_out_interval", i);
 		__recinfo_int(key, ri, r, conn[i].timeo.noop_out_interval,
-				IDBM_SHOW, num);
+				IDBM_SHOW, num, 1);
 		sprintf(key, "node.conn[%d].timeo.noop_out_timeout", i);
 		__recinfo_int(key, ri, r, conn[i].timeo.noop_out_timeout,
-				IDBM_SHOW, num);
+				IDBM_SHOW, num, 1);
 
 		sprintf(key, "node.conn[%d].iscsi.MaxRecvDataSegmentLength", i);
 		__recinfo_int(key, ri, r,
-			conn[i].iscsi.MaxRecvDataSegmentLength, IDBM_SHOW, num);
+			conn[i].iscsi.MaxRecvDataSegmentLength, IDBM_SHOW,
+			num, 1);
 		sprintf(key, "node.conn[%d].iscsi.HeaderDigest", i);
 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.HeaderDigest,
 				 IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
-				 "None,CRC32C", num);
+				 "None,CRC32C", num, 1);
 		sprintf(key, "node.conn[%d].iscsi.DataDigest", i);
 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
 				 "None", "CRC32C", "CRC32C,None",
-				 "None,CRC32C", num);
+				 "None,CRC32C", num, 1);
 		sprintf(key, "node.conn[%d].iscsi.IFMarker", i);
 		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
-				"No", "Yes", num);
+				"No", "Yes", num, 1);
 		sprintf(key, "node.conn[%d].iscsi.OFMarker", i);
 		__recinfo_int_o2(key, ri, r, conn[i].iscsi.OFMarker, IDBM_SHOW,
-				"No", "Yes", num);
+				"No", "Yes", num, 1);
 	}
 }
 
@@ -382,12 +407,12 @@ idbm_recinfo_iface(iface_rec_t *r, recin
 {
 	int num = 0;
 
-	__recinfo_str("iface.iscsi_ifacename", ri, r, name, IDBM_SHOW, num);
-	__recinfo_str("iface.net_ifacename", ri, r, netdev, IDBM_SHOW, num);
-//	__recinfo_str("iface.ipaddress", ri, r, ipaddress, IDBM_SHOW, num);
-	__recinfo_str("iface.hwaddress", ri, r, hwaddress, IDBM_SHOW, num);
+	__recinfo_str("iface.iscsi_ifacename", ri, r, name, IDBM_SHOW, num, 0);
+	__recinfo_str("iface.net_ifacename", ri, r, netdev, IDBM_SHOW, num, 1);
+//	__recinfo_str("iface.ipaddress", ri, r, ipaddress, IDBM_SHOW, num, 1);
+	__recinfo_str("iface.hwaddress", ri, r, hwaddress, IDBM_SHOW, num, 1);
 	__recinfo_str("iface.transport_name", ri, r, transport_name,
-		      IDBM_SHOW, num);
+		      IDBM_SHOW, num, 1);
 }
 
 static recinfo_t*
@@ -481,8 +506,8 @@ idbm_discovery_setup_defaults(discovery_
 }
 
 static int
-idbm_node_update_param(recinfo_t *info, char *name, char *value,
-		       int line_number)
+idbm_rec_update_param(recinfo_t *info, char *name, char *value,
+		      int line_number)
 {
 	int i;
 	int passwd_done = 0;
@@ -551,6 +576,31 @@ updated:
 	return 0;
 }
 
+/*
+ * TODO: we can also check for valid values here.
+ */
+static int idbm_verify_param(recinfo_t *info, char *name)
+{
+	int i;
+
+	for (i = 0; i < MAX_KEYS; i++) {
+		if (strcmp(name, info[i].name))
+			continue;
+
+		log_debug(7, "verify %s %d\n", name, info[i].can_modify);
+		if (info[i].can_modify)
+			return 0;
+		else {
+			log_error("Cannot modify %s. It is used to look up "
+				  "the record and cannot be changed.", name);
+			return EINVAL;
+		}
+	}
+
+	log_error("Cannot modify %s. Invalid param name.", name);
+	return EINVAL;
+}
+
 static void
 idbm_recinfo_config(recinfo_t *info, FILE *f)
 {
@@ -615,7 +665,7 @@ idbm_recinfo_config(recinfo_t *info, FIL
 		}
 		*(value+i) = 0;
 
-		(void)idbm_node_update_param(info, name, value, line_number);
+		(void)idbm_rec_update_param(info, name, value, line_number);
 	} while (line);
 }
 
@@ -710,6 +760,14 @@ int idbm_print_node_info(idbm_t *db, voi
 	return 0;
 }
 
+int idbm_print_iface_info(idbm_t *db, void *data, struct iface_rec *iface)
+{
+	int show = *((int *)data);
+
+	idbm_print(PRINT_TYPE_IFACE, iface, show, stdout);
+	return 0;
+}
+
 int idbm_print_node_flat(idbm_t *db, void *data, node_rec_t *rec)
 {
 	if (strchr(rec->conn[0].address, '.'))
@@ -964,7 +1022,11 @@ int iface_conf_update(idbm_t *db, struct
 		return ENOMEM;
 
 	idbm_recinfo_iface(iface, info);
-	rc = idbm_node_update_param(info, param->name, param->value, 0);
+	rc = idbm_verify_param(info, param->name);
+	if (rc)
+		goto free_info;
+
+	rc = idbm_rec_update_param(info, param->name, param->value, 0);
 	if (rc) {
 		rc = EIO;
 		goto free_info;
@@ -976,59 +1038,6 @@ free_info:
 	return rc;
 }
 
-static void idbm_read_def_ifaces(struct list_head *ifaces)
-{
-	DIR *iface_dirfd;
-	struct dirent *iface_dent;
-	struct iface_rec *iface;
-	int err = 0;
-
-	iface_dirfd = opendir(IFACE_CONFIG_DIR);
-	if (!iface_dirfd)
-		return;
-
-	while ((iface_dent = readdir(iface_dirfd))) {
-		if (!strcmp(iface_dent->d_name, ".") ||
-		    !strcmp(iface_dent->d_name, ".."))
-			continue;
-
-		log_debug(5, "idbm_read_def_ifaces found %s",
-			 iface_dent->d_name);
-		iface = iface_alloc(iface_dent->d_name, &err);
-		if (!iface || err) {
-			if (err == EINVAL)
-				log_error("Invalid iface name %s. Must be "
-					  "from 1 to %d characters.",
-					   iface_dent->d_name,
-					   ISCSI_MAX_IFACE_LEN - 1);
-			else
-				log_error("Could not add iface %s.",
-					  iface_dent->d_name);
-			free(iface);
-			continue;
-		}
-
-		err = __iface_conf_read(iface);
-		if (err) {
-			log_error("Could not read def iface %s (err %d)",
-				  iface->name, err);
-			free(iface);
-			continue;
-		}
-		if (!iface_is_bound(iface)) {
-			log_debug(5, "Default iface is not bound "
-				  "Iface settings " iface_fmt,
-				  iface_str(iface));
-			free(iface);
-			continue;
-		}
-
-		log_debug(5, "idbm_read_def_ifaces added %s", iface->name);
-		list_add_tail(&iface->list, ifaces);
-	}
-	closedir(iface_dirfd);
-}
-
 static int iface_get_next_id(void)
 {
 	struct stat statb;
@@ -1304,6 +1313,27 @@ int iface_is_bound_by_ipaddr(struct ifac
 */
 }
 
+/**
+ * iface_print_node_tree - print out binding info
+ * @iface: iface to print out
+ *
+ * Currently this looks like the iface conf print, because we only
+ * have the binding info. When we store the iface specific node settings
+ * in the iface record then it will look different.
+ */
+int iface_print_tree(void *data, struct iface_rec *iface)
+{
+	printf("Name: %s\n", iface->name);
+	printf("\tTransport Name: %s\n",
+	       strlen(iface->transport_name) ? iface->transport_name :
+	       UNKNOWN_VALUE);
+	printf("\tHW Address: %s\n",
+	       strlen(iface->hwaddress) ? iface->hwaddress : UNKNOWN_VALUE);
+	printf("\tNetdev: %s\n",
+	       strlen(iface->netdev) ? iface->netdev : UNKNOWN_VALUE);
+	return 0;
+}
+
 int iface_print_flat(void *data, struct iface_rec *iface)
 {
 	printf("%s %s,%s,%s\n",
@@ -1315,34 +1345,34 @@ int iface_print_flat(void *data, struct 
 	return 0;
 }
 
-static int iface_filter(const struct dirent *dir)
-{
-	return strcmp(dir->d_name, ".") && strcmp(dir->d_name, "..");
-}
-
 int iface_for_each_iface(idbm_t *db, void *data, int *nr_found, iface_op_fn *fn)
 {
-	struct dirent **namelist;
+	DIR *iface_dirfd;
+	struct dirent *iface_dent;
 	struct iface_rec *iface;
-	int err = 0, n, i;
+	int err = 0;
 
-	n = scandir(IFACE_CONFIG_DIR, &namelist, iface_filter, versionsort);
-	if (n <= 0)
-		return 0;
+	iface_dirfd = opendir(IFACE_CONFIG_DIR);
+	if (!iface_dirfd)
+		return errno;
+
+	while ((iface_dent = readdir(iface_dirfd))) {
+		if (!strcmp(iface_dent->d_name, ".") ||
+		    !strcmp(iface_dent->d_name, ".."))
+			continue;
 
-	for (i = 0; i < n; i++) {
 		log_debug(5, "iface_for_each_iface found %s",
-			 namelist[i]->d_name);
-		iface = iface_alloc(namelist[i]->d_name, &err);
+			 iface_dent->d_name);
+		iface = iface_alloc(iface_dent->d_name, &err);
 		if (!iface || err) {
 			if (err == EINVAL)
 				log_error("Invalid iface name %s. Must be "
 					  "from 1 to %d characters.",
-					   namelist[i]->d_name,
+					   iface_dent->d_name,
 					   ISCSI_MAX_IFACE_LEN - 1);
 			else
 				log_error("Could not add iface %s.",
-					  namelist[i]->d_name);
+					  iface_dent->d_name);
 			free(iface);
 			continue;
 		}
@@ -1372,12 +1402,32 @@ int iface_for_each_iface(idbm_t *db, voi
 		(*nr_found)++;
 	}
 
-	for (i = 0; i < n; i++)
-		free(namelist[i]);
-	free(namelist);
+	closedir(iface_dirfd);
 	return err;
 }
 
+static int iface_link(void *data, struct iface_rec *iface)
+{
+	struct list_head *ifaces = data;
+	struct iface_rec *iface_copy;
+
+	iface_copy = calloc(1, sizeof(*iface_copy));
+	if (!iface_copy)
+		return ENOMEM;
+
+	memcpy(iface_copy, iface, sizeof(*iface_copy));
+	INIT_LIST_HEAD(&iface_copy->list);
+	list_add_tail(&iface_copy->list, ifaces);
+	return 0;
+}
+
+static void iface_link_ifaces(idbm_t *db, struct list_head *ifaces)
+{
+	int nr_found = 0;
+
+	iface_for_each_iface(db, ifaces, &nr_found, iface_link);
+}
+
 /*
  * Backwards Compat:
  * If the portal is a file then we are doing the old style default
@@ -1486,7 +1536,7 @@ static int print_discovered(idbm_t *db, 
 	struct dirent **namelist;
 	node_rec_t *rec;
 
-	n = scandir(disc_path, &namelist, st_disc_filter, versionsort);
+	n = scandir(disc_path, &namelist, st_disc_filter, direntcmp);
 	if (n < 0)
 		return 0;
 
@@ -2094,14 +2144,16 @@ free_portal:
 	return rc;
 }
 
-static int
-idbm_add_discovery(idbm_t *db, discovery_rec_t *newrec)
+int
+idbm_add_discovery(idbm_t *db, discovery_rec_t *newrec, int overwrite)
 {
 	discovery_rec_t rec;
 	int rc;
 
 	if (!idbm_discovery_read(db, &rec, newrec->address,
 				newrec->port)) {
+		if (!overwrite)
+			return 0;
 		log_debug(7, "overwriting existing record");
 	} else
 		log_debug(7, "adding new DB record");
@@ -2159,7 +2211,8 @@ static int setup_disc_to_node_link(char 
 	return rc;
 }
 
-int idbm_add_node(idbm_t *db, node_rec_t *newrec, discovery_rec_t *drec)
+int idbm_add_node(idbm_t *db, node_rec_t *newrec, discovery_rec_t *drec,
+		  int overwrite)
 {
 	node_rec_t rec;
 	char *node_portal, *disc_portal;
@@ -2168,7 +2221,10 @@ int idbm_add_node(idbm_t *db, node_rec_t
 	if (!idbm_rec_read(db, &rec, newrec->name, newrec->tpgt,
 			   newrec->conn[0].address, newrec->conn[0].port,
 			   &newrec->iface)) {
-		rc = idbm_delete_node(db, NULL, &rec);
+		if (!overwrite)
+			return 0;
+
+		rc = idbm_delete_node(db, &rec);
 		if (rc)
 			return rc;
 		log_debug(7, "overwriting existing record");
@@ -2221,8 +2277,26 @@ free_portal:
 	return rc;
 }
 
-int idbm_add_nodes(idbm_t *db, node_rec_t *newrec, discovery_rec_t *drec,
-		   struct list_head *ifaces)
+static int idbm_bind_iface_to_node(struct node_rec *new_rec,
+				   struct iface_rec *iface,
+				   struct list_head *bound_recs)
+{
+	struct node_rec *clone_rec;
+
+	clone_rec = calloc(1, sizeof(*clone_rec));
+	if (!clone_rec)
+		return ENOMEM;
+
+	memcpy(clone_rec, new_rec, sizeof(*clone_rec));
+	INIT_LIST_HEAD(&clone_rec->list);
+	iface_copy(&clone_rec->iface, iface);
+	list_add_tail(&clone_rec->list, bound_recs);
+	return 0;
+}
+
+int idbm_bind_ifaces_to_node(idbm_t *db, struct node_rec *new_rec,
+			     struct list_head *ifaces,
+			     struct list_head *bound_recs)
 {
 	struct iface_rec *iface, *tmp;
 	struct iscsi_transport *t;
@@ -2232,25 +2306,78 @@ int idbm_add_nodes(idbm_t *db, node_rec_
 		struct list_head def_ifaces;
 
 		INIT_LIST_HEAD(&def_ifaces);
-		idbm_lock(db);
-		idbm_read_def_ifaces(&def_ifaces);
-		idbm_unlock(db);
+		iface_link_ifaces(db, &def_ifaces);
 
 		list_for_each_entry_safe(iface, tmp, &def_ifaces, list) {
 			list_del(&iface->list);
 			t = get_transport_by_name(iface->transport_name);
-			if (!t) {
+			if (!t || t->caps & CAP_FW_DB) {
 				free(iface);
 				continue;
 			}
 
-			if (t->caps & CAP_FW_DB) {
+			rc = idbm_bind_iface_to_node(new_rec, iface,
+						     bound_recs);
+			free(iface);
+			if (rc)
+				return rc;
+			found = 1;
+		}
+
+		/* create default iface with old/default behavior */
+		if (!found) {
+			struct iface_rec def_iface;
+
+			iface_init(&def_iface);
+			return idbm_bind_iface_to_node(new_rec, &def_iface,
+						       bound_recs);
+		}
+	} else {
+		list_for_each_entry(iface, ifaces, list) {
+			if (strcmp(iface->name, DEFAULT_IFACENAME) &&
+			    !iface_is_bound(iface)) {
+				log_error("iface %s is not bound. Will not "
+					  "bind node to it. Iface settings "
+					  iface_fmt, iface->name,
+					  iface_str(iface));
+				continue;
+			}
+
+			rc = idbm_bind_iface_to_node(new_rec, iface,
+						     bound_recs);
+			if (rc)
+				return rc;
+		}
+	}
+	return 0;
+}
+
+/*
+ * remove this when isns is converted
+ */
+int idbm_add_nodes(idbm_t *db, node_rec_t *newrec, discovery_rec_t *drec,
+		   struct list_head *ifaces, int update)
+{
+	struct iface_rec *iface, *tmp;
+	struct iscsi_transport *t;
+	int rc = 0, found = 0;
+
+	if (!ifaces || list_empty(ifaces)) {
+		struct list_head def_ifaces;
+
+		INIT_LIST_HEAD(&def_ifaces);
+		iface_link_ifaces(db, &def_ifaces);
+
+		list_for_each_entry_safe(iface, tmp, &def_ifaces, list) {
+			list_del(&iface->list);
+			t = get_transport_by_name(iface->transport_name);
+			if (!t || t->caps & CAP_FW_DB) {
 				free(iface);
 				continue;
 			}
 
 			iface_copy(&newrec->iface, iface);
-			rc = idbm_add_node(db, newrec, drec);
+			rc = idbm_add_node(db, newrec, drec, update);
 			free(iface);
 			if (rc)
 				return rc;
@@ -2260,7 +2387,7 @@ int idbm_add_nodes(idbm_t *db, node_rec_
 		/* create default iface with old/default behavior */
 		if (!found) {
 			iface_init(&newrec->iface);
-			return idbm_add_node(db, newrec, drec);
+			return idbm_add_node(db, newrec, drec, update);
 		}
 	} else {
 		list_for_each_entry(iface, ifaces, list) {
@@ -2274,7 +2401,7 @@ int idbm_add_nodes(idbm_t *db, node_rec_
 			}
 
 			iface_copy(&newrec->iface, iface);
-			rc = idbm_add_node(db, newrec, drec);
+			rc = idbm_add_node(db, newrec, drec, update);
 			if (rc)
 				return rc;
 		}
@@ -2282,13 +2409,6 @@ int idbm_add_nodes(idbm_t *db, node_rec_
 	return 0;
 }
 
-void idbm_new_discovery(idbm_t *db, discovery_rec_t *drec)
-{
-	idbm_delete_discovery(db, drec);
-	if (idbm_add_discovery(db, drec))
-		log_error("can not update discovery record.");
-}
-
 static void idbm_rm_disc_node_links(idbm_t *db, char *disc_dir)
 {
 	char *target = NULL, *tpgt = NULL, *port = NULL;
@@ -2328,7 +2448,7 @@ static void idbm_rm_disc_node_links(idbm
 		strncpy(rec->conn[0].address, address, NI_MAXHOST);
 		strncpy(rec->iface.name, iface_id, ISCSI_MAX_IFACE_LEN);
 
-		if (idbm_delete_node(db, NULL, rec))
+		if (idbm_delete_node(db, rec))
 			log_error("Could not delete node %s/%s/%s,%s/%s",
 				  NODE_CONFIG_DIR, target, address, port,
 				  iface_id);
@@ -2438,7 +2558,7 @@ done:
 	return rc;
 }
 
-int idbm_delete_node(idbm_t *db, void *data, node_rec_t *rec)
+int idbm_delete_node(idbm_t *db, node_rec_t *rec)
 {
 	struct stat statb;
 	char *portal;
@@ -2494,7 +2614,7 @@ rm_conf:
 		snprintf(portal, PATH_MAX, "%s/%s/%s,%d,%d", NODE_CONFIG_DIR,
 			 rec->name, rec->conn[0].address, rec->conn[0].port,
 			 rec->tpgt);
-		n = scandir(portal, &namelist, st_disc_filter, versionsort);
+		n = scandir(portal, &namelist, st_disc_filter, direntcmp);
 		if (n < 0)
 			goto free_portal;
 		if (n == 0)
@@ -2532,8 +2652,7 @@ idbm_slp_defaults(idbm_t *db, struct isc
 	       sizeof(struct iscsi_slp_config));
 }
 
-int
-idbm_node_set_param(idbm_t *db, void *data, node_rec_t *rec)
+int idbm_node_set_param(idbm_t *db, void *data, node_rec_t *rec)
 {
 	struct db_set_param *param = data;
 	recinfo_t *info;
@@ -2545,6 +2664,9 @@ idbm_node_set_param(idbm_t *db, void *da
 
 	idbm_recinfo_node(rec, info);
 
+	rc = idbm_verify_param(info, param->name);
+	if (rc)
+		goto free_info;
 	/*
 	 * Another compat hack!!!!: in the future we will have a common
 	 * way to define node wide vs iface wide values and it will
@@ -2553,23 +2675,20 @@ idbm_node_set_param(idbm_t *db, void *da
 	 * we update it for them.
 	 */
 	if (!strcmp("node.transport_name", param->name))
-		rc = idbm_node_update_param(info, "iface.transport_name",
+		rc = idbm_rec_update_param(info, "iface.transport_name",
 					    param->value, 0);
 	else
-		rc = idbm_node_update_param(info, param->name, param->value, 0);
-	if (rc) {
-		free(info);
-		return EIO;
-	}
+		rc = idbm_rec_update_param(info, param->name, param->value, 0);
+	if (rc)
+		goto free_info;
 
 	rc = idbm_rec_write(param->db, rec);
-	if (rc) {
-		free(info);
-		return rc;
-	}
+	if (rc)
+		goto free_info;
 
+free_info:
 	free(info);
-	return 0;
+	return rc;
 }
 
 idbm_t*
Only in open-iscsi.git/usr: idbm.c~
Only in open-iscsi.git/usr: idbm.c.orig
Only in open-iscsi.git/usr: idbm.c.rej
diff -pur open-iscsi-2.0-865/usr/idbm.h open-iscsi.git/usr/idbm.h
--- open-iscsi-2.0-865/usr/idbm.h	2008-03-05 11:43:19.308975500 +0100
+++ open-iscsi.git/usr/idbm.h	2008-03-05 11:29:21.328605000 +0100
@@ -50,6 +50,12 @@ typedef struct recinfo {
 	int		visible;
 	char*		opts[OPTS_MAXVAL];
 	int		numopts;
+	/*
+	 * bool indicating if we can change it or not.
+	 * TODO: make it a enum that can indicate wheter it also requires
+	 * a relogin to pick up if a session is running.
+	 */
+	int		can_modify;
 } recinfo_t;
 
 typedef char *(idbm_get_config_file_fn)(void);
@@ -73,7 +79,7 @@ typedef struct idbm {
 struct db_set_param {
 	char *name;
 	char *value;
-	struct idbm  *db;
+	struct idbm *db;
 };
 
 typedef int (idbm_iface_op_fn)(idbm_t *db, void *data, node_rec_t *rec);
@@ -100,6 +106,8 @@ extern idbm_t *idbm_init(idbm_get_config
 
 extern void idbm_node_setup_from_conf(idbm_t *db, node_rec_t *rec);
 extern void idbm_terminate(idbm_t *db);
+extern int idbm_print_iface_info(idbm_t *db, void *data,
+				 struct iface_rec *iface);
 extern int idbm_print_node_info(idbm_t *db, void *data, node_rec_t *rec);
 extern int idbm_print_node_flat(idbm_t *db, void *data, node_rec_t *rec);
 extern int idbm_print_node_tree(idbm_t *db, void *data, node_rec_t *rec);
@@ -110,13 +118,18 @@ extern int idbm_print_discovered(idbm_t 
 				 int info_level);
 extern int idbm_delete_discovery(idbm_t *db, discovery_rec_t *rec);
 extern void idbm_node_setup_defaults(node_rec_t *rec);
-extern int idbm_delete_node(idbm_t *db, void *data, node_rec_t *rec);
-extern int idbm_add_node(idbm_t *db, node_rec_t *newrec, discovery_rec_t *drec);
-
+extern int idbm_delete_node(idbm_t *db, node_rec_t *rec);
+extern int idbm_add_node(idbm_t *db, node_rec_t *newrec, discovery_rec_t *drec,
+			 int overwrite);
 struct list_head;
+extern int idbm_bind_ifaces_to_node(idbm_t *db, struct node_rec *new_rec,
+				    struct list_head *ifaces,
+				    struct list_head *bound_recs);
 extern int idbm_add_nodes(idbm_t *db, node_rec_t *newrec,
-			  discovery_rec_t *drec, struct list_head *ifaces);
-extern void idbm_new_discovery(idbm_t *db, discovery_rec_t *drec);
+			  discovery_rec_t *drec, struct list_head *ifaces,
+			  int overwrite);
+extern int idbm_add_discovery(idbm_t *db, discovery_rec_t *newrec,
+			      int overwrite);
 extern void idbm_sendtargets_defaults(idbm_t *db,
 		      struct iscsi_sendtargets_config *cfg);
 extern void idbm_slp_defaults(idbm_t *db, struct iscsi_slp_config *cfg);
@@ -143,6 +156,7 @@ typedef int (iface_op_fn)(void *data, st
 extern int iface_for_each_iface(idbm_t *db, void *data, int *nr_found,
 				 iface_op_fn *fn);
 extern int iface_print_flat(void *data, struct iface_rec *iface);
+extern int iface_print_tree(void *data, struct iface_rec *iface);
 extern void iface_setup_host_bindings(idbm_t *db);
 extern int iface_get_by_bind_info(idbm_t *db, struct iface_rec *pattern,
 				 struct iface_rec *out_rec);
Only in open-iscsi.git/usr: idbm.o
diff -pur open-iscsi-2.0-865/usr/initiator.c open-iscsi.git/usr/initiator.c
--- open-iscsi-2.0-865/usr/initiator.c	2008-03-05 11:28:54.082902250 +0100
+++ open-iscsi.git/usr/initiator.c	2008-03-05 11:29:21.376608000 +0100
@@ -149,7 +149,6 @@ __login_response_status(iscsi_conn_t *co
 	case LOGIN_REDIRECT:
 		return CONN_LOGIN_IMM_REDIRECT_RETRY;
 	case LOGIN_IO_ERROR:
-	case LOGIN_WRONG_PORTAL_GROUP:
 	case LOGIN_REDIRECTION_FAILED:
 		return CONN_LOGIN_RETRY;
 	default:
@@ -365,6 +364,11 @@ iscsi_copy_operational_params(iscsi_conn
 	session->initial_r2t_en = rec->session.iscsi.InitialR2T;
 	session->imm_data_en = rec->session.iscsi.ImmediateData;
 	session->first_burst = __padding(rec->session.iscsi.FirstBurstLength);
+	/*
+	 * some targets like netapp fail the login if sent bad first_burst
+	 * and max_burst lens, even when immediate data=no and
+	 * initial r2t = Yes, so we always check the user values.
+	 */
 	if (session->first_burst < ISCSI_MIN_FIRST_BURST_LEN ||
 	    session->first_burst > ISCSI_MAX_FIRST_BURST_LEN) {
 		log_error("Invalid iscsi.FirstBurstLength of %u. Must be "
@@ -388,6 +392,14 @@ iscsi_copy_operational_params(iscsi_conn
 		session->max_burst = DEF_INI_MAX_BURST_LEN;
 	}
 
+	if (session->first_burst > session->max_burst) {
+		log_error("Invalid iscsi.FirstBurstLength of %u. Must be "
+			  "less than iscsi.MaxBurstLength. Setting to %u\n",
+			   session->first_burst, session->max_burst);
+		rec->session.iscsi.FirstBurstLength = session->max_burst;
+		session->first_burst = session->max_burst;
+	}
+
 	session->def_time2wait = rec->session.iscsi.DefaultTime2Wait;
 	session->def_time2retain = rec->session.iscsi.DefaultTime2Retain;
 	session->erl = rec->session.iscsi.ERL;
@@ -590,7 +602,10 @@ session_conn_shutdown(iscsi_conn_t *conn
 {
 	iscsi_session_t *session = conn->session;
 
-	if (!conn->ksetup)
+	if (session->id == -1)
+		goto disconnect_conn;
+
+	if (!sysfs_session_has_leadconn(session->id))
 		goto disconnect_conn;
 
 	if (conn->state == STATE_IN_LOGIN ||
@@ -611,7 +626,6 @@ session_conn_shutdown(iscsi_conn_t *conn
 		log_error("can not safely destroy connection %d", conn->id);
 		return MGMT_IPC_ERR_INTERNAL;
 	}
-	conn->ksetup = 0;
 
 disconnect_conn:
 	log_debug(2, "disconnect conn");
@@ -1708,7 +1722,6 @@ static void session_conn_poll(void *data
 				err = MGMT_IPC_ERR_INTERNAL;
 				goto cleanup;
 			}
-			conn->ksetup = 1;
 			log_debug(3, "created new iSCSI connection "
 				  "%d:%d", session->id, conn->id);
 		}
diff -pur open-iscsi-2.0-865/usr/initiator.h open-iscsi.git/usr/initiator.h
--- open-iscsi-2.0-865/usr/initiator.h	2008-03-05 11:28:54.110904000 +0100
+++ open-iscsi.git/usr/initiator.h	2008-03-05 11:29:21.404609750 +0100
@@ -75,10 +75,9 @@ enum iscsi_login_status {
 	LOGIN_VERSION_MISMATCH		= 3,
 	LOGIN_NEGOTIATION_FAILED	= 4,
 	LOGIN_AUTHENTICATION_FAILED	= 5,
-	LOGIN_WRONG_PORTAL_GROUP	= 6,
-	LOGIN_REDIRECTION_FAILED	= 7,
-	LOGIN_INVALID_PDU		= 8,
-	LOGIN_REDIRECT			= 9,
+	LOGIN_REDIRECTION_FAILED	= 6,
+	LOGIN_INVALID_PDU		= 7,
+	LOGIN_REDIRECT			= 8,
 };
 
 typedef enum iscsi_event_e {
@@ -117,7 +116,6 @@ struct iscsi_conn_context;
 /* daemon's connection structure */
 typedef struct iscsi_conn {
 	uint32_t id;
-	int ksetup;
 	struct iscsi_session *session;
 	iscsi_login_context_t login_context;
 	struct iscsi_conn_context *recv_context;
Only in open-iscsi.git/usr: initiator.o
diff -pur open-iscsi-2.0-865/usr/io.c open-iscsi.git/usr/io.c
--- open-iscsi-2.0-865/usr/io.c	2008-03-05 11:28:54.138905750 +0100
+++ open-iscsi.git/usr/io.c	2008-03-05 11:29:21.440612000 +0100
@@ -24,7 +24,6 @@
 #include <signal.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <ifaddrs.h>
 #include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <netinet/tcp.h>
@@ -75,6 +74,8 @@ set_non_blocking(int fd)
 
 }
 
+#if 0
+/* not used by anyone */
 static int get_hwaddress_from_netdev(char *netdev, char *hwaddress)
 {
 	struct ifaddrs *ifap, *ifa;
@@ -152,6 +153,7 @@ free_ifap:
 	freeifaddrs(ifap);
 	return found;
 }
+#endif
 
 /*
  * In this mode we do not support interfaces like a bond or alias because
@@ -159,15 +161,14 @@ free_ifap:
  */
 static int get_netdev_from_hwaddress(char *hwaddress, char *netdev)
 {
-	struct ifaddrs *ifap, *ifa;
-	struct sockaddr_in *s4;
-	struct sockaddr_in6 *s6;
+	struct if_nameindex *ifni;
 	struct ifreq if_hwaddr;
-	int found = 0, sockfd;
+	int found = 0, sockfd, i = 0;
 	unsigned char *hwaddr;
-	char buf[INET6_ADDRSTRLEN], tmp_hwaddress[ISCSI_MAX_IFACE_LEN];
+	char tmp_hwaddress[ISCSI_MAX_IFACE_LEN];
 
-	if (getifaddrs(&ifap)) {
+	ifni = if_nameindex();
+	if (ifni == NULL) {
 		log_error("Could not match hwaddress %s to netdev. "
 			  "getifaddrs failed %d", hwaddress, errno);
 		return 0;
@@ -177,34 +178,13 @@ static int get_netdev_from_hwaddress(cha
 	sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sockfd < 0) {
 		log_error("Could not open socket for ioctl.");
-		goto free_ifap;
+		goto free_ifni;
 	}
 
-	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-		if (!ifa->ifa_addr)
-			continue;
-
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			s4 = (struct sockaddr_in *)(ifa->ifa_addr);
-			if (!inet_ntop(ifa->ifa_addr->sa_family,
-				      (void *)&(s4->sin_addr), buf,
-				      INET_ADDRSTRLEN))
-				continue;
-			log_debug(4, "name %s addr %s\n", ifa->ifa_name, buf);
-			break;
-		case AF_INET6:
-			s6 = (struct sockaddr_in6 *)(ifa->ifa_addr);
-			if (!inet_ntop(ifa->ifa_addr->sa_family,
-			    (void *)&(s6->sin6_addr), buf, INET6_ADDRSTRLEN))
-				continue;
-			log_debug(4, "name %s addr %s\n", ifa->ifa_name, buf);
-			break;
-		default:
-			continue;
-		}
+	for (i = 0; ifni[i].if_index && ifni[i].if_name; i++) {
+		struct if_nameindex *n = &ifni[i];
 
-		strncpy(if_hwaddr.ifr_name, ifa->ifa_name, IFNAMSIZ);
+		strncpy(if_hwaddr.ifr_name, n->if_name, IFNAMSIZ);
 		if (ioctl(sockfd, SIOCGIFHWADDR, &if_hwaddr) < 0) {
 			log_error("Could not match %s to netdevice.",
 				  hwaddress);
@@ -224,17 +204,17 @@ static int get_netdev_from_hwaddress(cha
 		log_debug(4, "Found hardware address %s", tmp_hwaddress);
 		if (!strcasecmp(tmp_hwaddress, hwaddress)) {
 			log_debug(4, "Matches %s to %s", hwaddress,
-				  ifa->ifa_name);
+				  n->if_name);
 			memset(netdev, 0, IFNAMSIZ); 
-			strncpy(netdev, ifa->ifa_name, IFNAMSIZ);
+			strncpy(netdev, n->if_name, IFNAMSIZ);
 			found = 1;
 			break;
 		}
 	}
 
 	close(sockfd);
-free_ifap:
-	freeifaddrs(ifap);
+free_ifni:
+	if_freenameindex(ifni);
 	return found;
 }
 
Only in open-iscsi.git/usr: io.o
Only in open-iscsi.git/usr: iscsiadm
diff -pur open-iscsi-2.0-865/usr/iscsiadm.c open-iscsi.git/usr/iscsiadm.c
--- open-iscsi-2.0-865/usr/iscsiadm.c	2008-03-05 11:43:19.340977500 +0100
+++ open-iscsi.git/usr/iscsiadm.c	2008-03-05 11:29:21.504616000 +0100
@@ -55,10 +55,11 @@ enum iscsiadm_mode {
 };
 
 enum iscsiadm_op {
-	OP_NEW,
-	OP_DELETE,
-	OP_UPDATE,
-	OP_SHOW,
+	OP_NOOP		= 0x0,
+	OP_NEW		= 0x1,
+	OP_DELETE	= 0x2,
+	OP_UPDATE	= 0x4,
+	OP_SHOW		= 0x8,
 };
 
 static struct option const long_options[] =
@@ -101,6 +102,7 @@ iscsiadm -m node [ -hV ] [ -d debug_leve
 [ [ -o  operation  ] [ -n name ] [ -v value ] ]\n\
 iscsiadm -m session [ -hV ] [ -d debug_level ] [ -P  printlevel] [ -r sessionid | sysfsdir [ -R | -u | -s ] [ -o operation ] [ -n name ] [ -v value ] ]\n\
 iscsiadm -m iface [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -I ifacename ] [ [ -o  operation  ] [ -n name ] [ -v value ] ]\n\
+iscsiadm -m fw [ -l ]\n\
 iscsiadm -k priority\n");
 	}
 	exit(status == 0 ? 0 : -1);
@@ -120,7 +122,7 @@ str_to_op(char *str)
 	else if (!strcmp("show", str))
 		op = OP_SHOW;
 	else
-		op = -1;
+		op = OP_NOOP;
 
 	return op;
 }
@@ -197,21 +199,31 @@ static void kill_iscsid(int priority)
 }
 
 /*
- * TODO: when we get more time we can make add what sessions
- * are connected to the host. For now you can see this in session
- * mode although with -P 3, althought it is not nicely structured
- * like how you would want
+ * TODO: we can display how the ifaces are related to node records.
+ * And we can add a scsi_host mode which would display how
+ * sessions are related to hosts
+ * (scsi_host and iscsi_sessions are the currently running instance of
+ * a iface or node record).
  */
 static int print_ifaces(idbm_t *db, int info_level)
 {
 	int err, num_found = 0;
 
-	if (info_level > 0) {
-		log_error("Invalid info level %d. Try 0.", info_level);
+	switch (info_level) {
+	case 0:
+	case -1:
+		err = iface_for_each_iface(db, NULL, &num_found,
+					   iface_print_flat);
+		break;
+	case 1:
+		err = iface_for_each_iface(db, NULL, &num_found,
+					   iface_print_tree);
+		break;
+	default:
+		log_error("Invalid info level %d. Try 0 or 1.", info_level);
 		return EINVAL;
 	}
 
-	err = iface_for_each_iface(db, NULL, &num_found, iface_print_flat);
 	if (!num_found) {
 		log_error("No interfaces found.");
 		err = ENODEV;
@@ -356,11 +368,20 @@ for_each_session(struct node_rec *rec, s
 	return err;
 }
 
+struct session_link_info {
+	struct list_head *list;
+	struct session_info *match_info;
+};
+
 static int link_sessions(void *data, struct session_info *info)
 {
-	struct list_head *list = data;
+	struct session_link_info *link_info = data;
+	struct list_head *list = link_info->list;
 	struct session_info *new, *curr, *match = NULL;
 
+	if (link_info->match_info && link_info->match_info->sid != info->sid)
+		return 0;
+
 	new = calloc(1, sizeof(*new));
 	if (!new)
 		return ENOMEM;
@@ -461,14 +482,19 @@ __logout_portals(idbm_t *db, void *data,
 				   struct session_info *))
 {
 	struct session_info *curr_info, *tmp;
+	struct session_link_info link_info;
 	struct list_head session_list, logout_list;
 	int ret = 0, err;
 
 	INIT_LIST_HEAD(&session_list);
 	INIT_LIST_HEAD(&logout_list);
+
+	memset(&link_info, 0, sizeof(link_info));
+	link_info.list = &session_list;
+	link_info.match_info = NULL;
 	*nr_found = 0;
 
-	err = sysfs_for_each_session(&session_list, nr_found,
+	err = sysfs_for_each_session(&link_info, nr_found,
 				    link_sessions);
 	if (err || !*nr_found)
 		return err;
@@ -877,8 +903,12 @@ static char *get_config_file(void)
 
 static int print_session_flat(void *data, struct session_info *info)
 {
+	struct session_info *match_info = data;
 	struct iscsi_transport *t = get_transport_by_sid(info->sid);
 
+	if (match_info && match_info->sid != info->sid)
+		return 0;
+
 	if (strchr(info->persistent_address, '.'))
 		printf("%s: [%d] %s:%d,%d %s\n",
 			t ? t->name : UNKNOWN_VALUE,
@@ -896,7 +926,9 @@ static int print_iscsi_state(int sid)
 {
 	iscsiadm_req_t req;
 	iscsiadm_rsp_t rsp;
+	int err;
 	char *state = NULL;
+	char state_buff[SCSI_MAX_STATE_VALUE];
 	static char *conn_state[] = {
 		"FREE",
 		"TRANSPORT WAIT",
@@ -917,23 +949,24 @@ static int print_iscsi_state(int sid)
 	req.command = MGMT_IPC_SESSION_INFO;
 	req.u.session.sid = sid;
 
-	if (do_iscsid(&req, &rsp)) {
-		printf("\t\tiSCSI Connection State: Unknown\n");
-		printf("\t\tInternal iscsid Session State: Unknown\n");
-		return ENODEV;
-	}
-
+	err = do_iscsid(&req, &rsp);
 	/*
 	 * for drivers like qla4xxx, iscsid does not display
 	 * anything here since it does not know about it.
 	 */
-	if (rsp.u.session_state.conn_state >= 0 &&
+	if (!err && rsp.u.session_state.conn_state >= 0 &&
 	    rsp.u.session_state.conn_state <= STATE_CLEANUP_WAIT)
 		state = conn_state[rsp.u.session_state.conn_state];
 	printf("\t\tiSCSI Connection State: %s\n", state ? state : "Unknown");
 	state = NULL;
 
-	if (rsp.u.session_state.session_state >= 0 &&
+	memset(state_buff, 0, SCSI_MAX_STATE_VALUE);
+	if (!get_session_state(state_buff, sid))
+		printf("\t\tiSCSI Session State: %s\n", state_buff);
+	else
+		printf("\t\tiSCSI Session State: Unknown\n");
+
+	if (!err && rsp.u.session_state.session_state >= 0 &&
 	   rsp.u.session_state.session_state <= R_STAGE_SESSION_REDIRECT)
 		state = session_state[rsp.u.session_state.session_state];
 	printf("\t\tInternal iscsid Session State: %s\n",
@@ -1096,37 +1129,8 @@ next:
 	}
 }
 
-static int print_session(idbm_t *db, int info_level, struct session_info *info)
-{
-	struct list_head list;
-	int err;
-
-	switch (info_level) {
-	case 0:
-	case -1:
-		err = print_session_flat(NULL, info);
-		break;
-	case 1:
-	case 2:
-	case 3:
-		INIT_LIST_HEAD(&list);
-
-		err = link_sessions(&list, info);
-		if (err)
-			break;
-		print_sessions_tree(db, &list, info_level);
-		break;
-	default:
-		log_error("Invalid info level %d. Try 0 - 3.", info_level);
-		return EINVAL;
-	}
-
-	if (err)
-		log_error("Can not get session info (%d)", err);
-	return 0;
-}
-
-static int print_sessions(idbm_t *db, int info_level)
+static int print_sessions(idbm_t *db, int info_level,
+			  struct session_info *match_info)
 {
 	struct list_head list;
 	int num_found = 0, err = 0;
@@ -1135,7 +1139,7 @@ static int print_sessions(idbm_t *db, in
 	switch (info_level) {
 	case 0:
 	case -1:
-		err = sysfs_for_each_session(NULL, &num_found,
+		err = sysfs_for_each_session(match_info, &num_found,
 					     print_session_flat);
 		break;
 	case 2:
@@ -1149,8 +1153,13 @@ static int print_sessions(idbm_t *db, in
 		/* fall through */
 	case 1:
 		INIT_LIST_HEAD(&list);
+		struct session_link_info link_info;
+
+		memset(&link_info, 0, sizeof(link_info));
+		link_info.list = &list;
+		link_info.match_info = match_info;
 
-		err = sysfs_for_each_session(&list, &num_found,
+		err = sysfs_for_each_session(&link_info, &num_found,
 					    link_sessions);
 		if (err || !num_found)
 			break;
@@ -1317,7 +1326,7 @@ static int add_static_rec(idbm_t *db, in
 		iface_copy(&rec->iface, iface);
 	}
 
-	rc = idbm_add_node(db, rec, drec);
+	rc = idbm_add_node(db, rec, drec, 1);
 	if (!rc) {
 		(*found)++;
 		printf("New iSCSI node [%s:" iface_fmt " %s,%d,%d %s] added\n",
@@ -1427,35 +1436,201 @@ static int login_discovered_portal(void 
 	return 0;
 }
 
+/* TODO merge with initiator.c implementation */
+/* And add locking */
+static int check_for_session_through_iface(struct node_rec *rec)
+{
+	int nr_found = 0;
+	if (sysfs_for_each_session(rec, &nr_found, iscsi_match_session))
+		return 1;
+	return 0;
+}
+
+static int delete_node(struct idbm *db, void *data, struct node_rec *rec)
+{
+	if (check_for_session_through_iface(rec)) {
+		/*
+		 * perf is not important in this path, so do not worry
+		 * about doing a async logout
+		 */
+		log_warning("Found running session using record. Logging "
+			    "out session [iface: %s, target: %s, "
+			    "portal: %s,%d] before deleting record.",
+			    rec->iface.name, rec->name,
+			    rec->conn[0].address, rec->conn[0].port);
+		switch (iscsid_req(MGMT_IPC_SESSION_LOGOUT, rec)) {
+		case MGMT_IPC_ERR_NOT_FOUND:
+		case MGMT_IPC_OK:
+			break;
+		default:
+			log_error("Could not remove record, because there "
+				  "is a session to the portal that cannot "
+				  "stopped. Please log out session: "
+				  "[iface: %s, target: %s, portal: %s,%d]"
+				  "and then remove record.",
+				  rec->iface.name, rec->name,
+				  rec->conn[0].address, rec->conn[0].port);
+			return EINVAL;
+		}
+	}
+	return idbm_delete_node(db, rec);
+}
+
+static int delete_stale_recs(struct idbm *db, void *data, struct node_rec *rec)
+{
+	struct list_head *new_rec_list = data;
+	struct node_rec *new_rec;
+
+	list_for_each_entry(new_rec, new_rec_list, list) {
+		/*
+		 * We could also move this to idbm.c and instead of looping
+		 * over every node just loop over disc to node links.
+		 */
+		if (rec->disc_type != new_rec->disc_type ||
+		    rec->disc_port != new_rec->disc_port ||
+		    strcmp(rec->disc_address, new_rec->disc_address))
+			/*
+			 * if we are not from the same discovery source
+			 * ignore it
+			 */
+			return 0;
+
+		/*
+		 * we only care if the target endpoint matches, because
+		 * it is gone and we want to logout all sessions with
+		 * that endpoint, so we pass in null for the iface.
+ 		 */
+		if (__iscsi_match_session(rec,
+					  new_rec->name,
+					  new_rec->conn[0].address,
+					  new_rec->conn[0].port,
+					  &new_rec->iface))
+			return 0;
+	}
+	/* if there is a error we can continue on */
+	delete_node(db, NULL, rec);
+	return 0;
+}
+
+static int
+update_discovery_recs(idbm_t *db, discovery_rec_t *drec,
+		      struct list_head *new_rec_list, struct list_head *ifaces,
+		      int info_level, int do_login, int op)
+{
+	int rc, err, found = 0;
+	struct list_head bound_rec_list;
+	struct node_rec *new_rec, *tmp;
+
+	INIT_LIST_HEAD(&bound_rec_list);
+ 
+	/* bind ifaces to node recs so we know what we have */
+	list_for_each_entry(new_rec, new_rec_list, list) {
+		rc = idbm_bind_ifaces_to_node(db, new_rec, ifaces,
+					      &bound_rec_list);
+		if (rc)
+			goto free_bound_recs;
+	}
+
+
+	/* clean up node db */
+	if (op & OP_DELETE)
+		idbm_for_each_rec(db, &found, &bound_rec_list,
+				  delete_stale_recs);
+
+	if (op & OP_NEW || op & OP_UPDATE) {
+		/* now add/update records */
+		list_for_each_entry(new_rec, &bound_rec_list, list) {
+			int update = op & OP_UPDATE;
+
+			if (update &&
+			    check_for_session_through_iface(new_rec)) {
+				log_warning("Could not update record for "
+					    "[iface: %s, target: %s, portal: "
+					    "%s,%d], because session is "
+					    "logged in. Log out session "
+					    "then retry operation, or run "
+					    "discovery without the 'update' "
+					    "option.",
+					    new_rec->iface.name, new_rec->name,
+					    new_rec->conn[0].address,
+					    new_rec->conn[0].port);
+				continue;
+			}
+
+			rc = idbm_add_node(db, new_rec, drec, update);
+			if (rc)
+				log_error("Could not add/update "
+					  "[%s:" iface_fmt " %s,%d,%d %s]",
+					   new_rec->iface.transport_name,
+					   iface_str(&new_rec->iface),
+					   new_rec->conn[0].address,
+					   new_rec->conn[0].port,
+					   new_rec->tpgt, new_rec->name);
+		}
+	}
+
+	idbm_print_discovered(db, drec, info_level);
+
+	if (!do_login) {
+		rc = 0;
+		goto free_bound_recs;
+	}
+
+	err = __login_portals(drec, &found, &bound_rec_list,
+			      login_discovered_portal);
+	if (err && !rc)
+		rc = err;
+
+free_bound_recs:
+	list_for_each_entry_safe(new_rec, tmp, &bound_rec_list, list) {
+		list_del(&new_rec->list);
+		free(new_rec);
+	}
+	return rc;
+}
+
 static int
 do_sofware_sendtargets(idbm_t *db, discovery_rec_t *drec,
-			struct list_head *ifaces, int info_level, int do_login)
+			struct list_head *ifaces, int info_level, int do_login,
+			int op)
 {
-	int rc, err, nr_found = 0;
-	struct list_head rec_list;
+	struct list_head new_rec_list;
+	struct node_rec *new_rec, *tmp;
+	int rc;
+
+	INIT_LIST_HEAD(&new_rec_list);
+	/*
+	 * compat: if the user did not pass any op then we do all
+	 * ops for them
+	 */
+	if (!op)
+		op = OP_NEW | OP_DELETE | OP_UPDATE;
 
 	drec->type = DISCOVERY_TYPE_SENDTARGETS;
-	rc = discovery_sendtargets(db, drec, ifaces);
+	rc = discovery_sendtargets(db, drec, &new_rec_list);
 	if (rc)
 		return rc;
 
-	idbm_print_discovered(db, drec, info_level);
+	rc = idbm_add_discovery(db, drec, op & OP_UPDATE);
+	if (rc) {
+		log_error("Could not add new discovery record.");
+		goto free_new_recs;
+	}
 
-	if (!do_login)
-		return 0;
+	rc = update_discovery_recs(db, drec, &new_rec_list, ifaces,
+				   info_level, do_login, op);
 
-	INIT_LIST_HEAD(&rec_list);
-	rc = idbm_for_each_rec(db, &nr_found, &rec_list, link_recs);
-	err = __login_portals(drec, &nr_found, &rec_list,
-			      login_discovered_portal);
-	if (err && !rc)
-		rc = err;
+free_new_recs:
+	list_for_each_entry_safe(new_rec, tmp, &new_rec_list, list) {
+		list_del(&new_rec->list);
+		free(new_rec);
+	}
 	return rc;
 }
 
 static int
 do_sendtargets(idbm_t *db, discovery_rec_t *drec, struct list_head *ifaces,
-	       int info_level, int do_login)
+	       int info_level, int do_login, int op)
 {
 	struct iface_rec *tmp, *iface;
 	int rc, host_no;
@@ -1515,7 +1690,8 @@ do_sendtargets(idbm_t *db, discovery_rec
 		return ENODEV;
 
 sw_st:
-	return do_sofware_sendtargets(db, drec, ifaces, info_level, do_login);
+	return do_sofware_sendtargets(db, drec, ifaces, info_level, do_login,
+				      op);
 }
 
 /* TODO: merge this with the idbm code */
@@ -1534,53 +1710,6 @@ static void print_fw_nodes(struct node_r
 	}
 }
 
-static int do_fw_discovery(idbm_t *db, discovery_rec_t *drec, int do_login,
-			   int info_level)
-{
-	struct boot_context context;
-	struct node_rec *rec;
-	int ret;
-
-	memset(&context, 0, sizeof(struct boot_context));
-	ret = fw_get_entry(&context, NULL);
-	if (ret) {
-		log_error("Could not read fw values.");
-		return ret;
-	}
-	/* tpgt hard coded to 1 */
-	rec = create_node_record(db, context.targetname, 1,
-				 context.target_ipaddr, context.target_port,
-				 NULL, 1);
-	if (!rec) {
-		log_error("Could not setup rec for fw discovery login.");
-		return ENOMEM;
-	}
-
-	/* todo - grab mac and set that here */
-	iface_init(&rec->iface);
-	strncpy(rec->iface.iname, context.initiatorname,
-		sizeof(context.initiatorname));
-	strncpy(rec->session.auth.username, context.chap_name,
-		sizeof(context.chap_name));
-	strncpy((char *)rec->session.auth.password, context.chap_password,
-		sizeof(context.chap_password));
-	strncpy(rec->session.auth.username_in, context.chap_name_in,
-		sizeof(context.chap_name_in));
-	strncpy((char *)rec->session.auth.password_in, context.chap_password_in,
-		sizeof(context.chap_password_in));
-	rec->session.auth.password_length =
-				strlen((char *)context.chap_password);
-	rec->session.auth.password_in_length =
-				strlen((char *)context.chap_password_in);
-
-	print_fw_nodes(rec, info_level);
-	if (do_login)
-		ret = login_portal(db, NULL, rec);
-	free(rec);
-	return ret;
-}
-
-
 static int isns_dev_attr_query(idbm_t *db, discovery_rec_t *drec,
 			       int info_level)
 {
@@ -1627,16 +1756,7 @@ static void catch_sigint( int signo ) {
 	exit(1);
 }
 
-/* TODO merge with initiator.c implementation */
-/* And add locking */
-static int check_for_session_through_iface(struct node_rec *rec)
-{
-	int nr_found = 0;
-	if (sysfs_for_each_session(rec, &nr_found, iscsi_match_session))
-		return 1;
-	return 0;
-}
-
+/* TODO: merge iter helpers and clean them up, so we can use them here */
 static int exec_iface_op(idbm_t *db, int op, int do_show, int info_level,
 			 struct iface_rec *iface, char *name, char *value)
 {
@@ -1684,13 +1804,8 @@ new_fail:
 		}
 
 		if (iface_is_bound(&rec->iface)) {
-			if (check_for_session_through_iface(rec)) {
-				rc = EBUSY;
-				goto delete_fail;
-			}
-
-			/* delete node records using it first */
-			rc = __for_each_rec(db, 0, rec, NULL, idbm_delete_node);
+			/* logout and delete records using it first */
+			rc = __for_each_rec(db, 0, rec, NULL, delete_node);
 			if (rc && rc != ENODEV)
 				goto delete_fail;
 		}
@@ -1775,10 +1890,19 @@ update_fail:
 			  iface->name);
 		break;
 	default:
-		if (op < 0 || op == OP_SHOW)
-			rc = print_ifaces(db, info_level);
-		else
-			rc = EINVAL;
+		if (!iface) {
+			if (op == OP_NOOP || op == OP_SHOW)
+				rc = print_ifaces(db, info_level);
+			else
+				rc = EINVAL;
+		} else {
+			rc = iface_conf_read(db, iface);
+			if (!rc)
+				idbm_print_iface_info(db, &do_show, iface);
+			else
+				log_error("Could not read iface %s (%d).",
+					  iface->name, rc);
+		}
 	}
 
 	if (rec)
@@ -1824,14 +1948,14 @@ static int exec_node_op(idbm_t *db, int 
 		goto out;
 	}
 
-	if ((do_login || do_logout) && op >= 0) {
+	if ((do_login || do_logout) && op > OP_NOOP) {
 		log_error("either operation or login/logout "
 			  "at the time allowed!");
 		rc = -1;
 		goto out;
 	}
 
-	if ((!do_login && !do_logout && op < 0) &&
+	if ((!do_login && !do_logout && op == OP_NOOP) &&
 	    (!strlen(rec->name) && !strlen(rec->conn[0].address) &&
 	     !strlen(rec->iface.name))) {
 		rc = print_nodes(db, info_level, rec);
@@ -1850,7 +1974,7 @@ static int exec_node_op(idbm_t *db, int 
 		goto out;
 	}
 
-	if (op < 0 || (!do_login && !do_logout && op == OP_SHOW)) {
+	if (op == OP_NOOP || (!do_login && !do_logout && op == OP_SHOW)) {
 		if (for_each_rec(db, rec, &do_show, idbm_print_node_info))
 			rc = -1;
 		goto out;
@@ -1863,6 +1987,22 @@ static int exec_node_op(idbm_t *db, int 
 			goto out;
 		}
 
+		/*
+		 * We do not export the iscsiadm iface.iscsi_ifacename
+		 * in sysfs because it is iscsiadm specific abstraction.
+		 * To work around this, we do some hacky matching by bind
+		 * info. As a result we cannot change the iface binding
+		 * values here and must do it in iface mode which will do
+		 * the right thing.
+		 */
+		if (!strncmp(name, "iface.", 6) &&
+		    strcmp(name, "iface.transport_name")) {
+			log_error("Cannot modify %s. Use iface mode to update "
+				  "this value.", name);
+			rc = -1;
+			goto out;
+		}
+
 		set_param.db = db;
 		set_param.name = name;
 		set_param.value = value;
@@ -1871,7 +2011,7 @@ static int exec_node_op(idbm_t *db, int 
 			rc = -1;
 		goto out;
 	} else if (op == OP_DELETE) {
-		if (for_each_rec(db, rec, NULL, idbm_delete_node))
+		if (for_each_rec(db, rec, NULL, delete_node))
 			rc = -1;
 		goto out;
 	} else {
@@ -1883,10 +2023,46 @@ out:
 	return rc;
 }
 
-static int exec_fw_op(void)
+static struct node_rec *
+fw_create_rec_by_entry(idbm_t *db, struct boot_context *context)
+{
+	struct node_rec *rec;
+
+	/* tpgt hard coded to 1 ??? */
+	rec = create_node_record(db, context->targetname, 1,
+				 context->target_ipaddr, context->target_port,
+				 NULL, 1);
+	if (!rec) {
+		log_error("Could not setup rec for fw discovery login.");
+		return NULL;
+	}
+
+	/* todo - grab mac and set that here */
+	iface_init(&rec->iface);
+	strncpy(rec->iface.iname, context->initiatorname,
+		sizeof(context->initiatorname));
+	strncpy(rec->session.auth.username, context->chap_name,
+		sizeof(context->chap_name));
+	strncpy((char *)rec->session.auth.password, context->chap_password,
+		sizeof(context->chap_password));
+	strncpy(rec->session.auth.username_in, context->chap_name_in,
+		sizeof(context->chap_name_in));
+	strncpy((char *)rec->session.auth.password_in,
+		context->chap_password_in,
+		sizeof(context->chap_password_in));
+	rec->session.auth.password_length =
+				strlen((char *)context->chap_password);
+	rec->session.auth.password_in_length =
+				strlen((char *)context->chap_password_in);
+	return rec;
+}
+
+static int exec_fw_op(idbm_t *db, discovery_rec_t *drec, int do_login,
+		     int info_level)
 {
 	struct boot_context context;
-	int ret;
+	struct node_rec *rec;
+	int ret = 0;
 
 	memset(&context, 0, sizeof(struct boot_context));
 	ret = fw_get_entry(&context, NULL);
@@ -1895,8 +2071,22 @@ static int exec_fw_op(void)
 		return ret;
 	}
 
-	fw_print_entry(&context);
-	return 0;
+	rec = fw_create_rec_by_entry(db, &context);
+	if (!rec)
+		return ENODEV;
+
+	/* if discovery, print nodes that were found. */
+	if (drec)
+		print_fw_nodes(rec, info_level);
+
+	if (do_login)
+		ret = login_portal(db, NULL, rec);
+	free(rec);
+
+	/* print the fw node info if called in fw mode with no params */
+	if (!do_login && !drec)
+		fw_print_entry(&context);
+	return ret;
 }
 
 static int parse_sid(char *session)
@@ -1955,9 +2145,9 @@ main(int argc, char **argv)
 	char *ip = NULL, *name = NULL, *value = NULL;
 	char *targetname = NULL, *group_session_mgmt_mode = NULL;
 	int ch, longindex, mode=-1, port=-1, do_login=0, do_rescan=0;
-	int rc=0, sid=-1, op=-1, type=-1, do_logout=0, do_stats=0, do_show=0;
+	int rc=0, sid=-1, op=OP_NOOP, type=-1, do_logout=0, do_stats=0;
 	int do_login_all=0, do_logout_all=0, info_level=-1, num_ifaces = 0;
-	int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1;
+	int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0;
 	idbm_t *db = NULL;
 	struct sigaction sa_old;
 	struct sigaction sa_new;
@@ -1999,8 +2189,8 @@ main(int argc, char **argv)
 			type = str_to_type(optarg);
 			break;
 		case 'o':
-			op = str_to_op(optarg);
-			if (op < 0) {
+			op |= str_to_op(optarg);
+			if (op == OP_NOOP) {
 				log_error("can not recognize operation: '%s'",
 					optarg);
 				return -1;
@@ -2098,14 +2288,14 @@ main(int argc, char **argv)
 		usage(0);
 
 	if (mode == MODE_FW) {
-		if ((rc = verify_mode_params(argc, argv, "m", 0))) {
+		if ((rc = verify_mode_params(argc, argv, "ml", 0))) {
 			log_error("fw mode: option '-%c' is not "
 				  "allowed/supported", rc);
 			rc = -1;
 			goto out;
 		}
 
-		rc = exec_fw_op();
+		rc = exec_fw_op(db, NULL, do_login, info_level);
 		goto out;
 	}
 
@@ -2160,7 +2350,7 @@ main(int argc, char **argv)
 			drec.port = port;
 
 			if (do_sendtargets(db, &drec, &ifaces, info_level,
-					   do_login)) {
+					   do_login, op)) {
 				rc = -1;
 				goto out;
 			}
@@ -2178,7 +2368,7 @@ main(int argc, char **argv)
 			break;
 		case DISCOVERY_TYPE_FWBOOT:
 			drec.type = DISCOVERY_TYPE_FWBOOT;
-			if (do_fw_discovery(db, &drec, do_login, info_level))
+			if (exec_fw_op(db, &drec, do_login, info_level))
 				rc = -1;
 			break;
 		default:
@@ -2192,7 +2382,8 @@ main(int argc, char **argv)
 				if (do_login &&
 				    drec.type == DISCOVERY_TYPE_SENDTARGETS) {
 					do_sendtargets(db, &drec, &ifaces,
-							info_level, do_login);
+							info_level, do_login,
+							op);
 				} else if (do_login &&
 					   drec.type == DISCOVERY_TYPE_SLP) {
 					log_error("SLP discovery is not fully "
@@ -2205,7 +2396,7 @@ main(int argc, char **argv)
 						  "implemented yet.");
 					rc = -1;
 					goto out;
-				} else if (op < 0 || op == OP_SHOW) {
+				} else if (op == OP_NOOP || op == OP_SHOW) {
 					if (!idbm_print_discovery_info(db,
 							&drec, do_show)) {
 						log_error("no records found!");
@@ -2223,7 +2414,7 @@ main(int argc, char **argv)
 					goto out;
 				}
 
-			} else if (op < 0 || op == OP_SHOW) {
+			} else if (op == OP_NOOP || op == OP_SHOW) {
 				if (!idbm_print_all_discovery(db, info_level))
 					rc = -1;
 				goto out;
@@ -2315,9 +2506,9 @@ main(int argc, char **argv)
 			if (!t)
 				goto free_info;
 
-			if (!do_logout && !do_rescan && !do_stats && op < 0 &&
-			    info_level > 0) {
-				rc = print_session(db, info_level, info);
+			if (!do_logout && !do_rescan && !do_stats &&
+			    op == OP_NOOP && info_level > 0) {
+				rc = print_sessions(db, info_level, info);
 				if (rc)
 					rc = -1;
 				goto free_info;
@@ -2348,7 +2539,7 @@ free_info:
 				goto out;
 			}
 
-			rc = print_sessions(db, info_level);
+			rc = print_sessions(db, info_level, NULL);
 		}
 		break;
 	default:
Only in open-iscsi.git/usr: iscsiadm.c~
diff -pur open-iscsi-2.0-865/usr/iscsiadm.h open-iscsi.git/usr/iscsiadm.h
--- open-iscsi-2.0-865/usr/iscsiadm.h	2008-03-05 11:43:19.352978250 +0100
+++ open-iscsi.git/usr/iscsiadm.h	2008-03-05 11:29:21.536618000 +0100
@@ -29,7 +29,7 @@ struct discovery_rec;
 struct list_head;
 
 extern int discovery_sendtargets(struct idbm *db, struct discovery_rec *drec,
-				 struct list_head *ifaces);
+				 struct list_head *rec_list);
 extern int discovery_offload_sendtargets(struct idbm *db, int host_no,
 					 int do_login, discovery_rec_t *drec);
 #endif /* ISCSIADM_H */
Only in open-iscsi.git/usr: iscsiadm.o
Only in open-iscsi.git/usr: iscsid
diff -pur open-iscsi-2.0-865/usr/iscsid.c open-iscsi.git/usr/iscsid.c
--- open-iscsi-2.0-865/usr/iscsid.c	2008-03-05 11:28:54.310916500 +0100
+++ open-iscsi.git/usr/iscsid.c	2008-02-06 08:24:29.404852500 +0100
@@ -369,7 +369,10 @@ int main(int argc, char *argv[])
 	log_pid = log_init(program_name, DEFAULT_AREA_SIZE);
 	if (log_pid < 0)
 		exit(1);
-	check_class_version();
+	if (check_class_version()) {
+		log_close(log_pid);
+		exit(1);
+	}
 
 	umask(0177);
 
@@ -379,11 +382,14 @@ int main(int argc, char *argv[])
 	daemon_config.initiator_alias = NULL;
 	if (atexit(iscsid_exit)) {
 		log_error("failed to set exit function\n");
+		log_close(log_pid);
 		exit(1);
 	}
 
-	if ((mgmt_ipc_fd = mgmt_ipc_listen()) < 0)
+	if ((mgmt_ipc_fd = mgmt_ipc_listen()) < 0) {
+		log_close(log_pid);
 		exit(-1);
+	}
 
 	if (log_daemon) {
 		char buf[64];
@@ -392,23 +398,28 @@ int main(int argc, char *argv[])
 		fd = open(pid_file, O_WRONLY|O_CREAT, 0644);
 		if (fd < 0) {
 			log_error("Unable to create pid file");
+			log_close(log_pid);
 			exit(1);
 		}
 		pid = fork();
 		if (pid < 0) {
 			log_error("Starting daemon failed");
+			log_close(log_pid);
 			exit(1);
 		} else if (pid) {
 			log_error("iSCSI daemon with pid=%d started!", pid);
 			exit(0);
 		}
 
-		if ((control_fd = ipc->ctldev_open()) < 0)
+		if ((control_fd = ipc->ctldev_open()) < 0) {
+			log_close(log_pid);
 			exit(-1);
+		}
 
 		chdir("/");
 		if (lockf(fd, F_TLOCK, 0) < 0) {
 			log_error("Unable to lock pid file");
+			log_close(log_pid);
 			exit(1);
 		}
 		ftruncate(fd, 0);
@@ -417,8 +428,10 @@ int main(int argc, char *argv[])
 
 		daemon_init();
 	} else {
-		if ((control_fd = ipc->ctldev_open()) < 0)
+		if ((control_fd = ipc->ctldev_open()) < 0) {
+			log_close(log_pid);
 			exit(-1);
+		}
 	}
 
 	if (uid && setuid(uid) < 0)
@@ -468,6 +481,7 @@ int main(int argc, char *argv[])
 	/* we don't want our active sessions to be paged out... */
 	if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
 		log_error("failed to mlockall, exiting...");
+		log_close(log_pid);
 		exit(1);
 	}
 
Only in open-iscsi.git/usr: iscsid.o
diff -pur open-iscsi-2.0-865/usr/iscsi_settings.h open-iscsi.git/usr/iscsi_settings.h
--- open-iscsi-2.0-865/usr/iscsi_settings.h	2008-03-05 11:28:54.190909000 +0100
+++ open-iscsi.git/usr/iscsi_settings.h	2008-02-06 08:24:29.228841500 +0100
@@ -5,8 +5,8 @@
 /* timeouts in seconds */
 #define DEF_LOGIN_TIMEO		30
 #define DEF_LOGOUT_TIMEO	15
-#define DEF_NOOP_OUT_INTERVAL	10
-#define DEF_NOOP_OUT_TIMEO	15
+#define DEF_NOOP_OUT_INTERVAL	5
+#define DEF_NOOP_OUT_TIMEO	5
 #define DEF_REPLACEMENT_TIMEO	120
 
 #define DEF_ABORT_TIMEO		15
Only in open-iscsi.git/usr: iscsistart
diff -pur open-iscsi-2.0-865/usr/iscsistart.c open-iscsi.git/usr/iscsistart.c
--- open-iscsi-2.0-865/usr/iscsistart.c	2008-03-05 11:28:54.354919250 +0100
+++ open-iscsi.git/usr/iscsistart.c	2008-02-06 08:24:29.420853500 +0100
@@ -305,7 +305,9 @@ int main(int argc, char *argv[])
 	log_daemon = 0;
 	log_init(program_name, DEFAULT_AREA_SIZE);
 
-	check_class_version();
+	if (check_class_version())
+		exit(1);
+
 	if (check_params(initiatorname))
 		exit(1);
 
Only in open-iscsi.git/usr: iscsistart.o
diff -pur open-iscsi-2.0-865/usr/iscsi_sysfs.c open-iscsi.git/usr/iscsi_sysfs.c
--- open-iscsi-2.0-865/usr/iscsi_sysfs.c	2008-03-05 11:28:54.222911000 +0100
+++ open-iscsi.git/usr/iscsi_sysfs.c	2008-03-05 11:29:21.464613500 +0100
@@ -38,11 +38,41 @@
 
 #define ISCSI_MAX_SYSFS_BUFFER NI_MAXHOST
 
+/*
+ * TODO: make this into a real API and check inputs better and add doc.
+ * We should also use a common lib and search sysfs according to the sysfs
+ * doc in the kernel documetnation.
+ */
+
 /* tmp buffer used by sysfs functions */
 static char sysfs_file[PATH_MAX];
 int num_transports = 0;
 LIST_HEAD(transports);
 
+/* mini implementation of versionsort for uclibc compatility */
+int direntcmp(const void *d1, const void *d2)
+{
+	const char *a = (*(const struct dirent **)d1)->d_name;
+	const char *b = (*(const struct dirent **)d2)->d_name;
+	while (*a && *b) {
+		int mask = (isdigit(*a) != 0) |  ((isdigit(*b) != 0) << 1);
+		switch (mask) {
+		case 0: /* none are digit */
+			if (*a == *b)
+				break;
+			return (*a - *b);
+		case 1: /* a is digit but not b */
+			return -1;
+		case 2: /* b is digit but not a */
+			return 1;
+		case 3: /* both ar digits */
+			return atoi(a) - atoi(b);
+		}
+		a++; b++;
+	}
+	return *a - *b;
+}
+
 int read_sysfs_file(char *filename, void *value, char *format)
 {
 	FILE *file;
@@ -91,7 +121,7 @@ static int read_transports(void)
 	log_debug(7, "in %s", __FUNCTION__);
 
 	n = scandir(ISCSI_TRANSPORT_DIR, &namelist, trans_filter,
-		    versionsort);
+		    direntcmp);
 	if (n < 0) {
 		log_error("Could not scan %s.", ISCSI_TRANSPORT_DIR);
 		return n;
@@ -373,7 +403,7 @@ int sysfs_for_each_host(void *data, int 
 		return ENOMEM;
 
 	n = scandir(ISCSI_HOST_DIR, &namelist, trans_filter,
-		    versionsort);
+		    direntcmp);
 	if (n <= 0)
 		goto free_info;
 
@@ -439,6 +469,24 @@ free_info:
 	return rc;
 }
 
+/**
+ * sysfs_session_has_leadconn - checks if session has lead conn in kernel
+ * @sid: session id
+ *
+ * return 1 if session has lead conn and 0 if not.
+ */
+int sysfs_session_has_leadconn(uint32_t sid)
+{
+	struct stat statb;
+
+	memset(sysfs_file, 0, PATH_MAX);
+	sprintf(sysfs_file, ISCSI_CONN_DIR"/connection%u:0", sid);
+	if (!stat(sysfs_file, &statb))
+		return 1;
+	else
+		return 0;
+}
+
 int get_sessioninfo_by_sysfs_id(struct session_info *info, char *session)
 {
 	int ret, pers_failed = 0;
@@ -598,7 +646,7 @@ int sysfs_for_each_session(void *data, i
 
 	sprintf(sysfs_file, ISCSI_SESSION_DIR);
 	n = scandir(sysfs_file, &namelist, trans_filter,
-		    versionsort);
+		    direntcmp);
 	if (n <= 0)
 		goto free_info;
 
@@ -629,6 +677,13 @@ free_info:
 	return rc;
 }
 
+int get_session_state(char *state, int sid)
+{
+	memset(sysfs_file, 0, PATH_MAX);
+	sprintf(sysfs_file, ISCSI_SESSION_DIR"/session%d/state", sid);
+	return read_sysfs_file(sysfs_file, state, "%s\n");
+}
+
 int get_host_state(char *state, int host_no)
 {
 	memset(sysfs_file, 0, PATH_MAX);
@@ -798,7 +853,7 @@ int sysfs_for_each_device(int host_no, u
 	sprintf(sysfs_file, ISCSI_SESSION_DIR"/session%d/device/target%d:0:%d",
 		sid, host_no, target);
 	n = scandir(sysfs_file, &namelist, trans_filter,
-		    versionsort);
+		    direntcmp);
 	if (n <= 0)
 		return 0;
 
@@ -917,7 +972,7 @@ int get_iscsi_kernel_version(char *buf)
 		return 0;
 }
 
-void check_class_version(void)
+int check_class_version(void)
 {
 	char version[20];
 	int i;
@@ -943,12 +998,12 @@ void check_class_version(void)
 	if (!strncmp(version, ISCSI_VERSION_STR, i) ||
 	   /* support 2.6.18 */
 	    !strncmp(version, "1.1", 3))
-		return;
+		return 0;
 
 fail:
 	log_error( "Missing or Invalid version from %s. Make sure a up "
 		"to date scsi_transport_iscsi module is loaded and a up to"
 		"date version of iscsid is running. Exiting...",
 		ISCSI_VERSION_FILE);
-	exit(1);
+	return -1;
 }
diff -pur open-iscsi-2.0-865/usr/iscsi_sysfs.h open-iscsi.git/usr/iscsi_sysfs.h
--- open-iscsi-2.0-865/usr/iscsi_sysfs.h	2008-03-05 11:28:54.242912250 +0100
+++ open-iscsi.git/usr/iscsi_sysfs.h	2008-03-05 11:29:21.484614750 +0100
@@ -48,11 +48,13 @@ struct host_info {
 	int host_no;
 };
 
+extern int direntcmp(const void *d1, const void *d2);
 extern void free_transports(void);
 extern int get_iscsi_kernel_version(char *buf);
-extern void check_class_version(void);
+extern int check_class_version(void);
 extern int get_sessioninfo_by_sysfs_id(struct session_info *info,
 				      char *sys_session);
+extern int sysfs_session_has_leadconn(uint32_t sid);
 
 typedef int (sysfs_session_op_fn)(void *, struct session_info *);
 typedef int (sysfs_host_op_fn)(void *, struct host_info *);
@@ -76,6 +78,7 @@ extern void get_negotiated_session_conf(
 extern void get_negotiated_conn_conf(int sid,
 				struct iscsi_conn_operational_config *conf);
 extern pid_t scan_host(int hostno, int async);
+extern int get_session_state(char *state, int sid);
 extern int get_host_state(char *state, int host_no);
 extern int get_device_state(char *state, int host_no, int target, int lun);
 extern void set_device_online(int hostno, int target, int lun);
Only in open-iscsi.git/usr: iscsi_sysfs.o
diff -pur open-iscsi-2.0-865/usr/isns.c open-iscsi.git/usr/isns.c
--- open-iscsi-2.0-865/usr/isns.c	2008-03-05 11:43:19.384980250 +0100
+++ open-iscsi.git/usr/isns.c	2008-03-05 11:29:21.556619250 +0100
@@ -286,7 +286,10 @@ static void add_new_target_node(char *ta
 	char dst[INET6_ADDRSTRLEN];
 
 	memset(dst, 0, sizeof(dst));
-	if (!memcmp(ip, dst, 10) && ip[10] == 0xff && ip[11] == 0xff)
+	/*
+	 * some servers are sending compat instead of mapped
+	 */
+	if (IN6_IS_ADDR_V4MAPPED(ip) || IN6_IS_ADDR_V4COMPAT(ip))
 		inet_ntop(AF_INET, ip + 12, dst, sizeof(dst));
 	else
 		inet_ntop(AF_INET6, ip, dst, sizeof(dst));
@@ -309,7 +312,7 @@ static void add_new_target_node(char *ta
 	/* TODO?: shoudl we set the address and port of the server ? */
 	memset(&drec, 0, sizeof(discovery_rec_t));
 	drec.type = DISCOVERY_TYPE_ISNS;
-	err = idbm_add_nodes(db, &rec, &drec, NULL);
+	err = idbm_add_nodes(db, &rec, &drec, NULL, 0);
 	if (err)
 		log_error("Could not add new target node:%s %s,%d",
 			  targetname, dst, port);
diff -pur open-iscsi-2.0-865/usr/list.h open-iscsi.git/usr/list.h
--- open-iscsi-2.0-865/usr/list.h	2008-03-05 11:28:54.406922500 +0100
+++ open-iscsi.git/usr/list.h	2008-03-05 11:29:21.572620250 +0100
@@ -1,6 +1,7 @@
 #ifndef __LIST_H__
 #define __LIST_H__
 
+#include <stddef.h>
 /* taken from linux kernel */
 
 #undef offsetof
diff -pur open-iscsi-2.0-865/usr/login.c open-iscsi.git/usr/login.c
--- open-iscsi-2.0-865/usr/login.c	2008-03-05 11:28:54.458925750 +0100
+++ open-iscsi.git/usr/login.c	2008-03-05 11:29:21.616623000 +0100
@@ -264,24 +264,20 @@ get_security_text_keys(iscsi_session_t *
 					 &value, &value_end)) {
 		/*
 		 * We should have already obtained this
-		 * via discovery.
-		 * We've already picked an isid, so the
-		 * most we can do is confirm we reached
-		 * the portal group we were expecting to
+		 * via discovery, but the value could be stale.
+		 * If the target was reconfigured it will send us
+		 * the updated tpgt.
 		 */
 		tag = strtoul(value, NULL, 0);
 		if (session->portal_group_tag >= 0) {
-			if (tag != session->portal_group_tag) {
-				log_error("Portal group tag "
+			if (tag != session->portal_group_tag)
+				log_debug(2, "Portal group tag "
 					  "mismatch, expected %u, "
-					  "received %u",
+					  "received %u. Updating",
 					  session->portal_group_tag, tag);
-				return LOGIN_WRONG_PORTAL_GROUP;
-			}
-		} else
-			/* we now know the tag */
-			session->portal_group_tag = tag;
-
+		}
+		/* we now know the tag */
+		session->portal_group_tag = tag;
 		text = value_end;
 	} else {
 		/*
@@ -339,21 +335,22 @@ get_op_params_text_keys(iscsi_session_t 
 		}
 	} else if (iscsi_find_key_value("TargetPortalGroupTag", text, end,
 					 &value, &value_end)) {
+		int tag = strtoul(value, NULL, 0);
 		/*
-		 * confirm we reached the portal group we were expecting to
+		 * We should have already obtained this
+		 * via discovery, but the value could be stale.
+		 * If the target was reconfigured it will send us
+		 * the updated tpgt.
 		 */
-		int tag = strtoul(value, NULL, 0);
 		if (session->portal_group_tag >= 0) {
-			if (tag != session->portal_group_tag) {
-				log_error("Portal group tag mismatch, "
-					  "expected %u, received %u",
+			if (tag != session->portal_group_tag)
+				log_debug(2, "Portal group tag "
+					  "mismatch, expected %u, "
+					  "received %u. Updating",
 					  session->portal_group_tag, tag);
-				return LOGIN_WRONG_PORTAL_GROUP;
-			}
-		} else
-			/* we now know the tag */
-			session->portal_group_tag = tag;
-
+		}
+		/* we now know the tag */
+		session->portal_group_tag = tag;
 		text = value_end;
 	} else if (iscsi_find_key_value("InitialR2T", text, end, &value,
 					 &value_end)) {
diff -pur open-iscsi-2.0-865/usr/mgmt_ipc.c open-iscsi.git/usr/mgmt_ipc.c
--- open-iscsi-2.0-865/usr/mgmt_ipc.c	2008-03-05 11:43:19.396981000 +0100
+++ open-iscsi.git/usr/mgmt_ipc.c	2008-03-05 11:29:21.656625500 +0100
@@ -139,7 +139,7 @@ mgmt_ipc_session_logout(queue_task_t *qt
 	iscsi_session_t *session;
 
 	if (!(session = session_find_by_rec(rec))) {
-		log_error("session [%s,%s,%d] not found!", rec->name,
+		log_debug(1, "session [%s,%s,%d] not found!", rec->name,
 			  rec->conn[0].address, rec->conn[0].port);
 		return MGMT_IPC_ERR_NOT_FOUND;
 	}
@@ -172,7 +172,7 @@ mgmt_ipc_session_info(queue_task_t *qtas
 	struct ipc_msg_session_state *info;
 
 	if (!(session = session_find_by_sid(sid))) {
-		log_error("session with sid %d not found!", sid);
+		log_debug(1, "session with sid %d not found!", sid);
 		return MGMT_IPC_ERR_NOT_FOUND;
 	}
 
diff -pur open-iscsi-2.0-865/usr/strings.c open-iscsi.git/usr/strings.c
--- open-iscsi-2.0-865/usr/strings.c	2008-03-05 11:28:54.670939000 +0100
+++ open-iscsi.git/usr/strings.c	2008-02-06 08:24:29.436854500 +0100
@@ -78,7 +78,7 @@ enlarge_data(struct string_buffer *s, in
 
 	if (s) {
 		s->data_length += length;
-		if (s->data_length >= s->allocated_length) {
+		if (s->data_length > s->allocated_length) {
 			log_debug(7, "enlarge buffer from %lu to %lu\n",
 				  s->allocated_length, s->data_length);
 			new_buf = realloc(s->buffer, s->data_length);
@@ -91,8 +91,9 @@ enlarge_data(struct string_buffer *s, in
 				exit(1);
 			}
 			s->buffer = new_buf;
-			memset(s->buffer + s->allocated_length, 0, length);
-			s->allocated_length += length;
+			memset(s->buffer + s->allocated_length, 0,
+			       s->data_length - s->allocated_length);
+			s->allocated_length = s->data_length;
 		}
 	}
 }
diff -pur open-iscsi-2.0-865/usr/util.c open-iscsi.git/usr/util.c
--- open-iscsi-2.0-865/usr/util.c	2008-03-05 11:43:19.436983500 +0100
+++ open-iscsi.git/usr/util.c	2008-03-05 11:29:21.692627750 +0100
@@ -313,7 +313,7 @@ int __iscsi_match_session(node_rec_t *re
 	if (rec->conn[0].port != -1 && port != rec->conn[0].port)
 		return 0;
 
-	if (strlen(rec->iface.transport_name) &&
+	if (iface && strlen(rec->iface.transport_name) &&
 	    strcmp(rec->iface.transport_name, iface->transport_name))
 		return 0;
 
diff -pur open-iscsi-2.0-865/usr/version.h open-iscsi.git/usr/version.h
--- open-iscsi-2.0-865/usr/version.h	2007-06-13 17:56:49.000000000 +0200
+++ open-iscsi.git/usr/version.h	2008-03-05 11:29:21.720629500 +0100
@@ -6,7 +6,7 @@
  * This may not be the same value as the kernel versions because
  * some other maintainer could merge a patch without going through us
  */
-#define ISCSI_VERSION_STR	"2.0-865"
+#define ISCSI_VERSION_STR	"2.0-868"
 #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
 
 #endif
diff -pur open-iscsi-2.0-865/utils/fwparam_ibft/fw_entry.c open-iscsi.git/utils/fwparam_ibft/fw_entry.c
--- open-iscsi-2.0-865/utils/fwparam_ibft/fw_entry.c	2008-03-05 11:28:54.870951500 +0100
+++ open-iscsi.git/utils/fwparam_ibft/fw_entry.c	2008-02-06 08:24:29.472856750 +0100
@@ -43,10 +43,7 @@ static void dump_mac(struct boot_context
 	if (!strlen(context->mac))
 		return;
 
-	printf("iface.hwaddress = ");
-	for (i = 0; i < 5; i++)
-		printf("%02x:", context->mac[i]);
-	printf("%02x\n", context->mac[i]);
+	printf("iface.hwaddress = %s\n", context->mac);
 }
 
 static void dump_initiator(struct boot_context *context)
diff -pur open-iscsi-2.0-865/utils/iscsi_discovery open-iscsi.git/utils/iscsi_discovery
--- open-iscsi-2.0-865/utils/iscsi_discovery	2007-05-31 20:14:20.000000000 +0200
+++ open-iscsi.git/utils/iscsi_discovery	2008-02-06 08:24:29.484857500 +0100
@@ -63,6 +63,12 @@ parse_cmdline()
 
 discover()
 {
+	# If open-iscsi is already logged in to the portal, exit
+	if [ $(iscsiadm -m session | grep -c ${ip}:${port}) -ne 0 ]; then
+		echo "Please logout from all targets on ${ip}:${port} before trying to run discovery on that portal"
+		exit 2
+	fi
+
 	connected=0
 	discovered=0
 	df=/tmp/discovered.$$
@@ -80,7 +86,7 @@ discover()
 		echo "failed to discover targets at ${ip}"
 		exit 2
 	else 
-		echo "discovered ${discovered} targets at ${ip}, connected to ${connected}"
+		echo "discovered ${discovered} targets at ${ip}"
 	fi
 	/bin/rm -f ${df}
 }

Places

File open-iscsi-add-discovery-ops of Package open-iscsi (Revision 45268e4d4efa62fee3f332d6539916e5)

Places