[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-101-g2616afb

Mike Christie michaelc at cs.wisc.edu
Mon May 2 18:56:43 UTC 2011


The following commit has been merged in the upstream-mnc branch:
commit 4662cbc84659b7a802a1ec4187842bad97baaecc
Author: Mark Rustad <mark.d.rustad at intel.com>
Date:   Thu Mar 31 11:52:10 2011 -0700

    iscsid: Fix netdev check
    
    A check for a bound session omitted the subscript for the first byte of
    the array, forcing the check to always be true. This means that in the
    case of a session not bound to an interface, the ss structure will not
    be filled-in if the logging level is set to 0. This will prevent the
    DCB priority from being set.
    
    Signed-off-by: Mark Rustad <mark.d.rustad at intel.com>
    Tested-by: Ross Brattain <ross.b.brattain at intel.com>

diff --git a/usr/io.c b/usr/io.c
index 7d366c7..28d9168 100644
--- a/usr/io.c
+++ b/usr/io.c
@@ -470,7 +470,7 @@ iscsi_io_tcp_poll(iscsi_conn_t *conn, int timeout_ms)
 	}
 
 	len = sizeof(ss);
-	if (log_level > 0 || !conn->session->netdev)
+	if (log_level > 0 || !conn->session->netdev[0])
 		rc = getsockname(conn->socket_fd, (struct sockaddr *)&ss, &len);
 	if (log_level > 0 && rc >= 0) {
 		getnameinfo((struct sockaddr *) &conn->saddr,

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list