Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Mar 2015 09:51:54 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r279879 - stable/10/usr.sbin/ctld
Message-ID:  <201503110951.t2B9ps9p004575@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Wed Mar 11 09:51:53 2015
New Revision: 279879
URL: https://svnweb.freebsd.org/changeset/base/279879

Log:
  MFC r279589: Fix handling of queued text and logout requests.
  
  While it may have little sense, text and logout requests can be queued.
  If they are, they consume cmdsn, so we should increment our conn_cmdsn.

Modified:
  stable/10/usr.sbin/ctld/discovery.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/ctld/discovery.c
==============================================================================
--- stable/10/usr.sbin/ctld/discovery.c	Wed Mar 11 09:50:31 2015	(r279878)
+++ stable/10/usr.sbin/ctld/discovery.c	Wed Mar 11 09:51:53 2015	(r279879)
@@ -75,6 +75,8 @@ text_receive(struct connection *conn)
 		    conn->conn_statsn);
 	}
 	conn->conn_cmdsn = ntohl(bhstr->bhstr_cmdsn);
+	if ((bhstr->bhstr_opcode & ISCSI_BHS_OPCODE_IMMEDIATE) == 0)
+		conn->conn_cmdsn++;
 
 	return (request);
 }
@@ -131,6 +133,8 @@ logout_receive(struct connection *conn)
 		    conn->conn_statsn);
 	}
 	conn->conn_cmdsn = ntohl(bhslr->bhslr_cmdsn);
+	if ((bhslr->bhslr_opcode & ISCSI_BHS_OPCODE_IMMEDIATE) == 0)
+		conn->conn_cmdsn++;
 
 	return (request);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503110951.t2B9ps9p004575>