CVS commit: src/sys/dev/iscsi

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Sun Jun  5 11:01:39 UTC 2016

Modified Files:
        src/sys/dev/iscsi: iscsi_rcv.c

Log Message:
more debug output


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/iscsi/iscsi_rcv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/iscsi/iscsi_rcv.c
diff -u src/sys/dev/iscsi/iscsi_rcv.c:1.18 src/sys/dev/iscsi/iscsi_rcv.c:1.19
--- src/sys/dev/iscsi/iscsi_rcv.c:1.18	Sun Jun  5 05:40:29 2016
+++ src/sys/dev/iscsi/iscsi_rcv.c	Sun Jun  5 11:01:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsi_rcv.c,v 1.18 2016/06/05 05:40:29 mlelstv Exp $	*/
+/*	$NetBSD: iscsi_rcv.c,v 1.19 2016/06/05 11:01:39 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -132,13 +132,20 @@ ccb_from_itt(connection_t *conn, uint32_
 
 	ccb = &conn->session->ccb[cidx];
 
-	if (ccb->ITT != itt || ccb->disp <= CCBDISP_BUSY) {
+	if (ccb->ITT != itt) {
 		DEBC(conn, 0,
 		     ("ccb_from_itt: received invalid CCB itt %08x != %08x\n",
 		      itt, ccb->ITT));
 		return NULL;
 	}
 
+	if (ccb->disp <= CCBDISP_BUSY) {
+		DEBC(conn, 0,
+		     ("ccb_from_itt: received CCB with invalid disp %d\n",
+		      ccb->disp));
+		return NULL;
+	}
+
 	return ccb;
 }
 
@@ -1029,7 +1036,8 @@ receive_pdu(connection_t *conn, pdu_t *p
 		}
 	}
 
-	DEBC(conn, 99, ("Received PDU ExpCmdSN = %u\n",
+	DEBC(conn, 99, ("Received PDU ExpCmdSN = %u, MaxCmdSN = %u\n",
+	     ntohl(pdu->pdu.p.response.ExpCmdSN),
 	     ntohl(pdu->pdu.p.response.ExpCmdSN)));
 
 	req_ccb = ccb_from_itt(conn, pdu->pdu.InitiatorTaskTag);